diff options
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/editdbg.cxx | 8 | ||||
| -rw-r--r-- | editeng/source/editeng/editobj.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/editeng/editview.cxx | 4 | ||||
| -rw-r--r-- | editeng/source/editeng/impedit4.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/items/borderline.cxx | 8 | ||||
| -rw-r--r-- | editeng/source/items/bulitem.cxx | 4 | ||||
| -rw-r--r-- | editeng/source/items/charhiddenitem.cxx | 4 | ||||
| -rw-r--r-- | editeng/source/items/frmitems.cxx | 60 | ||||
| -rw-r--r-- | editeng/source/items/itemtype.cxx | 66 | ||||
| -rw-r--r-- | editeng/source/items/justifyitem.cxx | 12 | ||||
| -rw-r--r-- | editeng/source/items/optitems.cxx | 8 | ||||
| -rw-r--r-- | editeng/source/items/paraitem.cxx | 42 | ||||
| -rw-r--r-- | editeng/source/items/textitem.cxx | 176 | ||||
| -rw-r--r-- | editeng/source/items/writingmodeitem.cxx | 4 | ||||
| -rw-r--r-- | editeng/source/items/xmlcnitm.cxx | 4 | ||||
| -rw-r--r-- | editeng/source/uno/unoipset.cxx | 26 |
16 files changed, 215 insertions, 215 deletions
diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx index 1572f046cec5..134abc8d7457 100644 --- a/editeng/source/editeng/editdbg.cxx +++ b/editeng/source/editeng/editdbg.cxx @@ -206,8 +206,8 @@ OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem) aDebStr.append("Groesse="); aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxFontHeightItem&>(rItem).GetHeight())); Size aSz( 0, static_cast<const SvxFontHeightItem&>(rItem).GetHeight() ); - SfxMapUnit eUnit = rPool.GetMetric( rItem.Which() ); - MapMode aItemMapMode( (MapUnit) eUnit ); + MapUnit eUnit = rPool.GetMetric( rItem.Which() ); + MapMode aItemMapMode(eUnit); MapMode aPntMap( MAP_POINT ); aSz = OutputDevice::LogicToLogic( aSz, aItemMapMode, aPntMap ); aDebStr.append(" Points="); @@ -276,8 +276,8 @@ OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem) aDebStr.append("Kerning="); aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxKerningItem&>(rItem).GetValue())); Size aSz( 0, (short)static_cast<const SvxKerningItem&>(rItem).GetValue() ); - SfxMapUnit eUnit = rPool.GetMetric( rItem.Which() ); - MapMode aItemMapMode( (MapUnit) eUnit ); + MapUnit eUnit = rPool.GetMetric( rItem.Which() ); + MapMode aItemMapMode(eUnit); MapMode aPntMap( MAP_POINT ); aSz = OutputDevice::LogicToLogic( aSz, aItemMapMode, aPntMap ); aDebStr.append(" Points="); diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 0f4a018696b9..6637a344d4bd 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -1449,7 +1449,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream ) // therefore evaluate only from 401 nMetric = nTmpMetric; if ( bOwnerOfPool && pPool && ( nMetric != 0xFFFF ) ) - pPool->SetDefaultMetric( (SfxMapUnit)nMetric ); + pPool->SetDefaultMetric( (MapUnit)nMetric ); } } diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 49aeaf23ff09..1bc28d3ad979 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -1205,8 +1205,8 @@ bool EditView::ChangeFontSize( bool bGrow, SfxItemSet& rSet, const FontList* pFo { SvxFontHeightItem aFontHeightItem( static_cast<const SvxFontHeightItem&>(rSet.Get( *pWhich )) ); long nHeight = aFontHeightItem.GetHeight(); - const SfxMapUnit eUnit = rSet.GetPool()->GetMetric( *pWhich ); - nHeight = OutputDevice::LogicToLogic( nHeight * 10, (MapUnit)eUnit, MAP_POINT ); + const MapUnit eUnit = rSet.GetPool()->GetMetric( *pWhich ); + nHeight = OutputDevice::LogicToLogic(nHeight * 10, eUnit, MAP_POINT); FontMetric aFontMetric = pFontList->Get( pFontItem->GetFamilyName(), pFontItem->GetStyleName() ); const sal_IntPtr* pAry = pFontList->GetSizeAry( aFontMetric ); diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 17eed1c5ca6a..1b97adc040fe 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -1027,7 +1027,7 @@ EditTextObject* ImpEditEngine::CreateTextObject( EditSelection aSel, SfxItemPool { EditTextObject* pTxtObj = new EditTextObject(pPool); pTxtObj->SetVertical( IsVertical() ); - SfxMapUnit eMapUnit = aEditDoc.GetItemPool().GetMetric( DEF_METRIC ); + MapUnit eMapUnit = aEditDoc.GetItemPool().GetMetric( DEF_METRIC ); pTxtObj->mpImpl->SetMetric( (sal_uInt16) eMapUnit ); if ( pTxtObj->mpImpl->IsOwnerOfPool() ) pTxtObj->mpImpl->GetPool()->SetDefaultMetric( eMapUnit ); diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx index 9abc38f5da29..1ae69140edab 100644 --- a/editeng/source/items/borderline.cxx +++ b/editeng/source/items/borderline.cxx @@ -633,10 +633,10 @@ void SvxBorderLine::SetWidth( long nWidth ) m_nWidth = nWidth; } -OUString SvxBorderLine::GetValueString( SfxMapUnit eSrcUnit, - SfxMapUnit eDestUnit, - const IntlWrapper* pIntl, - bool bMetricStr) const +OUString SvxBorderLine::GetValueString(MapUnit eSrcUnit, + MapUnit eDestUnit, + const IntlWrapper* pIntl, + bool bMetricStr) const { static const sal_uInt16 aStyleIds[] = { diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index 36c7b35b5669..e2a68daaf513 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -340,8 +340,8 @@ OUString SvxBulletItem::GetFullText() const bool SvxBulletItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { diff --git a/editeng/source/items/charhiddenitem.cxx b/editeng/source/items/charhiddenitem.cxx index 70a3a17a5b9e..b8ad6cd5c463 100644 --- a/editeng/source/items/charhiddenitem.cxx +++ b/editeng/source/items/charhiddenitem.cxx @@ -37,8 +37,8 @@ SfxPoolItem* SvxCharHiddenItem::Clone( SfxItemPool * ) const bool SvxCharHiddenItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * /*pIntl*/ ) const diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index ed2d0331378b..eda2aedaab3a 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -184,8 +184,8 @@ SfxPoolItem* SvxPaperBinItem::Create( SvStream& rStrm, sal_uInt16 ) const bool SvxPaperBinItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -322,8 +322,8 @@ SfxPoolItem* SvxSizeItem::Clone( SfxItemPool* ) const bool SvxSizeItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + MapUnit eCoreUnit, + MapUnit ePresUnit, OUString& rText, const IntlWrapper *pIntl ) const { @@ -596,8 +596,8 @@ SfxPoolItem* SvxLRSpaceItem::Clone( SfxItemPool* ) const bool SvxLRSpaceItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + MapUnit eCoreUnit, + MapUnit ePresUnit, OUString& rText, const IntlWrapper* pIntl ) const { @@ -973,8 +973,8 @@ SfxPoolItem* SvxULSpaceItem::Clone( SfxItemPool* ) const bool SvxULSpaceItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + MapUnit eCoreUnit, + MapUnit ePresUnit, OUString& rText, const IntlWrapper *pIntl ) const @@ -1123,8 +1123,8 @@ SfxPoolItem* SvxPrintItem::Create( SvStream& rStrm, sal_uInt16 ) const bool SvxPrintItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -1161,8 +1161,8 @@ SfxPoolItem* SvxOpaqueItem::Create( SvStream& rStrm, sal_uInt16 ) const bool SvxOpaqueItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -1231,8 +1231,8 @@ SfxPoolItem* SvxProtectItem::Clone( SfxItemPool* ) const bool SvxProtectItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -1457,8 +1457,8 @@ sal_uInt16 SvxShadowItem::CalcShadowSpace( SvxShadowItemSide nShadow ) const bool SvxShadowItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + MapUnit eCoreUnit, + MapUnit ePresUnit, OUString& rText, const IntlWrapper *pIntl ) const { @@ -2058,8 +2058,8 @@ SfxPoolItem* SvxBoxItem::Clone( SfxItemPool* ) const bool SvxBoxItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + MapUnit eCoreUnit, + MapUnit ePresUnit, OUString& rText, const IntlWrapper *pIntl ) const { @@ -2557,8 +2557,8 @@ SfxPoolItem* SvxBoxInfoItem::Clone( SfxItemPool* ) const bool SvxBoxInfoItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -2893,8 +2893,8 @@ bool SvxFormatBreakItem::operator==( const SfxPoolItem& rAttr ) const bool SvxFormatBreakItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -3023,8 +3023,8 @@ SfxPoolItem* SvxFormatKeepItem::Create( SvStream& rStrm, sal_uInt16 ) const bool SvxFormatKeepItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -3153,8 +3153,8 @@ bool SvxLineItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemId ) bool SvxLineItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + MapUnit eCoreUnit, + MapUnit ePresUnit, OUString& rText, const IntlWrapper *pIntl ) const { @@ -3667,8 +3667,8 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) bool SvxBrushItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -4131,8 +4131,8 @@ sal_uInt16 SvxFrameDirectionItem::GetVersion( sal_uInt16 nFVer ) const bool SvxFrameDirectionItem::GetPresentation( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper *) const { rText = EE_RESSTR( RID_SVXITEMS_FRMDIR_BEGIN + GetValue() ); diff --git a/editeng/source/items/itemtype.cxx b/editeng/source/items/itemtype.cxx index dff82ee7ca44..ee1749186b8b 100644 --- a/editeng/source/items/itemtype.cxx +++ b/editeng/source/items/itemtype.cxx @@ -26,7 +26,7 @@ #include <rtl/ustrbuf.hxx> -OUString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, const IntlWrapper* pIntl ) +OUString GetMetricText( long nVal, MapUnit eSrcUnit, MapUnit eDestUnit, const IntlWrapper* pIntl ) { bool bNeg = false; sal_Int32 nRet = 0; @@ -39,45 +39,45 @@ OUString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, co switch ( eDestUnit ) { - case SFX_MAPUNIT_100TH_MM: - case SFX_MAPUNIT_10TH_MM: - case SFX_MAPUNIT_MM: - case SFX_MAPUNIT_CM: + case MAP_100TH_MM: + case MAP_10TH_MM: + case MAP_MM: + case MAP_CM: { nRet = (long)OutputDevice::LogicToLogic( - nVal, (MapUnit)eSrcUnit, (MapUnit)SFX_MAPUNIT_100TH_MM ); + nVal, (MapUnit)eSrcUnit, (MapUnit)MAP_100TH_MM ); switch ( eDestUnit ) { - case SFX_MAPUNIT_100TH_MM: nRet *= 1000; break; - case SFX_MAPUNIT_10TH_MM: nRet *= 100; break; - case SFX_MAPUNIT_MM: nRet *= 10; break; + case MAP_100TH_MM: nRet *= 1000; break; + case MAP_10TH_MM: nRet *= 100; break; + case MAP_MM: nRet *= 10; break; default: ;//prevent warning } break; } - case SFX_MAPUNIT_1000TH_INCH: - case SFX_MAPUNIT_100TH_INCH: - case SFX_MAPUNIT_10TH_INCH: - case SFX_MAPUNIT_INCH: + case MAP_1000TH_INCH: + case MAP_100TH_INCH: + case MAP_10TH_INCH: + case MAP_INCH: { nRet = OutputDevice::LogicToLogic( - nVal, (MapUnit)eSrcUnit, (MapUnit)SFX_MAPUNIT_1000TH_INCH ); + nVal, (MapUnit)eSrcUnit, (MapUnit)MAP_1000TH_INCH ); switch ( eDestUnit ) { - case SFX_MAPUNIT_1000TH_INCH: nRet *= 1000; break; - case SFX_MAPUNIT_100TH_INCH: nRet *= 100; break; - case SFX_MAPUNIT_10TH_INCH: nRet *= 10; break; + case MAP_1000TH_INCH: nRet *= 1000; break; + case MAP_100TH_INCH: nRet *= 100; break; + case MAP_10TH_INCH: nRet *= 10; break; default: ;//prevent warning } break; } - case SFX_MAPUNIT_POINT: - case SFX_MAPUNIT_TWIP: - case SFX_MAPUNIT_PIXEL: + case MAP_POINT: + case MAP_TWIP: + case MAP_PIXEL: return OUString::number( (long)OutputDevice::LogicToLogic( nVal, (MapUnit)eSrcUnit, (MapUnit)eDestUnit )); @@ -86,7 +86,7 @@ OUString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, co return OUString(); } - if ( SFX_MAPUNIT_CM == eDestUnit || SFX_MAPUNIT_INCH == eDestUnit ) + if ( MAP_CM == eDestUnit || MAP_INCH == eDestUnit ) { sal_Int32 nMod = nRet % 10; @@ -168,38 +168,38 @@ OUString GetColorString( const Color& rCol ) } -sal_uInt16 GetMetricId( SfxMapUnit eUnit ) +sal_uInt16 GetMetricId( MapUnit eUnit ) { sal_uInt16 nId = RID_SVXITEMS_METRIC_MM; switch ( eUnit ) { - case SFX_MAPUNIT_100TH_MM: - case SFX_MAPUNIT_10TH_MM: - case SFX_MAPUNIT_MM: + case MAP_100TH_MM: + case MAP_10TH_MM: + case MAP_MM: nId = RID_SVXITEMS_METRIC_MM; break; - case SFX_MAPUNIT_CM: + case MAP_CM: nId = RID_SVXITEMS_METRIC_CM; break; - case SFX_MAPUNIT_1000TH_INCH: - case SFX_MAPUNIT_100TH_INCH: - case SFX_MAPUNIT_10TH_INCH: - case SFX_MAPUNIT_INCH: + case MAP_1000TH_INCH: + case MAP_100TH_INCH: + case MAP_10TH_INCH: + case MAP_INCH: nId = RID_SVXITEMS_METRIC_INCH; break; - case SFX_MAPUNIT_POINT: + case MAP_POINT: nId = RID_SVXITEMS_METRIC_POINT; break; - case SFX_MAPUNIT_TWIP: + case MAP_TWIP: nId = RID_SVXITEMS_METRIC_TWIP; break; - case SFX_MAPUNIT_PIXEL: + case MAP_PIXEL: nId = RID_SVXITEMS_METRIC_PIXEL; break; diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx index 48f961aab56d..7979a7b82e93 100644 --- a/editeng/source/items/justifyitem.cxx +++ b/editeng/source/items/justifyitem.cxx @@ -52,8 +52,8 @@ SvxHorJustifyItem::SvxHorJustifyItem( const SvxCellHorJustify eJustify, bool SvxHorJustifyItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper *) const { rText = GetValueText( GetValue() ); @@ -199,8 +199,8 @@ SvxVerJustifyItem::SvxVerJustifyItem( const SvxCellVerJustify eJustify, bool SvxVerJustifyItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -330,8 +330,8 @@ SvxJustifyMethodItem::SvxJustifyMethodItem( const SvxCellJustifyMethod eJustify, bool SvxJustifyMethodItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx index 9feba60d5cda..8d89d2333bd4 100644 --- a/editeng/source/items/optitems.cxx +++ b/editeng/source/items/optitems.cxx @@ -53,8 +53,8 @@ SfxSpellCheckItem::SfxSpellCheckItem( const SfxSpellCheckItem& rItem ) : bool SfxSpellCheckItem::GetPresentation ( SfxItemPresentation , - SfxMapUnit , - SfxMapUnit , + MapUnit , + MapUnit , OUString& , const IntlWrapper* ) const @@ -113,8 +113,8 @@ SfxPoolItem* SfxHyphenRegionItem::Clone( SfxItemPool* ) const bool SfxHyphenRegionItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit , - SfxMapUnit , + MapUnit , + MapUnit , OUString& rText, const IntlWrapper* ) const diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 0f5decdeab10..3ce42df30ac6 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -230,8 +230,8 @@ SfxPoolItem* SvxLineSpacingItem::Clone( SfxItemPool * ) const bool SvxLineSpacingItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -415,8 +415,8 @@ SfxPoolItem* SvxAdjustItem::Clone( SfxItemPool * ) const bool SvxAdjustItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -530,8 +530,8 @@ SvStream& SvxWidowsItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c bool SvxWidowsItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -591,8 +591,8 @@ SvStream& SvxOrphansItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) bool SvxOrphansItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -703,8 +703,8 @@ SfxPoolItem* SvxHyphenZoneItem::Clone( SfxItemPool * ) const bool SvxHyphenZoneItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -1028,8 +1028,8 @@ SfxPoolItem* SvxTabStopItem::Clone( SfxItemPool * ) const bool SvxTabStopItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + MapUnit eCoreUnit, + MapUnit ePresUnit, OUString& rText, const IntlWrapper *pIntl ) const { @@ -1186,8 +1186,8 @@ SfxPoolItem* SvxFormatSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const bool SvxFormatSplitItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -1246,8 +1246,8 @@ bool SvxPageModelItem::operator==( const SfxPoolItem& rAttr ) const bool SvxPageModelItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -1302,7 +1302,7 @@ sal_uInt16 SvxScriptSpaceItem::GetVersion( sal_uInt16 nFFVer ) const bool SvxScriptSpaceItem::GetPresentation( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* /*pIntl*/ ) const { rText = EE_RESSTR( !GetValue() @@ -1342,7 +1342,7 @@ sal_uInt16 SvxHangingPunctuationItem::GetVersion( sal_uInt16 nFFVer ) const bool SvxHangingPunctuationItem::GetPresentation( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* /*pIntl*/ ) const { rText = EE_RESSTR( !GetValue() @@ -1382,7 +1382,7 @@ sal_uInt16 SvxForbiddenRuleItem::GetVersion( sal_uInt16 nFFVer ) const bool SvxForbiddenRuleItem::GetPresentation( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* /*pIntl*/ ) const { rText = EE_RESSTR( !GetValue() @@ -1426,7 +1426,7 @@ sal_uInt16 SvxParaVertAlignItem::GetVersion( sal_uInt16 nFFVer ) const bool SvxParaVertAlignItem::GetPresentation( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* ) const { sal_uInt16 nTmp; @@ -1498,7 +1498,7 @@ sal_uInt16 SvxParaGridItem::GetVersion( sal_uInt16 nFFVer ) const bool SvxParaGridItem::GetPresentation( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* /*pIntl*/ ) const { rText = GetValue() ? diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index e76b527d0469..64efe964b4e7 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -186,8 +186,8 @@ bool SvxFontListItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) bool SvxFontListItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * /*pIntl*/ ) const { @@ -422,8 +422,8 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const bool SvxFontItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * /*pIntl*/ ) const { @@ -487,8 +487,8 @@ SfxPoolItem* SvxPostureItem::Create(SvStream& rStrm, sal_uInt16) const bool SvxPostureItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * /*pIntl*/ ) const { @@ -638,8 +638,8 @@ SfxPoolItem* SvxWeightItem::Create(SvStream& rStrm, sal_uInt16) const bool SvxWeightItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * /*pIntl*/ ) const { @@ -733,7 +733,7 @@ SvStream& SvxFontHeightItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) // When exporting to the old versions the relative information is lost // when there is no percentage sal_uInt16 _nProp = GetProp(); - if( SFX_MAPUNIT_RELATIVE != GetPropUnit() ) + if( MAP_RELATIVE != GetPropUnit() ) _nProp = 100; rStrm.WriteUInt16( _nProp ); } @@ -744,7 +744,7 @@ SvStream& SvxFontHeightItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const { - sal_uInt16 nsize, nprop = 0, nPropUnit = SFX_MAPUNIT_RELATIVE; + sal_uInt16 nsize, nprop = 0, nPropUnit = MAP_RELATIVE; rStrm.ReadUInt16( nsize ); @@ -761,7 +761,7 @@ SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm, rStrm.ReadUInt16( nPropUnit ); SvxFontHeightItem* pItem = new SvxFontHeightItem( nsize, 100, Which() ); - pItem->SetProp( nprop, (SfxMapUnit)nPropUnit ); + pItem->SetProp( nprop, (MapUnit)nPropUnit ); return pItem; } @@ -801,22 +801,22 @@ bool SvxFontHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const aFontHeight.Height = fRoundPoints; } - aFontHeight.Prop = (sal_Int16)(SFX_MAPUNIT_RELATIVE == ePropUnit ? nProp : 100); + aFontHeight.Prop = (sal_Int16)(MAP_RELATIVE == ePropUnit ? nProp : 100); float fRet = (float)(short)nProp; switch( ePropUnit ) { - case SFX_MAPUNIT_RELATIVE: + case MAP_RELATIVE: fRet = 0.; break; - case SFX_MAPUNIT_100TH_MM: + case MAP_100TH_MM: fRet = convertMm100ToTwip(fRet); fRet /= 20.; break; - case SFX_MAPUNIT_POINT: + case MAP_POINT: break; - case SFX_MAPUNIT_TWIP: + case MAP_TWIP: fRet /= 20.; break; default: ;//prevent warning @@ -843,24 +843,24 @@ bool SvxFontHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const } break; case MID_FONTHEIGHT_PROP: - rVal <<= (sal_Int16)(SFX_MAPUNIT_RELATIVE == ePropUnit ? nProp : 100); + rVal <<= (sal_Int16)(MAP_RELATIVE == ePropUnit ? nProp : 100); break; case MID_FONTHEIGHT_DIFF: { float fRet = (float)(short)nProp; switch( ePropUnit ) { - case SFX_MAPUNIT_RELATIVE: + case MAP_RELATIVE: fRet = 0.; break; - case SFX_MAPUNIT_100TH_MM: + case MAP_100TH_MM: fRet = convertMm100ToTwip(fRet); fRet /= 20.; break; - case SFX_MAPUNIT_POINT: + case MAP_POINT: break; - case SFX_MAPUNIT_TWIP: + case MAP_TWIP: fRet /= 20.; break; default: ;//prevent warning @@ -879,17 +879,17 @@ bool SvxFontHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const // overloads), and indeed known to occasionally produce nRet values that would // be negative, so just guard against negative results here and throw the hands // up in despair: -static sal_uInt32 lcl_GetRealHeight_Impl(sal_uInt32 nHeight, sal_uInt16 nProp, SfxMapUnit eProp, bool bCoreInTwip) +static sal_uInt32 lcl_GetRealHeight_Impl(sal_uInt32 nHeight, sal_uInt16 nProp, MapUnit eProp, bool bCoreInTwip) { sal_uInt32 nRet = nHeight; short nDiff = 0; switch( eProp ) { - case SFX_MAPUNIT_RELATIVE: + case MAP_RELATIVE: nRet *= 100; nRet /= nProp; break; - case SFX_MAPUNIT_POINT: + case MAP_POINT: { short nTemp = (short)nProp; nDiff = nTemp * 20; @@ -897,11 +897,11 @@ static sal_uInt32 lcl_GetRealHeight_Impl(sal_uInt32 nHeight, sal_uInt16 nProp, S nDiff = (short)convertTwipToMm100((long)(nDiff)); } break; - case SFX_MAPUNIT_100TH_MM: + case MAP_100TH_MM: //then the core is surely also in 1/100 mm nDiff = (short)nProp; break; - case SFX_MAPUNIT_TWIP: + case MAP_TWIP: // Here surely TWIP nDiff = ((short)nProp); break; @@ -926,7 +926,7 @@ bool SvxFontHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) if ( rVal >>= aFontHeight ) { // Height - ePropUnit = SFX_MAPUNIT_RELATIVE; + ePropUnit = MAP_RELATIVE; nProp = 100; double fPoint = aFontHeight.Height; if( fPoint < 0. || fPoint > 10000. ) @@ -944,7 +944,7 @@ bool SvxFontHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) break; case MID_FONTHEIGHT: { - ePropUnit = SFX_MAPUNIT_RELATIVE; + ePropUnit = MAP_RELATIVE; nProp = 100; double fPoint = 0; if(!(rVal >>= fPoint)) @@ -973,7 +973,7 @@ bool SvxFontHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) nHeight *= nNew; nHeight /= 100; nProp = nNew; - ePropUnit = SFX_MAPUNIT_RELATIVE; + ePropUnit = MAP_RELATIVE; } break; case MID_FONTHEIGHT_DIFF: @@ -990,7 +990,7 @@ bool SvxFontHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) sal_Int16 nCoreDiffValue = (sal_Int16)(fValue * 20.); nHeight += bConvert ? nCoreDiffValue : convertTwipToMm100(nCoreDiffValue); nProp = (sal_uInt16)((sal_Int16)fValue); - ePropUnit = SFX_MAPUNIT_POINT; + ePropUnit = MAP_POINT; } break; } @@ -1001,12 +1001,12 @@ bool SvxFontHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) bool SvxFontHeightItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit eCoreUnit, - SfxMapUnit /*ePresUnit*/, + MapUnit eCoreUnit, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper *pIntl ) const { - if( SFX_MAPUNIT_RELATIVE != ePropUnit ) + if( MAP_RELATIVE != ePropUnit ) { rText = OUString::number( (short)nProp ) + " " + EE_RESSTR( GetMetricId( ePropUnit ) ); @@ -1016,8 +1016,8 @@ bool SvxFontHeightItem::GetPresentation else if( 100 == nProp ) { rText = GetMetricText( (long)nHeight, - eCoreUnit, SFX_MAPUNIT_POINT, pIntl ) + - " " + EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT)); + eCoreUnit, MAP_POINT, pIntl ) + + " " + EE_RESSTR(GetMetricId(MAP_POINT)); } else rText = OUString::number( nProp ) + "%"; @@ -1045,11 +1045,11 @@ bool SvxFontHeightItem::HasMetrics() const } void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, const sal_uInt16 nNewProp, - SfxMapUnit eUnit ) + MapUnit eUnit ) { DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); - if( SFX_MAPUNIT_RELATIVE != eUnit ) + if( MAP_RELATIVE != eUnit ) nHeight = nNewHeight + ::ItemToControl( (short)nNewProp, eUnit, FUNIT_TWIP ); else if( 100 != nNewProp ) @@ -1062,11 +1062,11 @@ void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, const sal_uInt16 nNewP } void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, sal_uInt16 nNewProp, - SfxMapUnit eMetric, SfxMapUnit eCoreMetric ) + MapUnit eMetric, MapUnit eCoreMetric ) { DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); - if( SFX_MAPUNIT_RELATIVE != eMetric ) + if( MAP_RELATIVE != eMetric ) nHeight = nNewHeight + ::ControlToItem( ::ItemToControl((short)nNewProp, eMetric, FUNIT_TWIP ), FUNIT_TWIP, @@ -1186,16 +1186,16 @@ bool SvxFontWidthItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) bool SvxFontWidthItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit eCoreUnit, - SfxMapUnit /*ePresUnit*/, + MapUnit eCoreUnit, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper *pIntl ) const { if ( 100 == nProp ) { rText = GetMetricText( (long)nWidth, - eCoreUnit, SFX_MAPUNIT_POINT, pIntl ) + - " " + EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT)); + eCoreUnit, MAP_POINT, pIntl ) + + " " + EE_RESSTR(GetMetricId(MAP_POINT)); } else rText = OUString::number( nProp ) + "%"; @@ -1260,8 +1260,8 @@ SfxPoolItem* SvxTextLineItem::Create(SvStream& rStrm, sal_uInt16) const bool SvxTextLineItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * /*pIntl*/ ) const { @@ -1463,8 +1463,8 @@ SfxPoolItem* SvxCrossedOutItem::Create(SvStream& rStrm, sal_uInt16) const bool SvxCrossedOutItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * /*pIntl*/ ) const { @@ -1545,8 +1545,8 @@ SfxPoolItem* SvxShadowedItem::Create(SvStream& rStrm, sal_uInt16) const bool SvxShadowedItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * /*pIntl*/ ) const { @@ -1590,8 +1590,8 @@ SfxPoolItem* SvxAutoKernItem::Create(SvStream& rStrm, sal_uInt16) const bool SvxAutoKernItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * /*pIntl*/ ) const { @@ -1636,8 +1636,8 @@ SfxPoolItem* SvxWordLineModeItem::Create(SvStream& rStrm, sal_uInt16) const bool SvxWordLineModeItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * /*pIntl*/ ) const { @@ -1681,8 +1681,8 @@ SfxPoolItem* SvxContourItem::Create(SvStream& rStrm, sal_uInt16) const bool SvxContourItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * /*pIntl*/ ) const { @@ -1726,8 +1726,8 @@ SfxPoolItem* SvxPropSizeItem::Create(SvStream& rStrm, sal_uInt16) const bool SvxPropSizeItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * /*pIntl*/ ) const { @@ -1910,8 +1910,8 @@ SfxPoolItem* SvxColorItem::Create(SvStream& rStrm, sal_uInt16 /*nVer*/ ) const bool SvxColorItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * /*pIntl*/ ) const { @@ -1972,8 +1972,8 @@ SfxPoolItem* SvxCharSetColorItem::Create(SvStream& rStrm, sal_uInt16) const bool SvxCharSetColorItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * /*pIntl*/ ) const { @@ -2025,16 +2025,16 @@ SfxPoolItem* SvxKerningItem::Create(SvStream& rStrm, sal_uInt16) const bool SvxKerningItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit /*ePresUnit*/, + MapUnit eCoreUnit, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper *pIntl ) const { switch ( ePres ) { case SFX_ITEM_PRESENTATION_NAMELESS: - rText = GetMetricText( (long)GetValue(), eCoreUnit, SFX_MAPUNIT_POINT, pIntl ) + - " " + EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT)); + rText = GetMetricText( (long)GetValue(), eCoreUnit, MAP_POINT, pIntl ) + + " " + EE_RESSTR(GetMetricId(MAP_POINT)); return true; case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -2049,8 +2049,8 @@ bool SvxKerningItem::GetPresentation if ( nId ) rText += EE_RESSTR(nId); rText = rText + - GetMetricText( (long)GetValue(), eCoreUnit, SFX_MAPUNIT_POINT, pIntl ) + - " " + EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT)); + GetMetricText( (long)GetValue(), eCoreUnit, MAP_POINT, pIntl ) + + " " + EE_RESSTR(GetMetricId(MAP_POINT)); return true; } default: ; //prevent warning @@ -2116,8 +2116,8 @@ SfxPoolItem* SvxCaseMapItem::Create(SvStream& rStrm, sal_uInt16) const bool SvxCaseMapItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * /*pIntl*/ ) const { @@ -2245,8 +2245,8 @@ sal_uInt16 SvxEscapementItem::GetValueCount() const bool SvxEscapementItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * /*pIntl*/ ) const { @@ -2389,8 +2389,8 @@ SfxPoolItem* SvxLanguageItem::Create(SvStream& rStrm, sal_uInt16) const bool SvxLanguageItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * /*pIntl*/ ) const { @@ -2472,8 +2472,8 @@ SfxPoolItem* SvxNoLinebreakItem::Create(SvStream& rStrm, sal_uInt16) const bool SvxNoLinebreakItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * /*pIntl*/ ) const { @@ -2513,8 +2513,8 @@ SfxPoolItem* SvxNoHyphenItem::Create( SvStream& rStrm, sal_uInt16 ) const bool SvxNoHyphenItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * /*pIntl*/ ) const { @@ -2551,8 +2551,8 @@ SvxLineColorItem::~SvxLineColorItem() bool SvxLineColorItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + MapUnit eCoreUnit, + MapUnit ePresUnit, OUString& rText, const IntlWrapper * pIntlWrapper ) const @@ -2594,8 +2594,8 @@ SfxPoolItem* SvxBlinkItem::Create(SvStream& rStrm, sal_uInt16) const bool SvxBlinkItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * /*pIntl*/ ) const { @@ -2641,8 +2641,8 @@ SfxPoolItem* SvxEmphasisMarkItem::Create( SvStream& rStrm, sal_uInt16 ) const bool SvxEmphasisMarkItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * /*pIntl*/ ) const @@ -2830,7 +2830,7 @@ bool SvxTwoLinesItem::PutValue( const css::uno::Any& rVal, } bool SvxTwoLinesItem::GetPresentation( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* /*pIntl*/ ) const { if( !GetValue() ) @@ -2910,7 +2910,7 @@ sal_uInt16 SvxCharRotateItem::GetVersion( sal_uInt16 nFFVer ) const bool SvxCharRotateItem::GetPresentation( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* ) const { if( !GetValue() ) @@ -3049,7 +3049,7 @@ sal_uInt16 SvxCharScaleWidthItem::GetVersion( sal_uInt16 nFFVer ) const bool SvxCharScaleWidthItem::GetPresentation( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* ) const { if( !GetValue() ) @@ -3135,8 +3135,8 @@ sal_uInt16 SvxCharReliefItem::GetValueCount() const bool SvxCharReliefItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * /*pIntl*/ ) const { diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx index 86c260a559bb..50e4b35ddf47 100644 --- a/editeng/source/items/writingmodeitem.cxx +++ b/editeng/source/items/writingmodeitem.cxx @@ -66,8 +66,8 @@ sal_uInt16 SvxWritingModeItem::GetVersion( sal_uInt16 /*nFVer*/ ) const } bool SvxWritingModeItem::GetPresentation( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresMetric*/, + MapUnit /*eCoreMetric*/, + MapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper * ) const { diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx index 07883f67e6c5..c1e397fe06d8 100644 --- a/editeng/source/items/xmlcnitm.cxx +++ b/editeng/source/items/xmlcnitm.cxx @@ -56,8 +56,8 @@ bool SvXMLAttrContainerItem::operator==( const SfxPoolItem& rItem ) const bool SvXMLAttrContainerItem::GetPresentation( SfxItemPresentation /*ePresentation*/, - SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, + MapUnit /*eCoreMetric*/, + MapUnit /*ePresentationMetric*/, OUString & /*rText*/, const IntlWrapper * /*pIntlWrapper*/ ) const { diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index 02c5d9d20618..31f7e48ea8e1 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -103,9 +103,9 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* if( nullptr == pItem && pPool ) pItem = &(pPool->GetDefaultItem( pMap->nWID )); - const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((sal_uInt16)pMap->nWID) : SFX_MAPUNIT_100TH_MM; + const MapUnit eMapUnit = pPool ? pPool->GetMetric((sal_uInt16)pMap->nWID) : MAP_100TH_MM; sal_uInt8 nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM); - if( eMapUnit == SFX_MAPUNIT_100TH_MM ) + if( eMapUnit == MAP_100TH_MM ) nMemberId &= (~CONVERT_TWIPS); if(pItem) @@ -113,7 +113,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* pItem->QueryValue( aVal, nMemberId ); if( pMap->nMemberId & SFX_METRIC_ITEM ) { - if( eMapUnit != SFX_MAPUNIT_100TH_MM ) + if( eMapUnit != MAP_100TH_MM ) { if ( !bDontConvertNegativeValues || SvxUnoCheckForPositiveValue( aVal ) ) SvxUnoConvertToMM( eMapUnit, aVal ); @@ -164,10 +164,10 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMa { uno::Any aValue( rVal ); - const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((sal_uInt16)pMap->nWID) : SFX_MAPUNIT_100TH_MM; + const MapUnit eMapUnit = pPool ? pPool->GetMetric((sal_uInt16)pMap->nWID) : MAP_100TH_MM; // check for needed metric translation - if( (pMap->nMemberId & SFX_METRIC_ITEM) && eMapUnit != SFX_MAPUNIT_100TH_MM ) + if( (pMap->nMemberId & SFX_METRIC_ITEM) && eMapUnit != MAP_100TH_MM ) { if ( !bDontConvertNegativeValues || SvxUnoCheckForPositiveValue( aValue ) ) SvxUnoConvertFromMM( eMapUnit, aValue ); @@ -176,7 +176,7 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMa SfxPoolItem *pNewItem = pItem->Clone(); sal_uInt8 nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM); - if( eMapUnit == SFX_MAPUNIT_100TH_MM ) + if( eMapUnit == MAP_100TH_MM ) nMemberId &= (~CONVERT_TWIPS); if( pNewItem->PutValue( aValue, nMemberId ) ) @@ -198,9 +198,9 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* return *pUsrAny; // No UsrAny detected yet, generate Default entry and return this - const SfxMapUnit eMapUnit = mrItemPool.GetMetric((sal_uInt16)pMap->nWID); + const MapUnit eMapUnit = mrItemPool.GetMetric((sal_uInt16)pMap->nWID); sal_uInt8 nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM); - if( eMapUnit == SFX_MAPUNIT_100TH_MM ) + if( eMapUnit == MAP_100TH_MM ) nMemberId &= (~CONVERT_TWIPS); uno::Any aVal; SfxItemSet aSet( mrItemPool, pMap->nWID, pMap->nWID); @@ -226,7 +226,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* if( pMap->nMemberId & SFX_METRIC_ITEM ) { // check for needed metric translation - if(pMap->nMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM) + if(pMap->nMemberId & SFX_METRIC_ITEM && eMapUnit != MAP_100TH_MM) { SvxUnoConvertToMM( eMapUnit, aVal ); } @@ -277,12 +277,12 @@ uno::Reference< beans::XPropertySetInfo > const & SvxItemPropertySet::getProper #endif /** converts the given any with a metric to 100th/mm if needed */ -void SvxUnoConvertToMM( const SfxMapUnit eSourceMapUnit, uno::Any & rMetric ) throw() +void SvxUnoConvertToMM( const MapUnit eSourceMapUnit, uno::Any & rMetric ) throw() { // map the metric of the itempool to 100th mm switch(eSourceMapUnit) { - case SFX_MAPUNIT_TWIP : + case MAP_TWIP : { switch( rMetric.getValueTypeClass() ) { @@ -315,11 +315,11 @@ void SvxUnoConvertToMM( const SfxMapUnit eSourceMapUnit, uno::Any & rMetric ) th /** converts the given any with a metric from 100th/mm to the given metric if needed */ -void SvxUnoConvertFromMM( const SfxMapUnit eDestinationMapUnit, uno::Any & rMetric ) throw() +void SvxUnoConvertFromMM( const MapUnit eDestinationMapUnit, uno::Any & rMetric ) throw() { switch(eDestinationMapUnit) { - case SFX_MAPUNIT_TWIP : + case MAP_TWIP : { switch( rMetric.getValueTypeClass() ) { |