diff options
Diffstat (limited to 'svx')
47 files changed, 285 insertions, 290 deletions
diff --git a/svx/inc/sxcikitm.hxx b/svx/inc/sxcikitm.hxx index ec221626b9cd..4aab9ea5b52a 100644 --- a/svx/inc/sxcikitm.hxx +++ b/svx/inc/sxcikitm.hxx @@ -40,7 +40,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; }; #endif diff --git a/svx/inc/sxmkitm.hxx b/svx/inc/sxmkitm.hxx index 718c860be857..cbd93c5a4ba4 100644 --- a/svx/inc/sxmkitm.hxx +++ b/svx/inc/sxmkitm.hxx @@ -40,7 +40,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; }; #endif diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index df0d257faf03..ade3e1c2deb3 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -421,7 +421,7 @@ void SvxFontWorkDialog::SetDistance_Impl(const XFormTextDistanceItem* pItem) // Use HasChildPathFocus() instead of HasFocus() at SpinFields if ( pItem && !m_pMtrFldDistance->HasChildPathFocus() ) { - SetMetricValue(*m_pMtrFldDistance, pItem->GetValue(), SFX_MAPUNIT_100TH_MM); + SetMetricValue(*m_pMtrFldDistance, pItem->GetValue(), MAP_100TH_MM); } } @@ -432,7 +432,7 @@ void SvxFontWorkDialog::SetStart_Impl(const XFormTextStartItem* pItem) // Use HasChildPathFocus() instead of HasFocus() at SpinFields if ( pItem && !m_pMtrFldTextStart->HasChildPathFocus() ) { - SetMetricValue(*m_pMtrFldTextStart, pItem->GetValue(), SFX_MAPUNIT_100TH_MM); + SetMetricValue(*m_pMtrFldTextStart, pItem->GetValue(), MAP_100TH_MM); } } @@ -513,8 +513,8 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem, if ( bRestoreValues ) { - SetMetricValue(*m_pMtrFldShadowX, nSaveShadowX, SFX_MAPUNIT_100TH_MM); - SetMetricValue(*m_pMtrFldShadowY, nSaveShadowY, SFX_MAPUNIT_100TH_MM); + SetMetricValue(*m_pMtrFldShadowX, nSaveShadowX, MAP_100TH_MM); + SetMetricValue(*m_pMtrFldShadowY, nSaveShadowY, MAP_100TH_MM); XFormTextShadowXValItem aXItem( nSaveShadowX ); XFormTextShadowYValItem aYItem( nSaveShadowY ); @@ -604,7 +604,7 @@ void SvxFontWorkDialog::SetShadowXVal_Impl(const XFormTextShadowXValItem* pItem) } else { - SetMetricValue(*m_pMtrFldShadowX, pItem->GetValue(), SFX_MAPUNIT_100TH_MM); + SetMetricValue(*m_pMtrFldShadowX, pItem->GetValue(), MAP_100TH_MM); } } } @@ -626,7 +626,7 @@ void SvxFontWorkDialog::SetShadowYVal_Impl(const XFormTextShadowYValItem* pItem) } else { - SetMetricValue(*m_pMtrFldShadowY, pItem->GetValue(), SFX_MAPUNIT_100TH_MM); + SetMetricValue(*m_pMtrFldShadowY, pItem->GetValue(), MAP_100TH_MM); } } } @@ -712,8 +712,8 @@ IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, SelectShadowHdl_Impl, ToolBox *, void) if (nLastShadowTbxId == nShadowNormalId) { - nSaveShadowX = GetCoreValue(*m_pMtrFldShadowX, SFX_MAPUNIT_100TH_MM); - nSaveShadowY = GetCoreValue(*m_pMtrFldShadowY, SFX_MAPUNIT_100TH_MM); + nSaveShadowX = GetCoreValue(*m_pMtrFldShadowX, MAP_100TH_MM); + nSaveShadowY = GetCoreValue(*m_pMtrFldShadowY, MAP_100TH_MM); } else if (nLastShadowTbxId == nShadowSlantId) { @@ -759,9 +759,9 @@ IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, InputTimoutHdl_Impl, Idle *, void) m_pMtrFldShadowY->SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 ); } - long nValue = GetCoreValue(*m_pMtrFldDistance, SFX_MAPUNIT_100TH_MM); + long nValue = GetCoreValue(*m_pMtrFldDistance, MAP_100TH_MM); XFormTextDistanceItem aDistItem( nValue ); - nValue = GetCoreValue(*m_pMtrFldTextStart, SFX_MAPUNIT_100TH_MM); + nValue = GetCoreValue(*m_pMtrFldTextStart, MAP_100TH_MM); XFormTextStartItem aStartItem( nValue ); sal_Int32 nValueX(0L); @@ -773,8 +773,8 @@ IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, InputTimoutHdl_Impl, Idle *, void) // methos regarding to the kind of value accessed. if (nLastShadowTbxId == nShadowNormalId) { - nValueX = GetCoreValue(*m_pMtrFldShadowX, SFX_MAPUNIT_100TH_MM); - nValueY = GetCoreValue(*m_pMtrFldShadowY, SFX_MAPUNIT_100TH_MM); + nValueX = GetCoreValue(*m_pMtrFldShadowX, MAP_100TH_MM); + nValueY = GetCoreValue(*m_pMtrFldShadowY, MAP_100TH_MM); } else if (nLastShadowTbxId == nShadowSlantId) { diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 57e1cc71ffcc..318ae321b22e 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -261,7 +261,7 @@ bool SvxHFPage::FillItemSet( SfxItemSet* rSet ) const SfxItemSet& rOldSet = GetItemSet(); SfxItemPool* pPool = rOldSet.GetPool(); DBG_ASSERT(pPool,"no pool :-("); - SfxMapUnit eUnit = pPool->GetMetric(nWSize); + MapUnit eUnit = pPool->GetMetric(nWSize); SfxItemSet aSet(*pPool,aWhichTab); if(mbEnableDrawingLayerFillStyles) @@ -367,7 +367,7 @@ void SvxHFPage::Reset( const SfxItemSet* rSet ) SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Where is the pool" ); - SfxMapUnit eUnit = pPool->GetMetric( GetWhich( SID_ATTR_PAGE_SIZE ) ); + MapUnit eUnit = pPool->GetMetric( GetWhich( SID_ATTR_PAGE_SIZE ) ); //hide "same content on first page when this is calc bool bIsCalc = false; @@ -439,8 +439,8 @@ void SvxHFPage::Reset( const SfxItemSet* rSet ) { // defaults for distance and height long nDefaultDist = bIsCalc ? DEF_DIST_CALC : DEF_DIST_WRITER; - SetMetricValue( *m_pDistEdit, nDefaultDist, SFX_MAPUNIT_100TH_MM ); - SetMetricValue( *m_pHeightEdit, 500, SFX_MAPUNIT_100TH_MM ); + SetMetricValue( *m_pDistEdit, nDefaultDist, MAP_100TH_MM ); + SetMetricValue( *m_pHeightEdit, 500, MAP_100TH_MM ); } if ( !pSetItem ) @@ -747,18 +747,18 @@ void SvxHFPage::UpdateExample() if ( nId == SID_ATTR_PAGE_HEADERSET ) { m_pBspWin->SetHeader( m_pTurnOnBox->IsChecked() ); - m_pBspWin->SetHdHeight( GetCoreValue( *m_pHeightEdit, SFX_MAPUNIT_TWIP ) ); - m_pBspWin->SetHdDist( GetCoreValue( *m_pDistEdit, SFX_MAPUNIT_TWIP ) ); - m_pBspWin->SetHdLeft( GetCoreValue( *m_pLMEdit, SFX_MAPUNIT_TWIP ) ); - m_pBspWin->SetHdRight( GetCoreValue( *m_pRMEdit, SFX_MAPUNIT_TWIP ) ); + m_pBspWin->SetHdHeight( GetCoreValue( *m_pHeightEdit, MAP_TWIP ) ); + m_pBspWin->SetHdDist( GetCoreValue( *m_pDistEdit, MAP_TWIP ) ); + m_pBspWin->SetHdLeft( GetCoreValue( *m_pLMEdit, MAP_TWIP ) ); + m_pBspWin->SetHdRight( GetCoreValue( *m_pRMEdit, MAP_TWIP ) ); } else { m_pBspWin->SetFooter( m_pTurnOnBox->IsChecked() ); - m_pBspWin->SetFtHeight( GetCoreValue( *m_pHeightEdit, SFX_MAPUNIT_TWIP ) ); - m_pBspWin->SetFtDist( GetCoreValue( *m_pDistEdit, SFX_MAPUNIT_TWIP ) ); - m_pBspWin->SetFtLeft( GetCoreValue( *m_pLMEdit, SFX_MAPUNIT_TWIP ) ); - m_pBspWin->SetFtRight( GetCoreValue( *m_pRMEdit, SFX_MAPUNIT_TWIP ) ); + m_pBspWin->SetFtHeight( GetCoreValue( *m_pHeightEdit, MAP_TWIP ) ); + m_pBspWin->SetFtDist( GetCoreValue( *m_pDistEdit, MAP_TWIP ) ); + m_pBspWin->SetFtLeft( GetCoreValue( *m_pLMEdit, MAP_TWIP ) ); + m_pBspWin->SetFtRight( GetCoreValue( *m_pRMEdit, MAP_TWIP ) ); } m_pBspWin->Invalidate(); } diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 36111159cd17..36efa3272519 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -105,8 +105,8 @@ bool SvxGridItem::operator==( const SfxPoolItem& rAttr ) const bool SvxGridItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -216,7 +216,7 @@ bool SvxGridTabPage::FillItemSet( SfxItemSet* rCoreSet ) aGridItem.bSynchronize = pCbxSynchronize->IsChecked(); aGridItem.bGridVisible = pCbxGridVisible->IsChecked(); - SfxMapUnit eUnit = + MapUnit eUnit = rCoreSet->GetPool()->GetMetric( GetWhich( SID_ATTR_GRID_OPTIONS ) ); long nX =GetCoreValue( *pMtrFldDrawX, eUnit ); long nY = GetCoreValue( *pMtrFldDrawY, eUnit ); @@ -244,7 +244,7 @@ void SvxGridTabPage::Reset( const SfxItemSet* rSet ) pCbxSynchronize->Check( pGridAttr->bSynchronize ); pCbxGridVisible->Check( pGridAttr->bGridVisible ); - SfxMapUnit eUnit = + MapUnit eUnit = rSet->GetPool()->GetMetric( GetWhich( SID_ATTR_GRID_OPTIONS ) ); SetMetricValue( *pMtrFldDrawX , pGridAttr->nFldDrawX, eUnit ); SetMetricValue( *pMtrFldDrawY , pGridAttr->nFldDrawY, eUnit ); diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index 33077bb5c241..45952e225cb3 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -117,8 +117,8 @@ bool SvxLongLRSpaceItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberI bool SvxLongLRSpaceItem::GetPresentation( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& /*rText*/, const IntlWrapper* /*pWrapper*/) const { @@ -243,8 +243,8 @@ bool SvxLongULSpaceItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberI bool SvxLongULSpaceItem::GetPresentation( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& /*rText*/, const IntlWrapper* /*pWrapper*/ ) const { @@ -364,8 +364,8 @@ bool SvxPagePosSizeItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberI bool SvxPagePosSizeItem::GetPresentation( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& /*rText*/, const IntlWrapper* /*pWrapper*/ ) const { @@ -455,8 +455,8 @@ SvxColumnItem::~SvxColumnItem() bool SvxColumnItem::GetPresentation( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& /*rText*/, const IntlWrapper* /*pWrapper*/ ) const { @@ -695,8 +695,8 @@ bool SvxObjectItem::operator==( const SfxPoolItem& rCmp ) const bool SvxObjectItem::GetPresentation( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& /*rText*/, const IntlWrapper* /*pWrapper*/ ) const { diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index d63c90f318a3..ea1f9a1631e9 100755 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -2148,21 +2148,21 @@ OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr, return rStr; // Metric query - SfxMapUnit eMapUnit = SFX_MAPUNIT_CM; + MapUnit eMapUnit = MAP_CM; FieldUnit eFieldUnit = pSh->GetModule()->GetFieldUnit(); switch ( eFieldUnit ) { - case FUNIT_MM: eMapUnit = SFX_MAPUNIT_MM; break; + case FUNIT_MM: eMapUnit = MAP_MM; break; case FUNIT_CM: case FUNIT_M: - case FUNIT_KM: eMapUnit = SFX_MAPUNIT_CM; break; - case FUNIT_TWIP: eMapUnit = SFX_MAPUNIT_TWIP; break; + case FUNIT_KM: eMapUnit = MAP_CM; break; + case FUNIT_TWIP: eMapUnit = MAP_TWIP; break; case FUNIT_POINT: - case FUNIT_PICA: eMapUnit = SFX_MAPUNIT_POINT; break; + case FUNIT_PICA: eMapUnit = MAP_POINT; break; case FUNIT_INCH: case FUNIT_FOOT: - case FUNIT_MILE: eMapUnit = SFX_MAPUNIT_INCH; break; - case FUNIT_100TH_MM: eMapUnit = SFX_MAPUNIT_100TH_MM; break; + case FUNIT_MILE: eMapUnit = MAP_INCH; break; + case FUNIT_100TH_MM: eMapUnit = MAP_100TH_MM; break; default: ;//prevent warning } diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index d204893fb70c..f885ce55363a 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -97,7 +97,7 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p , pConvertTo3DItem(nullptr) , pConvertTo3DLatheItem(nullptr) , mpImpl(new Svx3DWinImpl()) - , ePoolUnit(SFX_MAPUNIT_MM) + , ePoolUnit(MAP_MM) , mpRemember2DAttributes(nullptr) { get(m_pBtnGeo, "geometry"); diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index f7c86ab81f0e..570b19ce9e33 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -138,7 +138,7 @@ bool GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel ) // read as XML uno::Reference< io::XInputStream > xInputStream( new utl::OInputStreamWrapper( rIStm ) ); - rModel.GetItemPool().SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); + rModel.GetItemPool().SetDefaultMetric( MAP_100TH_MM ); uno::Reference< lang::XComponent > xComponent; bRet = SvxDrawingLayerImport( &rModel, xInputStream, xComponent, "com.sun.star.comp.Draw.XMLOasisImporter" ); diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index ec1f4e47e9f9..b2d7173c4daa 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -60,8 +60,8 @@ SvxOrientationItem::SvxOrientationItem( sal_Int32 nRotation, bool bStacked, cons bool SvxOrientationItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { rText = GetValueText( GetValue() ); @@ -206,8 +206,8 @@ SvxMarginItem::SvxMarginItem( const SvxMarginItem& rItem ) : bool SvxMarginItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + MapUnit eCoreUnit, + MapUnit ePresUnit, OUString& rText, const IntlWrapper *pIntl ) const { diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index 7dd679c5e02a..de1e7327cd48 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -193,8 +193,8 @@ OUString SvxDoubleItem::GetValueText() const bool SvxDoubleItem::GetPresentation - ( SfxItemPresentation /*ePresentation*/, SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, OUString& rText, + ( SfxItemPresentation /*ePresentation*/, MapUnit /*eCoreMetric*/, + MapUnit /*ePresentationMetric*/, OUString& rText, const IntlWrapper * pIntlWrapper) const { DBG_ASSERT( pIntlWrapper, "SvxDoubleItem::GetPresentation: no IntlWrapper" ); diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index de80bebb8cb7..c93336a4f393 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -260,8 +260,8 @@ bool SdrCustomShapeGeometryItem::operator==( const SfxPoolItem& rCmp ) const } bool SdrCustomShapeGeometryItem::GetPresentation( - SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const + SfxItemPresentation ePresentation, MapUnit /*eCoreMetric*/, + MapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const { rText += " "; if ( ePresentation == SFX_ITEM_PRESENTATION_COMPLETE ) diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index d097711e3cba..c2760fe9b89c 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -53,8 +53,8 @@ SvxColorListItem::SvxColorListItem( const SvxColorListItem& rItem ) : bool SvxColorListItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -115,8 +115,8 @@ SvxGradientListItem::SvxGradientListItem( const SvxGradientListItem& rItem ) : bool SvxGradientListItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -162,8 +162,8 @@ SvxHatchListItem::SvxHatchListItem( const SvxHatchListItem& rItem ) : bool SvxHatchListItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -205,8 +205,8 @@ SvxBitmapListItem::SvxBitmapListItem( const SvxBitmapListItem& rItem ) : bool SvxBitmapListItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -246,8 +246,8 @@ SvxPatternListItem::SvxPatternListItem( const SvxPatternListItem& rItem ) : bool SvxPatternListItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -288,8 +288,8 @@ SvxDashListItem::SvxDashListItem( const SvxDashListItem& rItem ) : bool SvxDashListItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -329,8 +329,8 @@ SvxLineEndListItem::SvxLineEndListItem( const SvxLineEndListItem& rItem ) : bool SvxLineEndListItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx index e4cfffc41166..8f13f3370f05 100644 --- a/svx/source/items/grfitem.cxx +++ b/svx/source/items/grfitem.cxx @@ -135,7 +135,7 @@ bool SvxGrfCrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } bool SvxGrfCrop::GetPresentation( - SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit /*ePresUnit*/, + SfxItemPresentation ePres, MapUnit eCoreUnit, MapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* pIntl ) const { rText.clear(); @@ -144,10 +144,10 @@ bool SvxGrfCrop::GetPresentation( case SFX_ITEM_PRESENTATION_NAMELESS: return true; case SFX_ITEM_PRESENTATION_COMPLETE: - rText = "L: " + OUString(::GetMetricText( GetLeft(), eCoreUnit, SFX_MAPUNIT_MM, pIntl )) + - " R: " + OUString(::GetMetricText( GetRight(), eCoreUnit, SFX_MAPUNIT_MM, pIntl )) + - " T: " + OUString(::GetMetricText( GetTop(), eCoreUnit, SFX_MAPUNIT_MM, pIntl )) + - " B: " + OUString(::GetMetricText( GetBottom(), eCoreUnit, SFX_MAPUNIT_MM, pIntl )); + rText = "L: " + OUString(::GetMetricText( GetLeft(), eCoreUnit, MAP_MM, pIntl )) + + " R: " + OUString(::GetMetricText( GetRight(), eCoreUnit, MAP_MM, pIntl )) + + " T: " + OUString(::GetMetricText( GetTop(), eCoreUnit, MAP_MM, pIntl )) + + " B: " + OUString(::GetMetricText( GetBottom(), eCoreUnit, MAP_MM, pIntl )); return true; break; diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx index 31c3374bb601..18f7e65d1583 100644 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx @@ -108,8 +108,8 @@ SvxNumberInfoItem::~SvxNumberInfoItem() bool SvxNumberInfoItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 1f40e9498c2c..d30890f1d7c7 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -85,8 +85,8 @@ inline OUString GetUsageText( const sal_uInt16 eU ) bool SvxPageItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -278,8 +278,8 @@ SfxPoolItem* SvxSetItem::Clone( SfxItemPool * ) const bool SvxSetItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx index 1741b8f3f580..f8e4cdd963f3 100644 --- a/svx/source/items/postattr.cxx +++ b/svx/source/items/postattr.cxx @@ -43,8 +43,8 @@ SvxPostItAuthorItem::SvxPostItAuthorItem( const OUString& rAuthor, bool SvxPostItAuthorItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -83,8 +83,8 @@ SvxPostItDateItem::SvxPostItDateItem( const OUString& rDate, sal_uInt16 _nWhich bool SvxPostItDateItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -112,19 +112,17 @@ SvxPostItTextItem::SvxPostItTextItem( sal_uInt16 _nWhich ) SetWhich( _nWhich ); } - SvxPostItTextItem::SvxPostItTextItem( const OUString& rText, sal_uInt16 _nWhich ) : SfxStringItem( _nWhich, rText ) { } - bool SvxPostItTextItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -141,11 +139,9 @@ bool SvxPostItTextItem::GetPresentation return false; } - SfxPoolItem* SvxPostItTextItem::Clone( SfxItemPool * ) const { return new SvxPostItTextItem( *this ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index e586fa0b7324..7c00734edb2a 100644 --- a/svx/source/items/rotmodit.cxx +++ b/svx/source/items/rotmodit.cxx @@ -66,7 +66,7 @@ SfxPoolItem* SvxRotateModeItem::Create( SvStream& rStream, sal_uInt16 ) const bool SvxRotateModeItem::GetPresentation( SfxItemPresentation ePres, - SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { rText.clear(); diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index b433529ac16d..fb197524517b 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -167,7 +167,7 @@ LinePropertyPanelBase::LinePropertyPanelBase( mpStyleItem(), mpDashItem(), mnTrans(0), - meMapUnit(SFX_MAPUNIT_MM), + meMapUnit(MAP_MM), mnWidthCoreValue(0), mpStartItem(), mpEndItem(), @@ -905,7 +905,7 @@ void LinePropertyPanelBase::ActivateControls() mpLBEnd->Enable( bLineStyle && mbArrowSupported ); } -void LinePropertyPanelBase::setMapUnit(SfxMapUnit eMapUnit) +void LinePropertyPanelBase::setMapUnit(MapUnit eMapUnit) { meMapUnit = eMapUnit; } diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx index 9112eb8d0473..1bc93919e2a4 100644 --- a/svx/source/sidebar/line/LineWidthPopup.cxx +++ b/svx/source/sidebar/line/LineWidthPopup.cxx @@ -32,7 +32,7 @@ LineWidthPopup::LineWidthPopup(LinePropertyPanelBase& rParent) , m_rParent(rParent) , m_pStr(nullptr) , m_sPt(SVX_RESSTR(RID_SVXSTR_PT)) - , m_eMapUnit(SFX_MAPUNIT_TWIP) + , m_eMapUnit(MAP_TWIP) , m_bVSFocus(true) , m_bCustom(false) , m_bCloseByEdit(false) @@ -174,7 +174,7 @@ IMPL_LINK_TYPED(LineWidthPopup, MFModifyHdl, Edit&, /*rControl*/, void) m_nTmpCustomWidth = nTmp; } -void LineWidthPopup::SetWidthSelect(long lValue, bool bValuable, SfxMapUnit eMapUnit) +void LineWidthPopup::SetWidthSelect(long lValue, bool bValuable, MapUnit eMapUnit) { m_bVSFocus = true; m_xVSWidth->SetSelItem(0); diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index 04bb93c85325..11b957d2835f 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -154,8 +154,8 @@ void NBOTypeMgrBase::StoreBulCharFmtName_impl() { void NBOTypeMgrBase::ImplLoad(const OUString& filename) { bIsLoading = true; - SfxMapUnit eOldCoreUnit=eCoreUnit; - eCoreUnit = SFX_MAPUNIT_100TH_MM; + MapUnit eOldCoreUnit=eCoreUnit; + eCoreUnit = MAP_100TH_MM; INetURLObject aFile( SvtPathOptions().GetUserConfigPath() ); aFile.Append( filename); std::unique_ptr<SvStream> xIStm(::utl::UcbStreamHelper::CreateStream( aFile.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ )); @@ -193,8 +193,8 @@ void NBOTypeMgrBase::ImplLoad(const OUString& filename) void NBOTypeMgrBase::ImplStore(const OUString& filename) { if (bIsLoading) return; - SfxMapUnit eOldCoreUnit=eCoreUnit; - eCoreUnit = SFX_MAPUNIT_100TH_MM; + MapUnit eOldCoreUnit=eCoreUnit; + eCoreUnit = MAP_100TH_MM; INetURLObject aFile( SvtPathOptions().GetUserConfigPath() ); aFile.Append( filename); std::unique_ptr<SvStream> xOStm(::utl::UcbStreamHelper::CreateStream( aFile.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE )); diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index 17bdd7e206de..6887e95d3e86 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -62,7 +62,7 @@ ParaLineSpacingControl::ParaLineSpacingControl(sal_uInt16 nId) mpActLineDistFld = mpLineDistAtPercentBox.get(); - meLNSpaceUnit = SFX_MAPUNIT_100TH_MM; + meLNSpaceUnit = MAP_100TH_MM; Link<Button*,void> aLink = LINK(this, ParaLineSpacingControl, PredefinedValuesHandler); mpSpacing1Button->SetClickHdl(aLink); @@ -120,7 +120,7 @@ void ParaLineSpacingControl::Initialize() if( eState >= SfxItemState::DEFAULT ) { - SfxMapUnit eUnit = SFX_MAPUNIT_100TH_MM; + MapUnit eUnit = MAP_100TH_MM; meLNSpaceUnit = eUnit; switch( currSPItem->GetLineSpaceRule() ) @@ -309,7 +309,7 @@ void ParaLineSpacingControl::UpdateMetricFields() mpLineDistAtMetricBox->SetMin(mpLineDistAtMetricBox->Normalize(MIN_FIXED_DISTANCE), FUNIT_TWIP); if (mpLineDistAtMetricBox->GetValue() != nTemp) - SetMetricValue(*mpLineDistAtMetricBox, FIX_DIST_DEF, SFX_MAPUNIT_TWIP); + SetMetricValue(*mpLineDistAtMetricBox, FIX_DIST_DEF, MAP_TWIP); mpLineDistLabel->Enable(); mpActLineDistFld->Show(); diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx index 1d27c40c69d1..c804cc92ea2f 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx @@ -35,7 +35,7 @@ public: virtual void dispose() override; private: - SfxMapUnit meLNSpaceUnit; + MapUnit meLNSpaceUnit; VclPtr<Edit> mpActLineDistFld; diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index 98fb676e0f0f..b6b8c6f6ef6f 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -225,7 +225,7 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pCont SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE ); maTxtLeft += INDENT_STEP; - sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM ); + sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(MAP_TWIP), MAP_100TH_MM ); nVal = OutputDevice::LogicToLogic( (long)nVal, MAP_100TH_MM, (MapUnit)m_eLRSpaceUnit ); aMargin.SetTextLeft( (const long)nVal ); aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) ); @@ -258,7 +258,7 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pCont SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE ); - sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM ); + sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(MAP_TWIP), MAP_100TH_MM ); nVal = OutputDevice::LogicToLogic( (long)nVal, MAP_100TH_MM, (MapUnit)m_eLRSpaceUnit ); aMargin.SetTextLeft( (const long)nVal ); @@ -370,17 +370,17 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat const SvxLRSpaceItem* pSpace = static_cast<const SvxLRSpaceItem*>(pState); maTxtLeft = pSpace->GetTextLeft(); maTxtLeft = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)m_eLRSpaceUnit, MAP_100TH_MM ); - maTxtLeft = OutputDevice::LogicToLogic( maTxtLeft, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) ); + maTxtLeft = OutputDevice::LogicToLogic( maTxtLeft, MAP_100TH_MM, (MapUnit)(MAP_TWIP) ); long aTxtRight = pSpace->GetRight(); aTxtRight = OutputDevice::LogicToLogic( aTxtRight, (MapUnit)m_eLRSpaceUnit, MAP_100TH_MM ); - aTxtRight = OutputDevice::LogicToLogic( aTxtRight, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) ); + aTxtRight = OutputDevice::LogicToLogic( aTxtRight, MAP_100TH_MM, (MapUnit)(MAP_TWIP) ); long aTxtFirstLineOfst = pSpace->GetTextFirstLineOfst(); aTxtFirstLineOfst = OutputDevice::LogicToLogic( aTxtFirstLineOfst, (MapUnit)m_eLRSpaceUnit, MAP_100TH_MM ); - aTxtFirstLineOfst = OutputDevice::LogicToLogic( aTxtFirstLineOfst, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) ); + aTxtFirstLineOfst = OutputDevice::LogicToLogic( aTxtFirstLineOfst, MAP_100TH_MM, (MapUnit)(MAP_TWIP) ); - long nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM ); + long nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(MAP_TWIP), MAP_100TH_MM ); nVal = (long)mpLeftIndent->Normalize( (long)nVal ); if ( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Text) @@ -390,7 +390,7 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat mpFLineIndent->SetMin( nVal*(-1), FUNIT_100TH_MM ); } - long nrVal = OutputDevice::LogicToLogic( aTxtRight, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM ); + long nrVal = OutputDevice::LogicToLogic( aTxtRight, (MapUnit)(MAP_TWIP), MAP_100TH_MM ); nrVal = (long)mpRightIndent->Normalize( (long)nrVal ); switch (maContext.GetCombinedContext_DI()) @@ -421,7 +421,7 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat mpLeftIndent->SetValue( nVal, FUNIT_100TH_MM ); mpRightIndent->SetValue( nrVal, FUNIT_100TH_MM ); - long nfVal = OutputDevice::LogicToLogic( aTxtFirstLineOfst, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM ); + long nfVal = OutputDevice::LogicToLogic( aTxtFirstLineOfst, (MapUnit)(MAP_TWIP), MAP_100TH_MM ); nfVal = (long)mpFLineIndent->Normalize( (long)nfVal ); mpFLineIndent->SetValue( nfVal, FUNIT_100TH_MM ); @@ -476,17 +476,17 @@ void ParaPropertyPanel::StateChangedULImpl( sal_uInt16 /*nSID*/, SfxItemState eS maUpper = pOldItem->GetUpper(); maUpper = OutputDevice::LogicToLogic( maUpper, (MapUnit)m_eULSpaceUnit, MAP_100TH_MM ); - maUpper = OutputDevice::LogicToLogic( maUpper, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) ); + maUpper = OutputDevice::LogicToLogic( maUpper, MAP_100TH_MM, (MapUnit)(MAP_TWIP) ); maLower = pOldItem->GetLower(); maLower = OutputDevice::LogicToLogic( maLower, (MapUnit)m_eULSpaceUnit, MAP_100TH_MM ); - maLower = OutputDevice::LogicToLogic( maLower, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) ); + maLower = OutputDevice::LogicToLogic( maLower, MAP_100TH_MM, (MapUnit)(MAP_TWIP) ); - sal_Int64 nVal = OutputDevice::LogicToLogic( maUpper, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM ); + sal_Int64 nVal = OutputDevice::LogicToLogic( maUpper, (MapUnit)(MAP_TWIP), MAP_100TH_MM ); nVal = mpTopDist->Normalize( nVal ); mpTopDist->SetValue( nVal, FUNIT_100TH_MM ); - nVal = OutputDevice::LogicToLogic( maLower, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM ); + nVal = OutputDevice::LogicToLogic( maLower, (MapUnit)(MAP_TWIP), MAP_100TH_MM ); nVal = mpBottomDist->Normalize( nVal ); mpBottomDist->SetValue( nVal, FUNIT_100TH_MM ); } diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index 4b204749efd3..90411f4e913b 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -98,8 +98,8 @@ private: FieldUnit m_eMetricUnit; FieldUnit m_last_eMetricUnit; - SfxMapUnit m_eLRSpaceUnit; - SfxMapUnit m_eULSpaceUnit; + MapUnit m_eLRSpaceUnit; + MapUnit m_eULSpaceUnit; // Control Items ::sfx2::sidebar::ControllerItem maLRSpaceControl; ::sfx2::sidebar::ControllerItem maULSpaceControl; diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx index f26b59673df3..c534d4c13640 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx +++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx @@ -36,7 +36,7 @@ using namespace svx; ParaULSpacingWindow::ParaULSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame>& xFrame) : VclVBox(pParent) - , m_eUnit(SFX_MAPUNIT_TWIP) + , m_eUnit(MAP_TWIP) { m_pUIBuilder = new VclBuilder(this, getUIRootDir(), "svx/ui/paraulspacing.ui", @@ -105,7 +105,7 @@ IMPL_LINK_NOARG_TYPED(ParaULSpacingWindow, ModifySpacingHdl, Edit&, void) ParaLRSpacingWindow::ParaLRSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame>& xFrame) : VclVBox(pParent) - , m_eUnit(SFX_MAPUNIT_TWIP) + , m_eUnit(MAP_TWIP) { m_pUIBuilder = new VclBuilder(this, getUIRootDir(), "svx/ui/paralrspacing.ui", diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx index 61ccfca53445..d0a16d5701b9 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx +++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx @@ -49,7 +49,7 @@ private: VclPtr<SvxRelativeField> m_pAboveSpacing; VclPtr<SvxRelativeField> m_pBelowSpacing; - SfxMapUnit m_eUnit; + MapUnit m_eUnit; DECL_LINK_TYPED(ModifySpacingHdl, Edit&, void); }; @@ -71,7 +71,7 @@ private: VclPtr<SvxRelativeField> m_pAfterSpacing; VclPtr<SvxRelativeField> m_pFLSpacing; - SfxMapUnit m_eUnit; + MapUnit m_eUnit; vcl::EnumContext m_aContext; diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index 755c563d26f7..4aa94750efcc 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -117,7 +117,7 @@ private: long mlRotX; long mlRotY; Fraction maUIScale; - SfxMapUnit mePoolUnit; + MapUnit mePoolUnit; FieldUnit meDlgUnit; // Controller Items diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index a3ff10e634f7..30d83e647bf6 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -125,7 +125,7 @@ void TextCharacterSpacingControl::Initialize() if(eState >= SfxItemState::DEFAULT) { - SfxMapUnit eUnit = GetCoreMetric(); + MapUnit eUnit = GetCoreMetric(); MapUnit eOrgUnit = (MapUnit)eUnit; MapUnit ePntUnit(MAP_POINT); long nBig = maEditKerning->Normalize(nKerning); @@ -146,7 +146,7 @@ void TextCharacterSpacingControl::Initialize() void TextCharacterSpacingControl::ExecuteCharacterSpacing(long nValue, bool bClose) { - SfxMapUnit eUnit = GetCoreMetric(); + MapUnit eUnit = GetCoreMetric(); long nSign = (nValue < 0) ? -1 : 1; nValue = nValue * nSign; @@ -201,7 +201,7 @@ IMPL_LINK_NOARG_TYPED(TextCharacterSpacingControl, KerningModifyHdl, Edit&, void ExecuteCharacterSpacing(mnCustomKern, false); } -SfxMapUnit TextCharacterSpacingControl::GetCoreMetric() const +MapUnit TextCharacterSpacingControl::GetCoreMetric() const { SfxItemPool &rPool = SfxGetpApp()->GetPool(); sal_uInt16 nWhich = rPool.GetWhich(mnId); diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx index 866e011ee62b..76df39d9ca23 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx @@ -63,7 +63,7 @@ private: DECL_LINK_TYPED(KerningSelectHdl, ListBox&, void); DECL_LINK_TYPED(KerningModifyHdl, Edit&, void); - SfxMapUnit GetCoreMetric() const; + MapUnit GetCoreMetric() const; }; } diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 56b9408d694d..b9563d0f9f28 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -375,7 +375,7 @@ SdrItemPool::~SdrItemPool() bool SdrItemPool::GetPresentation( const SfxPoolItem& rItem, - SfxMapUnit ePresentationMetric, OUString& rText, + MapUnit ePresentationMetric, OUString& rText, const IntlWrapper * pIntlWrapper) const { if (!IsInvalidItem(&rItem)) { @@ -639,8 +639,8 @@ bool SdrFractionItem::operator==(const SfxPoolItem& rCmp) const } bool SdrFractionItem::GetPresentation( - SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const + SfxItemPresentation ePresentation, MapUnit /*eCoreMetric*/, + MapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const { if(nValue.IsValid()) { @@ -693,8 +693,8 @@ SfxPoolItem* SdrFractionItem::Clone(SfxItemPool * /*pPool*/) const bool SdrScaleItem::GetPresentation( - SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const + SfxItemPresentation ePresentation, MapUnit /*eCoreMetric*/, + MapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const { if(GetValue().IsValid()) { @@ -750,7 +750,7 @@ OUString SdrOnOffItem::GetValueTextByVal(bool bVal) const } bool SdrOnOffItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByVal(GetValue()); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { @@ -781,7 +781,7 @@ OUString SdrYesNoItem::GetValueTextByVal(bool bVal) const } bool SdrYesNoItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByVal(GetValue()); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { @@ -808,8 +808,8 @@ SfxPoolItem* SdrPercentItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const } bool SdrPercentItem::GetPresentation( - SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + SfxItemPresentation ePres, MapUnit /*eCoreMetric*/, + MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText = unicode::formatPercent(GetValue(), Application::GetSettings().GetUILanguageTag()); @@ -840,7 +840,7 @@ SfxPoolItem* SdrAngleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const } bool SdrAngleItem::GetPresentation( - SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, + SfxItemPresentation ePres, MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper * pIntlWrapper) const { sal_Int32 nValue(GetValue()); @@ -943,7 +943,7 @@ void SdrMetricItem::ScaleMetrics(long nMul, long nDiv) } bool SdrMetricItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper *) const + MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper *) const { long nValue=GetValue(); SdrFormatter aFmt((MapUnit)eCoreMetric,(MapUnit)ePresMetric); @@ -976,7 +976,7 @@ OUString SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { @@ -1001,7 +1001,7 @@ OUString SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { @@ -1033,7 +1033,7 @@ OUString SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { @@ -1092,7 +1092,7 @@ OUString SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrTextVertAdjustItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { @@ -1140,7 +1140,7 @@ OUString SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrTextHorzAdjustItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { @@ -1188,7 +1188,7 @@ OUString SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrTextAniKindItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { @@ -1235,7 +1235,7 @@ OUString SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrTextAniDirectionItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { @@ -1276,7 +1276,7 @@ SfxPoolItem* SdrTextAniDelayItem::Clone(SfxItemPool* /*pPool*/) const SfxPoolItem* SdrTextAniDelayItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextAniDelayItem(rIn); } bool SdrTextAniDelayItem::GetPresentation( - SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, + SfxItemPresentation ePres, MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText = OUString::number(GetValue()) + "ms"; @@ -1314,7 +1314,7 @@ void SdrTextAniAmountItem::ScaleMetrics(long nMul, long nDiv) } bool SdrTextAniAmountItem::GetPresentation( - SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, + SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper *) const { sal_Int32 nValue(GetValue()); @@ -1363,7 +1363,7 @@ SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( SvStream & rStream, sal_ } } bool SdrTextFixedCellHeightItem::GetPresentation( SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresentationMetric*/, + MapUnit /*eCoreMetric*/, MapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper * ) const { rText = GetValueTextByVal( GetValue() ); @@ -1454,8 +1454,8 @@ bool SdrCustomShapeAdjustmentItem::operator==( const SfxPoolItem& rCmp ) const } bool SdrCustomShapeAdjustmentItem::GetPresentation( - SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const + SfxItemPresentation ePresentation, MapUnit /*eCoreMetric*/, + MapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const { sal_uInt32 i, nCount = GetCount(); rText += OUString::number( nCount ); @@ -1569,7 +1569,7 @@ OUString SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrEdgeKindItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { @@ -1734,7 +1734,7 @@ OUString SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrMeasureKindItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { @@ -1781,7 +1781,7 @@ OUString SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { @@ -1828,7 +1828,7 @@ OUString SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { @@ -1882,7 +1882,7 @@ OUString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrMeasureUnitItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { @@ -1923,7 +1923,7 @@ OUString SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrCircKindItem::GetPresentation(SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { @@ -1972,7 +1972,7 @@ SfxPoolItem* SdrSignedPercentItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) c } bool SdrSignedPercentItem::GetPresentation( - SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, + SfxItemPresentation ePres, MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText = unicode::formatPercent(GetValue(), @@ -2141,7 +2141,7 @@ OUString SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrGrafModeItem::GetPresentation( SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText = GetValueTextByPos( sal::static_int_cast< sal_uInt16 >( GetValue() ) ); diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 679b40dfe5b2..5f373c7bbb85 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -1005,7 +1005,7 @@ void SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItemS rItem.GetPresentation(SFX_ITEM_PRESENTATION_NAMELESS, pPool->GetMetric(nWhich), - SFX_MAPUNIT_MM, aEntry.aValue); + MAP_MM, aEntry.aValue); if (aEntry.bCanNum) { aEntry.aValue = OUString::number(aEntry.nVal) + ": " + aEntry.aValue; diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 81ee1612e75b..47c326374e9a 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -186,7 +186,7 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe // remember that I created both pools myself bMyPool=true; } - pItemPool->SetDefaultMetric((SfxMapUnit)eObjUnit); + pItemPool->SetDefaultMetric(eObjUnit); // using static SdrEngineDefaults only if default SvxFontHeight item is not available const SfxPoolItem* pPoolItem = pItemPool->GetPoolDefaultItem( EE_CHAR_FONTHEIGHT ); @@ -1050,7 +1050,7 @@ void SdrModel::SetScaleUnit(MapUnit eMap, const Fraction& rFrac) if (eObjUnit!=eMap || aObjUnit!=rFrac) { eObjUnit=eMap; aObjUnit=rFrac; - pItemPool->SetDefaultMetric((SfxMapUnit)eObjUnit); + pItemPool->SetDefaultMetric(eObjUnit); ImpSetUIUnit(); ImpSetOutlinerDefaults( pDrawOutliner ); ImpSetOutlinerDefaults( pHitTestOutliner ); @@ -1062,7 +1062,7 @@ void SdrModel::SetScaleUnit(MapUnit eMap) { if (eObjUnit!=eMap) { eObjUnit=eMap; - pItemPool->SetDefaultMetric((SfxMapUnit)eObjUnit); + pItemPool->SetDefaultMetric(eObjUnit); ImpSetUIUnit(); ImpSetOutlinerDefaults( pDrawOutliner ); ImpSetOutlinerDefaults( pHitTestOutliner ); diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 603bc14e1543..ef16b4b1ac74 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -2969,12 +2969,12 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, aGeo.RecalcTan(); // force metric to pool metric - const SfxMapUnit eMapUnit(GetObjectMapUnit()); - if(eMapUnit != SFX_MAPUNIT_100TH_MM) + const MapUnit eMapUnit(GetObjectMapUnit()); + if(eMapUnit != MAP_100TH_MM) { switch(eMapUnit) { - case SFX_MAPUNIT_TWIP : + case MAP_TWIP : { // position aTranslate.setX(ImplMMToTwips(aTranslate.getX())); @@ -3121,12 +3121,12 @@ bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegf } // force MapUnit to 100th mm - const SfxMapUnit eMapUnit(GetObjectMapUnit()); - if(eMapUnit != SFX_MAPUNIT_100TH_MM) + const MapUnit eMapUnit(GetObjectMapUnit()); + if(eMapUnit != MAP_100TH_MM) { switch(eMapUnit) { - case SFX_MAPUNIT_TWIP : + case MAP_TWIP : { // position aTranslate.setX(ImplTwipsToMM(aTranslate.getX())); diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index ba81a6dc796a..cf39f0a82d02 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -476,7 +476,7 @@ SdrItemPool& SdrObject::GetGlobalDrawObjectItemPool() mpGlobalItemPool = new SdrItemPool(); SfxItemPool* pGlobalOutlPool = EditEngine::CreatePool(); mpGlobalItemPool->SetSecondaryPool(pGlobalOutlPool); - mpGlobalItemPool->SetDefaultMetric((SfxMapUnit)SdrEngineDefaults::GetMapUnit()); + mpGlobalItemPool->SetDefaultMetric(SdrEngineDefaults::GetMapUnit()); mpGlobalItemPool->FreezeIdRanges(); } @@ -1971,7 +1971,7 @@ const SfxPoolItem& SdrObject::GetObjectItem(const sal_uInt16 nWhich) const return GetObjectItemSet().Get(nWhich); } -SfxMapUnit SdrObject::GetObjectMapUnit() const +MapUnit SdrObject::GetObjectMapUnit() const { return GetObjectItemPool().GetMetric(0); } @@ -2958,12 +2958,12 @@ bool SdrObject::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPo } // force MapUnit to 100th mm - const SfxMapUnit eMapUnit(GetObjectMapUnit()); - if(eMapUnit != SFX_MAPUNIT_100TH_MM) + const MapUnit eMapUnit(GetObjectMapUnit()); + if(eMapUnit != MAP_100TH_MM) { switch(eMapUnit) { - case SFX_MAPUNIT_TWIP : + case MAP_TWIP : { // position aTranslate.setX(ImplTwipsToMM(aTranslate.getX())); @@ -3008,12 +3008,12 @@ void SdrObject::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const ba } // force metric to pool metric - const SfxMapUnit eMapUnit(GetObjectMapUnit()); - if(eMapUnit != SFX_MAPUNIT_100TH_MM) + const MapUnit eMapUnit(GetObjectMapUnit()); + if(eMapUnit != MAP_100TH_MM) { switch(eMapUnit) { - case SFX_MAPUNIT_TWIP : + case MAP_TWIP : { // position aTranslate.setX(ImplMMToTwips(aTranslate.getX())); diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index effea5dc123e..64927a52b96a 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -773,12 +773,12 @@ void SdrCaptionObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, cons handleNegativeScale(aScale, &fRotate); // force metric to pool metric - SfxMapUnit eMapUnit = pModel->GetItemPool().GetMetric(0); - if(eMapUnit != SFX_MAPUNIT_100TH_MM) + MapUnit eMapUnit = pModel->GetItemPool().GetMetric(0); + if(eMapUnit != MAP_100TH_MM) { switch(eMapUnit) { - case SFX_MAPUNIT_TWIP : + case MAP_TWIP : { // position aTranslate.setX(ImplMMToTwips(aTranslate.getX())); diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 1f8880c648fa..b18baf6472b8 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -1391,12 +1391,12 @@ bool SdrMeasureObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B } // force MapUnit to 100th mm - SfxMapUnit eMapUnit = pModel->GetItemPool().GetMetric(0); - if(eMapUnit != SFX_MAPUNIT_100TH_MM) + MapUnit eMapUnit = pModel->GetItemPool().GetMetric(0); + if(eMapUnit != MAP_100TH_MM) { switch(eMapUnit) { - case SFX_MAPUNIT_TWIP : + case MAP_TWIP : { // position aTranslate.setX(ImplTwipsToMM(aTranslate.getX())); @@ -1428,12 +1428,12 @@ void SdrMeasureObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, cons basegfx::B2DPoint aPosB(rMatrix * basegfx::B2DPoint(1.0, 0.0)); // force metric to pool metric - SfxMapUnit eMapUnit = pModel->GetItemPool().GetMetric(0); - if(eMapUnit != SFX_MAPUNIT_100TH_MM) + MapUnit eMapUnit = pModel->GetItemPool().GetMetric(0); + if(eMapUnit != MAP_100TH_MM) { switch(eMapUnit) { - case SFX_MAPUNIT_TWIP : + case MAP_TWIP : { // position aPosA.setX(ImplMMToTwips(aPosA.getX())); diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 7379ecd65c49..6f5a83217ac9 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -2945,12 +2945,12 @@ bool SdrPathObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DP } // force MapUnit to 100th mm - const SfxMapUnit eMapUnit(GetObjectMapUnit()); - if(eMapUnit != SFX_MAPUNIT_100TH_MM) + const MapUnit eMapUnit(GetObjectMapUnit()); + if(eMapUnit != MAP_100TH_MM) { switch(eMapUnit) { - case SFX_MAPUNIT_TWIP : + case MAP_TWIP : { // position aTranslate.setX(ImplTwipsToMM(aTranslate.getX())); @@ -3015,12 +3015,12 @@ void SdrPathObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b aGeo.RecalcTan(); // force metric to pool metric - const SfxMapUnit eMapUnit(GetObjectMapUnit()); - if(eMapUnit != SFX_MAPUNIT_100TH_MM) + const MapUnit eMapUnit(GetObjectMapUnit()); + if(eMapUnit != MAP_100TH_MM) { switch(eMapUnit) { - case SFX_MAPUNIT_TWIP : + case MAP_TWIP : { // position aTranslate.setX(ImplMMToTwips(aTranslate.getX())); diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 952a7328a030..ddf5295951c1 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -1630,12 +1630,12 @@ bool SdrTextObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DP } // force MapUnit to 100th mm - const SfxMapUnit eMapUnit(GetObjectMapUnit()); - if(eMapUnit != SFX_MAPUNIT_100TH_MM) + const MapUnit eMapUnit(GetObjectMapUnit()); + if(eMapUnit != MAP_100TH_MM) { switch(eMapUnit) { - case SFX_MAPUNIT_TWIP : + case MAP_TWIP : { // position aTranslate.setX(ImplTwipsToMM(aTranslate.getX())); @@ -1695,12 +1695,12 @@ void SdrTextObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b aGeo.RecalcTan(); // force metric to pool metric - const SfxMapUnit eMapUnit(GetObjectMapUnit()); - if(eMapUnit != SFX_MAPUNIT_100TH_MM) + const MapUnit eMapUnit(GetObjectMapUnit()); + if(eMapUnit != MAP_100TH_MM) { switch(eMapUnit) { - case SFX_MAPUNIT_TWIP : + case MAP_TWIP : { // position aTranslate.setX(ImplMMToTwips(aTranslate.getX())); diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 6faa32363ade..36191d062473 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -671,12 +671,12 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) ( pObj->GetGraphicType() != GraphicType::Default ) ) { SfxItemSet aGrfAttr( rPool, SDRATTR_GRAFCROP, SDRATTR_GRAFCROP, 0 ); - const SfxMapUnit eOldMetric = rPool.GetMetric( 0 ); + const MapUnit eOldMetric = rPool.GetMetric( 0 ); const MapMode aMap100( MAP_100TH_MM ); const MapMode aMapTwip( MAP_TWIP ); aGrfAttr.Put(pObj->GetMergedItemSet()); - rPool.SetDefaultMetric( SFX_MAPUNIT_TWIP ); + rPool.SetDefaultMetric( MAP_TWIP ); SfxItemSet aCropDlgAttr( rPool, SDRATTR_GRAFCROP, SDRATTR_GRAFCROP, diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index cd37b984df68..7d26b8f2a880 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -245,7 +245,7 @@ SvxMetricField::SvxMetricField( vcl::Window* pParent, const Reference< XFrame >& rFrame, WinBits nBits ) : MetricField(pParent, nBits) , aCurTxt() - , ePoolUnit(SFX_MAPUNIT_CM) + , ePoolUnit(MAP_CM) , mxFrame(rFrame) { Size aSize(GetTextWidth( "99,99mm" ),GetTextHeight()); @@ -305,7 +305,7 @@ void SvxMetricField::ReleaseFocus_Impl() } } -void SvxMetricField::SetCoreUnit( SfxMapUnit eUnit ) +void SvxMetricField::SetCoreUnit( MapUnit eUnit ) { ePoolUnit = eUnit; } diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 9f9b34a37218..f601d5843433 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -226,7 +226,7 @@ void SvxLineWidthToolBoxControl::StateChanged( // Core-Unit handed over to MetricField // Should not happen in CreateItemWin ()! - SfxMapUnit eUnit = SFX_MAPUNIT_100TH_MM; // CD!!! GetCoreMetric(); + MapUnit eUnit = MAP_100TH_MM; // CD!!! GetCoreMetric(); pFld->SetCoreUnit( eUnit ); pFld->Update( static_cast<const XLineWidthItem*>(pState) ); diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index 3d63ff953bc1..c62a7ed26d2c 100644 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -73,7 +73,7 @@ void SvxUnoDrawPool::init() mpDefaultsPool->SetSecondaryPool(pOutlPool); SdrModel::SetTextDefaults( mpDefaultsPool, SdrEngineDefaults::GetFontHeight() ); - mpDefaultsPool->SetDefaultMetric((SfxMapUnit)SdrEngineDefaults::GetMapUnit()); + mpDefaultsPool->SetDefaultMetric(SdrEngineDefaults::GetMapUnit()); mpDefaultsPool->FreezeIdRanges(); } @@ -117,10 +117,10 @@ void SvxUnoDrawPool::getAny( SfxItemPool* pPool, const comphelper::PropertyMapEn } default: { - const SfxMapUnit eMapUnit = pPool->GetMetric((sal_uInt16)pEntry->mnHandle); + const MapUnit eMapUnit = pPool->GetMetric((sal_uInt16)pEntry->mnHandle); sal_uInt8 nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM); - if( eMapUnit == SFX_MAPUNIT_100TH_MM ) + if( eMapUnit == MAP_100TH_MM ) nMemberId &= (~CONVERT_TWIPS); // DVO, OD 10.10.2003 #i18732# @@ -132,8 +132,8 @@ void SvxUnoDrawPool::getAny( SfxItemPool* pPool, const comphelper::PropertyMapEn // check for needed metric translation - const SfxMapUnit eMapUnit = pPool->GetMetric((sal_uInt16)pEntry->mnHandle); - if(pEntry->mnMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM) + const MapUnit eMapUnit = pPool->GetMetric((sal_uInt16)pEntry->mnHandle); + if(pEntry->mnMemberId & SFX_METRIC_ITEM && eMapUnit != MAP_100TH_MM) { SvxUnoConvertToMM( eMapUnit, rValue ); } @@ -152,8 +152,8 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn { uno::Any aValue( rValue ); - const SfxMapUnit eMapUnit = pPool->GetMetric((sal_uInt16)pEntry->mnHandle); - if(pEntry->mnMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM) + const MapUnit eMapUnit = pPool->GetMetric((sal_uInt16)pEntry->mnHandle); + if(pEntry->mnMemberId & SFX_METRIC_ITEM && eMapUnit != MAP_100TH_MM) { SvxUnoConvertFromMM( eMapUnit, aValue ); } @@ -187,7 +187,7 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn { std::unique_ptr<SfxPoolItem> pNewItem( pPool->GetDefaultItem( nWhich ).Clone() ); sal_uInt8 nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM); - if( pPool->GetMetric(nWhich) == SFX_MAPUNIT_100TH_MM ) + if( pPool->GetMetric(nWhich) == MAP_100TH_MM ) nMemberId &= (~CONVERT_TWIPS); if( !pNewItem->PutValue( aValue, nMemberId ) ) diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index f7a2ea7e9f42..971373266d45 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -484,12 +484,12 @@ void SvxShape::ForceMetricToItemPoolMetric(Pair& rPoint) const throw() DBG_TESTSOLARMUTEX(); if(mpModel) { - SfxMapUnit eMapUnit = mpModel->GetItemPool().GetMetric(0); - if(eMapUnit != SFX_MAPUNIT_100TH_MM) + MapUnit eMapUnit = mpModel->GetItemPool().GetMetric(0); + if(eMapUnit != MAP_100TH_MM) { switch(eMapUnit) { - case SFX_MAPUNIT_TWIP : + case MAP_TWIP : { rPoint.A() = MM_TO_TWIPS(rPoint.A()); rPoint.B() = MM_TO_TWIPS(rPoint.B()); @@ -510,12 +510,12 @@ void SvxShape::ForceMetricToItemPoolMetric(basegfx::B2DPolyPolygon& rPolyPolygon DBG_TESTSOLARMUTEX(); if(mpModel) { - SfxMapUnit eMapUnit = mpModel->GetItemPool().GetMetric(0); - if(eMapUnit != SFX_MAPUNIT_100TH_MM) + MapUnit eMapUnit = mpModel->GetItemPool().GetMetric(0); + if(eMapUnit != MAP_100TH_MM) { switch(eMapUnit) { - case SFX_MAPUNIT_TWIP : + case MAP_TWIP : { basegfx::B2DHomMatrix aTransform; const double fMMToTWIPS(72.0 / 127.0); @@ -537,15 +537,15 @@ void SvxShape::ForceMetricToItemPoolMetric(basegfx::B2DPolyPolygon& rPolyPolygon void SvxShape::ForceMetricTo100th_mm(Pair& rPoint) const throw() { DBG_TESTSOLARMUTEX(); - SfxMapUnit eMapUnit = SFX_MAPUNIT_100TH_MM; + MapUnit eMapUnit = MAP_100TH_MM; if(mpModel) { eMapUnit = mpModel->GetItemPool().GetMetric(0); - if(eMapUnit != SFX_MAPUNIT_100TH_MM) + if(eMapUnit != MAP_100TH_MM) { switch(eMapUnit) { - case SFX_MAPUNIT_TWIP : + case MAP_TWIP : { rPoint.A() = TWIPS_TO_MM(rPoint.A()); rPoint.B() = TWIPS_TO_MM(rPoint.B()); @@ -564,15 +564,15 @@ void SvxShape::ForceMetricTo100th_mm(Pair& rPoint) const throw() void SvxShape::ForceMetricTo100th_mm(basegfx::B2DPolyPolygon& rPolyPolygon) const throw() { DBG_TESTSOLARMUTEX(); - SfxMapUnit eMapUnit = SFX_MAPUNIT_100TH_MM; + MapUnit eMapUnit = MAP_100TH_MM; if(mpModel) { eMapUnit = mpModel->GetItemPool().GetMetric(0); - if(eMapUnit != SFX_MAPUNIT_100TH_MM) + if(eMapUnit != MAP_100TH_MM) { switch(eMapUnit) { - case SFX_MAPUNIT_TWIP : + case MAP_TWIP : { basegfx::B2DHomMatrix aTransform; const double fTWIPSToMM(127.0 / 72.0); diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 8d1472d02845..b917ec23c331 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -380,8 +380,8 @@ SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const bool XLineStyleItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -721,8 +721,8 @@ SvStream& XLineDashItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const bool XLineDashItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -1036,8 +1036,8 @@ SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const bool XLineWidthItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + MapUnit eCoreUnit, + MapUnit ePresUnit, OUString& rText, const IntlWrapper * pIntl ) const { @@ -1098,8 +1098,8 @@ SfxPoolItem* XLineColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const bool XLineColorItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -1284,8 +1284,8 @@ SvStream& XLineStartItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const bool XLineStartItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -1848,8 +1848,8 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const bool XLineEndItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -1929,8 +1929,8 @@ SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) con bool XLineStartWidthItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + MapUnit eCoreUnit, + MapUnit ePresUnit, OUString& rText, const IntlWrapper * pIntl ) const { @@ -1979,8 +1979,8 @@ SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const bool XLineEndWidthItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + MapUnit eCoreUnit, + MapUnit ePresUnit, OUString& rText, const IntlWrapper *pIntl ) const { @@ -2029,8 +2029,8 @@ SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) co bool XLineStartCenterItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -2081,8 +2081,8 @@ SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons bool XLineEndCenterItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -2136,8 +2136,8 @@ SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const bool XFillStyleItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -2207,7 +2207,7 @@ void XFillStyleItem::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), BAD_CAST(OString::number(GetValue()).getStr())); OUString aPresentation; - GetPresentation(SFX_ITEM_PRESENTATION_NAMELESS, SFX_MAPUNIT_100TH_MM, SFX_MAPUNIT_100TH_MM, aPresentation); + GetPresentation(SFX_ITEM_PRESENTATION_NAMELESS, MAP_100TH_MM, MAP_100TH_MM, aPresentation); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("presentation"), BAD_CAST(aPresentation.toUtf8().getStr())); xmlTextWriterEndElement(pWriter); @@ -2244,8 +2244,8 @@ SfxPoolItem* XFillColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const bool XFillColorItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -2310,8 +2310,8 @@ sal_uInt16 XSecondaryFillColorItem::GetVersion( sal_uInt16 /*nFileFormatVersion* bool XSecondaryFillColorItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -2500,8 +2500,8 @@ sal_uInt16 XFillGradientItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) con bool XFillGradientItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -2811,7 +2811,7 @@ bool XFillFloatTransparenceItem::PutValue( const css::uno::Any& rVal, sal_uInt8 } bool XFillFloatTransparenceItem::GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit, + MapUnit eCoreUnit, MapUnit ePresUnit, OUString& rText, const IntlWrapper * pIntlWrapper ) const { @@ -2958,12 +2958,11 @@ SvStream& XFillHatchItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const return rOut; } - bool XFillHatchItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index 3e21f215c694..ad53a7755bf8 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -59,8 +59,8 @@ SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) c bool XLineTransparenceItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -113,8 +113,8 @@ SfxPoolItem* XLineJointItem::Clone(SfxItemPool* /*pPool*/) const return new XLineJointItem( *this ); } -bool XLineJointItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const +bool XLineJointItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const { rText.clear(); @@ -317,8 +317,8 @@ SfxPoolItem* XLineCapItem::Clone(SfxItemPool* /*pPool*/) const return new XLineCapItem( *this ); } -bool XLineCapItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const +bool XLineCapItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const { rText.clear(); @@ -419,8 +419,8 @@ SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) c bool XFillTransparenceItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -498,8 +498,8 @@ SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) bool XGradientStepCountItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -535,8 +535,8 @@ SfxPoolItem* XFillBmpTileItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const bool XFillBmpTileItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -580,8 +580,8 @@ SfxPoolItem* XFillBmpPosItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const bool XFillBmpPosItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -629,8 +629,8 @@ SfxPoolItem* XFillBmpSizeXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) cons bool XFillBmpSizeXItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -671,8 +671,8 @@ SfxPoolItem* XFillBmpSizeYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) cons bool XFillBmpSizeYItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -712,8 +712,8 @@ SfxPoolItem* XFillBmpSizeLogItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) co bool XFillBmpSizeLogItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -749,8 +749,8 @@ SfxPoolItem* XFillBmpTileOffsetXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/ bool XFillBmpTileOffsetXItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -785,8 +785,8 @@ SfxPoolItem* XFillBmpTileOffsetYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/ bool XFillBmpTileOffsetYItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -819,8 +819,8 @@ SfxPoolItem* XFillBmpStretchItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) co bool XFillBmpStretchItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -863,8 +863,8 @@ SfxPoolItem* XFillBmpPosOffsetXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) bool XFillBmpPosOffsetXItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -899,8 +899,8 @@ SfxPoolItem* XFillBmpPosOffsetYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) bool XFillBmpPosOffsetYItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { @@ -930,8 +930,8 @@ SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) con return new XFillBackgroundItem( rIn ); } -bool XFillBackgroundItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const +bool XFillBackgroundItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const { rText.clear(); return true; diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 0382f829f79c..d4f6af4229b6 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -370,8 +370,8 @@ sal_uInt16 XFillBitmapItem::GetVersion(sal_uInt16 /*nFileFormatVersion*/) const bool XFillBitmapItem::GetPresentation( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const { |