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 /include | |
| 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>
Diffstat (limited to 'include')
157 files changed, 515 insertions, 536 deletions
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; |