summaryrefslogtreecommitdiff
path: root/include/svl
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/svl
parentd62d07b3d29014f76c0d676c891cbafa80d0765f (diff)
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/svl')
-rw-r--r--include/svl/cenumitm.hxx2
-rw-r--r--include/svl/cintitem.hxx8
-rw-r--r--include/svl/ctypeitm.hxx2
-rw-r--r--include/svl/custritm.hxx2
-rw-r--r--include/svl/eitem.hxx6
-rw-r--r--include/svl/flagitem.hxx2
-rw-r--r--include/svl/inettype.hxx3
-rw-r--r--include/svl/int64item.hxx2
-rw-r--r--include/svl/intitem.hxx2
-rw-r--r--include/svl/itempool.hxx2
-rw-r--r--include/svl/macitem.hxx2
-rw-r--r--include/svl/poolitem.hxx6
-rw-r--r--include/svl/ptitem.hxx2
-rw-r--r--include/svl/rectitem.hxx2
-rw-r--r--include/svl/rngitem.hxx2
-rw-r--r--include/svl/slstitm.hxx2
-rw-r--r--include/svl/srchitem.hxx2
-rw-r--r--include/svl/szitem.hxx2
-rw-r--r--include/svl/visitem.hxx2
19 files changed, 26 insertions, 27 deletions
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,