diff options
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/richtext/richtextengine.cxx | 2 | ||||
| -rw-r--r-- | forms/source/richtext/rtattributehandler.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx index 98f88fdc0dfd..0e94313da277 100644 --- a/forms/source/richtext/richtextengine.cxx +++ b/forms/source/richtext/richtextengine.cxx @@ -55,7 +55,7 @@ namespace frm pReturn->SetStatusEventHdl( LINK( pReturn, RichTextEngine, EditEngineStatusChanged ) ); - pPool->SetDefaultMetric( (SfxMapUnit)( aDeviceMapMode.GetMapUnit() ) ); + pPool->SetDefaultMetric(aDeviceMapMode.GetMapUnit()); // defaults vcl::Font aFont = Application::GetSettings().GetStyleSettings().GetAppFont(); diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx index ededc66730cb..1e9998700cfa 100644 --- a/forms/source/richtext/rtattributehandler.cxx +++ b/forms/source/richtext/rtattributehandler.cxx @@ -326,7 +326,7 @@ namespace frm { // by definition, the item should have the unit twip sal_uLong nHeight = pFontHeightItem->GetHeight(); - if ( _rAttribs.GetPool()->GetMetric( getWhich() ) != SFX_MAPUNIT_TWIP ) + if ( _rAttribs.GetPool()->GetMetric( getWhich() ) != MAP_TWIP ) { nHeight = OutputDevice::LogicToLogic( Size( 0, nHeight ), @@ -352,13 +352,13 @@ namespace frm if ( pFontHeightItem ) { // correct measurement units - SfxMapUnit eItemMapUnit = pFontHeightItem->GetPropUnit(); (void)eItemMapUnit; + MapUnit eItemMapUnit = pFontHeightItem->GetPropUnit(); (void)eItemMapUnit; sal_uLong nHeight = pFontHeightItem->GetHeight(); - if ( _rNewAttribs.GetPool()->GetMetric( getWhich() ) != SFX_MAPUNIT_TWIP ) + if ( _rNewAttribs.GetPool()->GetMetric( getWhich() ) != MAP_TWIP ) { nHeight = OutputDevice::LogicToLogic( Size( 0, nHeight ), - MapMode( (MapUnit)( SFX_MAPUNIT_TWIP ) ), + MapMode( (MapUnit)( MAP_TWIP ) ), MapMode( (MapUnit)( _rNewAttribs.GetPool()->GetMetric( getWhich() ) ) ) ).Height(); } |