summaryrefslogtreecommitdiffstats
path: root/include/editeng
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-07-28 16:43:06 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-07-31 22:00:27 +0200
commit90ac4671c13ed4f548bb4188355b02217b9e24ba (patch)
treeb07d9238cbe7b7d39530b6e18875196278790368 /include/editeng
parentCorrected HitTest for layouted text (diff)
downloadcore-90ac4671c13ed4f548bb4188355b02217b9e24ba.tar.gz
core-90ac4671c13ed4f548bb4188355b02217b9e24ba.zip
make IntlWrapper arg to GetPresentation non-implicit and non-optional
which requires explicitly adding null in 1) SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItemSet* p2ndSet) where SdrItemBrowserControl is only used by SdrItemBrowser and the only use of that is within DBG_UTIL in SdrPaintView 2) SwCursorShell::GetContentAtPos( const Point& rPt, within a #ifdef DBG_UTIL block in 3) SvxSearchDialog::BuildAttrText_Impl( OUString& rStr, bool bSrchFlag ) const where the other branch uses SvxResId 4) SfxPoolItem::dumpAsXml(xmlTextWriterPtr pWriter) const 5) XFillStyleItem::dumpAsXml(xmlTextWriterPtr pWriter) const looks very much like all uses (outside the dumpers) are intended to be in the ui locale results in that INetContentTypes::GetPresentation always called with UI Locale Change-Id: I5a110c107838b4db3c355476426d6532f2b6ce52 Reviewed-on: https://gerrit.libreoffice.org/40538 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/editeng')
-rw-r--r--include/editeng/adjustitem.hxx2
-rw-r--r--include/editeng/autokernitem.hxx2
-rw-r--r--include/editeng/blinkitem.hxx2
-rw-r--r--include/editeng/boxitem.hxx4
-rw-r--r--include/editeng/brushitem.hxx2
-rw-r--r--include/editeng/bulletitem.hxx2
-rw-r--r--include/editeng/charhiddenitem.hxx2
-rw-r--r--include/editeng/charreliefitem.hxx2
-rw-r--r--include/editeng/charrotateitem.hxx4
-rw-r--r--include/editeng/charscaleitem.hxx2
-rw-r--r--include/editeng/charsetcoloritem.hxx2
-rw-r--r--include/editeng/cmapitem.hxx2
-rw-r--r--include/editeng/colritem.hxx2
-rw-r--r--include/editeng/contouritem.hxx2
-rw-r--r--include/editeng/crossedoutitem.hxx2
-rw-r--r--include/editeng/emphasismarkitem.hxx2
-rw-r--r--include/editeng/escapementitem.hxx2
-rw-r--r--include/editeng/fhgtitem.hxx2
-rw-r--r--include/editeng/flstitem.hxx2
-rw-r--r--include/editeng/fontitem.hxx2
-rw-r--r--include/editeng/forbiddenruleitem.hxx2
-rw-r--r--include/editeng/formatbreakitem.hxx2
-rw-r--r--include/editeng/frmdiritem.hxx2
-rw-r--r--include/editeng/fwdtitem.hxx2
-rw-r--r--include/editeng/hngpnctitem.hxx2
-rw-r--r--include/editeng/hyphenzoneitem.hxx2
-rw-r--r--include/editeng/justifyitem.hxx6
-rw-r--r--include/editeng/keepitem.hxx2
-rw-r--r--include/editeng/kernitem.hxx2
-rw-r--r--include/editeng/langitem.hxx2
-rw-r--r--include/editeng/lineitem.hxx2
-rw-r--r--include/editeng/lrspitem.hxx2
-rw-r--r--include/editeng/lspcitem.hxx2
-rw-r--r--include/editeng/nhypitem.hxx2
-rw-r--r--include/editeng/nlbkitem.hxx2
-rw-r--r--include/editeng/opaqitem.hxx2
-rw-r--r--include/editeng/optitems.hxx4
-rw-r--r--include/editeng/orphitem.hxx2
-rw-r--r--include/editeng/paravertalignitem.hxx2
-rw-r--r--include/editeng/pbinitem.hxx2
-rw-r--r--include/editeng/pgrditem.hxx2
-rw-r--r--include/editeng/pmdlitem.hxx2
-rw-r--r--include/editeng/postitem.hxx2
-rw-r--r--include/editeng/prntitem.hxx2
-rw-r--r--include/editeng/protitem.hxx2
-rw-r--r--include/editeng/prszitem.hxx2
-rw-r--r--include/editeng/scriptspaceitem.hxx2
-rw-r--r--include/editeng/shaditem.hxx2
-rw-r--r--include/editeng/shdditem.hxx2
-rw-r--r--include/editeng/sizeitem.hxx2
-rw-r--r--include/editeng/spltitem.hxx2
-rw-r--r--include/editeng/tstpitem.hxx2
-rw-r--r--include/editeng/twolinesitem.hxx2
-rw-r--r--include/editeng/udlnitem.hxx2
-rw-r--r--include/editeng/ulspitem.hxx2
-rw-r--r--include/editeng/wghtitem.hxx2
-rw-r--r--include/editeng/widwitem.hxx2
-rw-r--r--include/editeng/writingmodeitem.hxx2
-rw-r--r--include/editeng/wrlmitem.hxx2
-rw-r--r--include/editeng/xmlcnitm.hxx11
60 files changed, 69 insertions, 70 deletions
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;