diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-08-19 09:31:35 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-08-19 11:25:18 +0000 |
| commit | 396138a6bc7192abe0837b419283860d3331f607 (patch) | |
| tree | f80818ba86220abb8db205b402429e3d45aa62d1 | |
| parent | 8b4705e0e0c76503b1ca61cb567d222f49466fc5 (diff) | |
Resolves: coverity#705366 Mixing enum types
and
coverity#705367 Mixing enum types
coverity#705371 Mixing enum types
coverity#982694 Mixing enum types
coverity#1027717 Mixing enum types
coverity#1371228 Mixing enum types
coverity#1371242 Mixing enum types
coverity#1371280 Mixing enum types
coverity#1371310 Mixing enum types
MapUnit and SfxMapUnit share the same values and
are freely cast from one to the other.
Now that
commit d30a4298bdb5ba53cd1fe659f2b742f218a2e527
Date: Thu Aug 11 15:02:19 2016 +0200
loplugin:unusedenumconstants in package..svtools
removed the SfxMapUnit entries that were directly unused, they
don't match anymore and casting from one to the other is dangerous.
Why there was two of these anyway escapes me, get rid of SfxMapUnit
and just use MapUnit universally
Change-Id: I4db5dcd04b59be2f85b62b728f96c90afe00c57e
Reviewed-on: https://gerrit.libreoffice.org/28234
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
331 files changed, 1581 insertions, 1615 deletions
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx index ed413f23a363..5a6a92ccb63b 100644 --- a/avmedia/source/framework/mediaitem.cxx +++ b/avmedia/source/framework/mediaitem.cxx @@ -125,24 +125,21 @@ bool MediaItem::operator==( const SfxPoolItem& rItem ) const && m_pImpl->m_eZoom == rOther.m_pImpl->m_eZoom; } - SfxPoolItem* MediaItem::Clone( SfxItemPool* ) const { return new MediaItem( *this ); } - bool MediaItem::GetPresentation( SfxItemPresentation, - SfxMapUnit, - SfxMapUnit, - OUString& rText, - const IntlWrapper * ) const + MapUnit, + MapUnit, + OUString& rText, + const IntlWrapper * ) const { rText.clear(); return false; } - bool MediaItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const { uno::Sequence< uno::Any > aSeq( 10 ); diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx index 6ed486211526..8cc18b90dca6 100644 --- a/chart2/source/controller/sidebar/ChartLinePanel.cxx +++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx @@ -174,7 +174,7 @@ void ChartLinePanel::Initialize() SvxColorToolBoxControl* pToolBoxColor = getColorToolBoxControl(mpTBColor.get()); pToolBoxColor->setColorSelectFunction(maLineColorWrapper); - setMapUnit(SFX_MAPUNIT_100TH_MM); + setMapUnit(MAP_100TH_MM); updateData(); } diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx index 6e089e0726b2..c1a9abf3eaff 100644 --- a/chart2/source/view/main/ChartItemPool.cxx +++ b/chart2/source/view/main/ChartItemPool.cxx @@ -208,9 +208,9 @@ SfxItemPool* ChartItemPool::Clone() const return new ChartItemPool(*this); } -SfxMapUnit ChartItemPool::GetMetric(sal_uInt16 /* nWhich */) const +MapUnit ChartItemPool::GetMetric(sal_uInt16 /* nWhich */) const { - return SFX_MAPUNIT_100TH_MM; + return MAP_100TH_MM; } SfxItemPool* ChartItemPool::CreateChartItemPool() diff --git a/chart2/source/view/main/ChartItemPool.hxx b/chart2/source/view/main/ChartItemPool.hxx index 7b0d28cb6094..5740fcdf9d38 100644 --- a/chart2/source/view/main/ChartItemPool.hxx +++ b/chart2/source/view/main/ChartItemPool.hxx @@ -38,7 +38,7 @@ protected: public: virtual SfxItemPool* Clone() const override; - SfxMapUnit GetMetric( sal_uInt16 nWhich ) const override; + MapUnit GetMetric( sal_uInt16 nWhich ) const override; /// creates a pure chart item pool static SfxItemPool* CreateChartItemPool(); diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx index d62886091cce..4dda034eb916 100644 --- a/chart2/source/view/main/DrawModelWrapper.cxx +++ b/chart2/source/view/main/DrawModelWrapper.cxx @@ -63,7 +63,7 @@ DrawModelWrapper::DrawModelWrapper( const uno::Reference<uno::XComponentContext> SetDefaultFontHeight(423); // 12pt SfxItemPool* pMasterPool = &GetItemPool(); - pMasterPool->SetDefaultMetric(SFX_MAPUNIT_100TH_MM); + pMasterPool->SetDefaultMetric(MAP_100TH_MM); pMasterPool->SetPoolDefaultItem(SfxBoolItem(EE_PARA_HYPHENATE, true) ); pMasterPool->SetPoolDefaultItem(makeSvx3DPercentDiagonalItem (5)); diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index 1b481f92907c..afb0624916f5 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -53,7 +53,7 @@ private: const SfxItemSet& rOutAttrs; SfxItemSet aAttrSet; const SdrView* pView; - SfxMapUnit eUnit; + MapUnit eUnit; void FillTypeLB(); diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 590cd6eeb2c6..1c2afd77739b 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -249,7 +249,7 @@ private: XFillAttrSetItem m_aXFillAttr; SfxItemSet& m_rXFSet; - SfxMapUnit m_ePoolUnit; + MapUnit m_ePoolUnit; DECL_LINK_TYPED(SelectDialogTypeHdl_Impl, ListBox&, void); DECL_LINK_TYPED( ModifyColorHdl_Impl, ListBox&, void ); @@ -328,7 +328,7 @@ private: XFillAttrSetItem m_aXFillAttr; SfxItemSet& m_rXFSet; - SfxMapUnit m_ePoolUnit; + MapUnit m_ePoolUnit; DECL_LINK_TYPED( ClickShadowHdl_Impl, Button*, void ); DECL_LINK_TYPED( ModifyShadowHdl_Impl, Edit&, void ); @@ -481,7 +481,7 @@ private: XFillAttrSetItem m_aXFillAttr; SfxItemSet& m_rXFSet; - SfxMapUnit m_ePoolUnit; + MapUnit m_ePoolUnit; DECL_LINK_TYPED( ChangeHatchHdl, ValueSet*, void ); void ChangeHatchHdl_Impl(); @@ -574,7 +574,7 @@ private: XFillAttrSetItem m_aXFillAttr; SfxItemSet& m_rXFSet; const SdrView* mpView; - SfxMapUnit mePoolUnit; + MapUnit mePoolUnit; Size rBitmapSize; Size rFilledSize; Size rZoomedSize; diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index f2398ad17c1c..639e5117598c 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -164,7 +164,7 @@ private: sal_Int32* m_pPosDashLb; sal_Int32* m_pPosLineEndLb; - SfxMapUnit m_ePoolUnit; + MapUnit m_ePoolUnit; sal_Int32 m_nActLineWidth; @@ -280,7 +280,7 @@ private: sal_uInt16 nDlgType; sal_Int32* pPosDashLb; - SfxMapUnit ePoolUnit; + MapUnit ePoolUnit; FieldUnit eFUnit; void FillDash_Impl(); diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index 90dbfa82602f..184ad5cca81e 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -54,7 +54,7 @@ private: const SfxItemSet& rOutAttrs; SfxItemSet aAttrSet; const SdrView* pView; - SfxMapUnit eUnit; + MapUnit eUnit; bool bPositionModified; diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 5344aaf177cd..42bcf2969646 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -213,7 +213,7 @@ class SvxBitmapPickTabPage : public SfxTabPage SvxNumRule* pSaveNum; sal_uInt16 nActNumLvl; sal_uInt16 nNumItemId; - SfxMapUnit eCoreUnit; + MapUnit eCoreUnit; bool bModified : 1; bool bPreset : 1; @@ -303,10 +303,10 @@ class SvxNumOptionsTabPage : public SfxTabPage std::vector<OUString> aGrfNames; vcl::Font aActBulletFont; - sal_uInt8 nBullet; - sal_uInt16 nActNumLvl; - sal_uInt16 nNumItemId; - SfxMapUnit eCoreUnit; + sal_uInt8 nBullet; + sal_uInt16 nActNumLvl; + sal_uInt16 nNumItemId; + MapUnit eCoreUnit; void InitControls(); /** To switch between the numbering type @@ -402,7 +402,7 @@ class SvxNumPositionTabPage : public SfxTabPage sal_uInt16 nActNumLvl; sal_uInt16 nNumItemId; - SfxMapUnit eCoreUnit; + MapUnit eCoreUnit; bool bModified : 1; bool bPreset : 1; diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index c76c39d93a3d..688bd2a5ec47 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -63,7 +63,7 @@ private: const SfxItemSet& rOutAttrs; SdrTextAniKind eAniKind; FieldUnit eFUnit; - SfxMapUnit eUnit; + MapUnit eUnit; DECL_LINK_TYPED( SelectEffectHdl_Impl, ListBox&, void ); DECL_LINK_TYPED( ClickEndlessHdl_Impl, Button*, void ); diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index b2e5157dac53..2857e451cc76 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -116,7 +116,7 @@ private: basegfx::B2DRange maWorkRange; basegfx::B2DPoint maAnchor; - SfxMapUnit mePoolUnit; + MapUnit mePoolUnit; FieldUnit meDlgUnit; TriState mnProtectSizeState; bool mbPageDisabled; @@ -197,7 +197,7 @@ private: basegfx::B2DRange maRange; basegfx::B2DPoint maAnchor; - SfxMapUnit ePoolUnit; + MapUnit ePoolUnit; FieldUnit eDlgUnit; public: @@ -250,7 +250,7 @@ private: // #i75273# basegfx::B2DRange maRange; - SfxMapUnit ePoolUnit; + MapUnit ePoolUnit; FieldUnit eDlgUnit; public: diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index c07f7dd9b43b..e28f03fc57cb 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -261,7 +261,7 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCore } bIsDontCare = !pBoxInfo->IsValid( SvxBoxInfoItemValidFlags::DISABLE ); } - if(!mbUseMarginItem && eFUnit == FUNIT_MM && SFX_MAPUNIT_TWIP == rCoreAttrs.GetPool()->GetMetric( GetWhich( SID_ATTR_BORDER_INNER ) )) + if(!mbUseMarginItem && eFUnit == FUNIT_MM && MAP_TWIP == rCoreAttrs.GetPool()->GetMetric( GetWhich( SID_ATTR_BORDER_INNER ) )) { //#i91548# changing the number of decimal digits changes the minimum values, too lcl_SetDecimalDigitsTo1(*m_pLeftMF); @@ -433,8 +433,8 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet ) const SvxBoxItem* pBoxItem; const SvxBoxInfoItem* pBoxInfoItem; - sal_uInt16 nWhichBox = GetWhich(SID_ATTR_BORDER_OUTER); - SfxMapUnit eCoreUnit; + sal_uInt16 nWhichBox = GetWhich(SID_ATTR_BORDER_OUTER); + MapUnit eCoreUnit; pBoxItem = static_cast<const SvxBoxItem*>(GetItem( *rSet, SID_ATTR_BORDER_OUTER )); @@ -663,7 +663,7 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs ) SvxBoxInfoItem aBoxInfoItem ( nBoxInfoWhich ); const SvxBoxItem* pOldBoxItem = static_cast<const SvxBoxItem*>(GetOldItem( *rCoreAttrs, SID_ATTR_BORDER_OUTER )); - SfxMapUnit eCoreUnit = rOldSet.GetPool()->GetMetric( nBoxWhich ); + MapUnit eCoreUnit = rOldSet.GetPool()->GetMetric( nBoxWhich ); // outer border: diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 99563d6a9afb..2ec8336769da 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -777,12 +777,12 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp if ( pSizeBox->IsRelativeMode() ) { - SfxMapUnit eUnit = rSet.GetPool()->GetMetric( nWhich ); + MapUnit eUnit = rSet.GetPool()->GetMetric( nWhich ); const SvxFontHeightItem& rItem = static_cast<const SvxFontHeightItem&>(rSet.Get( nWhich )); - if( rItem.GetProp() != 100 || SFX_MAPUNIT_RELATIVE != rItem.GetPropUnit() ) + if( rItem.GetProp() != 100 || MAP_RELATIVE != rItem.GetPropUnit() ) { - bool bPtRel = SFX_MAPUNIT_POINT == rItem.GetPropUnit(); + bool bPtRel = MAP_POINT == rItem.GetPropUnit(); pSizeBox->SetPtRelative( bPtRel ); pSizeBox->SetValue( bPtRel ? ((short)rItem.GetProp()) * 10 : rItem.GetProp() ); } @@ -794,7 +794,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp } else if ( eState >= SfxItemState::DEFAULT ) { - SfxMapUnit eUnit = rSet.GetPool()->GetMetric( nWhich ); + MapUnit eUnit = rSet.GetPool()->GetMetric( nWhich ); const SvxFontHeightItem& rItem = static_cast<const SvxFontHeightItem&>(rSet.Get( nWhich )); pSizeBox->SetValue( (long)CalcToPoint( rItem.GetHeight(), eUnit, 10 ) ); } @@ -1079,9 +1079,9 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp } if ( bChanged || !pOldHeight || - bRel != ( SFX_MAPUNIT_RELATIVE != pOldHeight->GetPropUnit() || 100 != pOldHeight->GetProp() ) ) + bRel != ( MAP_RELATIVE != pOldHeight->GetPropUnit() || 100 != pOldHeight->GetProp() ) ) { - SfxMapUnit eUnit = rSet.GetPool()->GetMetric( nWhich ); + MapUnit eUnit = rSet.GetPool()->GetMetric( nWhich ); if ( pSizeBox->IsRelative() ) { DBG_ASSERT( GetItemSet().GetParent(), "No parent set" ); @@ -1090,7 +1090,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp SvxFontHeightItem aHeight( 240, 100, nWhich ); if ( pSizeBox->IsPtRelative() ) - aHeight.SetHeight( rOldItem.GetHeight(), (sal_uInt16)( nSize / 10 ), SFX_MAPUNIT_POINT, eUnit ); + aHeight.SetHeight( rOldItem.GetHeight(), (sal_uInt16)( nSize / 10 ), MAP_POINT, eUnit ); else aHeight.SetHeight( rOldItem.GetHeight(), (sal_uInt16)nSize ); rSet.Put( aHeight ); @@ -1269,7 +1269,7 @@ namespace const SvxFontHeightItem& rHeightItem = static_cast<const SvxFontHeightItem&>(_pPage->GetItemSet().GetParent()->Get( _nHeightWhich )); - SfxMapUnit eUnit = _pPage->GetItemSet().GetPool()->GetMetric( _nHeightWhich ); + MapUnit eUnit = _pPage->GetItemSet().GetPool()->GetMetric( _nHeightWhich ); short nCurHeight = static_cast< short >( CalcToPoint( rHeightItem.GetHeight(), eUnit, 1 ) * 10 ); @@ -3003,7 +3003,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet* rSet ) if ( rSet->GetItemState( nWhich ) >= SfxItemState::DEFAULT ) { const SvxKerningItem& rItem = static_cast<const SvxKerningItem&>(rSet->Get( nWhich )); - SfxMapUnit eUnit = rSet->GetPool()->GetMetric( nWhich ); + MapUnit eUnit = rSet->GetPool()->GetMetric( nWhich ); MapUnit eOrgUnit = (MapUnit)eUnit; MapUnit ePntUnit( MAP_POINT ); long nBig = static_cast<long>(m_pKerningMF->Normalize( static_cast<long>(rItem.GetValue()) )); @@ -3176,7 +3176,7 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet* rSet ) nWhich = GetWhich( SID_ATTR_CHAR_KERNING ); pOld = GetOldItem( *rSet, SID_ATTR_CHAR_KERNING ); short nKerning = 0; - SfxMapUnit eUnit = rSet->GetPool()->GetMetric( nWhich ); + MapUnit eUnit = rSet->GetPool()->GetMetric( nWhich ); long nTmp = static_cast<long>(m_pKerningMF->GetValue()); long nVal = LogicToLogic( nTmp, MAP_POINT, (MapUnit)eUnit ); diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 1b18c5bdf076..2c01f5381630 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -170,7 +170,7 @@ bool SvxCaptionTabPage::FillItemSet( SfxItemSet* _rOutAttrs) SfxItemPool* pPool = _rOutAttrs->GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); - SfxMapUnit eUnit; + MapUnit eUnit; nCaptionType = (SdrCaptionType) (m_pCT_CAPTTYPE->GetSelectItemId()-1); @@ -260,8 +260,8 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* ) SfxItemPool* pPool = rOutAttrs.GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); - sal_uInt16 nWhich; - SfxMapUnit eUnit; + sal_uInt16 nWhich; + MapUnit eUnit; nWhich = GetWhich( SDRATTR_CAPTIONESCABS ); eUnit = pPool->GetMetric( nWhich ); diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 4cfe577b7272..714a362af017 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -86,7 +86,7 @@ SvxMeasurePage::SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs rOutAttrs ( rInAttrs ), aAttrSet ( *rInAttrs.GetPool() ), pView( nullptr ), - eUnit( SFX_MAPUNIT_100TH_MM ), + eUnit( MAP_100TH_MM ), bPositionModified ( false ) { get(m_pMtrFldLineDist, "MTR_LINE_DIST"); diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 2fdee55b1b53..61d5da6243a6 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -116,9 +116,9 @@ Size GetMinBorderSpace_Impl( const SvxShadowItem& rShadow, const SvxBoxItem& rBo } -long ConvertLong_Impl( const long nIn, SfxMapUnit eUnit ) +long ConvertLong_Impl( const long nIn, MapUnit eUnit ) { - return OutputDevice::LogicToLogic( nIn, (MapUnit)eUnit, MAP_TWIP ); + return OutputDevice::LogicToLogic( nIn, eUnit, MAP_TWIP ); } bool IsEqualSize_Impl( const SvxSizeItem* pSize, const Size& rSize ) @@ -435,7 +435,7 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet ) { SfxItemPool* pPool = rSet->GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); - SfxMapUnit eUnit = pPool->GetMetric( GetWhich( SID_ATTR_LRSPACE ) ); + MapUnit eUnit = pPool->GetMetric( GetWhich( SID_ATTR_LRSPACE ) ); // adjust margins (right/left) const SfxPoolItem* pItem = GetItem( *rSet, SID_ATTR_LRSPACE ); @@ -549,8 +549,8 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet ) Swap( aPaperSize ); // write values into the edits - SetMetricValue( *m_pPaperHeightEdit, aPaperSize.Height(), SFX_MAPUNIT_100TH_MM ); - SetMetricValue( *m_pPaperWidthEdit, aPaperSize.Width(), SFX_MAPUNIT_100TH_MM ); + SetMetricValue( *m_pPaperHeightEdit, aPaperSize.Height(), MAP_100TH_MM ); + SetMetricValue( *m_pPaperWidthEdit, aPaperSize.Width(), MAP_100TH_MM ); m_pPaperSizeBox->Clear(); m_pPaperSizeBox->FillPaperSizeEntries( ( ePaperStart == PAPER_A3 ) ? PaperSizeStd : PaperSizeDraw ); @@ -675,7 +675,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet ) SfxItemPool* pPool = rOldSet.GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); sal_uInt16 nWhich = GetWhich( SID_ATTR_LRSPACE ); - SfxMapUnit eUnit = pPool->GetMetric( nWhich ); + MapUnit eUnit = pPool->GetMetric( nWhich ); const SfxPoolItem* pOld = nullptr; // copy old left and right margins @@ -964,8 +964,8 @@ IMPL_LINK_TYPED( SvxPageDescPage, PaperSizeSelect_Impl, ListBox&, rBox, void ) if ( aSize.Width() < m_pPaperWidthEdit->GetMin( FUNIT_100TH_MM ) ) m_pPaperWidthEdit->SetMin( m_pPaperWidthEdit->Normalize( aSize.Width() ), FUNIT_100TH_MM ); - SetMetricValue( *m_pPaperHeightEdit, aSize.Height(), SFX_MAPUNIT_100TH_MM ); - SetMetricValue( *m_pPaperWidthEdit, aSize.Width(), SFX_MAPUNIT_100TH_MM ); + SetMetricValue( *m_pPaperHeightEdit, aSize.Height(), MAP_100TH_MM ); + SetMetricValue( *m_pPaperWidthEdit, aSize.Width(), MAP_100TH_MM ); CalcMargin_Impl(); @@ -984,28 +984,28 @@ IMPL_LINK_TYPED( SvxPageDescPage, PaperSizeSelect_Impl, ListBox&, rBox, void ) if ( bScreen || m_pRightMarginEdit->GetValue() == 0 ) { - SetMetricValue( *m_pRightMarginEdit, nTmp, SFX_MAPUNIT_CM ); + SetMetricValue( *m_pRightMarginEdit, nTmp, MAP_CM ); if ( !bScreen && m_pRightMarginEdit->GetFirst() > m_pRightMarginEdit->GetValue() ) m_pRightMarginEdit->SetValue( m_pRightMarginEdit->GetFirst() ); } if ( bScreen || m_pLeftMarginEdit->GetValue() == 0 ) { - SetMetricValue( *m_pLeftMarginEdit, nTmp, SFX_MAPUNIT_CM ); + SetMetricValue( *m_pLeftMarginEdit, nTmp, MAP_CM ); if ( !bScreen && m_pLeftMarginEdit->GetFirst() > m_pLeftMarginEdit->GetValue() ) m_pLeftMarginEdit->SetValue( m_pLeftMarginEdit->GetFirst() ); } if ( bScreen || m_pBottomMarginEdit->GetValue() == 0 ) { - SetMetricValue( *m_pBottomMarginEdit, nTmp, SFX_MAPUNIT_CM ); + SetMetricValue( *m_pBottomMarginEdit, nTmp, MAP_CM ); if ( !bScreen && m_pBottomMarginEdit->GetFirst() > m_pBottomMarginEdit->GetValue() ) m_pBottomMarginEdit->SetValue( m_pBottomMarginEdit->GetFirst() ); } if ( bScreen || m_pTopMarginEdit->GetValue() == 0 ) { - SetMetricValue( *m_pTopMarginEdit, nTmp, SFX_MAPUNIT_CM ); + SetMetricValue( *m_pTopMarginEdit, nTmp, MAP_CM ); if ( !bScreen && m_pTopMarginEdit->GetFirst() > m_pTopMarginEdit->GetValue() ) m_pTopMarginEdit->SetValue( m_pTopMarginEdit->GetFirst() ); @@ -1019,7 +1019,7 @@ IMPL_LINK_TYPED( SvxPageDescPage, PaperSizeSelect_Impl, ListBox&, rBox, void ) IMPL_LINK_NOARG_TYPED(SvxPageDescPage, PaperSizeModify_Impl, Edit&, void) { sal_uInt16 nWhich = GetWhich( SID_ATTR_LRSPACE ); - SfxMapUnit eUnit = GetItemSet().GetPool()->GetMetric( nWhich ); + MapUnit eUnit = GetItemSet().GetPool()->GetMetric( nWhich ); Size aSize( GetCoreValue( *m_pPaperWidthEdit, eUnit ), GetCoreValue( *m_pPaperHeightEdit, eUnit ) ); Paper ePaper = SvxPaperInfo::GetSvxPaper( aSize, (MapUnit)eUnit, true ); @@ -1038,12 +1038,12 @@ IMPL_LINK_TYPED( SvxPageDescPage, SwapOrientation_Impl, Button *, pBtn, void ) { bLandscape = m_pLandscapeBtn->IsChecked(); - const long lWidth = GetCoreValue( *m_pPaperWidthEdit, SFX_MAPUNIT_100TH_MM ); - const long lHeight = GetCoreValue( *m_pPaperHeightEdit, SFX_MAPUNIT_100TH_MM ); + const long lWidth = GetCoreValue( *m_pPaperWidthEdit, MAP_100TH_MM ); + const long lHeight = GetCoreValue( *m_pPaperHeightEdit, MAP_100TH_MM ); // swap width and height - SetMetricValue( *m_pPaperWidthEdit, lHeight, SFX_MAPUNIT_100TH_MM ); - SetMetricValue( *m_pPaperHeightEdit, lWidth, SFX_MAPUNIT_100TH_MM ); + SetMetricValue( *m_pPaperWidthEdit, lHeight, MAP_100TH_MM ); + SetMetricValue( *m_pPaperHeightEdit, lWidth, MAP_100TH_MM ); // recalculate margins if necessary CalcMargin_Impl(); @@ -1133,16 +1133,16 @@ IMPL_LINK_NOARG_TYPED(SvxPageDescPage, BorderModify_Impl, Edit&, void) void SvxPageDescPage::UpdateExample_Impl( bool bResetbackground ) { // Size - Size aSize( GetCoreValue( *m_pPaperWidthEdit, SFX_MAPUNIT_TWIP ), - GetCoreValue( *m_pPaperHeightEdit, SFX_MAPUNIT_TWIP ) ); + Size aSize( GetCoreValue( *m_pPaperWidthEdit, MAP_TWIP ), + GetCoreValue( *m_pPaperHeightEdit, MAP_TWIP ) ); m_pBspWin->SetSize( aSize ); // Margins - m_pBspWin->SetTop( GetCoreValue( *m_pTopMarginEdit, SFX_MAPUNIT_TWIP ) ); - m_pBspWin->SetBottom( GetCoreValue( *m_pBottomMarginEdit, SFX_MAPUNIT_TWIP ) ); - m_pBspWin->SetLeft( GetCoreValue( *m_pLeftMarginEdit, SFX_MAPUNIT_TWIP ) ); - m_pBspWin->SetRight( GetCoreValue( *m_pRightMarginEdit, SFX_MAPUNIT_TWIP ) ); + m_pBspWin->SetTop( GetCoreValue( *m_pTopMarginEdit, MAP_TWIP ) ); + m_pBspWin->SetBottom( GetCoreValue( *m_pBottomMarginEdit, MAP_TWIP ) ); + m_pBspWin->SetLeft( GetCoreValue( *m_pLeftMarginEdit, MAP_TWIP ) ); + m_pBspWin->SetRight( GetCoreValue( *m_pRightMarginEdit, MAP_TWIP ) ); // Layout m_pBspWin->SetUsage( PosToPageUsage_Impl( m_pLayoutBox->GetSelectEntryPos() ) ); @@ -1456,7 +1456,7 @@ DeactivateRC SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) // put portray/landscape if applicable sal_uInt16 nWh = GetWhich( SID_ATTR_PAGE_SIZE ); - SfxMapUnit eUnit = GetItemSet().GetPool()->GetMetric( nWh ); + MapUnit eUnit = GetItemSet().GetPool()->GetMetric( nWh ); Size aSize( GetCoreValue( *m_pPaperWidthEdit, eUnit ), GetCoreValue( *m_pPaperHeightEdit, eUnit ) ); @@ -1540,14 +1540,14 @@ IMPL_LINK_NOARG_TYPED(SvxPageDescPage, RangeHdl_Impl, Control&, void) void SvxPageDescPage::CalcMargin_Impl() { // current values for page margins - long nBT = GetCoreValue( *m_pTopMarginEdit, SFX_MAPUNIT_TWIP ); - long nBB = GetCoreValue( *m_pBottomMarginEdit, SFX_MAPUNIT_TWIP ); + long nBT = GetCoreValue( *m_pTopMarginEdit, MAP_TWIP ); + long nBB = GetCoreValue( *m_pBottomMarginEdit, MAP_TWIP ); - long nBL = GetCoreValue( *m_pLeftMarginEdit, SFX_MAPUNIT_TWIP ); - long nBR = GetCoreValue( *m_pRightMarginEdit, SFX_MAPUNIT_TWIP ); + long nBL = GetCoreValue( *m_pLeftMarginEdit, MAP_TWIP ); + long nBR = GetCoreValue( *m_pRightMarginEdit, MAP_TWIP ); - long nH = GetCoreValue( *m_pPaperHeightEdit, SFX_MAPUNIT_TWIP ); - long nW = GetCoreValue( *m_pPaperWidthEdit, SFX_MAPUNIT_TWIP ); + long nH = GetCoreValue( *m_pPaperHeightEdit, MAP_TWIP ); + long nW = GetCoreValue( *m_pPaperWidthEdit, MAP_TWIP ); long nWidth = nBL + nBR + MINBODY; long nHeight = nBT + nBB + MINBODY; @@ -1560,9 +1560,9 @@ void SvxPageDescPage::CalcMargin_Impl() nTmp -= nWidth - nW; if ( nBL <= nBR ) - SetMetricValue( *m_pRightMarginEdit, nTmp, SFX_MAPUNIT_TWIP ); + SetMetricValue( *m_pRightMarginEdit, nTmp, MAP_TWIP ); else - SetMetricValue( *m_pLeftMarginEdit, nTmp, SFX_MAPUNIT_TWIP ); + SetMetricValue( *m_pLeftMarginEdit, nTmp, MAP_TWIP ); } if ( nHeight > nH ) @@ -1571,9 +1571,9 @@ void SvxPageDescPage::CalcMargin_Impl() nTmp -= nHeight - nH; if ( nBT <= nBB ) - SetMetricValue( *m_pBottomMarginEdit, nTmp, SFX_MAPUNIT_TWIP ); + SetMetricValue( *m_pBottomMarginEdit, nTmp, MAP_TWIP ); else - SetMetricValue( *m_pTopMarginEdit, nTmp, SFX_MAPUNIT_TWIP ); + SetMetricValue( *m_pTopMarginEdit, nTmp, MAP_TWIP ); } } } diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 7bc84037e078..b48e7934f0cf 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -220,7 +220,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) m_pLineDistAtMetricBox->IsValueModified() ) ) { nWhich = GetWhich( SID_ATTR_PARA_LINESPACE ); - SfxMapUnit eUnit = pPool->GetMetric( nWhich ); + MapUnit eUnit = pPool->GetMetric( nWhich ); SvxLineSpacingItem aSpacing( static_cast<const SvxLineSpacingItem&>(GetItemSet().Get( nWhich )) ); @@ -265,7 +265,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) || m_pContextualCB->IsValueChangedFromSaved()) { nWhich = GetWhich( SID_ATTR_ULSPACE ); - SfxMapUnit eUnit = pPool->GetMetric( nWhich ); + MapUnit eUnit = pPool->GetMetric( nWhich ); pOld = GetOldItem( *rOutSet, SID_ATTR_ULSPACE ); SvxULSpaceItem aMargin( nWhich ); @@ -312,7 +312,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) m_pAutoCB->IsValueChangedFromSaved() ) { nWhich = GetWhich( SID_ATTR_LRSPACE ); - SfxMapUnit eUnit = pPool->GetMetric( nWhich ); + MapUnit eUnit = pPool->GetMetric( nWhich ); SvxLRSpaceItem aMargin( nWhich ); pOld = GetOldItem( *rOutSet, SID_ATTR_LRSPACE ); @@ -441,7 +441,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet ) if ( eItemState >= SfxItemState::DEFAULT ) { - SfxMapUnit eUnit = pPool->GetMetric( _nWhich ); + MapUnit eUnit = pPool->GetMetric( _nWhich ); if ( bRelativeMode ) { @@ -511,7 +511,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet ) if ( eItemState >= SfxItemState::DEFAULT ) { - SfxMapUnit eUnit = pPool->GetMetric( _nWhich ); + MapUnit eUnit = pPool->GetMetric( _nWhich ); const SvxULSpaceItem& rOldItem = static_cast<const SvxULSpaceItem&>(rSet->Get( _nWhich )); @@ -714,7 +714,7 @@ void SvxStdParagraphTabPage::SetLineSpacing_Impl const SvxLineSpacingItem &rAttr ) { - SfxMapUnit eUnit = GetItemSet().GetPool()->GetMetric( rAttr.Which() ); + MapUnit eUnit = GetItemSet().GetPool()->GetMetric( rAttr.Which() ); switch( rAttr.GetLineSpaceRule() ) { @@ -837,7 +837,7 @@ IMPL_LINK_TYPED( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox&, rBox, void // if the value has been changed at SetMin, // it is time for the default if ( m_pLineDistAtMetricBox->GetValue() != nTemp ) - SetMetricValue( *m_pLineDistAtMetricBox, FIX_DIST_DEF, SFX_MAPUNIT_TWIP ); // fix is only in Writer + SetMetricValue( *m_pLineDistAtMetricBox, FIX_DIST_DEF, MAP_TWIP ); // fix is only in Writer m_pLineDistAtPercentBox->Hide(); m_pLineDistAtMetricBox->Show(); m_pLineDistAtMetricBox->Enable(); @@ -908,7 +908,7 @@ void SvxStdParagraphTabPage::UpdateExample_Impl() case LLINESPACE_DURCH: case LLINESPACE_FIX: m_pExampleWin->SetLineSpace( (SvxPrevLineSpace)nPos, - (sal_uInt16)GetCoreValue( *m_pLineDistAtMetricBox, SFX_MAPUNIT_TWIP ) ); + (sal_uInt16)GetCoreValue( *m_pLineDistAtMetricBox, MAP_TWIP ) ); break; } m_pExampleWin->Invalidate(); diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index d7d8008f523d..49eca66e4648 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -135,7 +135,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs ) { SfxItemPool* pPool = rAttrs->GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); - SfxMapUnit eUnit = pPool->GetMetric( SDRATTR_TEXT_LEFTDIST ); + MapUnit eUnit = pPool->GetMetric( SDRATTR_TEXT_LEFTDIST ); const SfxPoolItem* pItem = GetItem( *rAttrs, SDRATTR_TEXT_LEFTDIST ); @@ -342,7 +342,7 @@ bool SvxTextAttrPage::FillItemSet( SfxItemSet* rAttrs) { SfxItemPool* pPool = rAttrs->GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); - SfxMapUnit eUnit = pPool->GetMetric( SDRATTR_TEXT_LEFTDIST ); + MapUnit eUnit = pPool->GetMetric( SDRATTR_TEXT_LEFTDIST ); sal_Int32 nValue; TriState eState; diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 8027c7aed2b1..430e703cc525 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -821,7 +821,7 @@ bool callColumnFormatDialog(vcl::Window* _pParent, }; SfxItemPool* pPool = new SfxItemPool(OUString("GridBrowserProperties"), SBA_DEF_RANGEFORMAT, SBA_ATTR_ALIGN_HOR_JUSTIFY, aItemInfos, pDefaults); - pPool->SetDefaultMetric( SFX_MAPUNIT_TWIP ); // ripped, don't understand why + pPool->SetDefaultMetric( MAP_TWIP ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same std::unique_ptr<SfxItemSet> pFormatDescriptor(new SfxItemSet(*pPool, aAttrMap)); 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() ) { diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx index 98f88fdc0dfd..0e94313da277 100644 --- a/forms/source/richtext/richtextengine.cxx +++ b/forms/source/richtext/richtextengine.cxx @@ -55,7 +55,7 @@ namespace frm pReturn->SetStatusEventHdl( LINK( pReturn, RichTextEngine, EditEngineStatusChanged ) ); - pPool->SetDefaultMetric( (SfxMapUnit)( aDeviceMapMode.GetMapUnit() ) ); + pPool->SetDefaultMetric(aDeviceMapMode.GetMapUnit()); // defaults vcl::Font aFont = Application::GetSettings().GetStyleSettings().GetAppFont(); diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx index ededc66730cb..1e9998700cfa 100644 --- a/forms/source/richtext/rtattributehandler.cxx +++ b/forms/source/richtext/rtattributehandler.cxx @@ -326,7 +326,7 @@ namespace frm { // by definition, the item should have the unit twip sal_uLong nHeight = pFontHeightItem->GetHeight(); - if ( _rAttribs.GetPool()->GetMetric( getWhich() ) != SFX_MAPUNIT_TWIP ) + if ( _rAttribs.GetPool()->GetMetric( getWhich() ) != MAP_TWIP ) { nHeight = OutputDevice::LogicToLogic( Size( 0, nHeight ), @@ -352,13 +352,13 @@ namespace frm if ( pFontHeightItem ) { // correct measurement units - SfxMapUnit eItemMapUnit = pFontHeightItem->GetPropUnit(); (void)eItemMapUnit; + MapUnit eItemMapUnit = pFontHeightItem->GetPropUnit(); (void)eItemMapUnit; sal_uLong nHeight = pFontHeightItem->GetHeight(); - if ( _rNewAttribs.GetPool()->GetMetric( getWhich() ) != SFX_MAPUNIT_TWIP ) + if ( _rNewAttribs.GetPool()->GetMetric( getWhich() ) != MAP_TWIP ) { nHeight = OutputDevice::LogicToLogic( Size( 0, nHeight ), - MapMode( (MapUnit)( SFX_MAPUNIT_TWIP ) ), + MapMode( (MapUnit)( MAP_TWIP ) ), MapMode( (MapUnit)( _rNewAttribs.GetPool()->GetMetric( getWhich() ) ) ) ).Height(); } diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx index 3235e36fa53a..1144885aa870 100644 --- a/include/avmedia/mediaitem.hxx +++ b/include/avmedia/mediaitem.hxx @@ -73,8 +73,8 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + MapUnit eCoreUnit, + MapUnit ePresUnit, OUString& rText, const IntlWrapper *pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx index b55e52af21dc..2af8a546c4b5 100644 --- a/include/editeng/adjustitem.hxx +++ b/include/editeng/adjustitem.hxx @@ -59,9 +59,9 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual sal_uInt16 GetValueCount() const override; virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; virtual sal_uInt16 GetEnumValue() const override; diff --git a/include/editeng/autokernitem.hxx b/include/editeng/autokernitem.hxx index 26231e7b58a2..5704b35c845d 100644 --- a/include/editeng/autokernitem.hxx +++ b/include/editeng/autokernitem.hxx @@ -45,9 +45,9 @@ public: virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; inline SvxAutoKernItem& operator=(const SvxAutoKernItem& rAutoKern) { diff --git a/include/editeng/blinkitem.hxx b/include/editeng/blinkitem.hxx index 2df566fa293f..4cdd649e934e 100644 --- a/include/editeng/blinkitem.hxx +++ b/include/editeng/blinkitem.hxx @@ -44,9 +44,9 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; inline SvxBlinkItem& operator=(const SvxBlinkItem& rBlink) { SetValue(rBlink.GetValue()); diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx index d72cdab18bda..bd8cb5a0df71 100644 --- a/include/editeng/borderline.hxx +++ b/include/editeng/borderline.hxx @@ -127,7 +127,7 @@ namespace editeng { bool operator==( const SvxBorderLine &rCmp ) const; - OUString GetValueString( SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, + OUString GetValueString( MapUnit eSrcUnit, MapUnit eDestUnit, const IntlWrapper* pIntl, bool bMetricStr = false ) const; diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx index cb23578be18b..83c42e296810 100644 --- a/include/editeng/boxitem.hxx +++ b/include/editeng/boxitem.hxx @@ -76,8 +76,8 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, + MapUnit eCoreMetric, + MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -189,8 +189,8 @@ public: // "pure virtual Methods" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, + MapUnit eCoreMetric, + MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index 2b94ce1cebf1..82fdd0ce4bc1 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -78,9 +78,9 @@ public: public: virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx index 9116222b77c9..8eaee6b6cfa8 100644 --- a/include/editeng/bulletitem.hxx +++ b/include/editeng/bulletitem.hxx @@ -96,8 +96,8 @@ public: virtual sal_uInt16 GetVersion(sal_uInt16 nFileVersion) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, + MapUnit eCoreMetric, + MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; static void StoreFont( SvStream&, const vcl::Font& ); diff --git a/include/editeng/charhiddenitem.hxx b/include/editeng/charhiddenitem.hxx index 728c0faf20aa..2cdc1978fddd 100644 --- a/include/editeng/charhiddenitem.hxx +++ b/include/editeng/charhiddenitem.hxx @@ -38,9 +38,9 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; inline SvxCharHiddenItem& operator=(const SvxCharHiddenItem& rHidden) { SetValue(rHidden.GetValue()); diff --git a/include/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx index 113678855c4b..b644d31d808e 100644 --- a/include/editeng/charreliefitem.hxx +++ b/include/editeng/charreliefitem.hxx @@ -50,10 +50,10 @@ public: void SetValue(FontRelief f) { SfxEnumItem::SetValue((sal_uInt16)f); } virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper * = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx index eaea31871891..2ab87f22aaa5 100644 --- a/include/editeng/charrotateitem.hxx +++ b/include/editeng/charrotateitem.hxx @@ -49,8 +49,8 @@ public: virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, + MapUnit eCoreMetric, + MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; diff --git a/include/editeng/charscaleitem.hxx b/include/editeng/charscaleitem.hxx index 1cbaf684862a..32761e429a69 100644 --- a/include/editeng/charscaleitem.hxx +++ b/include/editeng/charscaleitem.hxx @@ -46,10 +46,10 @@ public: virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper * = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/editeng/charsetcoloritem.hxx b/include/editeng/charsetcoloritem.hxx index f949c1324830..b0208a998921 100644 --- a/include/editeng/charsetcoloritem.hxx +++ b/include/editeng/charsetcoloritem.hxx @@ -42,9 +42,9 @@ public: // "pure virtual Methods" from SfxPoolItem virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx index 3d8087419524..3b320647a6d9 100644 --- a/include/editeng/cmapitem.hxx +++ b/include/editeng/cmapitem.hxx @@ -42,8 +42,8 @@ public: // "pure virtual Methods" from SfxPoolItem + SfxEnumItem virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, + MapUnit eCoreMetric, + MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx index c91429ea49b1..33f9dec7fdfd 100644 --- a/include/editeng/colritem.hxx +++ b/include/editeng/colritem.hxx @@ -50,7 +50,7 @@ public: virtual sal_uInt16 GetVersion(sal_uInt16 nFileVersion) const override; virtual bool GetPresentation(SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, + MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, const IntlWrapper* pIntlWrapper = nullptr) const override; virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; diff --git a/include/editeng/contouritem.hxx b/include/editeng/contouritem.hxx index 6ea0d5cc9d98..13f4083d3afb 100644 --- a/include/editeng/contouritem.hxx +++ b/include/editeng/contouritem.hxx @@ -42,9 +42,9 @@ public: virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; inline SvxContourItem& operator=(const SvxContourItem& rCont) { diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx index 07ab74ce65d5..e50d947bf526 100644 --- a/include/editeng/crossedoutitem.hxx +++ b/include/editeng/crossedoutitem.hxx @@ -41,9 +41,9 @@ public: // "pure virtual Methods" from SfxPoolItem virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/emphasismarkitem.hxx b/include/editeng/emphasismarkitem.hxx index 62955dc4832b..0f5942162a11 100644 --- a/include/editeng/emphasismarkitem.hxx +++ b/include/editeng/emphasismarkitem.hxx @@ -42,8 +42,8 @@ public: // "pure virtual Methods" from SfxPoolItem + SfxEnumItem virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, + MapUnit eCoreMetric, + MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; diff --git a/include/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx index e7aab1305f9f..427950d41062 100644 --- a/include/editeng/escapementitem.hxx +++ b/include/editeng/escapementitem.hxx @@ -54,8 +54,8 @@ public: // "pure virtual Methods" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, + MapUnit eCoreMetric, + MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx index c352e8e2bed9..b27f9985ab06 100644 --- a/include/editeng/fhgtitem.hxx +++ b/include/editeng/fhgtitem.hxx @@ -39,8 +39,8 @@ class SvXMLUnitConverter; class EDITENG_DLLPUBLIC SvxFontHeightItem : public SfxPoolItem { sal_uInt32 nHeight; - sal_uInt16 nProp; // default 100% - SfxMapUnit ePropUnit; // Percent, Twip, ... + sal_uInt16 nProp; // default 100% + MapUnit ePropUnit; // Percent, Twip, ... public: static SfxPoolItem* CreateDefault(); @@ -53,8 +53,8 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, + MapUnit eCoreMetric, + MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -74,14 +74,14 @@ public: } void SetHeight( sal_uInt32 nNewHeight, const sal_uInt16 nNewProp = 100, - SfxMapUnit eUnit = SFX_MAPUNIT_RELATIVE ); + MapUnit eUnit = MAP_RELATIVE ); void SetHeight( sal_uInt32 nNewHeight, sal_uInt16 nNewProp, - SfxMapUnit eUnit, SfxMapUnit eCoreUnit ); + MapUnit eUnit, MapUnit eCoreUnit ); sal_uInt32 GetHeight() const { return nHeight; } - void SetProp( sal_uInt16 nNewProp, SfxMapUnit eUnit ) + void SetProp( sal_uInt16 nNewProp, MapUnit eUnit ) { DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); nProp = nNewProp; @@ -90,7 +90,7 @@ public: sal_uInt16 GetProp() const { return nProp; } - SfxMapUnit GetPropUnit() const { return ePropUnit; } // Percent, Twip, ... + MapUnit GetPropUnit() const { return ePropUnit; } // Percent, Twip, ... void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/include/editeng/flstitem.hxx b/include/editeng/flstitem.hxx index 0e8a91253e09..894add8a20de 100644 --- a/include/editeng/flstitem.hxx +++ b/include/editeng/flstitem.hxx @@ -54,9 +54,9 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; const FontList* GetFontList() const { return pFontList; } }; diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx index 173a7b7747ac..bd78542b72c1 100644 --- a/include/editeng/fontitem.hxx +++ b/include/editeng/fontitem.hxx @@ -57,7 +57,7 @@ public: virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; virtual bool GetPresentation(SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, + MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, const IntlWrapper* = nullptr) const override; // Access methods: diff --git a/include/editeng/forbiddenruleitem.hxx b/include/editeng/forbiddenruleitem.hxx index 00596ca2d06a..9f351aefb813 100644 --- a/include/editeng/forbiddenruleitem.hxx +++ b/include/editeng/forbiddenruleitem.hxx @@ -42,10 +42,10 @@ public: virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper * = nullptr ) const override; inline SvxForbiddenRuleItem& operator=( const SvxForbiddenRuleItem& rItem ) diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx index b7a57f883b98..38894da2678c 100644 --- a/include/editeng/formatbreakitem.hxx +++ b/include/editeng/formatbreakitem.hxx @@ -49,9 +49,9 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx index c9a0d61848bb..b70f6947e2fb 100644 --- a/include/editeng/frmdiritem.hxx +++ b/include/editeng/frmdiritem.hxx @@ -48,10 +48,10 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper * = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/editeng/fwdtitem.hxx b/include/editeng/fwdtitem.hxx index 9ef655ed1128..06fe69a7e1eb 100644 --- a/include/editeng/fwdtitem.hxx +++ b/include/editeng/fwdtitem.hxx @@ -47,9 +47,9 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/hngpnctitem.hxx b/include/editeng/hngpnctitem.hxx index 608c4641723d..d4b1c186ccfe 100644 --- a/include/editeng/hngpnctitem.hxx +++ b/include/editeng/hngpnctitem.hxx @@ -41,10 +41,10 @@ public: virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper * = nullptr ) const override; inline SvxHangingPunctuationItem& operator=( const SvxHangingPunctuationItem& rItem ) diff --git a/include/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx index 3be73a7cc3e4..b37c2544cb99 100644 --- a/include/editeng/hyphenzoneitem.hxx +++ b/include/editeng/hyphenzoneitem.hxx @@ -52,9 +52,9 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx index ee6150f7288f..eea1b0a5fbc5 100644 --- a/include/editeng/itemtype.hxx +++ b/include/editeng/itemtype.hxx @@ -36,9 +36,9 @@ class IntlWrapper; static const sal_Unicode cpDelim[] = { ',' , ' ', '\0' }; EDITENG_DLLPUBLIC OUString GetSvxString( sal_uInt16 nId ); -EDITENG_DLLPUBLIC OUString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, const IntlWrapper * pIntl ); +EDITENG_DLLPUBLIC OUString GetMetricText( long nVal, MapUnit eSrcUnit, MapUnit eDestUnit, const IntlWrapper * pIntl ); OUString GetColorString( const Color& rCol ); -EDITENG_DLLPUBLIC sal_uInt16 GetMetricId( SfxMapUnit eUnit ); +EDITENG_DLLPUBLIC sal_uInt16 GetMetricId( MapUnit eUnit ); inline long Scale( long nVal, long nMult, long nDiv ) diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx index 467b0ae4a51c..9ffaf6f66aa8 100644 --- a/include/editeng/justifyitem.hxx +++ b/include/editeng/justifyitem.hxx @@ -37,9 +37,9 @@ public: const sal_uInt16 nId ); virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -69,9 +69,9 @@ public: const sal_uInt16 nId ); virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -97,9 +97,9 @@ public: const sal_uInt16 nId ); virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/editeng/keepitem.hxx b/include/editeng/keepitem.hxx index 257bfdd7b543..115b8117879d 100644 --- a/include/editeng/keepitem.hxx +++ b/include/editeng/keepitem.hxx @@ -45,9 +45,9 @@ public: virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; }; inline SvxFormatKeepItem::SvxFormatKeepItem( const bool bKeep, const sal_uInt16 _nWhich ) : diff --git a/include/editeng/kernitem.hxx b/include/editeng/kernitem.hxx index 0398d46553f4..a32657cdc15c 100644 --- a/include/editeng/kernitem.hxx +++ b/include/editeng/kernitem.hxx @@ -49,9 +49,9 @@ public: virtual bool HasMetrics() const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; inline SvxKerningItem& operator=(const SvxKerningItem& rKern) { SetValue( rKern.GetValue() ); diff --git a/include/editeng/langitem.hxx b/include/editeng/langitem.hxx index 61645937881d..6b611b15682d 100644 --- a/include/editeng/langitem.hxx +++ b/include/editeng/langitem.hxx @@ -41,10 +41,10 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - 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; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/lcolitem.hxx b/include/editeng/lcolitem.hxx index 968b85d070f0..bfaec7d3f6e1 100644 --- a/include/editeng/lcolitem.hxx +++ b/include/editeng/lcolitem.hxx @@ -37,10 +37,10 @@ public: virtual ~SvxLineColorItem(); virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper * pIntlWrapper = nullptr ) + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper * pIntlWrapper = nullptr ) const override; inline SvxLineColorItem& operator=(const SvxLineColorItem& rColor) diff --git a/include/editeng/lineitem.hxx b/include/editeng/lineitem.hxx index 8c947eabce26..43bb08947e6b 100644 --- a/include/editeng/lineitem.hxx +++ b/include/editeng/lineitem.hxx @@ -49,9 +49,9 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx index 895aefc068e2..064d68a640e6 100644 --- a/include/editeng/lrspitem.hxx +++ b/include/editeng/lrspitem.hxx @@ -79,9 +79,9 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx index f63daf5fba81..75d600afeb30 100644 --- a/include/editeng/lspcitem.hxx +++ b/include/editeng/lspcitem.hxx @@ -56,9 +56,9 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/nhypitem.hxx b/include/editeng/nhypitem.hxx index ba67dcdc9a1a..74cad7a505e8 100644 --- a/include/editeng/nhypitem.hxx +++ b/include/editeng/nhypitem.hxx @@ -37,9 +37,9 @@ public: virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; inline SvxNoHyphenItem& operator=(const SvxNoHyphenItem& rNHH) { diff --git a/include/editeng/nlbkitem.hxx b/include/editeng/nlbkitem.hxx index 15f8fe607e8e..1c1260a8bbdd 100644 --- a/include/editeng/nlbkitem.hxx +++ b/include/editeng/nlbkitem.hxx @@ -37,9 +37,9 @@ public: virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; inline SvxNoLinebreakItem& operator=(const SvxNoLinebreakItem& rLB) { diff --git a/include/editeng/opaqitem.hxx b/include/editeng/opaqitem.hxx index 59ff46fe5677..494349c29f57 100644 --- a/include/editeng/opaqitem.hxx +++ b/include/editeng/opaqitem.hxx @@ -46,9 +46,9 @@ public: virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; }; inline SvxOpaqueItem::SvxOpaqueItem( const sal_uInt16 nId, const bool bOpa ) diff --git a/include/editeng/optitems.hxx b/include/editeng/optitems.hxx index d44c2dc89678..4e6f7d95c679 100644 --- a/include/editeng/optitems.hxx +++ b/include/editeng/optitems.hxx @@ -42,9 +42,9 @@ public: SfxSpellCheckItem( const SfxSpellCheckItem& rItem ); virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; @@ -71,9 +71,9 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVer ) const override; diff --git a/include/editeng/orphitem.hxx b/include/editeng/orphitem.hxx index ed6b0541f177..f0bb668f86ea 100644 --- a/include/editeng/orphitem.hxx +++ b/include/editeng/orphitem.hxx @@ -44,9 +44,9 @@ public: virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; inline SvxOrphansItem& operator=( const SvxOrphansItem& rOrphans ) { diff --git a/include/editeng/paravertalignitem.hxx b/include/editeng/paravertalignitem.hxx index 68fdcabb9ff6..26926b3456ef 100644 --- a/include/editeng/paravertalignitem.hxx +++ b/include/editeng/paravertalignitem.hxx @@ -46,10 +46,10 @@ public: virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper * = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/editeng/pbinitem.hxx b/include/editeng/pbinitem.hxx index b439c99b5441..3c390451d671 100644 --- a/include/editeng/pbinitem.hxx +++ b/include/editeng/pbinitem.hxx @@ -47,9 +47,9 @@ public: virtual SfxPoolItem* Create( SvStream &, sal_uInt16 ) const override; virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; }; inline SvxPaperBinItem::SvxPaperBinItem( const sal_uInt16 nId, const sal_uInt8 nT ) diff --git a/include/editeng/pgrditem.hxx b/include/editeng/pgrditem.hxx index 4080532bab00..0e11a8bc3b41 100644 --- a/include/editeng/pgrditem.hxx +++ b/include/editeng/pgrditem.hxx @@ -44,9 +44,9 @@ public: virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; }; #endif diff --git a/include/editeng/pmdlitem.hxx b/include/editeng/pmdlitem.hxx index 423a06bcf823..6ab2be2d7e47 100644 --- a/include/editeng/pmdlitem.hxx +++ b/include/editeng/pmdlitem.hxx @@ -45,9 +45,9 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx index 065aed5617f8..8a6a0c58027d 100644 --- a/include/editeng/postitem.hxx +++ b/include/editeng/postitem.hxx @@ -42,9 +42,9 @@ public: // "pure virtual Methods" from SfxPoolItem + SwEnumItem virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/prntitem.hxx b/include/editeng/prntitem.hxx index 5bcb65743413..b7ddfa598f4f 100644 --- a/include/editeng/prntitem.hxx +++ b/include/editeng/prntitem.hxx @@ -46,9 +46,9 @@ public: virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; }; inline SvxPrintItem::SvxPrintItem( const sal_uInt16 nId, const bool bPrt ) diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx index e6f930557d71..8c40da989a76 100644 --- a/include/editeng/protitem.hxx +++ b/include/editeng/protitem.hxx @@ -48,9 +48,9 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/editeng/prszitem.hxx b/include/editeng/prszitem.hxx index c0a16f1bdd90..1ec271b198f8 100644 --- a/include/editeng/prszitem.hxx +++ b/include/editeng/prszitem.hxx @@ -43,9 +43,9 @@ public: virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; inline SvxPropSizeItem& operator=(const SvxPropSizeItem& rPropSize) { diff --git a/include/editeng/scriptspaceitem.hxx b/include/editeng/scriptspaceitem.hxx index 0b6b6e00bc69..bfba0165bba4 100644 --- a/include/editeng/scriptspaceitem.hxx +++ b/include/editeng/scriptspaceitem.hxx @@ -43,10 +43,10 @@ public: virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper * = nullptr ) const override; inline SvxScriptSpaceItem& operator=(const SvxScriptSpaceItem& rItem ) { diff --git a/include/editeng/shaditem.hxx b/include/editeng/shaditem.hxx index eb6dd819a062..62d5af17d6d7 100644 --- a/include/editeng/shaditem.hxx +++ b/include/editeng/shaditem.hxx @@ -53,9 +53,9 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/shdditem.hxx b/include/editeng/shdditem.hxx index b0ab85ec2ea7..82221b6b0845 100644 --- a/include/editeng/shdditem.hxx +++ b/include/editeng/shdditem.hxx @@ -45,9 +45,9 @@ public: virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; inline SvxShadowedItem& operator=(const SvxShadowedItem& rShadow) { SetValue(rShadow.GetValue()); diff --git a/include/editeng/sizeitem.hxx b/include/editeng/sizeitem.hxx index 3615adff4dec..37fc8c8e5c07 100644 --- a/include/editeng/sizeitem.hxx +++ b/include/editeng/sizeitem.hxx @@ -49,9 +49,9 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/spltitem.hxx b/include/editeng/spltitem.hxx index 02779c37e0d0..99dcbb6b3cdf 100644 --- a/include/editeng/spltitem.hxx +++ b/include/editeng/spltitem.hxx @@ -47,9 +47,9 @@ public: virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; }; inline SvxFormatSplitItem::SvxFormatSplitItem( const bool bSplit, const sal_uInt16 nWh ) : diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx index ca8db68f3128..1c89a0a8b744 100644 --- a/include/editeng/tstpitem.hxx +++ b/include/editeng/tstpitem.hxx @@ -142,9 +142,9 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const override; diff --git a/include/editeng/twolinesitem.hxx b/include/editeng/twolinesitem.hxx index d0a3ebfacdb8..b02d4657d808 100644 --- a/include/editeng/twolinesitem.hxx +++ b/include/editeng/twolinesitem.hxx @@ -44,10 +44,10 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVer) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nIVer) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx index baf8e8accfff..93a91afc6579 100644 --- a/include/editeng/udlnitem.hxx +++ b/include/editeng/udlnitem.hxx @@ -41,9 +41,9 @@ public: // "pure virtual Methods" from SfxPoolItem virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx index bae95b19dc1d..97fd58990301 100644 --- a/include/editeng/ulspitem.hxx +++ b/include/editeng/ulspitem.hxx @@ -53,9 +53,9 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/unoipset.hxx b/include/editeng/unoipset.hxx index 9eeede104735..9d8471ca933a 100644 --- a/include/editeng/unoipset.hxx +++ b/include/editeng/unoipset.hxx @@ -63,10 +63,10 @@ public: }; /** converts the given any with a metric to 100th/mm if needed */ -EDITENG_DLLPUBLIC void SvxUnoConvertToMM( const SfxMapUnit eSourceMapUnit, css::uno::Any & rMetric ) throw(); +EDITENG_DLLPUBLIC void SvxUnoConvertToMM( const MapUnit eSourceMapUnit, css::uno::Any & rMetric ) throw(); /** converts the given any with a metric from 100th/mm to the given metric if needed */ -EDITENG_DLLPUBLIC void SvxUnoConvertFromMM( const SfxMapUnit eDestinationMapUnit, css::uno::Any & rMetric ) throw(); +EDITENG_DLLPUBLIC void SvxUnoConvertFromMM( const MapUnit eDestinationMapUnit, css::uno::Any & rMetric ) throw(); #endif // INCLUDED_EDITENG_UNOIPSET_HXX diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx index 2426051d8a5b..4ced552b81bb 100644 --- a/include/editeng/wghtitem.hxx +++ b/include/editeng/wghtitem.hxx @@ -42,9 +42,9 @@ public: // "pure virtual Methods" from SfxPoolItem + SfxEnumItem virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/widwitem.hxx b/include/editeng/widwitem.hxx index 1708c9c5a394..fbffc6cea9d1 100644 --- a/include/editeng/widwitem.hxx +++ b/include/editeng/widwitem.hxx @@ -44,9 +44,9 @@ public: virtual SvStream& Store( SvStream & , sal_uInt16 nItemVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; inline SvxWidowsItem& operator=( const SvxWidowsItem& rWidows ) { diff --git a/include/editeng/writingmodeitem.hxx b/include/editeng/writingmodeitem.hxx index 28bbf44e77e9..73ec4ecc0702 100644 --- a/include/editeng/writingmodeitem.hxx +++ b/include/editeng/writingmodeitem.hxx @@ -43,10 +43,10 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper * = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/editeng/wrlmitem.hxx b/include/editeng/wrlmitem.hxx index 22f403f1c788..d2195566da22 100644 --- a/include/editeng/wrlmitem.hxx +++ b/include/editeng/wrlmitem.hxx @@ -46,9 +46,9 @@ public: virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; inline SvxWordLineModeItem& operator=( const SvxWordLineModeItem& rWLM ) { diff --git a/include/editeng/xmlcnitm.hxx b/include/editeng/xmlcnitm.hxx index 2ce157eb8dd4..d6a9e0a81f0a 100644 --- a/include/editeng/xmlcnitm.hxx +++ b/include/editeng/xmlcnitm.hxx @@ -43,8 +43,8 @@ public: virtual bool GetPresentation( SfxItemPresentation ePresentation, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresentationMetric, + MapUnit eCoreMetric, + MapUnit ePresentationMetric, OUString &rText, const IntlWrapper *pIntlWrapper = nullptr ) const override; diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx index f94a59f99bd5..134a4fd09953 100644 --- a/include/sfx2/ctrlitem.hxx +++ b/include/sfx2/ctrlitem.hxx @@ -68,7 +68,7 @@ public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - SfxMapUnit GetCoreMetric() const; + MapUnit GetCoreMetric() const; static SfxItemState GetItemState( const SfxPoolItem* pState ); diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx index 98d231d02ac1..ff9cc8a39eed 100644 --- a/include/sfx2/evntconf.hxx +++ b/include/sfx2/evntconf.hxx @@ -76,10 +76,10 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx index 496c5cff53c6..834f3b71ea52 100644 --- a/include/sfx2/unoctitm.hxx +++ b/include/sfx2/unoctitm.hxx @@ -124,7 +124,7 @@ class SfxDispatchController_Impl : public SfxControllerItem static void addParametersToArgs( const css::util::URL& aURL, css::uno::Sequence< css::beans::PropertyValue >& rArgs ); - static SfxMapUnit GetCoreMetric( SfxItemPool& rPool, sal_uInt16 nSlot ); + static MapUnit GetCoreMetric( SfxItemPool& rPool, sal_uInt16 nSlot ); void sendStatusChanged(const OUString& rURL, const css::frame::FeatureStateEvent& rEvent); diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx index 6a027b3132c5..2bbe74036c17 100644 --- a/include/svl/cenumitm.hxx +++ b/include/svl/cenumitm.hxx @@ -35,11 +35,9 @@ public: virtual bool operator ==(const SfxPoolItem & rItem) const override; - virtual bool GetPresentation(SfxItemPresentation, - SfxMapUnit, SfxMapUnit, - OUString & rText, - const IntlWrapper * = nullptr) - const override; + virtual bool GetPresentation(SfxItemPresentation, MapUnit, MapUnit, + OUString & rText, + const IntlWrapper * = nullptr) const override; virtual bool QueryValue(css::uno::Any & rVal, sal_uInt8 = 0) const override; diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx index 5f23dd12116c..12d9ce30efa8 100644 --- a/include/svl/cintitem.hxx +++ b/include/svl/cintitem.hxx @@ -42,9 +42,9 @@ public: virtual bool operator ==(const SfxPoolItem & rItem) const override; virtual bool GetPresentation(SfxItemPresentation, - SfxMapUnit, SfxMapUnit, - OUString & rText, - const IntlWrapper * = nullptr) + MapUnit, MapUnit, + OUString & rText, + const IntlWrapper * = nullptr) const override; virtual bool QueryValue(css::uno::Any& rVal, @@ -91,9 +91,9 @@ public: virtual bool operator ==(const SfxPoolItem & rItem) const override; virtual bool GetPresentation(SfxItemPresentation, - SfxMapUnit, SfxMapUnit, - OUString & rText, - const IntlWrapper * = nullptr) + MapUnit, MapUnit, + OUString & rText, + const IntlWrapper * = nullptr) const override; virtual bool QueryValue(css::uno::Any& rVal, @@ -140,9 +140,9 @@ public: virtual bool operator ==(const SfxPoolItem & rItem) const override; virtual bool GetPresentation(SfxItemPresentation, - SfxMapUnit, SfxMapUnit, - OUString & rText, - const IntlWrapper * = nullptr) + MapUnit, MapUnit, + OUString & rText, + const IntlWrapper * = nullptr) const override; virtual bool QueryValue(css::uno::Any& rVal, @@ -189,9 +189,9 @@ public: virtual bool operator ==(const SfxPoolItem & rItem) const override; virtual bool GetPresentation(SfxItemPresentation, - SfxMapUnit, SfxMapUnit, - OUString & rText, - const IntlWrapper * = nullptr) + MapUnit, MapUnit, + OUString & rText, + const IntlWrapper * = nullptr) const override; virtual bool QueryValue(css::uno::Any& rVal, diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx index 3f2a712ff79a..17da7e54be71 100644 --- a/include/svl/ctypeitm.hxx +++ b/include/svl/ctypeitm.hxx @@ -47,10 +47,10 @@ public: void SetValue( const OUString& rNewVal ); virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString & rText, - const IntlWrapper* pIntlWrapper = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString & rText, + const IntlWrapper* pIntlWrapper = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx index aa6d220b381d..e89479aa0e76 100644 --- a/include/svl/custritm.hxx +++ b/include/svl/custritm.hxx @@ -46,10 +46,9 @@ public: virtual bool operator ==(const SfxPoolItem & rItem) const override; virtual bool GetPresentation(SfxItemPresentation, - SfxMapUnit, SfxMapUnit, - OUString & rText, - const IntlWrapper * = nullptr) - const override; + MapUnit, MapUnit, + OUString & rText, + const IntlWrapper * = nullptr) const override; virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override; diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx index 599a5c1c9635..bed13e458615 100644 --- a/include/svl/eitem.hxx +++ b/include/svl/eitem.hxx @@ -86,7 +86,7 @@ public: virtual bool operator ==(const SfxPoolItem & rItem) const override; virtual bool GetPresentation(SfxItemPresentation, - SfxMapUnit, SfxMapUnit, + MapUnit, MapUnit, OUString & rText, const IntlWrapper * = nullptr) const override; diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx index f43d3d05b9aa..ca4864ba3d8b 100644 --- a/include/svl/flagitem.hxx +++ b/include/svl/flagitem.hxx @@ -43,10 +43,10 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString & rText, - const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString & rText, + const IntlWrapper * = nullptr ) const override; sal_uInt16 GetValue() const { return nVal; } void SetValue( sal_uInt16 nNewVal ) { DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); diff --git a/include/svl/int64item.hxx b/include/svl/int64item.hxx index 3402e1d96d68..fd6827e6d6be 100644 --- a/include/svl/int64item.hxx +++ b/include/svl/int64item.hxx @@ -27,7 +27,7 @@ public: virtual bool operator== ( const SfxPoolItem& rItem ) const override; virtual bool GetPresentation( - SfxItemPresentation, SfxMapUnit, SfxMapUnit, + SfxItemPresentation, MapUnit, MapUnit, OUString& rText, const IntlWrapper* pIntlWrapper = nullptr ) const override; virtual bool QueryValue( diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx index 8eceede33e21..dd6b1178b5a9 100644 --- a/include/svl/intitem.hxx +++ b/include/svl/intitem.hxx @@ -60,7 +60,7 @@ public: virtual bool operator ==(const SfxPoolItem & rItem) const override; virtual bool GetPresentation(SfxItemPresentation, - SfxMapUnit, SfxMapUnit, + MapUnit, MapUnit, OUString & rText, const IntlWrapper * = nullptr) const override; diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index d7b5b73df3e2..8925b98439ef 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -111,8 +111,8 @@ public: void ReleaseDefaults( bool bDelete = false ); static void ReleaseDefaults( SfxPoolItem **pDefaults, sal_uInt16 nCount, bool bDelete = false ); - virtual SfxMapUnit GetMetric( sal_uInt16 nWhich ) const; - void SetDefaultMetric( SfxMapUnit eNewMetric ); + virtual MapUnit GetMetric( sal_uInt16 nWhich ) const; + void SetDefaultMetric( MapUnit eNewMetric ); /** Request string representation of pool items. @@ -141,9 +141,9 @@ public: @return true if it has a valid string representation */ virtual bool GetPresentation( const SfxPoolItem& rItem, - SfxMapUnit ePresentationMetric, - OUString& rText, - const IntlWrapper * pIntlWrapper = nullptr ) const; + MapUnit ePresentationMetric, + OUString& rText, + const IntlWrapper * pIntlWrapper = nullptr ) const; virtual SfxItemPool* Clone() const; const OUString& GetName() const; diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx index a6d78aa638c5..db601e059783 100644 --- a/include/svl/macitem.hxx +++ b/include/svl/macitem.hxx @@ -126,10 +126,10 @@ public: // "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index 2a13b9890017..2faee978ceb0 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -28,6 +28,7 @@ #include <svl/hint.hxx> #include <svl/svldllapi.h> #include <tools/debug.hxx> +#include <tools/mapunit.hxx> #include <tools/solar.h> class IntlWrapper; @@ -60,22 +61,6 @@ inline bool Any2Bool( const css::uno::Any&rValue ) return bValue; } -enum SfxMapUnit -{ - SFX_MAPUNIT_100TH_MM, - SFX_MAPUNIT_10TH_MM, - SFX_MAPUNIT_MM, - SFX_MAPUNIT_CM, - SFX_MAPUNIT_1000TH_INCH, - SFX_MAPUNIT_100TH_INCH, - SFX_MAPUNIT_10TH_INCH, - SFX_MAPUNIT_INCH, - SFX_MAPUNIT_POINT, - SFX_MAPUNIT_TWIP, - SFX_MAPUNIT_PIXEL, - SFX_MAPUNIT_RELATIVE, -}; - /* * The values of this enum describe the degree of textual * representation of an item after calling the virtual @@ -166,8 +151,8 @@ public: /** @return true if it has a valid string representation */ virtual bool GetPresentation( SfxItemPresentation ePresentation, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresentationMetric, + MapUnit eCoreMetric, + MapUnit ePresentationMetric, OUString &rText, const IntlWrapper * pIntlWrapper = nullptr ) const; @@ -256,8 +241,8 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, + MapUnit eCoreMetric, + MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; @@ -280,8 +265,8 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, + MapUnit eCoreMetric, + MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx index ad863ea5c284..846bf0ee2681 100644 --- a/include/svl/ptitem.hxx +++ b/include/svl/ptitem.hxx @@ -37,10 +37,10 @@ public: virtual ~SfxPointItem() {} virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper * = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx index 3d94941f3a4a..af438333dc7f 100644 --- a/include/svl/rectitem.hxx +++ b/include/svl/rectitem.hxx @@ -38,10 +38,10 @@ public: virtual ~SfxRectangleItem() {} virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper * = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx index 91d9300500f6..8d3422346d70 100644 --- a/include/svl/rngitem.hxx +++ b/include/svl/rngitem.hxx @@ -36,10 +36,10 @@ public: SfxRangeItem( const SfxRangeItem& rItem ); virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; inline sal_uInt16& From() { return nFrom; } virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const override; @@ -58,10 +58,10 @@ public: virtual ~SfxUShortRangesItem(); virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const override; virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const override; diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx index 79f4def0dcf6..b06a7351baaf 100644 --- a/include/svl/slstitm.hxx +++ b/include/svl/slstitm.hxx @@ -55,10 +55,10 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const override; virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const override; diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx index d53abbdbd2c1..54c66cbb96d1 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -103,9 +103,9 @@ public: virtual bool operator == ( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; // ConfigItem virtual void Notify( const css::uno::Sequence< OUString > &rPropertyNames ) override; diff --git a/include/svl/style.hxx b/include/svl/style.hxx index c82ff8c9b7b0..2b6d586a38cc 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -122,7 +122,7 @@ public: virtual bool HasParentSupport() const; // Default true virtual bool HasClearParentSupport() const; // Default false virtual bool IsUsed() const; // Default true - virtual OUString GetDescription( SfxMapUnit eMetric ); + virtual OUString GetDescription( MapUnit eMetric ); SfxStyleSheetBasePool& GetPool() { return *pPool; } SfxStyleFamily GetFamily() const { return nFamily; } diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx index 1ce7a676abbb..bcca652601a0 100644 --- a/include/svl/szitem.hxx +++ b/include/svl/szitem.hxx @@ -36,10 +36,10 @@ public: virtual ~SfxSizeItem() {} virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper * = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool QueryValue( css::uno::Any& rVal, diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx index 9479f2c737ba..b6c2102cfaa5 100644 --- a/include/svl/visitem.hxx +++ b/include/svl/visitem.hxx @@ -46,10 +46,9 @@ public: virtual bool operator ==(const SfxPoolItem & rItem) const override; - virtual bool GetPresentation(SfxItemPresentation, - SfxMapUnit, SfxMapUnit, - OUString & rText, - const IntlWrapper * = nullptr) + virtual bool GetPresentation(SfxItemPresentation, MapUnit, MapUnit, + OUString & rText, + const IntlWrapper * = nullptr) const override; virtual bool QueryValue( css::uno::Any& rVal, diff --git a/include/svtools/unitconv.hxx b/include/svtools/unitconv.hxx index 8d0e19deefd6..756c4fdfe9ab 100644 --- a/include/svtools/unitconv.hxx +++ b/include/svtools/unitconv.hxx @@ -34,16 +34,16 @@ typedef long (*FUNC_CONVERT)(long); SVT_DLLPUBLIC void SetFieldUnit( MetricField& rCtrl, FieldUnit eUnit, bool bAll = false ); SVT_DLLPUBLIC void SetFieldUnit( MetricBox& rCtrl, FieldUnit eUnit ); -SVT_DLLPUBLIC long CalcToUnit( float nIn, SfxMapUnit eUnit ); -SVT_DLLPUBLIC long CalcToPoint( long nIn, SfxMapUnit eUnit, sal_uInt16 nFactor ); +SVT_DLLPUBLIC long CalcToUnit( float nIn, MapUnit eUnit ); +SVT_DLLPUBLIC long CalcToPoint( long nIn, MapUnit eUnit, sal_uInt16 nFactor ); -SVT_DLLPUBLIC long ItemToControl( long nIn, SfxMapUnit eItem, FieldUnit eCtrl ); -SVT_DLLPUBLIC long ControlToItem( long nIn, FieldUnit eCtrl, SfxMapUnit eItem ); +SVT_DLLPUBLIC long ItemToControl( long nIn, MapUnit eItem, FieldUnit eCtrl ); +SVT_DLLPUBLIC long ControlToItem( long nIn, FieldUnit eCtrl, MapUnit eItem ); -SVT_DLLPUBLIC FieldUnit MapToFieldUnit( const SfxMapUnit eUnit ); +SVT_DLLPUBLIC FieldUnit MapToFieldUnit( const MapUnit eUnit ); -SVT_DLLPUBLIC void SetMetricValue( MetricField& rField, long lCoreValue, SfxMapUnit eUnit ); -SVT_DLLPUBLIC long GetCoreValue( const MetricField& rField, SfxMapUnit eUnit ); +SVT_DLLPUBLIC void SetMetricValue( MetricField& rField, long lCoreValue, MapUnit eUnit ); +SVT_DLLPUBLIC long GetCoreValue( const MetricField& rField, MapUnit eUnit ); SVT_DLLPUBLIC long PointToTwips( long nIn ); diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx index d2b0d8ddf5fa..335040eb09ca 100644 --- a/include/svx/algitem.hxx +++ b/include/svx/algitem.hxx @@ -41,9 +41,9 @@ public: const sal_uInt16 nId ); virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -82,9 +82,9 @@ public: SvxMarginItem( const SvxMarginItem& ); virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx index 3fcb8312807e..330533874b5f 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -213,9 +213,9 @@ public: OUString GetValueText() const; virtual bool GetPresentation(SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr) const override; virtual bool operator == (const SfxPoolItem&) const override; virtual SfxPoolItem* Clone(SfxItemPool *pPool = nullptr) const override; diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx index 905b5aec8a9e..8444ee1f887f 100644 --- a/include/svx/drawitem.hxx +++ b/include/svx/drawitem.hxx @@ -37,9 +37,9 @@ public: SvxColorListItem( const SvxColorListItem& ); virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -62,9 +62,9 @@ public: SvxGradientListItem( const SvxGradientListItem& ); virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -86,9 +86,9 @@ public: SvxHatchListItem( const SvxHatchListItem& ); virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -111,9 +111,9 @@ public: SvxBitmapListItem( const SvxBitmapListItem& ); virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -136,9 +136,9 @@ public: SvxPatternListItem( const SvxPatternListItem& ); virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -160,9 +160,9 @@ public: SvxDashListItem( const SvxDashListItem& ); virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -185,9 +185,9 @@ public: SvxLineEndListItem( const SvxLineEndListItem& ); virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index c395e75161eb..91634273b78d 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -180,7 +180,7 @@ private: SvxConvertTo3DItem* pConvertTo3DLatheItem; std::unique_ptr<Svx3DWinImpl> mpImpl; - SfxMapUnit ePoolUnit; + MapUnit ePoolUnit; FieldUnit eFUnit; // ItemSet used to remember set 2d attributes diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx index 2092902adf6c..721e5047250d 100644 --- a/include/svx/grfcrop.hxx +++ b/include/svx/grfcrop.hxx @@ -41,10 +41,10 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVer) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nIVer) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index d5f96cf178d4..450a51155599 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -66,7 +66,7 @@ class SVX_DLLPUBLIC SvxMetricField : public MetricField using Window::Update; OUString aCurTxt; - SfxMapUnit ePoolUnit; + MapUnit ePoolUnit; FieldUnit eDlgUnit; Size aLogicalSize; css::uno::Reference< css::frame::XFrame > mxFrame; @@ -86,7 +86,7 @@ public: WinBits nBits = WB_BORDER | WB_SPIN | WB_REPEAT ); void Update( const XLineWidthItem* pItem ); - void SetCoreUnit( SfxMapUnit eUnit ); + void SetCoreUnit( MapUnit eUnit ); void RefreshDlgUnit(); }; diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index d75d163c05f5..217f7e761643 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -185,7 +185,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase NBOType eType; private: const SfxItemSet* pSet; - SfxMapUnit eCoreUnit; + MapUnit eCoreUnit; // store the attributes passed from pSet OUString aNumCharFmtName; void StoreBulCharFmtName_impl(); @@ -195,7 +195,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase NBOTypeMgrBase(const NBOType aType) : eType(aType) , pSet(nullptr) - , eCoreUnit(SFX_MAPUNIT_TWIP) + , eCoreUnit(MAP_TWIP) , aNumCharFmtName(OUString()) , bIsLoading(false) {} @@ -219,7 +219,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase void SetItems(const SfxItemSet* pArg) { pSet = pArg;StoreBulCharFmtName_impl();StoreMapUnit_impl();} protected: const OUString& GetBulCharFmtName() { return aNumCharFmtName;} - SfxMapUnit GetMapUnit() { return eCoreUnit;} + MapUnit GetMapUnit() { return eCoreUnit;} protected: bool bIsLoading; void ImplLoad(const OUString& filename); diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx index 626f7ebf0dc9..10314678d2af 100644 --- a/include/svx/numinf.hxx +++ b/include/svx/numinf.hxx @@ -53,9 +53,9 @@ public: virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; SvNumberFormatter* GetNumberFormatter() const { return pFormatter; } const OUString& GetValueString() const { return aStringVal; } diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index 64d28a9a0334..da7e37a73446 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -86,9 +86,9 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; }; diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx index f31107848663..8aa95584f40b 100644 --- a/include/svx/pageitem.hxx +++ b/include/svx/pageitem.hxx @@ -78,9 +78,9 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -117,9 +117,9 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVersion ) const override; virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const override; diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx index 8d929c9aba50..2c1c2466d7c2 100644 --- a/include/svx/postattr.hxx +++ b/include/svx/postattr.hxx @@ -38,9 +38,9 @@ public: SvxPostItAuthorItem( const OUString& rAuthor, sal_uInt16 nWhich ); virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -68,9 +68,9 @@ public: SvxPostItDateItem( const OUString& rDate, sal_uInt16 nWhich ); virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -99,9 +99,9 @@ public: SvxPostItTextItem( const OUString& rText, sal_uInt16 nWhich ); // "pure virtual methods" from SfxPoolItem virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx index 9604b4a54e8a..9dd5e2f57624 100644 --- a/include/svx/rotmodit.hxx +++ b/include/svx/rotmodit.hxx @@ -48,9 +48,9 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString& rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString& rText, const IntlWrapper * = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index bce67342519d..3eab85cd6877 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -36,9 +36,9 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -69,9 +69,9 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -101,9 +101,9 @@ protected: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -169,10 +169,10 @@ protected: virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -225,9 +225,9 @@ protected: virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/sdangitm.hxx b/include/svx/sdangitm.hxx index 60d886bfe05e..869e25478d0f 100644 --- a/include/svx/sdangitm.hxx +++ b/include/svx/sdangitm.hxx @@ -33,11 +33,11 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; virtual bool GetPresentation(SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString& rText, - const IntlWrapper * - pIntlWrapper = nullptr) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString& rText, + const IntlWrapper * + pIntlWrapper = nullptr) const override; }; diff --git a/include/svx/sdasaitm.hxx b/include/svx/sdasaitm.hxx index 2dea1c4e2030..a43d8790f4d2 100644 --- a/include/svx/sdasaitm.hxx +++ b/include/svx/sdasaitm.hxx @@ -43,8 +43,8 @@ class SVX_DLLPUBLIC SdrCustomShapeAdjustmentItem : public SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation(SfxItemPresentation ePresentation, - SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, - OUString &rText, const IntlWrapper * = nullptr) const override; + MapUnit eCoreMetric, MapUnit ePresentationMetric, + OUString &rText, const IntlWrapper * = nullptr) const override; virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItem ) const override; virtual SvStream& Store( SvStream&, sal_uInt16 nVersion ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index 6e19e3f59160..e7cfc76be8f9 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -59,8 +59,8 @@ private: virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation(SfxItemPresentation ePresentation, - SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, - OUString &rText, const IntlWrapper * = nullptr) const override; + MapUnit eCoreMetric, MapUnit ePresentationMetric, + OUString &rText, const IntlWrapper * = nullptr) const override; virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItem ) const override; virtual SvStream& Store( SvStream&, sal_uInt16 nVersion ) const override; diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx index 3722511c17bc..411266a9fc17 100644 --- a/include/svx/sdgmoitm.hxx +++ b/include/svx/sdgmoitm.hxx @@ -44,10 +44,9 @@ public: virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString& rText, const IntlWrapper * = nullptr) const override; - + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString& rText, const IntlWrapper * = nullptr) const override; }; #endif // INCLUDED_SVX_SDGMOITM_HXX diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx index 3174cbacb797..6f8196e98819 100644 --- a/include/svx/sdmetitm.hxx +++ b/include/svx/sdmetitm.hxx @@ -37,9 +37,9 @@ public: virtual void ScaleMetrics(long nMul, long nDiv) override; virtual bool GetPresentation(SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString& rText, const IntlWrapper * = nullptr) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString& rText, const IntlWrapper * = nullptr) const override; }; diff --git a/include/svx/sdooitm.hxx b/include/svx/sdooitm.hxx index b17977d8027c..8d846b47bb08 100644 --- a/include/svx/sdooitm.hxx +++ b/include/svx/sdooitm.hxx @@ -36,7 +36,7 @@ public: virtual OUString GetValueTextByVal(bool bVal) 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; }; diff --git a/include/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx index 113a41307ded..a21be90fa743 100644 --- a/include/svx/sdprcitm.hxx +++ b/include/svx/sdprcitm.hxx @@ -35,7 +35,7 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) 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; }; @@ -51,7 +51,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) 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; }; diff --git a/include/svx/sdtaaitm.hxx b/include/svx/sdtaaitm.hxx index 3083e2f33262..ab997452ee9c 100644 --- a/include/svx/sdtaaitm.hxx +++ b/include/svx/sdtaaitm.hxx @@ -32,7 +32,7 @@ public: virtual bool HasMetrics() const override; virtual void ScaleMetrics(long nMul, long nDiv) 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/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx index 57bba8f13333..2c05bde526c1 100644 --- a/include/svx/sdtaditm.hxx +++ b/include/svx/sdtaditm.hxx @@ -46,7 +46,7 @@ public: 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/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx index 590df23ce2ce..e25259de9072 100644 --- a/include/svx/sdtaitm.hxx +++ b/include/svx/sdtaitm.hxx @@ -47,7 +47,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; }; @@ -73,7 +73,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/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx index b181dea967b7..2960559d69de 100644 --- a/include/svx/sdtakitm.hxx +++ b/include/svx/sdtakitm.hxx @@ -89,7 +89,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/include/svx/sdtayitm.hxx b/include/svx/sdtayitm.hxx index ee583952fef1..2bb331009147 100644 --- a/include/svx/sdtayitm.hxx +++ b/include/svx/sdtayitm.hxx @@ -29,7 +29,7 @@ public: SdrTextAniDelayItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) 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/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx index e4cb5e2594fe..4637a9a100d4 100644 --- a/include/svx/sdtfchim.hxx +++ b/include/svx/sdtfchim.hxx @@ -29,8 +29,8 @@ public: SVX_DLLPRIVATE SdrTextFixedCellHeightItem( SvStream & rStream, sal_uInt16 nVersion ); SVX_DLLPRIVATE virtual bool GetPresentation(SfxItemPresentation ePresentation, - SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, - OUString &rText, const IntlWrapper * = nullptr) const override; + MapUnit eCoreMetric, MapUnit ePresentationMetric, + OUString &rText, const IntlWrapper * = nullptr) const override; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItem ) const override; SVX_DLLPRIVATE virtual SvStream& Store( SvStream&, sal_uInt16 nVersion ) const override; diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx index 0b64a01049bc..656f1aa45331 100644 --- a/include/svx/sdtfsitm.hxx +++ b/include/svx/sdtfsitm.hxx @@ -56,7 +56,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; virtual bool HasBoolValue() const override; virtual bool GetBoolValue() const override; virtual void SetBoolValue(bool bVal) override; diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx index 410d5fc888b7..e7ea20f7d23b 100644 --- a/include/svx/sdynitm.hxx +++ b/include/svx/sdynitm.hxx @@ -34,7 +34,7 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; virtual OUString GetValueTextByVal(bool bVal) 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; }; diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx index 93398f80a42c..a444a33d48fb 100644 --- a/include/svx/sidebar/LinePropertyPanelBase.hxx +++ b/include/svx/sidebar/LinePropertyPanelBase.hxx @@ -111,7 +111,7 @@ protected: void SelectLineStyle(); void ActivateControls(); - void setMapUnit(SfxMapUnit eMapUnit); + void setMapUnit(MapUnit eMapUnit); void disableArrowHead(); @@ -139,7 +139,7 @@ private: std::unique_ptr<XLineDashItem> mpDashItem; sal_uInt16 mnTrans; - SfxMapUnit meMapUnit; + MapUnit meMapUnit; sal_Int32 mnWidthCoreValue; XLineEndListRef mxLineEndList; XDashListRef mxLineStyleList; diff --git a/include/svx/sidebar/LineWidthPopup.hxx b/include/svx/sidebar/LineWidthPopup.hxx index 79952c1f0b9f..c24ce65e9031 100644 --- a/include/svx/sidebar/LineWidthPopup.hxx +++ b/include/svx/sidebar/LineWidthPopup.hxx @@ -39,13 +39,13 @@ public: virtual void dispose() override; virtual ~LineWidthPopup(); - void SetWidthSelect (long lValue, bool bValuable, SfxMapUnit eMapUnit); + void SetWidthSelect (long lValue, bool bValuable, MapUnit eMapUnit); private: LinePropertyPanelBase& m_rParent; OUString* m_pStr; OUString m_sPt; - SfxMapUnit m_eMapUnit; + MapUnit m_eMapUnit; bool m_bVSFocus; bool m_bCustom; bool m_bCloseByEdit; diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 7ac2c7ad14ba..a762127bdc79 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -700,8 +700,8 @@ protected: void SetObjectItemSet(const SfxItemSet& rSet); const SfxPoolItem& GetObjectItem(const sal_uInt16 nWhich) const; - // get SfxMapUnit the object is using - SfxMapUnit GetObjectMapUnit() const; + // get MapUnit the object is using + MapUnit GetObjectMapUnit() const; public: // syntactical sugar for ItemSet accesses diff --git a/include/svx/svdpool.hxx b/include/svx/svdpool.hxx index 1a5c8da77037..cbbe980f3926 100644 --- a/include/svx/svdpool.hxx +++ b/include/svx/svdpool.hxx @@ -39,10 +39,9 @@ public: virtual SfxItemPool* Clone() const override; virtual bool GetPresentation(const SfxPoolItem& rItem, - SfxMapUnit ePresentationMetric, - OUString& rText, - const IntlWrapper * pIntlWrapper - = nullptr) const override; + MapUnit ePresentationMetric, + OUString& rText, + const IntlWrapper * pIntlWrapper = nullptr) const override; static void TakeItemName(sal_uInt16 nWhich, OUString& rItemName); }; diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx index ba11540ceb16..a307d5099e51 100644 --- a/include/svx/sxcecitm.hxx +++ b/include/svx/sxcecitm.hxx @@ -41,7 +41,7 @@ public: 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; }; diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx index 13cf4073ccd6..b255b95c5b66 100644 --- a/include/svx/sxctitm.hxx +++ b/include/svx/sxctitm.hxx @@ -37,7 +37,7 @@ public: virtual sal_uInt16 GetValueCount() const override; // { return 4; } SdrCaptionType GetValue() const { return (SdrCaptionType)SfxEnumItem::GetValue(); } 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/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx index feeaffc7e72d..1fce19df61a8 100644 --- a/include/svx/sxekitm.hxx +++ b/include/svx/sxekitm.hxx @@ -42,7 +42,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; 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/include/svx/sxfiitm.hxx b/include/svx/sxfiitm.hxx index 19767c0b6137..16b3a1249863 100644 --- a/include/svx/sxfiitm.hxx +++ b/include/svx/sxfiitm.hxx @@ -32,7 +32,7 @@ public: SdrFractionItem(sal_uInt16 nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {} SdrFractionItem(sal_uInt16 nId, SvStream& rIn); virtual bool operator==(const SfxPoolItem&) const override; - virtual bool GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePresentation, MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = nullptr) const override; virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const override; virtual SvStream& Store(SvStream&, sal_uInt16 nItemVers) const override; virtual SfxPoolItem* Clone(SfxItemPool *pPool=nullptr) const override; diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx index b36a70652592..c242b421437c 100644 --- a/include/svx/sxmtpitm.hxx +++ b/include/svx/sxmtpitm.hxx @@ -42,7 +42,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; }; @@ -61,7 +61,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/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx index bd333ffb55dd..47102dc98f32 100644 --- a/include/svx/sxmuitm.hxx +++ b/include/svx/sxmuitm.hxx @@ -39,7 +39,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/include/svx/sxsiitm.hxx b/include/svx/sxsiitm.hxx index 69aad0c01319..8e840369334a 100644 --- a/include/svx/sxsiitm.hxx +++ b/include/svx/sxsiitm.hxx @@ -25,7 +25,7 @@ class SdrScaleItem: public SdrFractionItem { public: SdrScaleItem(sal_uInt16 nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {} SdrScaleItem(sal_uInt16 nId, SvStream& rIn): SdrFractionItem(nId,rIn) {} - virtual bool GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePresentation, MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = nullptr) const override; virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const override; virtual SfxPoolItem* Clone(SfxItemPool *pPool=nullptr) const override; }; diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index 24782f7b2c91..646206d34db0 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -59,9 +59,9 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; const GraphicObject& GetGraphicObject() const { return maGraphicObject;} void SetGraphicObject(const GraphicObject& rGraphicObject); diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx index 9604f97057a8..54495aa87677 100644 --- a/include/svx/xfillit0.hxx +++ b/include/svx/xfillit0.hxx @@ -46,9 +46,9 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual sal_uInt16 GetValueCount() const override; css::drawing::FillStyle GetValue() const { return (css::drawing::FillStyle) SfxEnumItem::GetValue(); } diff --git a/include/svx/xflbckit.hxx b/include/svx/xflbckit.hxx index 2cc31a82b8fc..4b0c154a978e 100644 --- a/include/svx/xflbckit.hxx +++ b/include/svx/xflbckit.hxx @@ -41,9 +41,9 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; }; #endif diff --git a/include/svx/xflbmpit.hxx b/include/svx/xflbmpit.hxx index b59053569a75..280f40c9b618 100644 --- a/include/svx/xflbmpit.hxx +++ b/include/svx/xflbmpit.hxx @@ -35,9 +35,9 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; SVX_DLLPRIVATE virtual sal_uInt16 GetValueCount() const override; SVX_DLLPRIVATE RECT_POINT GetValue() const { return (RECT_POINT) SfxEnumItem::GetValue(); } diff --git a/include/svx/xflbmsli.hxx b/include/svx/xflbmsli.hxx index 687f084d5841..efea81423a4e 100644 --- a/include/svx/xflbmsli.hxx +++ b/include/svx/xflbmsli.hxx @@ -34,9 +34,9 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; }; #endif diff --git a/include/svx/xflbmsxy.hxx b/include/svx/xflbmsxy.hxx index ce5a91d36795..8abf813a180d 100644 --- a/include/svx/xflbmsxy.hxx +++ b/include/svx/xflbmsxy.hxx @@ -34,9 +34,9 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; // This item records both metrical and percentage quotation (negative); // We have to consider that. SVX_DLLPRIVATE virtual bool HasMetrics() const override; @@ -53,9 +53,9 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; // This item records both metrical and percentage quotation (negative); // We have to consider that. SVX_DLLPRIVATE virtual bool HasMetrics() const override; diff --git a/include/svx/xflbmtit.hxx b/include/svx/xflbmtit.hxx index c218578e8cfe..607461bb400a 100644 --- a/include/svx/xflbmtit.hxx +++ b/include/svx/xflbmtit.hxx @@ -34,9 +34,9 @@ public: virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/include/svx/xflboxy.hxx b/include/svx/xflboxy.hxx index c8a01426bdd7..551e608617e0 100644 --- a/include/svx/xflboxy.hxx +++ b/include/svx/xflboxy.hxx @@ -34,9 +34,9 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; }; class SVX_DLLPUBLIC XFillBmpPosOffsetYItem : public SfxUInt16Item @@ -50,9 +50,9 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; }; #endif diff --git a/include/svx/xflbstit.hxx b/include/svx/xflbstit.hxx index 3b33a7231aac..113886e22539 100644 --- a/include/svx/xflbstit.hxx +++ b/include/svx/xflbstit.hxx @@ -34,9 +34,9 @@ public: virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/include/svx/xflbtoxy.hxx b/include/svx/xflbtoxy.hxx index 8eb851fe5d89..d37ad82a1577 100644 --- a/include/svx/xflbtoxy.hxx +++ b/include/svx/xflbtoxy.hxx @@ -34,9 +34,9 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; }; class SVX_DLLPUBLIC XFillBmpTileOffsetYItem : public SfxUInt16Item @@ -50,9 +50,9 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; }; #endif diff --git a/include/svx/xflclit.hxx b/include/svx/xflclit.hxx index 3087d528b159..0caa9d7521f2 100644 --- a/include/svx/xflclit.hxx +++ b/include/svx/xflclit.hxx @@ -46,9 +46,9 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx index 27ef1c068383..a5b819251d3b 100644 --- a/include/svx/xflftrit.hxx +++ b/include/svx/xflftrit.hxx @@ -43,12 +43,12 @@ public: virtual bool operator==( const SfxPoolItem& rItem ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * pIntlWrapper = nullptr ) const override; + virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, + MapUnit ePresMetric, OUString &rText, const IntlWrapper * pIntlWrapper = nullptr ) const override; bool IsEnabled() const { return bEnabled; } void SetEnabled( bool bEnable ) { bEnabled = bEnable; } diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx index 2dc6a7fd2f70..eae119460170 100644 --- a/include/svx/xflgrit.hxx +++ b/include/svx/xflgrit.hxx @@ -51,9 +51,9 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; const XGradient& GetGradientValue() const; // GetValue -> GetGradientValue void SetGradientValue(const XGradient& rNew) { aGradient = rNew; Detach(); } // SetValue -> SetGradientValue diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx index b30c3f6fe229..961b941df9d8 100644 --- a/include/svx/xflhtit.hxx +++ b/include/svx/xflhtit.hxx @@ -49,9 +49,9 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual bool HasMetrics() const override; virtual void ScaleMetrics(long nMul, long nDiv) override; diff --git a/include/svx/xfltrit.hxx b/include/svx/xfltrit.hxx index 696127cb4466..146ca5ef32d7 100644 --- a/include/svx/xfltrit.hxx +++ b/include/svx/xfltrit.hxx @@ -38,9 +38,9 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/include/svx/xgrscit.hxx b/include/svx/xgrscit.hxx index d880e1591afb..dec1edd49e7d 100644 --- a/include/svx/xgrscit.hxx +++ b/include/svx/xgrscit.hxx @@ -38,9 +38,9 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; }; #endif diff --git a/include/svx/xlineit0.hxx b/include/svx/xlineit0.hxx index 2986dcfdb9e5..ca0148afad47 100644 --- a/include/svx/xlineit0.hxx +++ b/include/svx/xlineit0.hxx @@ -41,9 +41,9 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual sal_uInt16 GetValueCount() const override; css::drawing::LineStyle GetValue() const { return (css::drawing::LineStyle) SfxEnumItem::GetValue(); } }; diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx index cd0b4918a3aa..131c9774faff 100644 --- a/include/svx/xlinjoit.hxx +++ b/include/svx/xlinjoit.hxx @@ -43,8 +43,8 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual sal_uInt16 GetValueCount() const override; css::drawing::LineJoint GetValue() const { return (css::drawing::LineJoint) SfxEnumItem::GetValue(); } diff --git a/include/svx/xlncapit.hxx b/include/svx/xlncapit.hxx index 12e5750bc6f9..80bf211626c8 100644 --- a/include/svx/xlncapit.hxx +++ b/include/svx/xlncapit.hxx @@ -43,8 +43,8 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual sal_uInt16 GetValueCount() const override; css::drawing::LineCap GetValue() const; diff --git a/include/svx/xlnclit.hxx b/include/svx/xlnclit.hxx index 85591c429d9f..921fdbeb7898 100644 --- a/include/svx/xlnclit.hxx +++ b/include/svx/xlnclit.hxx @@ -42,9 +42,9 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; }; #endif diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx index 04bfa03d0bb1..6d47aa257372 100644 --- a/include/svx/xlndsit.hxx +++ b/include/svx/xlndsit.hxx @@ -51,9 +51,9 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual bool HasMetrics() const override; virtual void ScaleMetrics(long nMul, long nDiv) override; diff --git a/include/svx/xlnedcit.hxx b/include/svx/xlnedcit.hxx index c912b37a732c..bd53b8a3c60b 100644 --- a/include/svx/xlnedcit.hxx +++ b/include/svx/xlnedcit.hxx @@ -39,9 +39,9 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; }; #endif diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx index 24c579fd2f2c..240065f6efdf 100644 --- a/include/svx/xlnedit.hxx +++ b/include/svx/xlnedit.hxx @@ -50,9 +50,9 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; const basegfx::B2DPolyPolygon& GetLineEndValue() const { return maPolyPolygon;} void SetLineEndValue(const basegfx::B2DPolyPolygon& rPolyPolygon) { maPolyPolygon = rPolyPolygon; Detach(); } diff --git a/include/svx/xlnedwit.hxx b/include/svx/xlnedwit.hxx index 5a3286d1d022..d3c65ce25f9b 100644 --- a/include/svx/xlnedwit.hxx +++ b/include/svx/xlnedwit.hxx @@ -42,8 +42,8 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, + MapUnit eCoreMetric, + MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; }; diff --git a/include/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx index bef563ee00a4..f51e5f96903f 100644 --- a/include/svx/xlnstcit.hxx +++ b/include/svx/xlnstcit.hxx @@ -39,9 +39,9 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; }; #endif diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx index 50bba7b9547d..4d67374bfceb 100644 --- a/include/svx/xlnstit.hxx +++ b/include/svx/xlnstit.hxx @@ -50,9 +50,9 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; const basegfx::B2DPolyPolygon& GetLineStartValue() const { return maPolyPolygon;} void SetLineStartValue(const basegfx::B2DPolyPolygon& rPolyPolygon) { maPolyPolygon = rPolyPolygon; Detach(); } diff --git a/include/svx/xlnstwit.hxx b/include/svx/xlnstwit.hxx index ecd29aed3afc..df889455b73d 100644 --- a/include/svx/xlnstwit.hxx +++ b/include/svx/xlnstwit.hxx @@ -41,9 +41,9 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; }; diff --git a/include/svx/xlntrit.hxx b/include/svx/xlntrit.hxx index aac2a2934410..1540c2b1e823 100644 --- a/include/svx/xlntrit.hxx +++ b/include/svx/xlntrit.hxx @@ -38,9 +38,9 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; }; #endif diff --git a/include/svx/xlnwtit.hxx b/include/svx/xlnwtit.hxx index fa46c5ece9ee..609660d856f0 100644 --- a/include/svx/xlnwtit.hxx +++ b/include/svx/xlnwtit.hxx @@ -39,9 +39,9 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, const IntlWrapper * = nullptr ) const override; }; #endif diff --git a/include/svx/xsflclit.hxx b/include/svx/xsflclit.hxx index 7d064643c39d..c6456bc8f5d8 100644 --- a/include/svx/xsflclit.hxx +++ b/include/svx/xsflclit.hxx @@ -37,8 +37,8 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, + MapUnit eCoreMetric, + MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 93f6ee9c0c11..773a7ce5fe41 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -703,7 +703,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep }; SfxItemPool* pPool( new SfxItemPool(OUString("ReportCharProperties"), ITEMID_FONT,ITEMID_WEIGHT_COMPLEX, aItemInfos, pDefaults) ); - // not needed for font height pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why + // not needed for font height pPool->SetDefaultMetric( MAP_100TH_MM ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same bool bSuccess = false; try diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 4e12a3d852b9..60b8ddca3777 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -2420,7 +2420,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ pPool->SetDefaults(pDefaults); - pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why + pPool->SetDefaultMetric( MAP_100TH_MM ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same try @@ -4217,7 +4217,7 @@ void OReportController::openZoomDialog() 0 }; SfxItemPool* pPool( new SfxItemPool(OUString("ZoomProperties"), SID_ATTR_ZOOM,SID_ATTR_ZOOM, aItemInfos, pDefaults) ); - pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why + pPool->SetDefaultMetric( MAP_100TH_MM ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same try { diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index 176cfe2632e4..39c08fb2d0a6 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -121,8 +121,8 @@ public: OUString GetValueText() const; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, + MapUnit eCoreMetric, + MapUnit ePresMetric, OUString& rText, const IntlWrapper* pIntl = nullptr ) const override; @@ -165,10 +165,10 @@ public: // "pure virtual methods" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; private: @@ -206,10 +206,10 @@ public: // "pure virtual Methoden" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; public: @@ -274,10 +274,10 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString& rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString& rText, + const IntlWrapper* pIntl = nullptr ) const override; }; class ScDoubleItem : public SfxPoolItem @@ -327,11 +327,10 @@ public: inline void Set( sal_uInt16 nWidth, sal_uInt16 nHeight ) { mnWidth = nWidth; mnHeight = nHeight; } - virtual bool GetPresentation( - SfxItemPresentation ePresentation, - SfxMapUnit, SfxMapUnit, - OUString& rText, - const IntlWrapper* = nullptr ) const override; + virtual bool GetPresentation( SfxItemPresentation ePresentation, + MapUnit, MapUnit, + OUString& rText, + const IntlWrapper* = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rAny, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rAny, sal_uInt8 nMemberId ) override; diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx index bbe2e84a70ba..9536bb8c787f 100644 --- a/sc/inc/docpool.hxx +++ b/sc/inc/docpool.hxx @@ -51,7 +51,7 @@ protected: public: virtual SfxItemPool* Clone() const override; - virtual SfxMapUnit GetMetric( sal_uInt16 nWhich ) const override; + virtual MapUnit GetMetric( sal_uInt16 nWhich ) const override; virtual const SfxPoolItem& Put( const SfxPoolItem&, sal_uInt16 nWhich = 0 ) override; virtual void Remove( const SfxPoolItem& ) override; @@ -59,11 +59,10 @@ public: void StyleDeleted( ScStyleSheet* pStyle ); // delete templates(?) in organizer void CellStyleCreated( const OUString& rName, ScDocument* pDoc ); - virtual bool GetPresentation( - const SfxPoolItem& rItem, - SfxMapUnit ePresentationMetric, - OUString& rText, - const IntlWrapper* pIntl = nullptr ) const override; + virtual bool GetPresentation( const SfxPoolItem& rItem, + MapUnit ePresentationMetric, + OUString& rText, + const IntlWrapper* pIntl = nullptr ) const override; static void InitVersionMaps(); static void DeleteVersionMaps(); diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index 6331565a25a7..add4cf23c78d 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -284,8 +284,8 @@ OUString ScProtectionAttr::GetValueText() const bool ScProtectionAttr::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit /* eCoreMetric */, - SfxMapUnit /* ePresMetric */, + MapUnit /* eCoreMetric */, + MapUnit /* ePresMetric */, OUString& rText, const IntlWrapper* /* pIntl */ ) const @@ -391,8 +391,8 @@ SfxPoolItem* ScRangeItem::Clone( SfxItemPool* ) const bool ScRangeItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit /* eCoreUnit */, - SfxMapUnit /* ePresUnit */, + MapUnit /* eCoreUnit */, + MapUnit /* ePresUnit */, OUString& rText, const IntlWrapper* /* pIntl */ ) const @@ -492,8 +492,8 @@ SfxPoolItem* ScTableListItem::Clone( SfxItemPool* ) const bool ScTableListItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit /* eCoreUnit */, - SfxMapUnit /* ePresUnit */, + MapUnit /* eCoreUnit */, + MapUnit /* ePresUnit */, OUString& rText, const IntlWrapper* /* pIntl */ ) const @@ -823,8 +823,8 @@ ScViewObjectModeItem::~ScViewObjectModeItem() bool ScViewObjectModeItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit /* eCoreUnit */, - SfxMapUnit /* ePresUnit */, + MapUnit /* eCoreUnit */, + MapUnit /* ePresUnit */, OUString& rText, const IntlWrapper* /* pIntl */ ) const @@ -986,7 +986,7 @@ void lclAppendScalePageCount( OUString& rText, sal_uInt16 nPages ) } // namespace bool ScPageScaleToItem::GetPresentation( - SfxItemPresentation ePres, SfxMapUnit, SfxMapUnit, OUString& rText, const IntlWrapper* ) const + SfxItemPresentation ePres, MapUnit, MapUnit, OUString& rText, const IntlWrapper* ) const { rText.clear(); if( !IsValid()) diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 6ecd7de4df5c..2fd1ad4986df 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -690,8 +690,8 @@ SfxItemPool* ScDocumentPool::Clone() const static bool lcl_HFPresentation ( const SfxPoolItem& rItem, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresentationMetric, + MapUnit eCoreMetric, + MapUnit ePresentationMetric, OUString& rText, const IntlWrapper* pIntl ) @@ -787,7 +787,7 @@ static bool lcl_HFPresentation bool ScDocumentPool::GetPresentation( const SfxPoolItem& rItem, - SfxMapUnit ePresentationMetric, + MapUnit ePresentationMetric, OUString& rText, const IntlWrapper* pIntl ) const { @@ -914,13 +914,13 @@ bool ScDocumentPool::GetPresentation( return ePresentationRet; } -SfxMapUnit ScDocumentPool::GetMetric( sal_uInt16 nWhich ) const +MapUnit ScDocumentPool::GetMetric( sal_uInt16 nWhich ) const { // Own attributes in Twips, everything else in 1/100 mm if ( nWhich >= ATTR_STARTINDEX && nWhich <= ATTR_ENDINDEX ) - return SFX_MAPUNIT_TWIP; + return MAP_TWIP; else - return SFX_MAPUNIT_100TH_MM; + return MAP_100TH_MM; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index b2c7ab9de54f..7d7edbf235f5 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -270,7 +270,7 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const OUString& rName ) : SetScaleUnit(MAP_100TH_MM); SfxItemPool& rPool = GetItemPool(); - rPool.SetDefaultMetric(SFX_MAPUNIT_100TH_MM); + rPool.SetDefaultMetric(MAP_100TH_MM); SvxFrameDirectionItem aModeItem( FRMDIR_ENVIRONMENT, EE_PARA_WRITINGDIR ); rPool.SetPoolDefaultItem( aModeItem ); diff --git a/sc/source/core/data/poolhelp.cxx b/sc/source/core/data/poolhelp.cxx index 72360c697728..02a29c377dae 100644 --- a/sc/source/core/data/poolhelp.cxx +++ b/sc/source/core/data/poolhelp.cxx @@ -51,7 +51,7 @@ SfxItemPool* ScPoolHelper::GetEditPool() const if ( !pEditPool ) { pEditPool = EditEngine::CreatePool(); - pEditPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); + pEditPool->SetDefaultMetric( MAP_100TH_MM ); pEditPool->FreezeIdRanges(); pEditPool->SetFileFormatVersion( SOFFICE_FILEFORMAT_50 ); // used in ScGlobal::EETextObjEqual } @@ -62,7 +62,7 @@ SfxItemPool* ScPoolHelper::GetEnginePool() const if ( !pEnginePool ) { pEnginePool = EditEngine::CreatePool(); - pEnginePool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); + pEnginePool->SetDefaultMetric( MAP_100TH_MM ); pEnginePool->FreezeIdRanges(); } // ifg ( pEnginePool ) return pEnginePool; diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx index caa8aaa37e43..9eac708dd647 100644 --- a/sc/source/ui/app/msgpool.cxx +++ b/sc/source/ui/app/msgpool.cxx @@ -88,13 +88,13 @@ ScMessagePool::~ScMessagePool() SfxItemPool::Free(pDocPool); } -SfxMapUnit ScMessagePool::GetMetric( sal_uInt16 nWhich ) const +MapUnit ScMessagePool::GetMetric( sal_uInt16 nWhich ) const { // Own attributes: Twips, everything else 1/100 mm if ( nWhich >= ATTR_STARTINDEX && nWhich <= ATTR_ENDINDEX ) - return SFX_MAPUNIT_TWIP; + return MAP_TWIP; else - return SFX_MAPUNIT_100TH_MM; + return MAP_100TH_MM; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/msgpool.hxx b/sc/source/ui/inc/msgpool.hxx index 1985aa00fe00..72bef8d61d7e 100644 --- a/sc/source/ui/inc/msgpool.hxx +++ b/sc/source/ui/inc/msgpool.hxx @@ -54,7 +54,7 @@ protected: virtual ~ScMessagePool(); public: - virtual SfxMapUnit GetMetric( sal_uInt16 nWhich ) const override; + virtual MapUnit GetMetric( sal_uInt16 nWhich ) const override; }; #endif diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index 463c90b29cc6..c093237f07d3 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -195,7 +195,7 @@ IMPL_LINK_NOARG_TYPED(AlignmentPropertyPanel, MFLeftIndentMdyHdl, Edit&, void) { mpCBXWrapText->EnableTriState(false); sal_uInt16 nVal = (sal_uInt16)mpMFLeftIndent->GetValue(); - SfxUInt16Item aItem( SID_ATTR_ALIGN_INDENT, (sal_uInt16)CalcToUnit( nVal, SFX_MAPUNIT_TWIP ) ); + SfxUInt16Item aItem( SID_ATTR_ALIGN_INDENT, (sal_uInt16)CalcToUnit( nVal, MAP_TWIP ) ); GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_ALIGN_INDENT, SfxCallMode::RECORD, { &aItem }); @@ -297,7 +297,7 @@ void AlignmentPropertyPanel::NotifyItemUpdate( { const SfxUInt16Item* pItem = static_cast<const SfxUInt16Item*>(pState); sal_uInt16 nVal = pItem->GetValue(); - mpMFLeftIndent->SetValue( CalcToPoint(nVal, SFX_MAPUNIT_TWIP, 1) ); + mpMFLeftIndent->SetValue( CalcToPoint(nVal, MAP_TWIP, 1) ); } else { diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index 67e2acb578b7..803e7d9247bd 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -859,7 +859,7 @@ ScDrawTextCursor* ScDrawTextCursor::getImplementation(const uno::Reference<uno:: ScSimpleEditSourceHelper::ScSimpleEditSourceHelper() { SfxItemPool* pEnginePool = EditEngine::CreatePool(); - pEnginePool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); + pEnginePool->SetDefaultMetric( MAP_100TH_MM ); pEnginePool->FreezeIdRanges(); pEditEngine = new ScFieldEditEngine(nullptr, pEnginePool, nullptr, true); // TRUE: become owner of pool diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index 5980b991f1f6..6b05c2bf4556 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -80,7 +80,7 @@ IMPL_LINK_NOARG_TYPED(ScNoteMarker, TimeHdl, Timer *, void) pModel = new SdrModel(aPath, nullptr, nullptr, false); pModel->SetScaleUnit(MAP_100TH_MM); SfxItemPool& rPool = pModel->GetItemPool(); - rPool.SetDefaultMetric(SFX_MAPUNIT_100TH_MM); + rPool.SetDefaultMetric(MAP_100TH_MM); rPool.FreezeIdRanges(); OutputDevice* pPrinter = pDoc->GetRefDevice(); diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index a507402b56c7..2b06a98c1477 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -204,7 +204,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) SetScaleFraction(Fraction(1, 1)); SetDefaultFontHeight(847); // 24p - pItemPool->SetDefaultMetric(SFX_MAPUNIT_100TH_MM); + pItemPool->SetDefaultMetric(MAP_100TH_MM); pItemPool->FreezeIdRanges(); SetTextDefaults(); diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 1f51811a4405..1818a021cdd3 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -436,7 +436,7 @@ SfxItemSet* SdModule::CreateItemSet( sal_uInt16 nSlot ) // Pool has by default MapUnit Twips (Awgh!) SfxItemPool& rPool = GetPool(); - rPool.SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); + rPool.SetDefaultMetric( MAP_100TH_MM ); SfxItemSet* pRet = new SfxItemSet( rPool, SID_ATTR_METRIC, SID_ATTR_METRIC, diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index f4bd4e14b2b5..f062b1f674ed 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -118,12 +118,12 @@ void CopyDlg::Reset() long nMoveX = 500L; if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_MOVE_X, true, &pPoolItem ) ) nMoveX = static_cast<const SfxInt32Item*>( pPoolItem )->GetValue(); - SetMetricValue( *m_pMtrFldMoveX, Fraction(nMoveX) / maUIScale, SFX_MAPUNIT_100TH_MM); + SetMetricValue( *m_pMtrFldMoveX, Fraction(nMoveX) / maUIScale, MAP_100TH_MM); long nMoveY = 500L; if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_MOVE_Y, true, &pPoolItem ) ) nMoveY = static_cast<const SfxInt32Item*>( pPoolItem )->GetValue(); - SetMetricValue( *m_pMtrFldMoveY, Fraction(nMoveY) / maUIScale, SFX_MAPUNIT_100TH_MM); + SetMetricValue( *m_pMtrFldMoveY, Fraction(nMoveY) / maUIScale, MAP_100TH_MM); if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_ANGLE, true, &pPoolItem ) ) m_pMtrFldAngle->SetValue( static_cast<const SfxInt32Item*>( pPoolItem )->GetValue() ); @@ -133,12 +133,12 @@ void CopyDlg::Reset() long nWidth = 0L; if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_WIDTH, true, &pPoolItem ) ) nWidth = static_cast<const SfxInt32Item*>( pPoolItem )->GetValue(); - SetMetricValue( *m_pMtrFldWidth, Fraction(nWidth) / maUIScale, SFX_MAPUNIT_100TH_MM); + SetMetricValue( *m_pMtrFldWidth, Fraction(nWidth) / maUIScale, MAP_100TH_MM); long nHeight = 0L; if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_HEIGHT, true, &pPoolItem ) ) nHeight = static_cast<const SfxInt32Item*>( pPoolItem )->GetValue(); - SetMetricValue( *m_pMtrFldHeight, Fraction(nHeight) / maUIScale, SFX_MAPUNIT_100TH_MM); + SetMetricValue( *m_pMtrFldHeight, Fraction(nHeight) / maUIScale, MAP_100TH_MM); if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, true, &pPoolItem ) ) { @@ -189,10 +189,10 @@ void CopyDlg::Reset() */ void CopyDlg::GetAttr( SfxItemSet& rOutAttrs ) { - long nMoveX = Fraction( GetCoreValue( *m_pMtrFldMoveX, SFX_MAPUNIT_100TH_MM) ) * maUIScale; - long nMoveY = Fraction( GetCoreValue( *m_pMtrFldMoveY, SFX_MAPUNIT_100TH_MM) ) * maUIScale; - long nHeight = Fraction( GetCoreValue( *m_pMtrFldHeight, SFX_MAPUNIT_100TH_MM) ) * maUIScale; - long nWidth = Fraction( GetCoreValue( *m_pMtrFldWidth, SFX_MAPUNIT_100TH_MM) ) * maUIScale; + long nMoveX = Fraction( GetCoreValue( *m_pMtrFldMoveX, MAP_100TH_MM) ) * maUIScale; + long nMoveY = Fraction( GetCoreValue( *m_pMtrFldMoveY, MAP_100TH_MM) ) * maUIScale; + long nHeight = Fraction( GetCoreValue( *m_pMtrFldHeight, MAP_100TH_MM) ) * maUIScale; + long nWidth = Fraction( GetCoreValue( *m_pMtrFldWidth, MAP_100TH_MM) ) * maUIScale; rOutAttrs.Put( SfxUInt16Item( ATTR_COPY_NUMBER, (sal_uInt16) m_pNumFldCopies->GetValue() ) ); rOutAttrs.Put( SfxInt32Item( ATTR_COPY_MOVE_X, nMoveX ) ); @@ -239,9 +239,9 @@ IMPL_LINK_NOARG_TYPED(CopyDlg, SetViewData, Button*, void) Rectangle aRect = mpView->GetAllMarkedRect(); SetMetricValue( *m_pMtrFldMoveX, Fraction( aRect.GetWidth() ) / - maUIScale, SFX_MAPUNIT_100TH_MM); + maUIScale, MAP_100TH_MM); SetMetricValue( *m_pMtrFldMoveY, Fraction( aRect.GetHeight() ) / - maUIScale, SFX_MAPUNIT_100TH_MM); + maUIScale, MAP_100TH_MM); // sets color attribute const SfxPoolItem* pPoolItem = nullptr; @@ -260,13 +260,13 @@ IMPL_LINK_NOARG_TYPED(CopyDlg, SetDefault, Button*, void) m_pNumFldCopies->SetValue( 1L ); long nValue = 500L; - SetMetricValue( *m_pMtrFldMoveX, Fraction(nValue) / maUIScale, SFX_MAPUNIT_100TH_MM); - SetMetricValue( *m_pMtrFldMoveY, Fraction(nValue) / maUIScale, SFX_MAPUNIT_100TH_MM); + SetMetricValue( *m_pMtrFldMoveX, Fraction(nValue) / maUIScale, MAP_100TH_MM); + SetMetricValue( *m_pMtrFldMoveY, Fraction(nValue) / maUIScale, MAP_100TH_MM); nValue = 0L; m_pMtrFldAngle->SetValue( nValue ); - SetMetricValue( *m_pMtrFldWidth, Fraction(nValue) / maUIScale, SFX_MAPUNIT_100TH_MM); - SetMetricValue( *m_pMtrFldHeight, Fraction(nValue) / maUIScale, SFX_MAPUNIT_100TH_MM); + SetMetricValue( *m_pMtrFldWidth, Fraction(nValue) / maUIScale, MAP_100TH_MM); + SetMetricValue( *m_pMtrFldHeight, Fraction(nValue) / maUIScale, MAP_100TH_MM); // set color attribute const SfxPoolItem* pPoolItem = nullptr; diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index 61c190586adf..7d945dd91e0e 100644 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -64,7 +64,7 @@ SdSnapLineDlg::SdSnapLineDlg( // determine PoolUnit SfxItemPool* pPool = rInAttrs.GetPool(); DBG_ASSERT( pPool, "Where's the Pool?" ); - SfxMapUnit ePoolUnit = pPool->GetMetric( SID_ATTR_FILL_HATCH ); + MapUnit ePoolUnit = pPool->GetMetric( SID_ATTR_FILL_HATCH ); // #i48497# Consider page origin SdrPageView* pPV = pView->GetSdrPageView(); @@ -105,8 +105,8 @@ SdSnapLineDlg::SdSnapLineDlg( nYValue = static_cast<const SfxInt32Item&>( rInAttrs.Get(ATTR_SNAPLINE_Y)).GetValue(); nXValue = Fraction(nXValue) / aUIScale; nYValue = Fraction(nYValue) / aUIScale; - SetMetricValue( *m_pMtrFldX, nXValue, SFX_MAPUNIT_100TH_MM); - SetMetricValue( *m_pMtrFldY, nYValue, SFX_MAPUNIT_100TH_MM); + SetMetricValue( *m_pMtrFldX, nXValue, MAP_100TH_MM); + SetMetricValue( *m_pMtrFldY, nYValue, MAP_100TH_MM); m_pRbPoint->Check(); } @@ -152,8 +152,8 @@ void SdSnapLineDlg::GetAttr(SfxItemSet& rOutAttrs) else if ( m_pRbVert->IsChecked() ) eKind = SK_VERTICAL; else eKind = SK_POINT; - nXValue = Fraction( GetCoreValue( *m_pMtrFldX, SFX_MAPUNIT_100TH_MM) ) * aUIScale; - nYValue = Fraction( GetCoreValue( *m_pMtrFldY, SFX_MAPUNIT_100TH_MM) ) * aUIScale; + nXValue = Fraction( GetCoreValue( *m_pMtrFldX, MAP_100TH_MM) ) * aUIScale; + nYValue = Fraction( GetCoreValue( *m_pMtrFldY, MAP_100TH_MM) ) * aUIScale; rOutAttrs.Put(SfxAllEnumItem(ATTR_SNAPLINE_KIND, (sal_uInt16)eKind)); rOutAttrs.Put(SfxUInt32Item(ATTR_SNAPLINE_X, nXValue)); diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index df55b9652ae7..06f49290ae97 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -433,7 +433,7 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs ) if( m_pMtrFldTabstop->IsValueChangedFromSaved() ) { sal_uInt16 nWh = GetWhich( SID_ATTR_DEFTABSTOP ); - SfxMapUnit eUnit = rAttrs->GetPool()->GetMetric( nWh ); + MapUnit eUnit = rAttrs->GetPool()->GetMetric( nWh ); SfxUInt16Item aDef( nWh,(sal_uInt16)GetCoreValue( *m_pMtrFldTabstop, eUnit ) ); rAttrs->Put( aDef ); bModified = true; @@ -501,7 +501,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs ) nWhich = GetWhich( SID_ATTR_DEFTABSTOP ); if( rAttrs->GetItemState( nWhich ) >= SfxItemState::DEFAULT ) { - SfxMapUnit eUnit = rAttrs->GetPool()->GetMetric( nWhich ); + MapUnit eUnit = rAttrs->GetPool()->GetMetric( nWhich ); const SfxUInt16Item& rItem = static_cast<const SfxUInt16Item&>(rAttrs->Get( nWhich )); SetMetricValue( *m_pMtrFldTabstop, rItem.GetValue(), eUnit ); } diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index e4edb5ef9f32..e96f5b4fe736 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -112,7 +112,7 @@ private: OUString aInfo1; OUString aInfo2; - SfxMapUnit ePoolUnit; + MapUnit ePoolUnit; static OUString GetScale( sal_Int32 nX, sal_Int32 nY ); static bool SetScale( const OUString& aScale, sal_Int32& rX, sal_Int32& rY ); diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx index 7e67f5e04cee..6bdac4a8ba78 100644 --- a/sd/source/ui/sidebar/SlideBackground.hxx +++ b/sd/source/ui/sidebar/SlideBackground.hxx @@ -114,7 +114,7 @@ private: bool mbTitle; SfxBindings* mpBindings; - SfxMapUnit meUnit; + MapUnit meUnit; DECL_LINK_TYPED(FillBackgroundHdl, ListBox&, void); DECL_LINK_TYPED(FillStyleModifyHdl, ListBox&, void); diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 58d79806ca64..ec2764825c76 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -1523,7 +1523,7 @@ bool View::PasteRTFTable( const ::tools::SvRef<SotStorageStream>& xStm, SdrPage* { std::unique_ptr<SdDrawDocument> pModel(new SdDrawDocument( DOCUMENT_TYPE_IMPRESS, mpDocSh )); pModel->NewOrLoadCompleted(NEW_DOC); - pModel->GetItemPool().SetDefaultMetric(SFX_MAPUNIT_100TH_MM); + pModel->GetItemPool().SetDefaultMetric(MAP_100TH_MM); pModel->InsertPage(pModel->AllocPage(false)); Reference< XComponent > xComponent( new SdXImpressDocument( pModel.get(), true ) ); diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 4b184618c87d..d2d4f64a0836 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -205,7 +205,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert } sal_uInt16 nWhich = rSet.GetPool()->GetWhich(nSlotId); - bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP ); + bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == MAP_TWIP ); pItem->SetWhich( nWhich ); sal_uInt16 nSubCount = pType->nAttribs; @@ -322,7 +322,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert } sal_uInt16 nWhich = rSet.GetPool()->GetWhich(rArg.nSlotId); - bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP ); + bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == MAP_TWIP ); pItem->SetWhich( nWhich ); const SfxType* pType = rArg.pType; sal_uInt16 nSubCount = pType->nAttribs; @@ -1273,7 +1273,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b { // slot is a property sal_uInt16 nWhich = rSet.GetPool()->GetWhich(nSlotId); - bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP ); + bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == MAP_TWIP ); const SfxPoolItem* pItem = rSet.GetItem<SfxPoolItem>(nWhich, false); if ( pItem ) //??? { @@ -1325,7 +1325,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b { const SfxFormalArgument &rArg = pSlot->GetFormalArgument( nArg ); sal_uInt16 nWhich = rSet.GetPool()->GetWhich( rArg.nSlotId ); - bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP ); + bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == MAP_TWIP ); const SfxPoolItem* pItem = rSet.GetItem<SfxPoolItem>(nWhich, false); if ( pItem ) //??? { diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index f68d77cac509..e7bea262ed20 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -94,10 +94,10 @@ bool SfxEventNamesItem::operator==( const SfxPoolItem& rAttr ) const } bool SfxEventNamesItem::GetPresentation( SfxItemPresentation, - SfxMapUnit, - SfxMapUnit, - OUString &rText, - const IntlWrapper* ) const + MapUnit, + MapUnit, + OUString &rText, + const IntlWrapper* ) const { rText.clear(); return false; diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx index aee8676a5225..29e6eaf28d6a 100644 --- a/sfx2/source/control/ctrlitem.cxx +++ b/sfx2/source/control/ctrlitem.cxx @@ -302,7 +302,7 @@ SfxItemState SfxControllerItem::GetItemState } -SfxMapUnit SfxControllerItem::GetCoreMetric() const +MapUnit SfxControllerItem::GetCoreMetric() const /* [Description] @@ -341,7 +341,7 @@ SfxMapUnit SfxControllerItem::GetCoreMetric() const } SAL_INFO( "sfx.control", "W1: Can not find ItemPool!" ); - return SFX_MAPUNIT_100TH_MM; + return MAP_100TH_MM; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index c464fba861a0..c959816ed449 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -2139,7 +2139,7 @@ SfxItemState SfxDispatcher::QueryState( sal_uInt16 nSID, css::uno::Any& rAny ) sal_uInt16 nSubId( 0 ); SfxItemPool& rPool = pShell->GetPool(); sal_uInt16 nWhich = rPool.GetWhich( nSID ); - if ( rPool.GetMetric( nWhich ) == SFX_MAPUNIT_TWIP ) + if ( rPool.GetMetric( nWhich ) == MAP_TWIP ) nSubId |= CONVERT_TWIPS; pItem->QueryValue( aState, (sal_uInt8)nSubId ); } diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index c7d4a88ea236..9c3ed15f5dd4 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -426,7 +426,7 @@ void SfxDispatchController_Impl::addParametersToArgs( const css::util::URL& aURL } } -SfxMapUnit SfxDispatchController_Impl::GetCoreMetric( SfxItemPool& rPool, sal_uInt16 nSlotId ) +MapUnit SfxDispatchController_Impl::GetCoreMetric( SfxItemPool& rPool, sal_uInt16 nSlotId ) { sal_uInt16 nWhich = rPool.GetWhich( nSlotId ); return rPool.GetMetric( nWhich ); @@ -665,7 +665,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const css::util::URL& aURL, bool bSuccess = false; const SfxPoolItem* pItem = nullptr; - SfxMapUnit eMapUnit( SFX_MAPUNIT_100TH_MM ); + MapUnit eMapUnit( MAP_100TH_MM ); // Extra scope so that aInternalSet is destroyed before // rListener->dispatchFinished potentially calls @@ -775,7 +775,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const css::util::URL& aURL, if ( bSuccess && pItem && dynamic_cast< const SfxVoidItem *>( pItem ) == nullptr ) { sal_uInt16 nSubId( 0 ); - if ( eMapUnit == SFX_MAPUNIT_TWIP ) + if ( eMapUnit == MAP_TWIP ) nSubId |= CONVERT_TWIPS; pItem->QueryValue( aEvent.Result, (sal_uInt8)nSubId ); } @@ -892,7 +892,7 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt { // Retrieve metric from pool to have correct sub ID when calling QueryValue sal_uInt16 nSubId( 0 ); - SfxMapUnit eMapUnit( SFX_MAPUNIT_100TH_MM ); + MapUnit eMapUnit( MAP_100TH_MM ); // retrieve the core metric // it's enough to check the objectshell, the only shell that does not use the pool of the document @@ -906,7 +906,7 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt eMapUnit = GetCoreMetric( pShell->GetPool(), nSID ); } - if ( eMapUnit == SFX_MAPUNIT_TWIP ) + if ( eMapUnit == MAP_TWIP ) nSubId |= CONVERT_TWIPS; pState->QueryValue( aState, (sal_uInt8)nSubId ); diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index fb99cd388d5e..60476b8ca155 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -311,7 +311,7 @@ void SfxManageStyleSheetPage::SetDescriptionText_Impl() */ { - SfxMapUnit eUnit = SFX_MAPUNIT_CM; + MapUnit eUnit = MAP_CM; FieldUnit eFieldUnit( FUNIT_CM ); SfxModule* pModule = SfxModule::GetActiveModule(); if ( pModule ) @@ -323,15 +323,15 @@ void SfxManageStyleSheetPage::SetDescriptionText_Impl() switch ( eFieldUnit ) { - case FUNIT_MM: eUnit = SFX_MAPUNIT_MM; break; + case FUNIT_MM: eUnit = MAP_MM; break; case FUNIT_CM: case FUNIT_M: - case FUNIT_KM: eUnit = SFX_MAPUNIT_CM; break; + case FUNIT_KM: eUnit = MAP_CM; break; case FUNIT_POINT: - case FUNIT_PICA: eUnit = SFX_MAPUNIT_POINT; break; + case FUNIT_PICA: eUnit = MAP_POINT; break; case FUNIT_INCH: case FUNIT_FOOT: - case FUNIT_MILE: eUnit = SFX_MAPUNIT_INCH; break; + case FUNIT_MILE: eUnit = MAP_INCH; break; default: OSL_FAIL( "non supported field unit" ); diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index fc62eb2f2006..4a3219663935 100644 --- a/svl/source/inc/poolio.hxx +++ b/svl/source/inc/poolio.hxx @@ -106,7 +106,7 @@ struct SfxItemPool_Impl sal_uInt16 nVerStart, nVerEnd; // WhichRange in versions sal_uInt16 nStoringStart, nStoringEnd; // Range to be saved sal_uInt8 nMajorVer, nMinorVer; // The Pool itself - SfxMapUnit eDefMetric; + MapUnit eDefMetric; bool bInSetItem; bool bStreaming; // in Load() or Store() bool mbPersistentRefCounts; @@ -131,7 +131,7 @@ struct SfxItemPool_Impl , nStoringEnd(0) , nMajorVer(0) , nMinorVer(0) - , eDefMetric(SFX_MAPUNIT_CM) + , eDefMetric(MAP_CM) , bInSetItem(false) , bStreaming(false) , mbPersistentRefCounts(false) diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index 6f1bd0512ce3..f17ce3c1eb55 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.cxx @@ -37,8 +37,8 @@ bool SfxEnumItemInterface::operator ==(const SfxPoolItem & rItem) const } // virtual -bool SfxEnumItemInterface::GetPresentation(SfxItemPresentation, SfxMapUnit, - SfxMapUnit, OUString & rText, +bool SfxEnumItemInterface::GetPresentation(SfxItemPresentation, MapUnit, + MapUnit, OUString & rText, const IntlWrapper *) const { rText = OUString::number( GetEnumValue() ); @@ -167,7 +167,7 @@ bool SfxBoolItem::operator ==(const SfxPoolItem & rItem) const // virtual bool SfxBoolItem::GetPresentation(SfxItemPresentation, - SfxMapUnit, SfxMapUnit, + MapUnit, MapUnit, OUString & rText, const IntlWrapper *) const { diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx index 6d30f4a44dd6..0ce5f256f32f 100644 --- a/svl/source/items/cintitem.cxx +++ b/svl/source/items/cintitem.cxx @@ -32,10 +32,9 @@ bool CntByteItem::operator ==(const SfxPoolItem & rItem) const } // virtual -bool CntByteItem::GetPresentation(SfxItemPresentation, - SfxMapUnit, SfxMapUnit, - OUString & rText, - const IntlWrapper *) const +bool CntByteItem::GetPresentation(SfxItemPresentation, MapUnit, MapUnit, + OUString & rText, + const IntlWrapper *) const { rText = OUString::number( m_nValue ); return true; @@ -104,9 +103,9 @@ bool CntUInt16Item::operator ==(const SfxPoolItem & rItem) const // virtual bool CntUInt16Item::GetPresentation(SfxItemPresentation, - SfxMapUnit, SfxMapUnit, - OUString & rText, - const IntlWrapper *) + MapUnit, MapUnit, + OUString & rText, + const IntlWrapper *) const { rText = OUString::number( m_nValue ); @@ -174,9 +173,9 @@ bool CntInt32Item::operator ==(const SfxPoolItem & rItem) const // virtual bool CntInt32Item::GetPresentation(SfxItemPresentation, - SfxMapUnit, SfxMapUnit, - OUString & rText, - const IntlWrapper *) const + MapUnit, MapUnit, + OUString & rText, + const IntlWrapper *) const { rText = OUString::number( m_nValue ); return true; @@ -243,9 +242,9 @@ bool CntUInt32Item::operator ==(const SfxPoolItem & rItem) const // virtual bool CntUInt32Item::GetPresentation(SfxItemPresentation, - SfxMapUnit, SfxMapUnit, - OUString & rText, - const IntlWrapper *) + MapUnit, MapUnit, + OUString & rText, + const IntlWrapper *) const { rText = OUString::number(m_nValue); diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx index 82b779bf4384..e01703bef86a 100644 --- a/svl/source/items/ctypeitm.cxx +++ b/svl/source/items/ctypeitm.cxx @@ -115,8 +115,8 @@ void CntContentTypeItem::SetValue( const OUString& rNewVal ) bool CntContentTypeItem::GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, + MapUnit eCoreMetric, + MapUnit ePresMetric, OUString & rText, const IntlWrapper * pIntlWrapper) const { diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx index 9f84dc32a0e6..c9f63d2e1e5d 100644 --- a/svl/source/items/custritm.cxx +++ b/svl/source/items/custritm.cxx @@ -36,8 +36,8 @@ bool CntUnencodedStringItem::operator ==(const SfxPoolItem & rItem) const } // virtual -bool CntUnencodedStringItem::GetPresentation(SfxItemPresentation, SfxMapUnit, - SfxMapUnit, OUString & rText, +bool CntUnencodedStringItem::GetPresentation(SfxItemPresentation, MapUnit, + MapUnit, OUString & rText, const IntlWrapper *) const { rText = m_aValue; diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx index c5934897b9a2..e22c2888cb58 100644 --- a/svl/source/items/flagitem.cxx +++ b/svl/source/items/flagitem.cxx @@ -47,8 +47,8 @@ SvStream& SfxFlagItem::Store(SvStream &rStream, sal_uInt16) const bool SfxFlagItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, - SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, + MapUnit /*eCoreMetric*/, + MapUnit /*ePresentationMetric*/, OUString& rText, const IntlWrapper * ) const diff --git a/svl/source/items/int64item.cxx b/svl/source/items/int64item.cxx index ed5f7889b4c9..6cfc0036c619 100644 --- a/svl/source/items/int64item.cxx +++ b/svl/source/items/int64item.cxx @@ -34,7 +34,7 @@ bool SfxInt64Item::operator== ( const SfxPoolItem& rItem ) const } bool SfxInt64Item::GetPresentation( - SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString& rText, + SfxItemPresentation, MapUnit, MapUnit, OUString& rText, const IntlWrapper* /*pIntlWrapper*/ ) const { rText = OUString::number(mnValue); diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index e6795e93f951..2b63937dc116 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -66,7 +66,7 @@ bool SfxInt16Item::operator ==(const SfxPoolItem & rItem) const // virtual bool SfxInt16Item::GetPresentation(SfxItemPresentation, - SfxMapUnit, SfxMapUnit, + MapUnit, MapUnit, OUString & rText, const IntlWrapper *) const { diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index fbbfcea51db3..4cb9ccebabbd 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -175,7 +175,7 @@ SfxItemPool::SfxItemPool pItemInfos(pInfo), pImpl( new SfxItemPool_Impl( this, rName, nStartWhich, nEndWhich ) ) { - pImpl->eDefMetric = SFX_MAPUNIT_TWIP; + pImpl->eDefMetric = MAP_TWIP; pImpl->nVersion = 0; pImpl->bStreaming = false; pImpl->nLoadingVersion = 0; @@ -445,13 +445,13 @@ void SfxItemPool::SetItemInfos(SfxItemInfo const*const pInfo) } -SfxMapUnit SfxItemPool::GetMetric( sal_uInt16 ) const +MapUnit SfxItemPool::GetMetric( sal_uInt16 ) const { return pImpl->eDefMetric; } -void SfxItemPool::SetDefaultMetric( SfxMapUnit eNewMetric ) +void SfxItemPool::SetDefaultMetric( MapUnit eNewMetric ) { pImpl->eDefMetric = eNewMetric; } @@ -465,7 +465,7 @@ const OUString& SfxItemPool::GetName() const bool SfxItemPool::GetPresentation ( const SfxPoolItem& rItem, - SfxMapUnit eMetric, + MapUnit eMetric, OUString& rText, const IntlWrapper * pIntlWrapper ) const diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx index 7a4ff58056b9..9580aab08bb4 100644 --- a/svl/source/items/macitem.cxx +++ b/svl/source/items/macitem.cxx @@ -223,8 +223,8 @@ SfxPoolItem* SvxMacroItem::Clone( SfxItemPool* ) const bool SvxMacroItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index c5595615d2d2..89ac95263969 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -180,8 +180,8 @@ SvStream& SfxPoolItem::Store(SvStream &rStream, sal_uInt16 ) const bool SfxPoolItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, // IN: how we should format - SfxMapUnit /*eCoreMetric*/, // IN: current metric of the SfxPoolItems - SfxMapUnit /*ePresentationMetric*/, // IN: target metric of the presentation + MapUnit /*eCoreMetric*/, // IN: current metric of the SfxPoolItems + MapUnit /*ePresentationMetric*/, // IN: target metric of the presentation OUString& /*rText*/, // OUT: textual representation const IntlWrapper * ) const @@ -230,8 +230,8 @@ bool SfxVoidItem::operator==( const SfxPoolItem& rCmp ) const bool SfxVoidItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, - SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, + MapUnit /*eCoreMetric*/, + MapUnit /*ePresentationMetric*/, OUString& rText, const IntlWrapper * ) const diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx index 4f1dee4a9bbf..cdfcb448c7f6 100644 --- a/svl/source/items/ptitem.cxx +++ b/svl/source/items/ptitem.cxx @@ -56,8 +56,8 @@ SfxPointItem::SfxPointItem( const SfxPointItem& rItem ) : bool SfxPointItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, - SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, + MapUnit /*eCoreMetric*/, + MapUnit /*ePresentationMetric*/, OUString& rText, const IntlWrapper * ) const diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx index 57e7827423be..b1f14e4546a8 100644 --- a/svl/source/items/rectitem.cxx +++ b/svl/source/items/rectitem.cxx @@ -53,8 +53,8 @@ SfxRectangleItem::SfxRectangleItem( const SfxRectangleItem& rItem ) : bool SfxRectangleItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, - SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, + MapUnit /*eCoreMetric*/, + MapUnit /*ePresentationMetric*/, OUString& rText, const IntlWrapper * ) const diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx index 7a0e2d1f69ad..467439ab66c9 100644 --- a/svl/source/items/rngitem.cxx +++ b/svl/source/items/rngitem.cxx @@ -50,8 +50,8 @@ SfxRangeItem::SfxRangeItem( const SfxRangeItem& rItem ) : bool SfxRangeItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, - SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, + MapUnit /*eCoreMetric*/, + MapUnit /*ePresentationMetric*/, OUString& rText, const IntlWrapper * ) const @@ -138,18 +138,16 @@ bool SfxUShortRangesItem::operator==( const SfxPoolItem &rItem ) const return !_pRanges[n] && !rOther._pRanges[n]; } - bool SfxUShortRangesItem::GetPresentation( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresMetric*/, - OUString & /*rText*/, - const IntlWrapper * ) const + MapUnit /*eCoreMetric*/, + MapUnit /*ePresMetric*/, + OUString & /*rText*/, + const IntlWrapper * ) const { // not implemented return false; } - SfxPoolItem* SfxUShortRangesItem::Clone( SfxItemPool * ) const { return new SfxUShortRangesItem( *this ); diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx index 79473821671f..f82d5099ebc4 100644 --- a/svl/source/items/sitem.cxx +++ b/svl/source/items/sitem.cxx @@ -59,9 +59,9 @@ bool SfxSetItem::operator==( const SfxPoolItem& rCmp) const bool SfxSetItem::GetPresentation ( - SfxItemPresentation /*ePresentation*/, - SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, + SfxItemPresentation /*ePresentation*/, + MapUnit /*eCoreMetric*/, + MapUnit /*ePresentationMetric*/, OUString& /*rText*/, const IntlWrapper * ) const diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index e66c4ae18c28..5d4ccae725b1 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -117,8 +117,8 @@ bool SfxStringListItem::operator==( const SfxPoolItem& rItem ) const bool SfxStringListItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, - SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, + MapUnit /*eCoreMetric*/, + MapUnit /*ePresentationMetric*/, OUString& rText, const IntlWrapper * ) const diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index f26597fc61d7..7cdcea9e3f20 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -284,8 +284,8 @@ bool SvxSearchItem::operator==( const SfxPoolItem& rItem ) const bool SvxSearchItem::GetPresentation ( SfxItemPresentation , - SfxMapUnit , - SfxMapUnit , + MapUnit , + MapUnit , OUString& , const IntlWrapper * ) const diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 1c04d7bf4bc8..9e69c302a478 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -340,7 +340,7 @@ bool SfxStyleSheetBase::IsUsed() const /** * Return set attributes */ -OUString SfxStyleSheetBase::GetDescription( SfxMapUnit eMetric ) +OUString SfxStyleSheetBase::GetDescription( MapUnit eMetric ) { SfxItemIter aIter( GetItemSet() ); OUString aDesc; diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx index ee4b77e25aeb..8a8db4fe4720 100644 --- a/svl/source/items/szitem.cxx +++ b/svl/source/items/szitem.cxx @@ -45,8 +45,8 @@ SfxSizeItem::SfxSizeItem( const SfxSizeItem& rItem ) : bool SfxSizeItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, - SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, + MapUnit /*eCoreMetric*/, + MapUnit /*ePresentationMetric*/, OUString& rText, const IntlWrapper * ) const diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx index 99f3ca4fbac0..da59348b3550 100644 --- a/svl/source/items/visitem.cxx +++ b/svl/source/items/visitem.cxx @@ -41,9 +41,9 @@ bool SfxVisibilityItem::operator ==(const SfxPoolItem & rItem) const // virtual bool SfxVisibilityItem::GetPresentation(SfxItemPresentation, - SfxMapUnit, SfxMapUnit, - OUString & rText, - const IntlWrapper *) const + MapUnit, MapUnit, + OUString & rText, + const IntlWrapper *) const { rText = GetValueTextByVal(m_nValue.bVisible); return true; diff --git a/svtools/source/misc/unitconv.cxx b/svtools/source/misc/unitconv.cxx index e710e8d254f5..250ac3b96438 100644 --- a/svtools/source/misc/unitconv.cxx +++ b/svtools/source/misc/unitconv.cxx @@ -109,7 +109,7 @@ void SetFieldUnit( MetricBox& rBox, FieldUnit eUnit ) } -void SetMetricValue( MetricField& rField, long nCoreValue, SfxMapUnit eUnit ) +void SetMetricValue( MetricField& rField, long nCoreValue, MapUnit eUnit ) { sal_Int64 nVal = OutputDevice::LogicToLogic( nCoreValue, (MapUnit)eUnit, MAP_100TH_MM ); nVal = rField.Normalize( nVal ); @@ -118,7 +118,7 @@ void SetMetricValue( MetricField& rField, long nCoreValue, SfxMapUnit eUnit ) } -long GetCoreValue( const MetricField& rField, SfxMapUnit eUnit ) +long GetCoreValue( const MetricField& rField, MapUnit eUnit ) { sal_Int64 nVal = rField.GetValue( FUNIT_100TH_MM ); // avoid rounding issues @@ -143,27 +143,27 @@ long GetCoreValue( const MetricField& rField, SfxMapUnit eUnit ) } -long CalcToUnit( float nIn, SfxMapUnit eUnit ) +long CalcToUnit( float nIn, MapUnit eUnit ) { // nIn ist in Points - DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP || - eUnit == SFX_MAPUNIT_100TH_MM || - eUnit == SFX_MAPUNIT_10TH_MM || - eUnit == SFX_MAPUNIT_MM || - eUnit == SFX_MAPUNIT_CM, "this unit is not implemented" ); + DBG_ASSERT( eUnit == MAP_TWIP || + eUnit == MAP_100TH_MM || + eUnit == MAP_10TH_MM || + eUnit == MAP_MM || + eUnit == MAP_CM, "this unit is not implemented" ); float nTmp = nIn; - if ( SFX_MAPUNIT_TWIP != eUnit ) + if ( MAP_TWIP != eUnit ) nTmp = nIn * 10 / 567; switch ( eUnit ) { - case SFX_MAPUNIT_100TH_MM: nTmp *= 100; break; - case SFX_MAPUNIT_10TH_MM: nTmp *= 10; break; - case SFX_MAPUNIT_MM: break; - case SFX_MAPUNIT_CM: nTmp /= 10; break; + case MAP_100TH_MM: nTmp *= 100; break; + case MAP_10TH_MM: nTmp *= 10; break; + case MAP_MM: break; + case MAP_CM: nTmp /= 10; break; default: ;//prevent warning } @@ -174,52 +174,52 @@ long CalcToUnit( float nIn, SfxMapUnit eUnit ) } -long ItemToControl( long nIn, SfxMapUnit eItem, FieldUnit eCtrl ) +long ItemToControl( long nIn, MapUnit eItem, FieldUnit eCtrl ) { long nOut = 0; switch ( eItem ) { - 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: { - if ( eItem == SFX_MAPUNIT_10TH_MM ) + if ( eItem == MAP_10TH_MM ) nIn /= 10; - else if ( eItem == SFX_MAPUNIT_100TH_MM ) + else if ( eItem == MAP_100TH_MM ) nIn /= 100; nOut = TransformMetric( nIn, FUNIT_MM, eCtrl ); } break; - case SFX_MAPUNIT_CM: + case MAP_CM: { nOut = TransformMetric( nIn, FUNIT_CM, eCtrl ); } 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: { - if ( eItem == SFX_MAPUNIT_10TH_INCH ) + if ( eItem == MAP_10TH_INCH ) nIn /= 10; - else if ( eItem == SFX_MAPUNIT_100TH_INCH ) + else if ( eItem == MAP_100TH_INCH ) nIn /= 100; - else if ( eItem == SFX_MAPUNIT_1000TH_INCH ) + else if ( eItem == MAP_1000TH_INCH ) nIn /= 1000; nOut = TransformMetric( nIn, FUNIT_INCH, eCtrl ); } break; - case SFX_MAPUNIT_POINT: + case MAP_POINT: { nOut = TransformMetric( nIn, FUNIT_POINT, eCtrl ); } break; - case SFX_MAPUNIT_TWIP: + case MAP_TWIP: { nOut = TransformMetric( nIn, FUNIT_TWIP, eCtrl ); } @@ -230,34 +230,34 @@ long ItemToControl( long nIn, SfxMapUnit eItem, FieldUnit eCtrl ) } -long ControlToItem( long nIn, FieldUnit eCtrl, SfxMapUnit eItem ) +long ControlToItem( long nIn, FieldUnit eCtrl, MapUnit eItem ) { return ItemToControl( nIn, eItem, eCtrl ); } -FieldUnit MapToFieldUnit( const SfxMapUnit eUnit ) +FieldUnit MapToFieldUnit( const MapUnit eUnit ) { 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: return FUNIT_MM; - case SFX_MAPUNIT_CM: + case MAP_CM: return FUNIT_CM; - 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: return FUNIT_INCH; - case SFX_MAPUNIT_POINT: + case MAP_POINT: return FUNIT_POINT; - case SFX_MAPUNIT_TWIP: + case MAP_TWIP: return FUNIT_TWIP; default: ;//prevent warning } @@ -265,32 +265,32 @@ FieldUnit MapToFieldUnit( const SfxMapUnit eUnit ) } -long CalcToPoint( long nIn, SfxMapUnit eUnit, sal_uInt16 nFactor ) +long CalcToPoint( long nIn, MapUnit eUnit, sal_uInt16 nFactor ) { - DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP || - eUnit == SFX_MAPUNIT_100TH_MM || - eUnit == SFX_MAPUNIT_10TH_MM || - eUnit == SFX_MAPUNIT_MM || - eUnit == SFX_MAPUNIT_CM, "this unit is not implemented" ); + DBG_ASSERT( eUnit == MAP_TWIP || + eUnit == MAP_100TH_MM || + eUnit == MAP_10TH_MM || + eUnit == MAP_MM || + eUnit == MAP_CM, "this unit is not implemented" ); long nRet = 0; - if ( SFX_MAPUNIT_TWIP == eUnit ) + if ( MAP_TWIP == eUnit ) nRet = nIn; else nRet = nIn * 567; switch ( eUnit ) { - case SFX_MAPUNIT_100TH_MM: nRet /= 100; break; - case SFX_MAPUNIT_10TH_MM: nRet /= 10; break; - case SFX_MAPUNIT_MM: break; - case SFX_MAPUNIT_CM: nRet *= 10; break; + case MAP_100TH_MM: nRet /= 100; break; + case MAP_10TH_MM: nRet /= 10; break; + case MAP_MM: break; + case MAP_CM: nRet *= 10; break; default: ;//prevent warning } // ggf. aufrunden - if ( SFX_MAPUNIT_TWIP != eUnit ) + if ( MAP_TWIP != eUnit ) { long nMod = 10; long nTmp = nRet % nMod; 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 { diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index 0e1e95965f8e..1eebe05d3988 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -127,7 +127,7 @@ public: virtual bool HasFollowSupport() const override; virtual bool HasParentSupport() const override; virtual bool HasClearParentSupport() const override; - virtual OUString GetDescription(SfxMapUnit eUnit) override; + virtual OUString GetDescription(MapUnit eUnit) override; SwCharFormat* GetCharFormat(); SwTextFormatColl* GetCollection(); diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index a7d4861a8fe5..5c631f76ed1e 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -52,10 +52,10 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx index bd260372b1e8..2dad3cb1aba3 100644 --- a/sw/inc/fmtanchr.hxx +++ b/sw/inc/fmtanchr.hxx @@ -54,10 +54,10 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx index 4fb85b4c24e0..b3fbbc0957ba 100644 --- a/sw/inc/fmtautofmt.hxx +++ b/sw/inc/fmtautofmt.hxx @@ -45,10 +45,10 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index 9f6a28903ad1..85d7ead78e3a 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -100,10 +100,10 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx index 18b02ce24081..78bc27a487e5 100644 --- a/sw/inc/fmtcnct.hxx +++ b/sw/inc/fmtcnct.hxx @@ -43,10 +43,10 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx index cef3224b303a..f90ba26f3f12 100644 --- a/sw/inc/fmteiro.hxx +++ b/sw/inc/fmteiro.hxx @@ -35,10 +35,10 @@ public: /// "pure virtual methos" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx index 031ef84df697..ef73d87c4271 100644 --- a/sw/inc/fmtfollowtextflow.hxx +++ b/sw/inc/fmtfollowtextflow.hxx @@ -36,10 +36,10 @@ public: /// "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx index e58cdda00d68..944367fe812d 100644 --- a/sw/inc/fmtfsize.hxx +++ b/sw/inc/fmtfsize.hxx @@ -68,10 +68,10 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx index 879c561d61bd..dfd48139ee1a 100644 --- a/sw/inc/fmtftntx.hxx +++ b/sw/inc/fmtftntx.hxx @@ -60,10 +60,10 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; inline bool IsAtEnd() const { return FTNEND_ATPGORDOCEND != GetValue(); } diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx index c78cb01581d2..07390d66234e 100644 --- a/sw/inc/fmthdft.hxx +++ b/sw/inc/fmthdft.hxx @@ -47,10 +47,10 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; const SwFrameFormat *GetHeaderFormat() const { return static_cast<const SwFrameFormat*>(GetRegisteredIn()); } SwFrameFormat *GetHeaderFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); } @@ -78,10 +78,10 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; const SwFrameFormat *GetFooterFormat() const { return static_cast<const SwFrameFormat*>(GetRegisteredIn()); } SwFrameFormat *GetFooterFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); } diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx index 7515b85f2c42..81e28973e1b8 100644 --- a/sw/inc/fmtinfmt.hxx +++ b/sw/inc/fmtinfmt.hxx @@ -54,10 +54,10 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx index 64f0f9a6f6d9..0560fa8c48f5 100644 --- a/sw/inc/fmtline.hxx +++ b/sw/inc/fmtline.hxx @@ -41,10 +41,10 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx index 112da9ba567c..74ce7b32894c 100644 --- a/sw/inc/fmtlsplt.hxx +++ b/sw/inc/fmtlsplt.hxx @@ -34,10 +34,10 @@ public: /// "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; }; inline const SwFormatLayoutSplit &SwAttrSet::GetLayoutSplit(bool bInP) const diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx index b18ba45894fa..e713207c2647 100644 --- a/sw/inc/fmtornt.hxx +++ b/sw/inc/fmtornt.hxx @@ -44,8 +44,8 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, + MapUnit eCoreMetric, + MapUnit ePresMetric, OUString &rText, const IntlWrapper* pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -80,10 +80,10 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index e62120fdc759..933e2d896499 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -57,10 +57,10 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx index 58c601461bbb..f5370f0ecab3 100644 --- a/sw/inc/fmtrowsplt.hxx +++ b/sw/inc/fmtrowsplt.hxx @@ -34,10 +34,10 @@ public: // "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; }; inline const SwFormatRowSplit &SwAttrSet::GetRowSplit(bool bInP) const diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx index 8f8b68515a69..437a1d3d63db 100644 --- a/sw/inc/fmtruby.hxx +++ b/sw/inc/fmtruby.hxx @@ -46,10 +46,10 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx index b628a9408d21..cc9bce7b6449 100644 --- a/sw/inc/fmtsrnd.hxx +++ b/sw/inc/fmtsrnd.hxx @@ -43,10 +43,10 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual sal_uInt16 GetValueCount() const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx index b1de04e06685..9f338f9a9fb0 100644 --- a/sw/inc/fmturl.hxx +++ b/sw/inc/fmturl.hxx @@ -52,10 +52,10 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 747c6a8b448d..66e61cf662e1 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -153,7 +153,7 @@ public: /// Get attribute-description. Returns passed string. void GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText ) const + MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText ) const { m_aSet.GetPresentation( ePres, eCoreMetric, ePresMetric, rText ); } /// Format-ID for reading/writing: diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index d4aa180dcddc..90838c359647 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -58,10 +58,10 @@ public: virtual sal_uInt16 GetValueCount() const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -105,10 +105,10 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, @@ -127,10 +127,10 @@ public: // pure virtual methods from SfxInt16Item virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; }; class SW_DLLPUBLIC SwContrastGrf : public SfxInt16Item @@ -143,10 +143,10 @@ public: // pure virtual methods from SfxInt16Item virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; }; class SwChannelGrf : public SfxInt16Item @@ -159,10 +159,10 @@ protected: public: // pure virtual methods from SfxInt16Item virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; }; class SwChannelRGrf : public SwChannelGrf @@ -211,10 +211,10 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -235,10 +235,10 @@ public: // pure virtual methods from SfxInt16Item virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; }; class SwTransparencyGrf : public SfxByteItem @@ -251,10 +251,10 @@ public: // pure virtual methods from SfxInt16Item virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, @@ -274,10 +274,10 @@ public: // pure virtual methods of SfxEnumItem virtual sal_uInt16 GetValueCount() const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx index 3822ee3edd84..137133d6a4ad 100644 --- a/sw/inc/hfspacingitem.hxx +++ b/sw/inc/hfspacingitem.hxx @@ -34,10 +34,10 @@ public: // "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; }; inline const SwHeaderAndFooterEatSpacingItem &SwAttrSet::GetHeaderAndFooterEatSpacing(bool bInP) const diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index 347130772796..7aed926aeed0 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -79,10 +79,10 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -123,10 +123,10 @@ public: /// "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; }; inline SwRegisterItem::SwRegisterItem( const bool bRegister ) : @@ -161,10 +161,10 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -184,10 +184,10 @@ public: /// "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; }; inline SwParaConnectBorderItem::SwParaConnectBorderItem( const bool bConnect ) : diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx index af96f2d2ba8b..13bc7bc8d2b7 100644 --- a/sw/inc/swatrset.hxx +++ b/sw/inc/swatrset.hxx @@ -197,7 +197,7 @@ public: int Intersect_BC( const SfxItemSet& rSet, SwAttrSet* pOld, SwAttrSet* pNew ); void GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText ) const; + MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText ) const; SwAttrPool* GetPool() const { return static_cast<SwAttrPool*>(SfxItemSet::GetPool()); } diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx index fa54460edec4..73802995ea12 100644 --- a/sw/inc/tgrditem.hxx +++ b/sw/inc/tgrditem.hxx @@ -54,10 +54,10 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index dec139daf86a..965114975d72 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -1601,7 +1601,7 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt, { OUString aStr; GetDoc()->GetAttrPool().GetPresentation( *pItem, - SFX_MAPUNIT_CM, aStr ); + MAP_CM, aStr ); if (!sAttrs.isEmpty()) sAttrs += ", "; sAttrs += aStr; diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx index 333e26bb1617..b52b9f07b15a 100644 --- a/sw/source/core/doc/fmtcol.cxx +++ b/sw/source/core/doc/fmtcol.cxx @@ -284,7 +284,7 @@ void SwTextFormatColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew pFSize != pOldFSize ) { if( 100 == pOldFSize->GetProp() && - SFX_MAPUNIT_RELATIVE == pOldFSize->GetPropUnit() ) + MAP_RELATIVE == pOldFSize->GetPropUnit() ) { // We set it to absolute -> do not propagate it further, unless // we set it! diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 3bc70aba25ef..9a6830e416c3 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -1280,7 +1280,7 @@ void SwFormatSurround::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())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("bAnchorOnly"), BAD_CAST(OString::boolean(bAnchorOnly).getStr())); @@ -1733,7 +1733,7 @@ void SwFormatAnchor::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nOrder"), BAD_CAST(OString::number(mnOrder).getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nOrderCounter"), BAD_CAST(OString::number(mnOrderCounter).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); diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 2a2e8c8caf16..cca3207d6474 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -1440,9 +1440,9 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any& { const SwDoc* pDoc = (IsDescriptor() ? m_pDoc : GetFrameFormat()->GetDoc()); const SfxItemPool& rPool = pDoc->GetAttrPool(); - const SfxMapUnit eMapUnit(rPool.GetMetric(pEntry->nWID)); + const MapUnit eMapUnit(rPool.GetMetric(pEntry->nWID)); - if(eMapUnit != SFX_MAPUNIT_100TH_MM) + if(eMapUnit != MAP_100TH_MM) { SvxUnoConvertFromMM(eMapUnit, aValue); } @@ -2346,9 +2346,9 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) { const SwDoc* pDoc = (IsDescriptor() ? m_pDoc : GetFrameFormat()->GetDoc()); const SfxItemPool& rPool = pDoc->GetAttrPool(); - const SfxMapUnit eMapUnit(rPool.GetMetric(pEntry->nWID)); + const MapUnit eMapUnit(rPool.GetMetric(pEntry->nWID)); - if(eMapUnit != SFX_MAPUNIT_100TH_MM) + if(eMapUnit != MAP_100TH_MM) { SvxUnoConvertToMM(eMapUnit, aAny); } diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index 7f7573261310..301f60a2c4c3 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -528,9 +528,9 @@ throw(uno::RuntimeException) if(bDoIt) { - const SfxMapUnit eMapUnit(rSet.GetPool()->GetMetric(rEntry.nWID)); + const MapUnit eMapUnit(rSet.GetPool()->GetMetric(rEntry.nWID)); - if(eMapUnit != SFX_MAPUNIT_100TH_MM) + if(eMapUnit != MAP_100TH_MM) { SvxUnoConvertToMM(eMapUnit, rAny); } diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 1e7ae1e46b7d..7957950f5466 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -1582,8 +1582,8 @@ sal_uInt8 lcl_TranslateMetric(const SfxItemPropertySimpleEntry& rEntry, SwDoc* p return rEntry.nMemberId & (~SFX_METRIC_ITEM); const SfxItemPool& rPool = pDoc->GetAttrPool(); - const SfxMapUnit eMapUnit(rPool.GetMetric(rEntry.nWID)); - if(eMapUnit != SFX_MAPUNIT_100TH_MM) + const MapUnit eMapUnit(rPool.GetMetric(rEntry.nWID)); + if(eMapUnit != MAP_100TH_MM) SvxUnoConvertFromMM(eMapUnit, o_aValue); return rEntry.nMemberId & (~SFX_METRIC_ITEM); } @@ -2310,13 +2310,13 @@ uno::Any SwXStyle::GetStyleProperty<HINT_BEGIN>(const SfxItemPropertySimpleEntry if(rEntry.nMemberId & SFX_METRIC_ITEM && GetDoc()) { const SfxItemPool& rPool = GetDoc()->GetAttrPool(); - const SfxMapUnit eMapUnit(rPool.GetMetric(rEntry.nWID)); + const MapUnit eMapUnit(rPool.GetMetric(rEntry.nWID)); bool bAllowedConvert(true); // exception: If these ItemTypes are used, do not convert when these are negative // since this means they are intended as percent values if(XATTR_FILLBMP_SIZEX == rEntry.nWID || XATTR_FILLBMP_SIZEY == rEntry.nWID) bAllowedConvert = !aResult.has<sal_Int32>() || aResult.get<sal_Int32>() > 0; - if(eMapUnit != SFX_MAPUNIT_100TH_MM && bAllowedConvert) + if(eMapUnit != MAP_100TH_MM && bAllowedConvert) SvxUnoConvertToMM(eMapUnit, aResult); } return aResult; @@ -3616,9 +3616,9 @@ uno::Reference< style::XAutoStyle > SwXAutoStyleFamily::insertStyle( if(bDoIt) { const SfxItemPool& rPool = m_pDocShell->GetDoc()->GetAttrPool(); - const SfxMapUnit eMapUnit(rPool.GetMetric(pEntry->nWID)); + const MapUnit eMapUnit(rPool.GetMetric(pEntry->nWID)); - if(eMapUnit != SFX_MAPUNIT_100TH_MM) + if(eMapUnit != MAP_100TH_MM) { SvxUnoConvertFromMM(eMapUnit, aValue); } @@ -4100,9 +4100,9 @@ uno::Sequence< uno::Any > SwXAutoStyle::GetPropertyValues_Impl( if(bDoIt) { const SfxItemPool& rPool = mrDoc.GetAttrPool(); - const SfxMapUnit eMapUnit(rPool.GetMetric(pEntry->nWID)); + const MapUnit eMapUnit(rPool.GetMetric(pEntry->nWID)); - if(eMapUnit != SFX_MAPUNIT_100TH_MM) + if(eMapUnit != MAP_100TH_MM) { SvxUnoConvertToMM(eMapUnit, aTarget); } diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index dd75cbe9423b..d6df1bd1eaeb 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -648,7 +648,7 @@ static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType, sal_Int32 nHeight, sal_uInt16 nFontHeightWhich) { float fSize = (float)nHeight / 10; - nHeight = CalcToUnit( fSize, SFX_MAPUNIT_TWIP ); + nHeight = CalcToUnit( fSize, MAP_TWIP ); SwTextFormatColl *pColl = pWrtShell->GetTextCollFromPool(nType); pColl->SetFormatAttr(SvxFontHeightItem(nHeight, 100, nFontHeightWhich)); } @@ -677,27 +677,27 @@ bool SwStdFontTabPage::FillItemSet( SfxItemSet* ) if(bStandardHeightChanged) { float fSize = (float)m_pStandardHeightLB->GetValue() / 10; - m_pFontConfig->SetFontHeight( CalcToUnit( fSize, SFX_MAPUNIT_TWIP ), FONT_STANDARD, m_nFontGroup ); + m_pFontConfig->SetFontHeight( CalcToUnit( fSize, MAP_TWIP ), FONT_STANDARD, m_nFontGroup ); } if(bTitleHeightChanged) { float fSize = (float)m_pTitleHeightLB->GetValue() / 10; - m_pFontConfig->SetFontHeight( CalcToUnit( fSize, SFX_MAPUNIT_TWIP ), FONT_OUTLINE, m_nFontGroup ); + m_pFontConfig->SetFontHeight( CalcToUnit( fSize, MAP_TWIP ), FONT_OUTLINE, m_nFontGroup ); } if(bListHeightChanged) { float fSize = (float)m_pListHeightLB->GetValue() / 10; - m_pFontConfig->SetFontHeight( CalcToUnit( fSize, SFX_MAPUNIT_TWIP ), FONT_LIST, m_nFontGroup ); + m_pFontConfig->SetFontHeight( CalcToUnit( fSize, MAP_TWIP ), FONT_LIST, m_nFontGroup ); } if(bLabelHeightChanged) { float fSize = (float)m_pLabelHeightLB->GetValue() / 10; - m_pFontConfig->SetFontHeight( CalcToUnit( fSize, SFX_MAPUNIT_TWIP ), FONT_CAPTION, m_nFontGroup ); + m_pFontConfig->SetFontHeight( CalcToUnit( fSize, MAP_TWIP ), FONT_CAPTION, m_nFontGroup ); } if(bIndexHeightChanged) { float fSize = (float)m_pIndexHeightLB->GetValue() / 10; - m_pFontConfig->SetFontHeight( CalcToUnit( fSize, SFX_MAPUNIT_TWIP ), FONT_INDEX, m_nFontGroup ); + m_pFontConfig->SetFontHeight( CalcToUnit( fSize, MAP_TWIP ), FONT_INDEX, m_nFontGroup ); } if(m_pWrtShell) @@ -725,7 +725,7 @@ bool SwStdFontTabPage::FillItemSet( SfxItemSet* ) if(bStandardHeightChanged) { float fSize = (float)m_pStandardHeightLB->GetValue() / 10; - m_pWrtShell->SetDefault(SvxFontHeightItem( CalcToUnit( fSize, SFX_MAPUNIT_TWIP ), 100, nFontHeightWhich ) ); + m_pWrtShell->SetDefault(SvxFontHeightItem( CalcToUnit( fSize, MAP_TWIP ), 100, nFontHeightWhich ) ); SwTextFormatColl *pColl = m_pWrtShell->GetTextCollFromPool(RES_POOLCOLL_STANDARD); pColl->ResetFormatAttr(nFontHeightWhich); bMod = true; @@ -949,11 +949,11 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet) aFontMetric = m_pFontList->Get(sIdxBackup, sIdxBackup ); m_pIndexHeightLB->Fill( &aFontMetric, m_pFontList ); - m_pStandardHeightLB->SetValue( CalcToPoint( nStandardHeight, SFX_MAPUNIT_TWIP, 10 ) ); - m_pTitleHeightLB-> SetValue( CalcToPoint( nTitleHeight , SFX_MAPUNIT_TWIP, 10 ) ); - m_pListHeightLB-> SetValue( CalcToPoint( nListHeight , SFX_MAPUNIT_TWIP, 10 ) ); - m_pLabelHeightLB-> SetValue( CalcToPoint( nLabelHeight , SFX_MAPUNIT_TWIP, 10 )); - m_pIndexHeightLB-> SetValue( CalcToPoint( nIndexHeight , SFX_MAPUNIT_TWIP, 10 )); + m_pStandardHeightLB->SetValue( CalcToPoint( nStandardHeight, MAP_TWIP, 10 ) ); + m_pTitleHeightLB-> SetValue( CalcToPoint( nTitleHeight , MAP_TWIP, 10 ) ); + m_pListHeightLB-> SetValue( CalcToPoint( nListHeight , MAP_TWIP, 10 ) ); + m_pLabelHeightLB-> SetValue( CalcToPoint( nLabelHeight , MAP_TWIP, 10 )); + m_pIndexHeightLB-> SetValue( CalcToPoint( nIndexHeight , MAP_TWIP, 10 )); m_pStandardBox->SaveValue(); m_pTitleBox->SaveValue(); @@ -985,19 +985,19 @@ IMPL_LINK_NOARG_TYPED(SwStdFontTabPage, StandardHdl, Button*, void) m_pStandardHeightLB->SetValue( CalcToPoint( SwStdFontConfig::GetDefaultHeightFor(FONT_STANDARD + nFontOffset, m_eLanguage), - SFX_MAPUNIT_TWIP, 10 ) ); + MAP_TWIP, 10 ) ); m_pTitleHeightLB ->SetValue(CalcToPoint( SwStdFontConfig::GetDefaultHeightFor(FONT_OUTLINE + - nFontOffset, m_eLanguage), SFX_MAPUNIT_TWIP, 10 )); + nFontOffset, m_eLanguage), MAP_TWIP, 10 )); m_pListHeightLB ->SetValue(CalcToPoint( SwStdFontConfig::GetDefaultHeightFor(FONT_LIST + nFontOffset, m_eLanguage), - SFX_MAPUNIT_TWIP, 10 )); + MAP_TWIP, 10 )); m_pLabelHeightLB ->SetValue(CalcToPoint( SwStdFontConfig::GetDefaultHeightFor(FONT_CAPTION + nFontOffset, m_eLanguage), - SFX_MAPUNIT_TWIP, 10 )); + MAP_TWIP, 10 )); m_pIndexHeightLB ->SetValue(CalcToPoint( SwStdFontConfig::GetDefaultHeightFor(FONT_INDEX + nFontOffset, m_eLanguage), - SFX_MAPUNIT_TWIP, 10 )); + MAP_TWIP, 10 )); } IMPL_LINK_TYPED( SwStdFontTabPage, ModifyHdl, Edit&, rBox, void ) diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index 557a00af2043..73e09d5b5497 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -838,7 +838,7 @@ bool SwDocStyleSheet::HasClearParentSupport() const } // determine textual description -OUString SwDocStyleSheet::GetDescription(SfxMapUnit eUnit) +OUString SwDocStyleSheet::GetDescription(MapUnit eUnit) { IntlWrapper aIntlWrapper( SvtSysLocale().GetLanguageTag() ); diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx index a1b4414f5c66..2222ffd2e8ec 100644 --- a/sw/source/uibase/inc/uiitems.hxx +++ b/sw/source/uibase/inc/uiitems.hxx @@ -42,10 +42,10 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + MapUnit eCoreMetric, + MapUnit ePresMetric, + OUString &rText, + const IntlWrapper* pIntl = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/sw/source/uibase/sidebar/PageFormatPanel.hxx b/sw/source/uibase/sidebar/PageFormatPanel.hxx index 7d6285cc53e7..2d81bc33c431 100644 --- a/sw/source/uibase/sidebar/PageFormatPanel.hxx +++ b/sw/source/uibase/sidebar/PageFormatPanel.hxx @@ -97,7 +97,7 @@ private: std::unique_ptr<SvxLongULSpaceItem> mpPageULMarginItem; FieldUnit meFUnit, meLastFUnit; - SfxMapUnit meUnit; + MapUnit meUnit; long mnPageLeftMargin; long mnPageRightMargin; diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx index f8236a1e9039..d9dce30a3915 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.cxx +++ b/sw/source/uibase/sidebar/PageMarginControl.cxx @@ -47,7 +47,7 @@ PageMarginControl::PageMarginControl( const Size& rPageSize, const bool bLandscape, const FieldUnit eFUnit, - const SfxMapUnit eUnit ) + const MapUnit eUnit ) : svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_MARGIN) ) , mpMarginValueSet( VclPtr<svx::sidebar::ValueSetWithTextControl>::Create( svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, this, SW_RES(VS_MARGIN) ) ) , maCustom(VclPtr<FixedText>::Create(this, SW_RES(FT_CUSTOM))) diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx b/sw/source/uibase/sidebar/PageMarginControl.hxx index b064c849fdd2..25c114bf74a4 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.hxx +++ b/sw/source/uibase/sidebar/PageMarginControl.hxx @@ -60,7 +60,7 @@ public: const Size& rPageSize, const bool bLandscape, const FieldUnit eFUnit, - const SfxMapUnit eUnit ); + const MapUnit eUnit ); virtual ~PageMarginControl(); virtual void dispose() override; @@ -88,7 +88,7 @@ private: long mnPageBottomMargin; bool mbMirrored; - const SfxMapUnit meUnit; + const MapUnit meUnit; bool mbUserCustomValuesAvailable; long mnUserCustomPageLeftMargin; diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/uibase/sidebar/PagePropertyPanel.hxx index baa225714980..22452c8f3586 100644 --- a/sw/source/uibase/sidebar/PagePropertyPanel.hxx +++ b/sw/source/uibase/sidebar/PagePropertyPanel.hxx @@ -178,7 +178,7 @@ namespace sw { namespace sidebar { std::unique_ptr<SfxInt16Item> mpPageColumnTypeItem; FieldUnit meFUnit; - SfxMapUnit meUnit; + MapUnit meUnit; // controller items ::sfx2::sidebar::ControllerItem m_aSwPagePgULControl; diff --git a/sw/source/uibase/utlui/attrdesc.cxx b/sw/source/uibase/utlui/attrdesc.cxx index 6b2e3649f903..8037c8249825 100644 --- a/sw/source/uibase/utlui/attrdesc.cxx +++ b/sw/source/uibase/utlui/attrdesc.cxx @@ -63,8 +63,8 @@ using namespace com::sun::star; // query the attribute descriptions void SwAttrSet::GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, + MapUnit eCoreMetric, + MapUnit ePresMetric, OUString &rText ) const { static sal_Char const sComma[] = ", "; @@ -94,8 +94,8 @@ void SwAttrSet::GetPresentation( bool SwFormatCharFormat::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + MapUnit eCoreUnit, + MapUnit ePresUnit, OUString& rText, const IntlWrapper* /*pIntl*/ ) const @@ -116,8 +116,8 @@ bool SwFormatCharFormat::GetPresentation bool SwFormatAutoFormat::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper* /*pIntl*/ ) const @@ -129,8 +129,8 @@ bool SwFormatAutoFormat::GetPresentation bool SwFormatINetFormat::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper* /*pIntl*/ ) const @@ -140,8 +140,8 @@ bool SwFormatINetFormat::GetPresentation } bool SwFormatRuby::GetPresentation( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, - OUString &rText, const IntlWrapper* /*pIntl*/ ) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, + OUString &rText, const IntlWrapper* /*pIntl*/ ) const { rText.clear(); return true; @@ -150,8 +150,8 @@ bool SwFormatRuby::GetPresentation( SfxItemPresentation /*ePres*/, bool SwFormatDrop::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper* /*pIntl*/ ) const @@ -178,8 +178,8 @@ bool SwFormatDrop::GetPresentation bool SwRegisterItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper* /*pIntl*/ ) const @@ -192,8 +192,8 @@ bool SwRegisterItem::GetPresentation bool SwNumRuleItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper* /*pIntl*/ ) const @@ -209,8 +209,8 @@ bool SwNumRuleItem::GetPresentation bool SwParaConnectBorderItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper* /*pIntl*/ ) const @@ -225,8 +225,8 @@ bool SwParaConnectBorderItem::GetPresentation bool SwFormatFrameSize::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + MapUnit eCoreUnit, + MapUnit ePresUnit, OUString& rText, const IntlWrapper* pIntl ) const @@ -267,8 +267,8 @@ bool SwFormatFrameSize::GetPresentation bool SwFormatHeader::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper* /*pIntl*/ ) const @@ -284,8 +284,8 @@ bool SwFormatHeader::GetPresentation bool SwFormatFooter::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper* /*pIntl*/ ) const @@ -298,8 +298,8 @@ bool SwFormatFooter::GetPresentation bool SwFormatSurround::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper* /*pIntl*/ ) const @@ -342,8 +342,8 @@ bool SwFormatSurround::GetPresentation bool SwFormatVertOrient::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + MapUnit eCoreUnit, + MapUnit ePresUnit, OUString& rText, const IntlWrapper* pIntl ) const @@ -388,8 +388,8 @@ bool SwFormatVertOrient::GetPresentation bool SwFormatHoriOrient::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + MapUnit eCoreUnit, + MapUnit ePresUnit, OUString& rText, const IntlWrapper* pIntl ) const @@ -434,8 +434,8 @@ bool SwFormatHoriOrient::GetPresentation bool SwFormatAnchor::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper* /*pIntl*/ ) const @@ -462,8 +462,8 @@ bool SwFormatAnchor::GetPresentation bool SwFormatPageDesc::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper* /*pIntl*/ ) const @@ -481,8 +481,8 @@ bool SwFormatPageDesc::GetPresentation bool SwFormatCol::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit eCoreUnit, - SfxMapUnit /*ePresUnit*/, + MapUnit eCoreUnit, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper* pIntl ) const @@ -496,7 +496,7 @@ bool SwFormatCol::GetPresentation const long nWdth = static_cast<long>(GetLineWidth()); rText = rText + " " + SW_RESSTR( STR_LINE_WIDTH ) + " " + ::GetMetricText( nWdth, eCoreUnit, - SFX_MAPUNIT_POINT, pIntl ); + MAP_POINT, pIntl ); } } else @@ -509,8 +509,8 @@ bool SwFormatCol::GetPresentation bool SwFormatURL::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper* /*pIntl*/ ) const @@ -536,8 +536,8 @@ bool SwFormatURL::GetPresentation bool SwFormatEditInReadonly::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper* /*pIntl*/ ) const @@ -559,8 +559,8 @@ void SwFormatEditInReadonly::dumpAsXml(xmlTextWriterPtr pWriter) const bool SwFormatLayoutSplit::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper* /*pIntl*/ ) const @@ -573,8 +573,8 @@ bool SwFormatLayoutSplit::GetPresentation bool SwFormatRowSplit::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& /*rText*/, const IntlWrapper* /*pIntl*/ ) const @@ -585,8 +585,8 @@ bool SwFormatRowSplit::GetPresentation bool SwFormatFootnoteEndAtTextEnd::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& /*rText*/, const IntlWrapper* /*pIntl*/ ) const @@ -597,8 +597,8 @@ bool SwFormatFootnoteEndAtTextEnd::GetPresentation bool SwFormatChain::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper* /*pIntl*/ ) const @@ -621,8 +621,8 @@ bool SwFormatChain::GetPresentation bool SwFormatLineNumber::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper* /*pIntl*/ ) const @@ -642,8 +642,8 @@ bool SwFormatLineNumber::GetPresentation bool SwTextGridItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper* /*pIntl*/ ) const @@ -670,8 +670,8 @@ bool SwTextGridItem::GetPresentation bool SwHeaderAndFooterEatSpacingItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, + MapUnit /*eCoreUnit*/, + MapUnit /*ePresUnit*/, OUString& /*rText*/, const IntlWrapper* /*pIntl*/ ) const @@ -682,7 +682,7 @@ bool SwHeaderAndFooterEatSpacingItem::GetPresentation // Graphic attributes bool SwMirrorGrf::GetPresentation( - SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, + SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper* /*pIntl*/ ) const { sal_uInt16 nId; @@ -704,7 +704,7 @@ bool SwMirrorGrf::GetPresentation( } bool SwRotationGrf::GetPresentation( - SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, + SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) @@ -716,7 +716,7 @@ bool SwRotationGrf::GetPresentation( } bool SwLuminanceGrf::GetPresentation( - SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, + SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) @@ -729,7 +729,7 @@ bool SwLuminanceGrf::GetPresentation( } bool SwContrastGrf::GetPresentation( - SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, + SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) @@ -742,7 +742,7 @@ bool SwContrastGrf::GetPresentation( } bool SwChannelGrf::GetPresentation( - SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, + SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) @@ -768,7 +768,7 @@ bool SwChannelGrf::GetPresentation( } bool SwGammaGrf::GetPresentation( - SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, + SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { OUStringBuffer aText; @@ -781,7 +781,7 @@ bool SwGammaGrf::GetPresentation( } bool SwInvertGrf::GetPresentation( - SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, + SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { rText.clear(); @@ -794,7 +794,7 @@ bool SwInvertGrf::GetPresentation( } bool SwTransparencyGrf::GetPresentation( - SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, + SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) @@ -807,7 +807,7 @@ bool SwTransparencyGrf::GetPresentation( } bool SwDrawModeGrf::GetPresentation( - SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, + SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { rText.clear(); @@ -828,10 +828,10 @@ bool SwDrawModeGrf::GetPresentation( } bool SwFormatFollowTextFlow::GetPresentation( SfxItemPresentation ePres, - SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresMetric*/, - OUString &rText, - const IntlWrapper* /*pIntl*/ ) const + MapUnit /*eCoreMetric*/, + MapUnit /*ePresMetric*/, + OUString &rText, + const IntlWrapper* /*pIntl*/ ) const { rText.clear(); if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx index 7c20a88e157e..8b759ff87d0b 100644 --- a/sw/source/uibase/utlui/uiitems.cxx +++ b/sw/source/uibase/utlui/uiitems.cxx @@ -59,11 +59,11 @@ bool SwPageFootnoteInfoItem::operator==( const SfxPoolItem& rAttr ) const return ( aFootnoteInfo == static_cast<const SwPageFootnoteInfoItem&>(rAttr).GetPageFootnoteInfo()); } -bool SwPageFootnoteInfoItem::GetPresentation +bool SwPageFootnoteInfoItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + MapUnit eCoreUnit, + MapUnit ePresUnit, OUString& rText, const IntlWrapper* pIntl ) const |