diff options
Diffstat (limited to 'sw/source/filter/xml')
-rw-r--r-- | sw/source/filter/xml/xmlexp.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/xml/xmlimp.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltexte.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltexti.cxx | 10 |
4 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index b87a04cfbea9..abbb8f5bc6c5 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -357,7 +357,7 @@ void SwXMLExport::GetViewSettings(Sequence<PropertyValue>& aProps) SwDoc *pDoc = getDoc(); const Rectangle rRect = pDoc->GetDocShell()->GetVisArea( ASPECT_CONTENT ); - bool bTwip = pDoc->GetDocShell()->GetMapUnit ( ) == MAP_TWIP; + bool bTwip = pDoc->GetDocShell()->GetMapUnit ( ) == MapUnit::MapTwip; OSL_ENSURE( bTwip, "Map unit for visible area is not in TWIPS!" ); diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 341154e71b82..4ee54299d8a2 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -1021,8 +1021,8 @@ void SwXMLImport::SetViewSettings(const Sequence < PropertyValue > & aViewProps) bool bChangeShowRedline = false, bChangeBrowseMode = false; //TODO/LATER: why that cast?! - bool bTwip = pDoc->GetDocShell()->GetMapUnit ( ) == MAP_TWIP; - //sal_Bool bTwip = pDoc->GetDocShell()->SfxInPlaceObject::GetMapUnit ( ) == MAP_TWIP; + bool bTwip = pDoc->GetDocShell()->GetMapUnit ( ) == MapUnit::MapTwip; + //sal_Bool bTwip = pDoc->GetDocShell()->SfxInPlaceObject::GetMapUnit ( ) == MapUnit::MapTwip; for (sal_Int32 i = 0; i < nCount ; i++) { diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index f652a32b176d..651ba668ac59 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -132,7 +132,7 @@ static void lcl_addOutplaceProperties( const rtl::Reference < XMLPropertySetMapper >& rMapper ) { { - MapMode aMode( MAP_100TH_MM ); // the API expects this map mode for the embedded objects + MapMode aMode( MapUnit::Map100thMM ); // the API expects this map mode for the embedded objects Size aSize = rObj.GetSize( &aMode ); // get the size in the requested map mode if( aSize.Width() && aSize.Height() ) diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index b83ef45d8da7..784909fdbfdd 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -286,7 +286,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject( if ( xObj.is() ) { //TODO/LATER: is it enough to only set the VisAreaSize? - lcl_setObjectVisualArea( xObj, nAspect, aTwipSize, MAP_TWIP ); + lcl_setObjectVisualArea( xObj, nAspect, aTwipSize, MapUnit::MapTwip ); } if( pTextCursor ) @@ -527,7 +527,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject( pDoc->GetPersist()->GetEmbeddedObjectContainer().GetEmbeddedObject( aObjName ); if( xObj.is() ) lcl_setObjectVisualArea( xObj, ( nDrawAspect ? nDrawAspect : embed::Aspects::MSOLE_CONTENT ), - aVisArea.GetSize(), MAP_100TH_MM ); + aVisArea.GetSize(), MapUnit::Map100thMM ); } return xPropSet; @@ -656,7 +656,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertApplet( lcl_setObjectVisualArea( aAppletImpl.GetApplet(), embed::Aspects::MSOLE_CONTENT, Size( nWidth, nHeight ), - MAP_100TH_MM ); + MapUnit::Map100thMM ); SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCursor->GetPaM(), ::svt::EmbeddedObjectRef( aAppletImpl.GetApplet(), embed::Aspects::MSOLE_CONTENT ), @@ -718,7 +718,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin( lcl_setObjectVisualArea( xObj, embed::Aspects::MSOLE_CONTENT, Size( nWidth, nHeight ), - MAP_100TH_MM ); + MapUnit::Map100thMM ); if ( svt::EmbeddedObjectRef::TryRunningState( xObj ) ) { @@ -851,7 +851,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra lcl_setObjectVisualArea( xObj, embed::Aspects::MSOLE_CONTENT, Size( nWidth, nHeight ), - MAP_100TH_MM ); + MapUnit::Map100thMM ); if ( svt::EmbeddedObjectRef::TryRunningState( xObj ) ) { |