Attachment #79381 for issue #119558

View | Details | Raw Unified | Return to issue 119558
Collapse All | Expand All

Lines 247-252 Link Here

(-)sw/inc/unomap.hxx (+1 lines)
247	#define WID_DOC_HAS_VALID_SIGNATURES 1017	247	#define WID_DOC_HAS_VALID_SIGNATURES 1017
248	#define WID_DOC_BUILDID 1024	248	#define WID_DOC_BUILDID 1024
249	#define WID_DOC_ISTEMPLATEID 1025	249	#define WID_DOC_ISTEMPLATEID 1025
		250	#define WID_DOC_DEFAULT_PAGE_MODE 1069
250	// --> OD 2006-03-21 #b6375613#	251	// --> OD 2006-03-21 #b6375613#
251	#define WID_APPLY_WORKAROUND_FOR_B6375613 1070	252	#define WID_APPLY_WORKAROUND_FOR_B6375613 1070
252	// <--	253	// <--

Lines 805-812 Link Here

(-)sw/inc/unoprnms.hxx (-1 / +2 lines)
805	/* 0740 */ UNO_NAME_EMBEDDED_OBJECT,	805	/* 0740 */ UNO_NAME_EMBEDDED_OBJECT,
806		806
807	/* 0741 */ UNO_NAME_REPLACEMENT_GRAPHIC_URL,	807	/* 0741 */ UNO_NAME_REPLACEMENT_GRAPHIC_URL,
		808	/* 0742 */ UNO_NAME_DEFAULT_PAGE_MODE,
808		809
809	/* 0742 */ SW_PROPNAME_END	810	/* 0743 */ SW_PROPNAME_END
810	};	811	};
811		812
812		813

Lines 1597-1602 Link Here

(-)sw/source/core/unocore/unomap.cxx (+1 lines)
1597	{ SW_PROP_NMID(UNO_NAME_BUILDID), WID_DOC_BUILDID, CPPU_E2T(CPPUTYPE_OUSTRING), 0, 0},	1597	{ SW_PROP_NMID(UNO_NAME_BUILDID), WID_DOC_BUILDID, CPPU_E2T(CPPUTYPE_OUSTRING), 0, 0},
1598	// --> OD 2006-03-21 #b6375613#	1598	// --> OD 2006-03-21 #b6375613#
1599	{ SW_PROP_NMID(UNO_NAME_APPLY_WORKAROUND_FOR_B6375613), WID_APPLY_WORKAROUND_FOR_B6375613, CPPU_E2T(CPPUTYPE_BOOLEAN), 0, 0},	1599	{ SW_PROP_NMID(UNO_NAME_APPLY_WORKAROUND_FOR_B6375613), WID_APPLY_WORKAROUND_FOR_B6375613, CPPU_E2T(CPPUTYPE_BOOLEAN), 0, 0},
		1600	{ SW_PROP_NMID(UNO_NAME_DEFAULT_PAGE_MODE), WID_DOC_DEFAULT_PAGE_MODE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
1600	// <--	1601	// <--
1601	{0,0,0,0,0,0}	1602	{0,0,0,0,0,0}
1602	};	1603	};

Lines 777-782 Link Here

(-)sw/source/core/unocore/unoprnms.cxx (+1 lines)
777	/* 0739 UNO_NAME_NESTED_TEXT_CONTENT */ {MAP_CHAR_LEN("NestedTextContent")},	777	/* 0739 UNO_NAME_NESTED_TEXT_CONTENT */ {MAP_CHAR_LEN("NestedTextContent")},
778	/* 0740 UNO_NAME_EMBEDDED_OBJECT */ {MAP_CHAR_LEN("EmbeddedObject")},	778	/* 0740 UNO_NAME_EMBEDDED_OBJECT */ {MAP_CHAR_LEN("EmbeddedObject")},
779	/* 0741 UNO_NAME_REPLACEMENT_GRAPHIC_URL */ {MAP_CHAR_LEN("ReplacementGraphicURL")},	779	/* 0741 UNO_NAME_REPLACEMENT_GRAPHIC_URL */ {MAP_CHAR_LEN("ReplacementGraphicURL")},
		780	/* 0742 UNO_NAME_DEFAULT_PAGE_MODE*/ {MAP_CHAR_LEN("DefaultPageMode")}
780	};	781	};
781		782
782	const SwPropNameLen& SwGetPropName( sal_uInt16 nId )	783	const SwPropNameLen& SwGetPropName( sal_uInt16 nId )

Lines 2144-2149 Link Here

(-)sw/source/ui/uno/unotxdoc.cxx (+7 lines)
2144	}	2144	}
2145	break;	2145	break;
2146	// <--	2146	// <--
		2147	case WID_DOC_DEFAULT_PAGE_MODE:
		2148	{
		2149	bool bDefaultPageMode( false );
		2150	aValue >>= bDefaultPageMode;
		2151	pDocShell->GetDoc()->SetDefaultPageMode( bDefaultPageMode );
		2152	}
		2153	break;
2147		2154
2148	default:	2155	default:
2149	{	2156	{

Lines 109-114 Link Here

(-)writerfilter/source/dmapper/DomainMapper.cxx (+9 lines)
109	sal_Int32 w;	109	sal_Int32 w;
110	} CT_PageSz;	110	} CT_PageSz;
111		111
		112	// For docGrid properties
		113	struct _DocGrid
		114	{
		115	_DocGrid()
		116	: type(0), linePitch(0)
		117	{}
		118	sal_Int16 type;
		119	sal_Int16 linePitch;
		120	} CT_DocGrid;
