diff options
Diffstat (limited to 'include')
145 files changed, 188 insertions, 198 deletions
diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx index 4819d62c9d87..1f92d0b0d7b6 100644 --- a/include/avmedia/mediaitem.hxx +++ b/include/avmedia/mediaitem.hxx @@ -76,7 +76,7 @@ public: MapUnit eCoreUnit, MapUnit ePresUnit, OUString& rText, - const IntlWrapper *pIntl = nullptr ) const override; + const IntlWrapper& rIntl ) 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/adjustitem.hxx b/include/editeng/adjustitem.hxx index 8c71878cae65..b74c45ef9596 100644 --- a/include/editeng/adjustitem.hxx +++ b/include/editeng/adjustitem.hxx @@ -61,7 +61,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 06b47f657190..ad2fc43d9367 100644 --- a/include/editeng/autokernitem.hxx +++ b/include/editeng/autokernitem.hxx @@ -47,7 +47,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvxAutoKernItem& operator=(const SvxAutoKernItem& rAutoKern) { diff --git a/include/editeng/blinkitem.hxx b/include/editeng/blinkitem.hxx index fe034a02f5b5..77cad8dcefbe 100644 --- a/include/editeng/blinkitem.hxx +++ b/include/editeng/blinkitem.hxx @@ -46,7 +46,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvxBlinkItem& operator=(const SvxBlinkItem& rBlink) { SetValue(rBlink.GetValue()); diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx index 984bd389d7e4..85eba50c4ecd 100644 --- a/include/editeng/boxitem.hxx +++ b/include/editeng/boxitem.hxx @@ -78,7 +78,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; @@ -193,7 +193,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 d1b66da8890d..787fb3f1d8e0 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -82,7 +82,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 c73fcb2d8cb9..e112e9776f9e 100644 --- a/include/editeng/bulletitem.hxx +++ b/include/editeng/bulletitem.hxx @@ -90,7 +90,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; static void StoreFont( SvStream&, const vcl::Font& ); static vcl::Font CreateFont( SvStream&, sal_uInt16 nVer ); diff --git a/include/editeng/charhiddenitem.hxx b/include/editeng/charhiddenitem.hxx index 7f53bcbe0c1f..ec2b1400adaf 100644 --- a/include/editeng/charhiddenitem.hxx +++ b/include/editeng/charhiddenitem.hxx @@ -38,7 +38,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvxCharHiddenItem& operator=(const SvxCharHiddenItem& rHidden) { SetValue(rHidden.GetValue()); diff --git a/include/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx index 6da13c4ee9bd..8bdc6f55ef23 100644 --- a/include/editeng/charreliefitem.hxx +++ b/include/editeng/charreliefitem.hxx @@ -51,7 +51,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) 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 292712cc6823..19c7f9cbcd76 100644 --- a/include/editeng/charrotateitem.hxx +++ b/include/editeng/charrotateitem.hxx @@ -45,7 +45,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr) const override; + const IntlWrapper&) 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; @@ -99,7 +99,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) 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/charscaleitem.hxx b/include/editeng/charscaleitem.hxx index 3c0539031b2a..8bec6b512341 100644 --- a/include/editeng/charscaleitem.hxx +++ b/include/editeng/charscaleitem.hxx @@ -49,7 +49,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) 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 7223c2b9a944..03d7542b974c 100644 --- a/include/editeng/charsetcoloritem.hxx +++ b/include/editeng/charsetcoloritem.hxx @@ -42,7 +42,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 e651a1e4222e..728099361923 100644 --- a/include/editeng/cmapitem.hxx +++ b/include/editeng/cmapitem.hxx @@ -44,7 +44,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx index 55bf50a8f4d1..b90f1e08ba90 100644 --- a/include/editeng/colritem.hxx +++ b/include/editeng/colritem.hxx @@ -51,7 +51,7 @@ public: virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper* pIntlWrapper = nullptr) const override; + OUString &rText, const IntlWrapper& rIntlWrapper) const override; virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const override; diff --git a/include/editeng/contouritem.hxx b/include/editeng/contouritem.hxx index c7865967373a..34602f575ede 100644 --- a/include/editeng/contouritem.hxx +++ b/include/editeng/contouritem.hxx @@ -44,7 +44,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvxContourItem& operator=(const SvxContourItem& rCont) { diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx index b09654d946e2..6e460cd869ca 100644 --- a/include/editeng/crossedoutitem.hxx +++ b/include/editeng/crossedoutitem.hxx @@ -43,7 +43,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 fe9d92a915e9..356cd56a2a47 100644 --- a/include/editeng/emphasismarkitem.hxx +++ b/include/editeng/emphasismarkitem.hxx @@ -45,7 +45,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx index 1e8585a0f116..0b0be8793cde 100644 --- a/include/editeng/escapementitem.hxx +++ b/include/editeng/escapementitem.hxx @@ -56,7 +56,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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/fhgtitem.hxx b/include/editeng/fhgtitem.hxx index ac021bcca0b3..a982e7a41e90 100644 --- a/include/editeng/fhgtitem.hxx +++ b/include/editeng/fhgtitem.hxx @@ -55,7 +55,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/flstitem.hxx b/include/editeng/flstitem.hxx index f75ccca5cd23..527a38544c0b 100644 --- a/include/editeng/flstitem.hxx +++ b/include/editeng/flstitem.hxx @@ -54,7 +54,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; const FontList* GetFontList() const { return pFontList; } }; diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx index bd78542b72c1..558239f34f09 100644 --- a/include/editeng/fontitem.hxx +++ b/include/editeng/fontitem.hxx @@ -58,7 +58,7 @@ public: virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper* = nullptr) const override; + OUString &rText, const IntlWrapper&) const override; // Access methods: void SetFamilyName(const OUString& rFamilyName) diff --git a/include/editeng/forbiddenruleitem.hxx b/include/editeng/forbiddenruleitem.hxx index 47233b7a3c26..f28849ed6a46 100644 --- a/include/editeng/forbiddenruleitem.hxx +++ b/include/editeng/forbiddenruleitem.hxx @@ -43,7 +43,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) const override; SvxForbiddenRuleItem& operator=( const SvxForbiddenRuleItem& rItem ) diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx index e0fd881162b1..64ca7346feed 100644 --- a/include/editeng/formatbreakitem.hxx +++ b/include/editeng/formatbreakitem.hxx @@ -51,7 +51,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 4e3018848722..7ae1a2db2ccf 100644 --- a/include/editeng/frmdiritem.hxx +++ b/include/editeng/frmdiritem.hxx @@ -43,7 +43,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) 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 00e146913360..a9a115ea9dc9 100644 --- a/include/editeng/fwdtitem.hxx +++ b/include/editeng/fwdtitem.hxx @@ -47,7 +47,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 ebb6ab406171..2a0d1f68b668 100644 --- a/include/editeng/hngpnctitem.hxx +++ b/include/editeng/hngpnctitem.hxx @@ -42,7 +42,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) const override; SvxHangingPunctuationItem& operator=( const SvxHangingPunctuationItem& rItem ) diff --git a/include/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx index 3a46267d754d..9c15ae446d38 100644 --- a/include/editeng/hyphenzoneitem.hxx +++ b/include/editeng/hyphenzoneitem.hxx @@ -54,7 +54,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx index 3f5633c33788..0b04ab39510b 100644 --- a/include/editeng/justifyitem.hxx +++ b/include/editeng/justifyitem.hxx @@ -39,7 +39,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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; @@ -71,7 +71,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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; @@ -99,7 +99,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 115b8117879d..77b528d7c631 100644 --- a/include/editeng/keepitem.hxx +++ b/include/editeng/keepitem.hxx @@ -47,7 +47,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 d5eca73b3104..fa8dcd6e9030 100644 --- a/include/editeng/kernitem.hxx +++ b/include/editeng/kernitem.hxx @@ -51,7 +51,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvxKerningItem& operator=(const SvxKerningItem& rKern) { SetValue( rKern.GetValue() ); diff --git a/include/editeng/langitem.hxx b/include/editeng/langitem.hxx index 81bbe052e460..a71c9a9ceef7 100644 --- a/include/editeng/langitem.hxx +++ b/include/editeng/langitem.hxx @@ -52,7 +52,7 @@ public: virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr) const override; + OUString &rText, const IntlWrapper&) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/lineitem.hxx b/include/editeng/lineitem.hxx index 0fb4a787fcb2..2dcdc97a763b 100644 --- a/include/editeng/lineitem.hxx +++ b/include/editeng/lineitem.hxx @@ -52,7 +52,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 82b2e3c57a40..b0d7e6b714ec 100644 --- a/include/editeng/lrspitem.hxx +++ b/include/editeng/lrspitem.hxx @@ -81,7 +81,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 2c5c6ffcc33c..caec910755fa 100644 --- a/include/editeng/lspcitem.hxx +++ b/include/editeng/lspcitem.hxx @@ -58,7 +58,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 fe7a33678c49..b54d69867678 100644 --- a/include/editeng/nhypitem.hxx +++ b/include/editeng/nhypitem.hxx @@ -37,7 +37,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvxNoHyphenItem& operator=(const SvxNoHyphenItem& rNHH) { diff --git a/include/editeng/nlbkitem.hxx b/include/editeng/nlbkitem.hxx index fb6a836ab318..f6a2c997bf0c 100644 --- a/include/editeng/nlbkitem.hxx +++ b/include/editeng/nlbkitem.hxx @@ -37,7 +37,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvxNoLinebreakItem& operator=(const SvxNoLinebreakItem& rLB) { diff --git a/include/editeng/opaqitem.hxx b/include/editeng/opaqitem.hxx index 6b464e3507a3..d2a26feac987 100644 --- a/include/editeng/opaqitem.hxx +++ b/include/editeng/opaqitem.hxx @@ -46,7 +46,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 82c9b55748d5..d950d456ed14 100644 --- a/include/editeng/optitems.hxx +++ b/include/editeng/optitems.hxx @@ -44,7 +44,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; @@ -73,7 +73,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 8998056f02d1..108ef55edc7c 100644 --- a/include/editeng/orphitem.hxx +++ b/include/editeng/orphitem.hxx @@ -46,7 +46,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvxOrphansItem& operator=( const SvxOrphansItem& rOrphans ) { diff --git a/include/editeng/paravertalignitem.hxx b/include/editeng/paravertalignitem.hxx index 19aac0e99766..dc8d695e2c91 100644 --- a/include/editeng/paravertalignitem.hxx +++ b/include/editeng/paravertalignitem.hxx @@ -49,7 +49,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) 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 3c390451d671..d0f03797e119 100644 --- a/include/editeng/pbinitem.hxx +++ b/include/editeng/pbinitem.hxx @@ -49,7 +49,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 6b3f297dabfd..741c88a73129 100644 --- a/include/editeng/pgrditem.hxx +++ b/include/editeng/pgrditem.hxx @@ -44,7 +44,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; #endif diff --git a/include/editeng/pmdlitem.hxx b/include/editeng/pmdlitem.hxx index 6ab2be2d7e47..a1c895fe98cb 100644 --- a/include/editeng/pmdlitem.hxx +++ b/include/editeng/pmdlitem.hxx @@ -47,7 +47,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 a558fbd5c7a1..1db525954f4d 100644 --- a/include/editeng/postitem.hxx +++ b/include/editeng/postitem.hxx @@ -44,7 +44,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 f276cf7f5643..087691c18f10 100644 --- a/include/editeng/prntitem.hxx +++ b/include/editeng/prntitem.hxx @@ -46,7 +46,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 8c40da989a76..28f82763db41 100644 --- a/include/editeng/protitem.hxx +++ b/include/editeng/protitem.hxx @@ -50,7 +50,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/editeng/prszitem.hxx b/include/editeng/prszitem.hxx index 20cb729505e1..ba4412308aad 100644 --- a/include/editeng/prszitem.hxx +++ b/include/editeng/prszitem.hxx @@ -43,7 +43,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvxPropSizeItem& operator=(const SvxPropSizeItem& rPropSize) { diff --git a/include/editeng/scriptspaceitem.hxx b/include/editeng/scriptspaceitem.hxx index 3dc6e7473cc3..4e084fedd7f4 100644 --- a/include/editeng/scriptspaceitem.hxx +++ b/include/editeng/scriptspaceitem.hxx @@ -44,7 +44,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) const override; SvxScriptSpaceItem& operator=(const SvxScriptSpaceItem& rItem ) { diff --git a/include/editeng/shaditem.hxx b/include/editeng/shaditem.hxx index 51d5ecfe86cc..bf85da422b58 100644 --- a/include/editeng/shaditem.hxx +++ b/include/editeng/shaditem.hxx @@ -55,7 +55,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 2c8e21f806ab..a27b54ccc145 100644 --- a/include/editeng/shdditem.hxx +++ b/include/editeng/shdditem.hxx @@ -47,7 +47,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvxShadowedItem& operator=(const SvxShadowedItem& rShadow) { SetValue(rShadow.GetValue()); diff --git a/include/editeng/sizeitem.hxx b/include/editeng/sizeitem.hxx index 37fc8c8e5c07..101424e834dc 100644 --- a/include/editeng/sizeitem.hxx +++ b/include/editeng/sizeitem.hxx @@ -51,7 +51,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 47112ca149ff..620c6bbd0c77 100644 --- a/include/editeng/spltitem.hxx +++ b/include/editeng/spltitem.hxx @@ -49,7 +49,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 880b46e10c22..c0f5c61649a9 100644 --- a/include/editeng/tstpitem.hxx +++ b/include/editeng/tstpitem.hxx @@ -144,7 +144,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 e978c89ca544..28ca49feae7c 100644 --- a/include/editeng/twolinesitem.hxx +++ b/include/editeng/twolinesitem.hxx @@ -46,7 +46,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + const IntlWrapper& rIntl ) 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 f0702c6f6965..694e92ba43b6 100644 --- a/include/editeng/udlnitem.hxx +++ b/include/editeng/udlnitem.hxx @@ -43,7 +43,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 97fd58990301..5e2ca0f834c7 100644 --- a/include/editeng/ulspitem.hxx +++ b/include/editeng/ulspitem.hxx @@ -55,7 +55,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx index 1dbd1e875cd3..40fdfcf56d83 100644 --- a/include/editeng/wghtitem.hxx +++ b/include/editeng/wghtitem.hxx @@ -44,7 +44,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 1d5d9eabf3db..d008c87a29cd 100644 --- a/include/editeng/widwitem.hxx +++ b/include/editeng/widwitem.hxx @@ -46,7 +46,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvxWidowsItem& operator=( const SvxWidowsItem& rWidows ) { diff --git a/include/editeng/writingmodeitem.hxx b/include/editeng/writingmodeitem.hxx index 518c087c83d2..55a0d5e2e9ea 100644 --- a/include/editeng/writingmodeitem.hxx +++ b/include/editeng/writingmodeitem.hxx @@ -45,7 +45,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) 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 2459c2557cdb..1e36d391e008 100644 --- a/include/editeng/wrlmitem.hxx +++ b/include/editeng/wrlmitem.hxx @@ -48,7 +48,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvxWordLineModeItem& operator=( const SvxWordLineModeItem& rWLM ) { diff --git a/include/editeng/xmlcnitm.hxx b/include/editeng/xmlcnitm.hxx index 02e304ee1b22..41664c404c41 100644 --- a/include/editeng/xmlcnitm.hxx +++ b/include/editeng/xmlcnitm.hxx @@ -41,12 +41,11 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; - virtual bool GetPresentation( - SfxItemPresentation ePresentation, - MapUnit eCoreMetric, - MapUnit ePresentationMetric, - OUString &rText, - const IntlWrapper *pIntlWrapper = nullptr ) const override; + virtual bool GetPresentation(SfxItemPresentation ePresentation, + MapUnit eCoreMetric, + MapUnit ePresentationMetric, + OUString &rText, + const IntlWrapper& rIntlWrapper) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx index 7df7c6ae6f88..ec6a0604f569 100644 --- a/include/sfx2/evntconf.hxx +++ b/include/sfx2/evntconf.hxx @@ -79,7 +79,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) 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/cenumitm.hxx b/include/svl/cenumitm.hxx index e4ea233c2f8b..1857be8cc886 100644 --- a/include/svl/cenumitm.hxx +++ b/include/svl/cenumitm.hxx @@ -37,7 +37,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper * = nullptr) const override; + const IntlWrapper&) 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 2ccfd942d6f9..9b265179cd77 100644 --- a/include/svl/cintitem.hxx +++ b/include/svl/cintitem.hxx @@ -42,7 +42,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper * = nullptr) + const IntlWrapper&) const override; virtual bool QueryValue(css::uno::Any& rVal, @@ -89,7 +89,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper * = nullptr) + const IntlWrapper&) const override; virtual bool QueryValue(css::uno::Any& rVal, @@ -136,7 +136,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper * = nullptr) + const IntlWrapper&) const override; virtual bool QueryValue(css::uno::Any& rVal, @@ -183,7 +183,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper * = nullptr) + const IntlWrapper&) const override; virtual bool QueryValue(css::uno::Any& rVal, diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx index 17da7e54be71..3fae7a61f215 100644 --- a/include/svl/ctypeitm.hxx +++ b/include/svl/ctypeitm.hxx @@ -50,7 +50,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString & rText, - const IntlWrapper* pIntlWrapper = nullptr ) const override; + const IntlWrapper& rIntlWrapper ) 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 66f65a85b508..c48988448418 100644 --- a/include/svl/custritm.hxx +++ b/include/svl/custritm.hxx @@ -46,7 +46,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper * = nullptr) const override; + const IntlWrapper&) 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 49b932985c2d..e8933f0bcdaf 100644 --- a/include/svl/eitem.hxx +++ b/include/svl/eitem.hxx @@ -110,9 +110,9 @@ public: virtual bool operator ==(const SfxPoolItem & rItem) const override; virtual bool GetPresentation(SfxItemPresentation, - MapUnit, MapUnit, - OUString & rText, - const IntlWrapper * = nullptr) + MapUnit, MapUnit, + OUString & rText, + const IntlWrapper&) const override; virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override; diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx index 34c5b67a2cd5..56965d68ba8b 100644 --- a/include/svl/flagitem.hxx +++ b/include/svl/flagitem.hxx @@ -44,7 +44,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString & rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) 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/inettype.hxx b/include/svl/inettype.hxx index a5282a53feea..1fbb036b4878 100644 --- a/include/svl/inettype.hxx +++ b/include/svl/inettype.hxx @@ -225,8 +225,7 @@ public: static OUString GetContentType(INetContentType eTypeID); - static OUString GetPresentation(INetContentType eTypeID, - const LanguageTag& aLocale); + static OUString GetPresentation(INetContentType eTypeID); static INetContentType GetContentType4Extension(OUString const & rExtension); diff --git a/include/svl/int64item.hxx b/include/svl/int64item.hxx index 46a3325a2d4b..3c2148e2411f 100644 --- a/include/svl/int64item.hxx +++ b/include/svl/int64item.hxx @@ -28,7 +28,7 @@ public: virtual bool GetPresentation( SfxItemPresentation, MapUnit, MapUnit, - OUString& rText, const IntlWrapper* pIntlWrapper = nullptr ) const override; + OUString& rText, const IntlWrapper& rIntlWrapper ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx index 6a0e4e92d439..5c73398864ad 100644 --- a/include/svl/intitem.hxx +++ b/include/svl/intitem.hxx @@ -60,7 +60,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper * = nullptr) + const IntlWrapper&) const override; virtual bool QueryValue( css::uno::Any& rVal, diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index eced0598bad6..f9285f9612bf 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -143,7 +143,7 @@ public: virtual bool GetPresentation( const SfxPoolItem& rItem, MapUnit ePresentationMetric, OUString& rText, - const IntlWrapper * pIntlWrapper = nullptr ) const; + const IntlWrapper& rIntlWrapper ) const; virtual SfxItemPool* Clone() const; const OUString& GetName() const; diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx index b7e6f292bbd8..788a721ccb37 100644 --- a/include/svl/macitem.hxx +++ b/include/svl/macitem.hxx @@ -128,7 +128,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) 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 b2a05b993f4a..5e071055f46b 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -158,7 +158,7 @@ public: MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString &rText, - const IntlWrapper * pIntlWrapper = nullptr ) const; + const IntlWrapper& rIntlWrapper ) const; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; virtual void ScaleMetrics( long lMult, long lDiv ); @@ -255,7 +255,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) const override; virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override; // create a copy of itself @@ -283,7 +283,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) const override; // create a copy of itself virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override = 0; diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx index 0d135ee6481d..7854c089abeb 100644 --- a/include/svl/ptitem.hxx +++ b/include/svl/ptitem.hxx @@ -39,7 +39,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx index bbd33b936161..25a722227355 100644 --- a/include/svl/rectitem.hxx +++ b/include/svl/rectitem.hxx @@ -40,7 +40,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) 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 a7187df469d7..e07f21f9cb6e 100644 --- a/include/svl/rngitem.hxx +++ b/include/svl/rngitem.hxx @@ -39,7 +39,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; sal_uInt16& From() { return nFrom; } virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const override; diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx index 183875d83a2c..22b36293ee85 100644 --- a/include/svl/slstitm.hxx +++ b/include/svl/slstitm.hxx @@ -58,7 +58,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) 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 b3e52a3b6aae..343433dd8808 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -105,7 +105,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; // ConfigItem virtual void Notify( const css::uno::Sequence< OUString > &rPropertyNames ) override; diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx index 0adfd8466568..c381495db210 100644 --- a/include/svl/szitem.hxx +++ b/include/svl/szitem.hxx @@ -38,7 +38,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) 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 8d3076d96058..c73bd970f863 100644 --- a/include/svl/visitem.hxx +++ b/include/svl/visitem.hxx @@ -46,7 +46,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper * = nullptr) + const IntlWrapper&) const override; virtual bool QueryValue( css::uno::Any& rVal, diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx index e54b8ccf4e39..4438d9148553 100644 --- a/include/svx/algitem.hxx +++ b/include/svx/algitem.hxx @@ -45,7 +45,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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; @@ -84,7 +84,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 9e29747f06c6..dc28dd52cd16 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -157,7 +157,7 @@ public: virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr) const override; + OUString &rText, const IntlWrapper&) 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 8444ee1f887f..f9e68d5bdb39 100644 --- a/include/svx/drawitem.hxx +++ b/include/svx/drawitem.hxx @@ -39,7 +39,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -64,7 +64,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -88,7 +88,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -113,7 +113,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -138,7 +138,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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; @@ -162,7 +162,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -187,7 +187,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx index 0526b4409070..2c57b4375df2 100644 --- a/include/svx/grfcrop.hxx +++ b/include/svx/grfcrop.hxx @@ -44,7 +44,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + const IntlWrapper& rIntl ) 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/numinf.hxx b/include/svx/numinf.hxx index 58a503fb74dc..6fb9dd171d89 100644 --- a/include/svx/numinf.hxx +++ b/include/svx/numinf.hxx @@ -56,7 +56,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 f69ab59bc963..9ca88ff34a10 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -87,7 +87,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx index 80277b7d3d3f..e83d81b7d59e 100644 --- a/include/svx/pageitem.hxx +++ b/include/svx/pageitem.hxx @@ -71,7 +71,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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; @@ -110,7 +110,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 ea3230211ac0..bcce77a4e5fb 100644 --- a/include/svx/postattr.hxx +++ b/include/svx/postattr.hxx @@ -41,7 +41,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -71,7 +71,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -102,7 +102,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx index fa2b04a2dd03..69c09a09925c 100644 --- a/include/svx/rotmodit.hxx +++ b/include/svx/rotmodit.hxx @@ -50,7 +50,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString& rText, const IntlWrapper * = nullptr ) const override; + OUString& rText, const IntlWrapper& ) 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 8ee0ec0db302..e8d8d0f5ba86 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -38,7 +38,7 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -71,7 +71,7 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -103,7 +103,7 @@ protected: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -172,7 +172,7 @@ protected: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -226,7 +226,7 @@ protected: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 977b1308b874..b923772cbe57 100644 --- a/include/svx/sdangitm.hxx +++ b/include/svx/sdangitm.hxx @@ -36,8 +36,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, - const IntlWrapper * - pIntlWrapper = nullptr) const override; + const IntlWrapper& rIntlWrapper) const override; }; diff --git a/include/svx/sdasaitm.hxx b/include/svx/sdasaitm.hxx index 9b731fe8009b..98004ae52dd7 100644 --- a/include/svx/sdasaitm.hxx +++ b/include/svx/sdasaitm.hxx @@ -44,7 +44,7 @@ class SVX_DLLPUBLIC SdrCustomShapeAdjustmentItem : public SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation(SfxItemPresentation ePresentation, MapUnit eCoreMetric, MapUnit ePresentationMetric, - OUString &rText, const IntlWrapper * = nullptr) const override; + OUString &rText, const IntlWrapper&) 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 57e1e20d3adc..aaff619e0d30 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -58,7 +58,7 @@ private: virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation(SfxItemPresentation ePresentation, MapUnit eCoreMetric, MapUnit ePresentationMetric, - OUString &rText, const IntlWrapper * = nullptr) const override; + OUString &rText, const IntlWrapper&) 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 2c7f13a2f9cd..dc4184976679 100644 --- a/include/svx/sdgmoitm.hxx +++ b/include/svx/sdgmoitm.hxx @@ -48,7 +48,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString& rText, const IntlWrapper * = nullptr) const override; + OUString& rText, const IntlWrapper& ) const override; }; #endif // INCLUDED_SVX_SDGMOITM_HXX diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx index 6f8196e98819..eead867fc48e 100644 --- a/include/svx/sdmetitm.hxx +++ b/include/svx/sdmetitm.hxx @@ -39,7 +39,7 @@ public: virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString& rText, const IntlWrapper * = nullptr) const override; + OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sdooitm.hxx b/include/svx/sdooitm.hxx index 293681c5daf4..974b1c804b34 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, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx index d4292bc5715d..6d3d11a5c6d7 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, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) 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, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr ) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sdtaaitm.hxx b/include/svx/sdtaaitm.hxx index ab997452ee9c..37a4b3c5f516 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, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; #endif diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx index 84d0736c9e7e..7b6a65563e86 100644 --- a/include/svx/sdtaditm.hxx +++ b/include/svx/sdtaditm.hxx @@ -45,7 +45,7 @@ public: virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; #endif diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx index 7cc9fb84908e..3f542c77534f 100644 --- a/include/svx/sdtaitm.hxx +++ b/include/svx/sdtaitm.hxx @@ -46,7 +46,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, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; @@ -72,7 +72,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, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; #endif diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx index 8d628ac2d3d0..5a8d020df091 100644 --- a/include/svx/sdtakitm.hxx +++ b/include/svx/sdtakitm.hxx @@ -88,7 +88,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, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; #endif diff --git a/include/svx/sdtayitm.hxx b/include/svx/sdtayitm.hxx index 2bb331009147..88a5c5809aa5 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, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; #endif diff --git a/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx index 4637a9a100d4..401de27dc81e 100644 --- a/include/svx/sdtfchim.hxx +++ b/include/svx/sdtfchim.hxx @@ -30,7 +30,7 @@ public: SVX_DLLPRIVATE virtual bool GetPresentation(SfxItemPresentation ePresentation, MapUnit eCoreMetric, MapUnit ePresentationMetric, - OUString &rText, const IntlWrapper * = nullptr) const override; + OUString &rText, const IntlWrapper&) 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 ed024c85754e..3039de81343b 100644 --- a/include/svx/sdtfsitm.hxx +++ b/include/svx/sdtfsitm.hxx @@ -55,7 +55,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, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) 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 4af52a326560..61fa67f4a8ef 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, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/svdpool.hxx b/include/svx/svdpool.hxx index 7605fb50c879..f82f88643c04 100644 --- a/include/svx/svdpool.hxx +++ b/include/svx/svdpool.hxx @@ -41,7 +41,7 @@ public: virtual bool GetPresentation(const SfxPoolItem& rItem, MapUnit ePresentationMetric, OUString& rText, - const IntlWrapper * pIntlWrapper = nullptr) const override; + const IntlWrapper& rIntlWrapper) const override; static void TakeItemName(sal_uInt16 nWhich, OUString& rItemName); }; diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx index a1b8ab41675b..3f51582bbe85 100644 --- a/include/svx/sxcecitm.hxx +++ b/include/svx/sxcecitm.hxx @@ -40,7 +40,7 @@ public: virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx index d75e80b35200..58f5e979d75f 100644 --- a/include/svx/sxctitm.hxx +++ b/include/svx/sxctitm.hxx @@ -36,7 +36,7 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; virtual sal_uInt16 GetValueCount() const override; // { return 4; } virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; #endif diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx index 67a11d390b5a..922db82f09a1 100644 --- a/include/svx/sxekitm.hxx +++ b/include/svx/sxekitm.hxx @@ -41,7 +41,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, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; #endif diff --git a/include/svx/sxfiitm.hxx b/include/svx/sxfiitm.hxx index 16b3a1249863..2d89b4ef0497 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, MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePresentation, MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString &rText, const IntlWrapper&) 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 a3692fbdd151..945710a11499 100644 --- a/include/svx/sxmtpitm.hxx +++ b/include/svx/sxmtpitm.hxx @@ -44,7 +44,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, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; // class SdrMeasureTextVPosItem @@ -66,7 +66,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, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; #endif diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx index 46052c3b7dfe..7275505996a6 100644 --- a/include/svx/sxmuitm.hxx +++ b/include/svx/sxmuitm.hxx @@ -38,7 +38,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, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; #endif diff --git a/include/svx/sxsiitm.hxx b/include/svx/sxsiitm.hxx index 8e840369334a..398ee298cc73 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, MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePresentation, MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString &rText, const IntlWrapper&) 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 e1e65229e60a..0180e3dbd0e0 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -63,7 +63,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; const GraphicObject& GetGraphicObject() const { return maGraphicObject;} bool isPattern() const; diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx index 53c946a18b15..7c16ffb14b3e 100644 --- a/include/svx/xfillit0.hxx +++ b/include/svx/xfillit0.hxx @@ -48,7 +48,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual sal_uInt16 GetValueCount() const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; diff --git a/include/svx/xflbckit.hxx b/include/svx/xflbckit.hxx index deb80cda472e..50f9b0063a15 100644 --- a/include/svx/xflbckit.hxx +++ b/include/svx/xflbckit.hxx @@ -42,7 +42,7 @@ public: SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; #endif diff --git a/include/svx/xflbmpit.hxx b/include/svx/xflbmpit.hxx index d92cb5340dfa..d3b0fc95227e 100644 --- a/include/svx/xflbmpit.hxx +++ b/include/svx/xflbmpit.hxx @@ -36,7 +36,7 @@ public: SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SVX_DLLPRIVATE virtual sal_uInt16 GetValueCount() const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; diff --git a/include/svx/xflbmsli.hxx b/include/svx/xflbmsli.hxx index a279b20bfe23..7244c591cb95 100644 --- a/include/svx/xflbmsli.hxx +++ b/include/svx/xflbmsli.hxx @@ -35,7 +35,7 @@ public: SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; #endif diff --git a/include/svx/xflbmsxy.hxx b/include/svx/xflbmsxy.hxx index a715545093ba..eb5a8a0abf5f 100644 --- a/include/svx/xflbmsxy.hxx +++ b/include/svx/xflbmsxy.hxx @@ -35,7 +35,7 @@ public: SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; // This item records both metrical and percentage quotation (negative); // We have to consider that. SVX_DLLPRIVATE virtual bool HasMetrics() const override; @@ -53,7 +53,7 @@ public: SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 713b05c7c853..d7d0ea66f0ae 100644 --- a/include/svx/xflbmtit.hxx +++ b/include/svx/xflbmtit.hxx @@ -35,7 +35,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/include/svx/xflboxy.hxx b/include/svx/xflboxy.hxx index 62a61db4301d..f0f3adf96ac1 100644 --- a/include/svx/xflboxy.hxx +++ b/include/svx/xflboxy.hxx @@ -35,7 +35,7 @@ public: SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; class SVX_DLLPUBLIC XFillBmpPosOffsetYItem : public SfxUInt16Item @@ -50,7 +50,7 @@ public: SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; #endif diff --git a/include/svx/xflbstit.hxx b/include/svx/xflbstit.hxx index 287d14091118..5d7a80712314 100644 --- a/include/svx/xflbstit.hxx +++ b/include/svx/xflbstit.hxx @@ -35,7 +35,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/include/svx/xflbtoxy.hxx b/include/svx/xflbtoxy.hxx index 95a48034cc95..61c2b2a054e5 100644 --- a/include/svx/xflbtoxy.hxx +++ b/include/svx/xflbtoxy.hxx @@ -35,7 +35,7 @@ public: SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; class SVX_DLLPUBLIC XFillBmpTileOffsetYItem : public SfxUInt16Item @@ -50,7 +50,7 @@ public: SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; #endif diff --git a/include/svx/xflclit.hxx b/include/svx/xflclit.hxx index 0caa9d7521f2..c3ea60c41f0f 100644 --- a/include/svx/xflclit.hxx +++ b/include/svx/xflclit.hxx @@ -48,7 +48,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx index 4d3154fa99ab..b8c4ed88c30a 100644 --- a/include/svx/xflftrit.hxx +++ b/include/svx/xflftrit.hxx @@ -48,7 +48,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, - MapUnit ePresMetric, OUString &rText, const IntlWrapper * pIntlWrapper = nullptr ) const override; + MapUnit ePresMetric, OUString &rText, const IntlWrapper& rIntlWrapper ) 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 6f3d336f9d1a..12127adf32a5 100644 --- a/include/svx/xflgrit.hxx +++ b/include/svx/xflgrit.hxx @@ -53,7 +53,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 973de794b24d..24aac4076418 100644 --- a/include/svx/xflhtit.hxx +++ b/include/svx/xflhtit.hxx @@ -51,7 +51,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 ce6552d72e3b..6cab8dcb8f48 100644 --- a/include/svx/xfltrit.hxx +++ b/include/svx/xfltrit.hxx @@ -39,7 +39,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/include/svx/xgrscit.hxx b/include/svx/xgrscit.hxx index 89ee4503bc00..3cae1e14635d 100644 --- a/include/svx/xgrscit.hxx +++ b/include/svx/xgrscit.hxx @@ -39,7 +39,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; #endif diff --git a/include/svx/xlineit0.hxx b/include/svx/xlineit0.hxx index 6f6e2044ff50..612ec5f3a476 100644 --- a/include/svx/xlineit0.hxx +++ b/include/svx/xlineit0.hxx @@ -43,7 +43,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual sal_uInt16 GetValueCount() const override; }; diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx index b9ac6f78f2b2..8111aed27f02 100644 --- a/include/svx/xlinjoit.hxx +++ b/include/svx/xlinjoit.hxx @@ -44,7 +44,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual sal_uInt16 GetValueCount() const override; }; diff --git a/include/svx/xlncapit.hxx b/include/svx/xlncapit.hxx index d42224cfa9a3..f7d525be6e4a 100644 --- a/include/svx/xlncapit.hxx +++ b/include/svx/xlncapit.hxx @@ -44,7 +44,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; css::drawing::LineCap GetValue() const; virtual sal_uInt16 GetValueCount() const override; diff --git a/include/svx/xlnclit.hxx b/include/svx/xlnclit.hxx index 921fdbeb7898..85036a4db428 100644 --- a/include/svx/xlnclit.hxx +++ b/include/svx/xlnclit.hxx @@ -44,7 +44,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; #endif diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx index 8f783e4cf327..9a9cf63ad6b2 100644 --- a/include/svx/xlndsit.hxx +++ b/include/svx/xlndsit.hxx @@ -53,7 +53,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 eb1aac54a761..8770976f2705 100644 --- a/include/svx/xlnedcit.hxx +++ b/include/svx/xlnedcit.hxx @@ -40,7 +40,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; #endif diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx index 1d6449bdd6cb..2e9e843fbdd7 100644 --- a/include/svx/xlnedit.hxx +++ b/include/svx/xlnedit.hxx @@ -52,7 +52,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 60fd36c7816f..738bfc1e9939 100644 --- a/include/svx/xlnedwit.hxx +++ b/include/svx/xlnedwit.hxx @@ -43,7 +43,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; #endif diff --git a/include/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx index a5dded2b3e3e..c5dd70c89262 100644 --- a/include/svx/xlnstcit.hxx +++ b/include/svx/xlnstcit.hxx @@ -40,7 +40,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; #endif diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx index a47d2ec5114f..c8ff1c2c6527 100644 --- a/include/svx/xlnstit.hxx +++ b/include/svx/xlnstit.hxx @@ -52,7 +52,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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 6a440b869fa1..3dde5e2e4d09 100644 --- a/include/svx/xlnstwit.hxx +++ b/include/svx/xlnstwit.hxx @@ -42,7 +42,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; diff --git a/include/svx/xlntrit.hxx b/include/svx/xlntrit.hxx index a001114abf71..0876d77f56b7 100644 --- a/include/svx/xlntrit.hxx +++ b/include/svx/xlntrit.hxx @@ -39,7 +39,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; #endif diff --git a/include/svx/xlnwtit.hxx b/include/svx/xlnwtit.hxx index 609660d856f0..56ed5f9cfc97 100644 --- a/include/svx/xlnwtit.hxx +++ b/include/svx/xlnwtit.hxx @@ -41,7 +41,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; #endif diff --git a/include/svx/xsflclit.hxx b/include/svx/xsflclit.hxx index 061c2f573737..e37f2727c142 100644 --- a/include/svx/xsflclit.hxx +++ b/include/svx/xsflclit.hxx @@ -37,7 +37,7 @@ public: SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; diff --git a/include/unotools/intlwrapper.hxx b/include/unotools/intlwrapper.hxx index a78d4bdcab12..65f298f9c88e 100644 --- a/include/unotools/intlwrapper.hxx +++ b/include/unotools/intlwrapper.hxx @@ -47,26 +47,19 @@ class UNOTOOLS_DLLPUBLIC IntlWrapper { private: - - LanguageTag maLanguageTag; + LanguageTag maLanguageTag; css::uno::Reference< css::uno::XComponentContext > m_xContext; - LocaleDataWrapper* pLocaleData; - CollatorWrapper* pCollator; - CollatorWrapper* pCaseCollator; + LocaleDataWrapper* pLocaleData; + CollatorWrapper* pCollator; + CollatorWrapper* pCaseCollator; - void ImplNewLocaleData() const; - void ImplNewCollator( bool bCaseSensitive ) const; + void ImplNewLocaleData() const; + void ImplNewCollator( bool bCaseSensitive ) const; public: - IntlWrapper( - const css::uno::Reference< css::uno::XComponentContext > & rxContext, - const LanguageTag& rLanguageTag - ); - IntlWrapper( - const LanguageTag& rLanguageTag - ); - ~IntlWrapper(); + IntlWrapper(const LanguageTag& rLanguageTag); + ~IntlWrapper(); const LanguageTag& getLanguageTag() const { return maLanguageTag; } |