112		121
113	/* ---- Fridrich's mess (hopefully) ends here ---- */	122	/* ---- Fridrich's mess (hopefully) ends here ---- */
114		123

Lines 237-242 Link Here

(-)writerfilter/source/dmapper/PropertyIds.cxx (+1 lines)
237	case PROP_GRID_LINES : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridLines")); break;	237	case PROP_GRID_LINES : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridLines")); break;
238	case PROP_GRID_BASE_HEIGHT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridBaseHeight")); break;	238	case PROP_GRID_BASE_HEIGHT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridBaseHeight")); break;
239	case PROP_GRID_RUBY_HEIGHT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridRubyHeight")); break;	239	case PROP_GRID_RUBY_HEIGHT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridRubyHeight")); break;
		240	case PROP_GRID_STANDARD_MODE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StandardPageMode")); break;
240	case PROP_IS_ON : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsOn")); break;	241	case PROP_IS_ON : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsOn")); break;
241	case PROP_RESTART_AT_EACH_PAGE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RestartAtEachPage")); break;	242	case PROP_RESTART_AT_EACH_PAGE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RestartAtEachPage")); break;
242	case PROP_COUNT_EMPTY_LINES : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CountEmptyLines")); break;	243	case PROP_COUNT_EMPTY_LINES : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CountEmptyLines")); break;

Lines 276-281 Link Here

(-)writerfilter/source/dmapper/PropertyIds.hxx (+1 lines)
276	,PROP_USER_DATA_TYPE	276	,PROP_USER_DATA_TYPE
277	,PROP_VERTICAL_MERGE	277	,PROP_VERTICAL_MERGE
278	,PROP_VERT_MIRRORED	278	,PROP_VERT_MIRRORED
		279	/254/,PROP_GRID_STANDARD_MODE
279	,PROP_VERT_ORIENT	280	,PROP_VERT_ORIENT
280	,PROP_VERT_ORIENT_POSITION	281	,PROP_VERT_ORIENT_POSITION
281	,PROP_VERT_ORIENT_RELATION	282	,PROP_VERT_ORIENT_RELATION




        if(nRubyHeight < 0 )
            nRubyHeight = 0;
        operator[]( PropertyDefinition( PROP_GRID_RUBY_HEIGHT, false )) = uno::makeAny( nRubyHeight );
/*
        sal_Int16 nGridMode = text::TextGridMode::NONE;
        
        switch (m_nGridType)

        }
        
        operator[](PropertyDefinition(PROP_GRID_MODE, false)) = uno::makeAny(nGridMode);
	*/
		// force to set document as standard page mode
		// refer to ww8 import process function "SwWW8ImplReader::SetDocumentGrid"
		try
		{
			uno::Reference< beans::XPropertySet > xDocProperties;
			xDocProperties = uno::Reference< beans::XPropertySet >( rDM_Impl.GetTextDocument(), uno::UNO_QUERY_THROW );
			sal_Bool bSquaredPageMode = sal_False;
			operator[]( PropertyDefinition( PROP_GRID_STANDARD_MODE, false )) = uno::makeAny( !bSquaredPageMode );
			xDocProperties->setPropertyValue( rtl::OUString::createFromAscii("DefaultPageMode"), uno::makeAny( bSquaredPageMode ));
		}
		catch (const uno::Exception& rEx)
		{
			OSL_ENSURE( false, "Exception in SectionPropertyMap::CloseSectionGroup");
            (void)rEx;
		}
        
        _ApplyProperties( xFollowPageStyle );


Return to issue 119558

Lines 945-951 Link Here

(-)writerfilter/source/dmapper/PropertyMap.cxx (-1 / +17 lines)
945	if(nRubyHeight < 0 )	945	if(nRubyHeight < 0 )
946	nRubyHeight = 0;	946	nRubyHeight = 0;
947	operator[]( PropertyDefinition( PROP_GRID_RUBY_HEIGHT, false )) = uno::makeAny( nRubyHeight );	947	operator[]( PropertyDefinition( PROP_GRID_RUBY_HEIGHT, false )) = uno::makeAny( nRubyHeight );
948		948	/*
949	sal_Int16 nGridMode = text::TextGridMode::NONE;	949	sal_Int16 nGridMode = text::TextGridMode::NONE;
950		950
951	switch (m_nGridType)	951	switch (m_nGridType)
Lines 961-966 Link Here
961	}	961	}
962		962
963	operator[](PropertyDefinition(PROP_GRID_MODE, false)) = uno::makeAny(nGridMode);	963	operator[](PropertyDefinition(PROP_GRID_MODE, false)) = uno::makeAny(nGridMode);
		964	*/
		965	// force to set document as standard page mode
		966	// refer to ww8 import process function "SwWW8ImplReader::SetDocumentGrid"
		967	try
		968	{
		969	uno::Reference< beans::XPropertySet > xDocProperties;
		970	xDocProperties = uno::Reference< beans::XPropertySet >( rDM_Impl.GetTextDocument(), uno::UNO_QUERY_THROW );
		971	sal_Bool bSquaredPageMode = sal_False;
		972	operator[]( PropertyDefinition( PROP_GRID_STANDARD_MODE, false )) = uno::makeAny( !bSquaredPageMode );
		973	xDocProperties->setPropertyValue( rtl::OUString::createFromAscii("DefaultPageMode"), uno::makeAny( bSquaredPageMode ));
		974	}
		975	catch (const uno::Exception& rEx)
		976	{
		977	OSL_ENSURE( false, "Exception in SectionPropertyMap::CloseSectionGroup");
		978	(void)rEx;
		979	}
964		980
965	_ApplyProperties( xFollowPageStyle );	981	_ApplyProperties( xFollowPageStyle );
966		982