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>

30 files changed, 95 insertions, 91 deletions

diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
index 90314b18d437..982346afd9c5 100644
--- a/sw/inc/fchrfmt.hxx
+++ b/sw/inc/fchrfmt.hxx
@@ -55,7 +55,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/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
index f96cff887334..3f92bede38a2 100644
--- a/sw/inc/fmtanchr.hxx
+++ b/sw/inc/fmtanchr.hxx
@@ -57,7 +57,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/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index de022f122031..566fc384788c 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -48,7 +48,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/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index e493ed087935..43a853f1519a 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -103,7 +103,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/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx
index 78bc27a487e5..5da8d3c87d01 100644
--- a/sw/inc/fmtcnct.hxx
+++ b/sw/inc/fmtcnct.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;
 
diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx
index f90ba26f3f12..d02b8fb07b0e 100644
--- a/sw/inc/fmteiro.hxx
+++ b/sw/inc/fmteiro.hxx
@@ -38,7 +38,7 @@ public:
                                   MapUnit eCoreMetric,
                                   MapUnit ePresMetric,
                                   OUString &rText,
-                                  const IntlWrapper*    pIntl = nullptr ) const override;
+                                  const IntlWrapper& rIntl ) const override;
     void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
 };
 
diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx
index ef73d87c4271..a259c9ba9ff7 100644
--- a/sw/inc/fmtfollowtextflow.hxx
+++ b/sw/inc/fmtfollowtextflow.hxx
@@ -39,7 +39,7 @@ public:
                                   MapUnit eCoreMetric,
                                   MapUnit ePresMetric,
                                   OUString &rText,
-                                  const IntlWrapper*    pIntl = nullptr ) const override;
+                                  const IntlWrapper& rIntl ) const override;
 
     void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
 };
diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx
index 944367fe812d..4bb829c01b71 100644
--- a/sw/inc/fmtfsize.hxx
+++ b/sw/inc/fmtfsize.hxx
@@ -71,7 +71,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/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index 2e928eaa8e9f..40dcae1bcd1c 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -63,7 +63,7 @@ public:
                                   MapUnit eCoreMetric,
                                   MapUnit ePresMetric,
                                   OUString &rText,
-                                  const IntlWrapper* pIntl = nullptr ) const override;
+                                  const IntlWrapper& rIntl ) const override;
 
     bool IsAtEnd() const { return FTNEND_ATPGORDOCEND != GetValue(); }
 
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx
index 26dc69ba7b67..59d999a421f5 100644
--- a/sw/inc/fmthdft.hxx
+++ b/sw/inc/fmthdft.hxx
@@ -50,7 +50,7 @@ public:
                                   MapUnit eCoreMetric,
                                   MapUnit ePresMetric,
                                   OUString &rText,
-                                  const IntlWrapper*    pIntl = nullptr ) const override;
+                                  const IntlWrapper& rIntl ) const override;
 
     const SwFrameFormat *GetHeaderFormat() const { return static_cast<const SwFrameFormat*>(GetRegisteredIn()); }
           SwFrameFormat *GetHeaderFormat()       { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
@@ -81,7 +81,7 @@ public:
                                   MapUnit eCoreMetric,
                                   MapUnit ePresMetric,
                                   OUString &rText,
-                                  const IntlWrapper*    pIntl = nullptr ) const override;
+                                  const IntlWrapper& rIntl ) const override;
 
     const SwFrameFormat *GetFooterFormat() const { return static_cast<const SwFrameFormat*>(GetRegisteredIn()); }
           SwFrameFormat *GetFooterFormat()       { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx
index 48f0e2aaefad..1b2d150c1049 100644
--- a/sw/inc/fmtinfmt.hxx
+++ b/sw/inc/fmtinfmt.hxx
@@ -59,7 +59,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/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx
index e510ea3ab819..fac0c269b6b4 100644
--- a/sw/inc/fmtline.hxx
+++ b/sw/inc/fmtline.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, sal_uInt8 nMemberId ) override;
 
diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx
index 74ce7b32894c..0a6524804073 100644
--- a/sw/inc/fmtlsplt.hxx
+++ b/sw/inc/fmtlsplt.hxx
@@ -37,7 +37,7 @@ public:
                                   MapUnit eCoreMetric,
                                   MapUnit ePresMetric,
                                   OUString &rText,
-                                  const IntlWrapper*    pIntl = nullptr ) const override;
+                                  const IntlWrapper& rIntl ) const override;
 };
 
 inline const SwFormatLayoutSplit &SwAttrSet::GetLayoutSplit(bool bInP) const
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
index e713207c2647..7dbd5889d1ad 100644
--- a/sw/inc/fmtornt.hxx
+++ b/sw/inc/fmtornt.hxx
@@ -47,7 +47,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;
 
@@ -83,7 +83,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/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx
index 98bb1bdf5dec..12fc58467676 100644
--- a/sw/inc/fmtpdsc.hxx
+++ b/sw/inc/fmtpdsc.hxx
@@ -59,7 +59,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/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx
index f5370f0ecab3..c045cea1b9b2 100644
--- a/sw/inc/fmtrowsplt.hxx
+++ b/sw/inc/fmtrowsplt.hxx
@@ -37,7 +37,7 @@ public:
                                   MapUnit eCoreMetric,
                                   MapUnit ePresMetric,
                                   OUString &rText,
-                                  const IntlWrapper*    pIntl = nullptr ) const override;
+                                  const IntlWrapper& rIntl ) const override;
 };
 
 inline const SwFormatRowSplit &SwAttrSet::GetRowSplit(bool bInP) const
diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx
index 646a26f7df43..dcd8cfe6caf8 100644
--- a/sw/inc/fmtruby.hxx
+++ b/sw/inc/fmtruby.hxx
@@ -50,7 +50,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/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx
index 74e429d4c9d5..e8b30f518a4d 100644
--- a/sw/inc/fmtsrnd.hxx
+++ b/sw/inc/fmtsrnd.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/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx
index fc062e3b9c64..371ce466e2ea 100644
--- a/sw/inc/fmturl.hxx
+++ b/sw/inc/fmturl.hxx
@@ -57,7 +57,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/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index b04b127d85ff..af5d606f4498 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -60,7 +60,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;
@@ -107,7 +107,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,
@@ -129,7 +129,7 @@ public:
                                   MapUnit eCoreMetric,
                                   MapUnit ePresMetric,
                                   OUString &rText,
-                                  const IntlWrapper* pIntl = nullptr ) const override;
+                                  const IntlWrapper& rIntl ) const override;
 };
 
 class SW_DLLPUBLIC SwContrastGrf : public SfxInt16Item
@@ -145,7 +145,7 @@ public:
                                   MapUnit eCoreMetric,
                                   MapUnit ePresMetric,
                                   OUString &rText,
-                                  const IntlWrapper* pIntl = nullptr ) const override;
+                                  const IntlWrapper& rIntl ) const override;
 };
 
 class SwChannelGrf : public SfxInt16Item
@@ -161,7 +161,7 @@ public:
                                   MapUnit eCoreMetric,
                                   MapUnit ePresMetric,
                                   OUString &rText,
-                                  const IntlWrapper* pIntl = nullptr ) const override;
+                                  const IntlWrapper& rIntl ) const override;
 };
 
 class SwChannelRGrf : public SwChannelGrf
@@ -213,7 +213,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;
@@ -236,7 +236,7 @@ public:
                                   MapUnit eCoreMetric,
                                   MapUnit ePresMetric,
                                   OUString &rText,
-                                  const IntlWrapper* pIntl = nullptr ) const override;
+                                  const IntlWrapper& rIntl ) const override;
 };
 
 class SwTransparencyGrf : public SfxByteItem
@@ -252,7 +252,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,
@@ -282,7 +282,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;
diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx
index 137133d6a4ad..5e7df9eb234f 100644
--- a/sw/inc/hfspacingitem.hxx
+++ b/sw/inc/hfspacingitem.hxx
@@ -37,7 +37,7 @@ public:
                                   MapUnit eCoreMetric,
                                   MapUnit ePresMetric,
                                   OUString &rText,
-                                  const IntlWrapper*    pIntl = nullptr ) const override;
+                                  const IntlWrapper& rIntl ) const override;
 };
 
 inline const SwHeaderAndFooterEatSpacingItem &SwAttrSet::GetHeaderAndFooterEatSpacing(bool bInP) const
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 6bc9f694c336..8bdb8eef7410 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -81,7 +81,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;
 
@@ -125,7 +125,7 @@ public:
                                   MapUnit eCoreMetric,
                                   MapUnit ePresMetric,
                                   OUString &rText,
-                                  const IntlWrapper*    pIntl = nullptr ) const override;
+                                  const IntlWrapper& rIntl ) const override;
 };
 
 inline SwRegisterItem::SwRegisterItem( const bool bRegister ) :
@@ -163,7 +163,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;
@@ -186,7 +186,7 @@ public:
                                   MapUnit eCoreMetric,
                                   MapUnit ePresMetric,
                                   OUString &rText,
-                                  const IntlWrapper*    pIntl = nullptr ) const override;
+                                  const IntlWrapper& rIntl ) const override;
 };
 
 inline SwParaConnectBorderItem::SwParaConnectBorderItem( const bool bConnect ) :
diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx
index e163a042e165..dc9f3696b383 100644
--- a/sw/inc/tgrditem.hxx
+++ b/sw/inc/tgrditem.hxx
@@ -57,7 +57,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/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 7df6263076c2..6bcdcae93bd3 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -67,6 +67,7 @@
 #include "txtfrm.hxx"
 #include <wrong.hxx>
 #include <calbck.hxx>
+#include <unotools/intlwrapper.hxx>
 #include <vcl/window.hxx>
 #include <docufld.hxx>
 
@@ -1615,13 +1616,14 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt,
                     OUString sAttrs;
                     SfxItemIter aIter( aSet );
                     const SfxPoolItem* pItem = aIter.FirstItem();
+                    const IntlWrapper aInt(SvtSysLocale().GetUILanguageTag());
                     while( true )
                     {
                         if( !IsInvalidItem( pItem ))
                         {
                             OUString aStr;
-                            GetDoc()->GetAttrPool().GetPresentation( *pItem,
-                                MapUnit::MapCM, aStr );
+                            GetDoc()->GetAttrPool().GetPresentation(*pItem,
+                                MapUnit::MapCM, aStr, aInt);
                             if (!sAttrs.isEmpty())
                                 sAttrs += ", ";
                             sAttrs += aStr;
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 2fc3dfcac906..f0e29e9e906b 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -25,6 +25,7 @@
 #include <svtools/unoimap.hxx>
 #include <svtools/imap.hxx>
 #include <svtools/imapobj.hxx>
+#include <unotools/intlwrapper.hxx>
 #include <frmfmt.hxx>
 #include <unocoll.hxx>
 #include <unosett.hxx>
@@ -1242,7 +1243,8 @@ void SwFormatSurround::dumpAsXml(xmlTextWriterPtr pWriter) const
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), BAD_CAST(OString::number((sal_Int32)GetValue()).getStr()));
 
     OUString aPresentation;
-    GetPresentation(SfxItemPresentation::Nameless, MapUnit::Map100thMM, MapUnit::Map100thMM, aPresentation);
+    IntlWrapper aIntlWrapper(SvtSysLocale().GetUILanguageTag());
+    GetPresentation(SfxItemPresentation::Nameless, MapUnit::Map100thMM, MapUnit::Map100thMM, aPresentation, aIntlWrapper);
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("presentation"), BAD_CAST(aPresentation.toUtf8().getStr()));
 
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("bAnchorOnly"), BAD_CAST(OString::boolean(bAnchorOnly).getStr()));
@@ -1695,7 +1697,8 @@ void SwFormatAnchor::dumpAsXml(xmlTextWriterPtr pWriter) const
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("m_nOrder"), BAD_CAST(OString::number(m_nOrder).getStr()));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("m_nOrderCounter"), BAD_CAST(OString::number(m_nOrderCounter).getStr()));
     OUString aPresentation;
-    GetPresentation(SfxItemPresentation::Nameless, MapUnit::Map100thMM, MapUnit::Map100thMM, aPresentation);
+    IntlWrapper aIntlWrapper(SvtSysLocale().GetUILanguageTag());
+    GetPresentation(SfxItemPresentation::Nameless, MapUnit::Map100thMM, MapUnit::Map100thMM, aPresentation, aIntlWrapper);
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("presentation"), BAD_CAST(aPresentation.toUtf8().getStr()));
 
     xmlTextWriterEndElement(pWriter);
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index 2d27a10a433f..09ed6e7393ff 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -833,7 +833,7 @@ bool  SwDocStyleSheet::HasClearParentSupport() const
 // determine textual description
 OUString  SwDocStyleSheet::GetDescription(MapUnit eUnit)
 {
-    IntlWrapper aIntlWrapper( SvtSysLocale().GetLanguageTag() );
+    IntlWrapper aIntlWrapper(SvtSysLocale().GetUILanguageTag());
 
     const OUString sPlus(" + ");
     if ( SfxStyleFamily::Page == nFamily )
@@ -861,7 +861,7 @@ OUString  SwDocStyleSheet::GetDescription(MapUnit eUnit)
                         OUString aItemPresentation;
                         if ( !IsInvalidItem( pItem ) &&
                              pPool->GetPool().GetPresentation(
-                                *pItem, eUnit, aItemPresentation, &aIntlWrapper ) )
+                                *pItem, eUnit, aItemPresentation, aIntlWrapper ) )
                         {
                             if ( !aDesc.isEmpty() && !aItemPresentation.isEmpty() )
                                 aDesc += sPlus;
@@ -913,7 +913,7 @@ OUString  SwDocStyleSheet::GetDescription(MapUnit eUnit)
                         OUString aItemPresentation;
                         if ( !IsInvalidItem( pItem ) &&
                              pPool->GetPool().GetPresentation(
-                                *pItem, eUnit, aItemPresentation, &aIntlWrapper ) )
+                                *pItem, eUnit, aItemPresentation, aIntlWrapper ) )
                         {
                             bool bIsDefault = false;
                             switch ( pItem->Which() )
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index 0da9c3a8bff0..40cb9aa2135c 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -146,7 +146,7 @@ using namespace ::com::sun::star::uno;
 SwModule::SwModule( SfxObjectFactory* pWebFact,
                     SfxObjectFactory* pFact,
                     SfxObjectFactory* pGlobalFact )
-    : SfxModule( Translate::Create("sw", Application::GetSettings().GetUILanguageTag()), {pWebFact, pFact, pGlobalFact} ),
+    : SfxModule( Translate::Create("sw", SvtSysLocale().GetUILanguageTag()), {pWebFact, pFact, pGlobalFact} ),
     m_pModuleConfig(nullptr),
     m_pUsrPref(nullptr),
     m_pWebUsrPref(nullptr),
diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx
index 6cb33a60a9a0..ec02154de2b3 100644
--- a/sw/source/uibase/inc/uiitems.hxx
+++ b/sw/source/uibase/inc/uiitems.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/sw/source/uibase/utlui/attrdesc.cxx b/sw/source/uibase/utlui/attrdesc.cxx
index f2077c883be9..4e10f8527d88 100644
--- a/sw/source/uibase/utlui/attrdesc.cxx
+++ b/sw/source/uibase/utlui/attrdesc.cxx
@@ -72,13 +72,12 @@ void SwAttrSet::GetPresentation(
     if( Count() )
     {
         SfxItemIter aIter( *this );
-        const IntlWrapper rInt( ::comphelper::getProcessComponentContext(),
-                                    GetAppLanguageTag() );
+        const IntlWrapper aInt(SvtSysLocale().GetUILanguageTag());
         while( true )
         {
             aIter.GetCurItem()->GetPresentation( ePres, eCoreMetric,
                                                  ePresMetric, aStr,
-                                                 &rInt );
+                                                 aInt );
             if( rText.getLength() && aStr.getLength() )
                 rText += ", ";
             rText += aStr;
@@ -95,7 +94,7 @@ bool SwFormatCharFormat::GetPresentation
     MapUnit             eCoreUnit,
     MapUnit             ePresUnit,
     OUString&           rText,
-    const IntlWrapper*        /*pIntl*/
+    const IntlWrapper& /*rIntl*/
 )   const
 {
     const SwCharFormat *pCharFormat = GetCharFormat();
@@ -117,7 +116,7 @@ bool SwFormatAutoFormat::GetPresentation
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
     OUString&           rText,
-    const IntlWrapper*        /*pIntl*/
+    const IntlWrapper&  /*rIntl*/
 )   const
 {
     rText.clear(); //TODO
@@ -130,7 +129,7 @@ bool SwFormatINetFormat::GetPresentation
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
     OUString&           rText,
-    const IntlWrapper*        /*pIntl*/
+    const IntlWrapper&  /*rIntl*/
 )   const
 {
     rText = GetValue();
@@ -139,7 +138,7 @@ bool SwFormatINetFormat::GetPresentation
 
 bool SwFormatRuby::GetPresentation( SfxItemPresentation /*ePres*/,
                                     MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
-                                    OUString &rText, const IntlWrapper* /*pIntl*/ ) const
+                                    OUString &rText, const IntlWrapper& /*rIntl*/ ) const
 {
     rText.clear();
     return true;
@@ -151,7 +150,7 @@ bool SwFormatDrop::GetPresentation
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
     OUString&           rText,
-    const IntlWrapper*        /*pIntl*/
+    const IntlWrapper&  /*rIntl*/
 )   const
 {
     rText.clear();
@@ -179,7 +178,7 @@ bool SwRegisterItem::GetPresentation
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
     OUString&           rText,
-    const IntlWrapper*        /*pIntl*/
+    const IntlWrapper&  /*rIntl*/
 )   const
 {
     const char* pId = GetValue() ? STR_REGISTER_ON : STR_REGISTER_OFF;
@@ -193,7 +192,7 @@ bool SwNumRuleItem::GetPresentation
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
     OUString&           rText,
-    const IntlWrapper*        /*pIntl*/
+    const IntlWrapper&  /*rIntl*/
 )   const
 {
     if( !GetValue().isEmpty() )
@@ -210,7 +209,7 @@ bool SwParaConnectBorderItem::GetPresentation
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
     OUString&           rText,
-    const IntlWrapper*        /*pIntl*/
+    const IntlWrapper&  /*rIntl*/
 )   const
 {
     const char* pId = GetValue() ? STR_CONNECT_BORDER_ON : STR_CONNECT_BORDER_OFF;
@@ -226,7 +225,7 @@ bool SwFormatFrameSize::GetPresentation
     MapUnit             eCoreUnit,
     MapUnit             ePresUnit,
     OUString&           rText,
-    const IntlWrapper*        pIntl
+    const IntlWrapper&  rIntl
 )   const
 {
     rText = SwResId( STR_FRM_WIDTH ) + " ";
@@ -237,7 +236,7 @@ bool SwFormatFrameSize::GetPresentation
     }
     else
     {
-        rText = rText + ::GetMetricText( GetWidth(), eCoreUnit, ePresUnit, pIntl ) +
+        rText = rText + ::GetMetricText( GetWidth(), eCoreUnit, ePresUnit, &rIntl ) +
             " " + ::GetSvxString( ::GetMetricId( ePresUnit ) );
     }
     if ( ATT_VAR_SIZE != GetHeightSizeType() )
@@ -252,7 +251,7 @@ bool SwFormatFrameSize::GetPresentation
         }
         else
         {
-            rText = ::GetMetricText( GetHeight(), eCoreUnit, ePresUnit, pIntl ) +
+            rText = ::GetMetricText( GetHeight(), eCoreUnit, ePresUnit, &rIntl ) +
                     " " + ::GetSvxString( ::GetMetricId( ePresUnit ) );
         }
     }
@@ -268,7 +267,7 @@ bool SwFormatHeader::GetPresentation
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
     OUString&           rText,
-    const IntlWrapper*        /*pIntl*/
+    const IntlWrapper&  /*rIntl*/
 )   const
 {
     const char* pId = GetHeaderFormat() ? STR_HEADER : STR_NO_HEADER;
@@ -285,7 +284,7 @@ bool SwFormatFooter::GetPresentation
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
     OUString&           rText,
-    const IntlWrapper*        /*pIntl*/
+    const IntlWrapper&  /*rIntl*/
 )   const
 {
     const char* pId = GetFooterFormat() ? STR_FOOTER : STR_NO_FOOTER;
@@ -299,7 +298,7 @@ bool SwFormatSurround::GetPresentation
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
     OUString&           rText,
-    const IntlWrapper*        /*pIntl*/
+    const IntlWrapper&  /*rIntl*/
 )   const
 {
     const char* pId = nullptr;
@@ -343,7 +342,7 @@ bool SwFormatVertOrient::GetPresentation
     MapUnit             eCoreUnit,
     MapUnit             ePresUnit,
     OUString&           rText,
-    const IntlWrapper*        pIntl
+    const IntlWrapper&  rIntl
 )   const
 {
     const char* pId = nullptr;
@@ -352,7 +351,7 @@ bool SwFormatVertOrient::GetPresentation
         case text::VertOrientation::NONE:
         {
             rText = rText + SwResId( STR_POS_Y ) + " " +
-                    ::GetMetricText( GetPos(), eCoreUnit, ePresUnit, pIntl ) +
+                    ::GetMetricText( GetPos(), eCoreUnit, ePresUnit, &rIntl ) +
                     " " + ::GetSvxString( ::GetMetricId( ePresUnit ) );
         }
         break;
@@ -389,7 +388,7 @@ bool SwFormatHoriOrient::GetPresentation
     MapUnit             eCoreUnit,
     MapUnit             ePresUnit,
     OUString&           rText,
-    const IntlWrapper*        pIntl
+    const IntlWrapper&  rIntl
 )   const
 {
     const char* pId = nullptr;
@@ -398,7 +397,7 @@ bool SwFormatHoriOrient::GetPresentation
         case text::HoriOrientation::NONE:
         {
             rText = rText + SwResId( STR_POS_X ) + " " +
-                    ::GetMetricText( GetPos(), eCoreUnit, ePresUnit, pIntl ) +
+                    ::GetMetricText( GetPos(), eCoreUnit, ePresUnit, &rIntl ) +
                     " " + ::GetSvxString( ::GetMetricId( ePresUnit ) );
         }
         break;
@@ -435,7 +434,7 @@ bool SwFormatAnchor::GetPresentation
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
     OUString&           rText,
-    const IntlWrapper*        /*pIntl*/
+    const IntlWrapper&  /*rIntl*/
 )   const
 {
     const char* pId = nullptr;
@@ -463,7 +462,7 @@ bool SwFormatPageDesc::GetPresentation
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
     OUString&           rText,
-    const IntlWrapper*        /*pIntl*/
+    const IntlWrapper&  /*rIntl*/
 )   const
 {
     const SwPageDesc *pPageDesc = GetPageDesc();
@@ -482,7 +481,7 @@ bool SwFormatCol::GetPresentation
     MapUnit             eCoreUnit,
     MapUnit             /*ePresUnit*/,
     OUString&           rText,
-    const IntlWrapper*        pIntl
+    const IntlWrapper&  rIntl
 )   const
 {
     sal_uInt16 nCnt = GetNumCols();
@@ -494,7 +493,7 @@ bool SwFormatCol::GetPresentation
             const long nWdth = static_cast<long>(GetLineWidth());
             rText = rText + " " + SwResId( STR_LINE_WIDTH ) + " " +
                     ::GetMetricText( nWdth, eCoreUnit,
-                                      MapUnit::MapPoint, pIntl );
+                                      MapUnit::MapPoint, &rIntl );
         }
     }
     else
@@ -510,7 +509,7 @@ bool SwFormatURL::GetPresentation
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
     OUString&           rText,
-    const IntlWrapper*        /*pIntl*/
+    const IntlWrapper&  /*rIntl*/
 )   const
 {
     rText.clear();
@@ -537,7 +536,7 @@ bool SwFormatEditInReadonly::GetPresentation
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
     OUString&           rText,
-    const IntlWrapper*        /*pIntl*/
+    const IntlWrapper&  /*rIntl*/
 )   const
 {
     rText.clear();
@@ -560,7 +559,7 @@ bool SwFormatLayoutSplit::GetPresentation
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
     OUString&           rText,
-    const IntlWrapper*        /*pIntl*/
+    const IntlWrapper&  /*rIntl*/
 )   const
 {
     if ( GetValue() )
@@ -574,7 +573,7 @@ bool SwFormatRowSplit::GetPresentation
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
     OUString&           /*rText*/,
-    const IntlWrapper*        /*pIntl*/
+    const IntlWrapper&  /*rIntl*/
 )   const
 {
     return false;
@@ -586,7 +585,7 @@ bool SwFormatFootnoteEndAtTextEnd::GetPresentation
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
     OUString&           /*rText*/,
-    const IntlWrapper*        /*pIntl*/
+    const IntlWrapper&  /*rIntl*/
 )   const
 {
     return true;
@@ -598,7 +597,7 @@ bool SwFormatChain::GetPresentation
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
     OUString&           rText,
-    const IntlWrapper*        /*pIntl*/
+    const IntlWrapper&  /*rIntl*/
 )   const
 {
     if ( GetPrev() || GetNext() )
@@ -622,7 +621,7 @@ bool SwFormatLineNumber::GetPresentation
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
     OUString&           rText,
-    const IntlWrapper*    /*pIntl*/
+    const IntlWrapper&  /*rIntl*/
 )   const
 {
     if ( IsCount() )
@@ -643,7 +642,7 @@ bool SwTextGridItem::GetPresentation
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
     OUString&           rText,
-    const IntlWrapper*  /*pIntl*/
+    const IntlWrapper&  /*rIntl*/
 )   const
 {
     const char* pId = nullptr;
@@ -671,7 +670,7 @@ bool SwHeaderAndFooterEatSpacingItem::GetPresentation
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
     OUString&           /*rText*/,
-    const IntlWrapper*        /*pIntl*/
+    const IntlWrapper&  /*rIntl*/
 )   const
 {
     return false;
@@ -681,7 +680,7 @@ bool SwHeaderAndFooterEatSpacingItem::GetPresentation
 
 bool SwMirrorGrf::GetPresentation(
     SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/,
-    OUString& rText, const IntlWrapper* /*pIntl*/ ) const
+    OUString& rText, const IntlWrapper& /*rIntl*/ ) const
 {
     const char* pId;
     switch( GetValue() )
@@ -703,7 +702,7 @@ bool SwMirrorGrf::GetPresentation(
 
 bool SwRotationGrf::GetPresentation(
     SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/,
-    OUString &rText, const IntlWrapper* /*pIntl*/) const
+    OUString &rText, const IntlWrapper& /*rIntl*/) const
 {
     if( SfxItemPresentation::Complete == ePres )
         rText = SwResId( STR_ROTATION );
@@ -715,7 +714,7 @@ bool SwRotationGrf::GetPresentation(
 
 bool SwLuminanceGrf::GetPresentation(
     SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/,
-    OUString &rText, const IntlWrapper* /*pIntl*/) const
+    OUString &rText, const IntlWrapper& /*rIntl*/) const
 {
     if( SfxItemPresentation::Complete == ePres )
         rText = SwResId( STR_LUMINANCE );
@@ -728,7 +727,7 @@ bool SwLuminanceGrf::GetPresentation(
 
 bool SwContrastGrf::GetPresentation(
     SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/,
-    OUString &rText, const IntlWrapper* /*pIntl*/) const
+    OUString &rText, const IntlWrapper& /*rIntl*/) const
 {
     if( SfxItemPresentation::Complete == ePres )
         rText = SwResId( STR_CONTRAST );
@@ -741,7 +740,7 @@ bool SwContrastGrf::GetPresentation(
 
 bool SwChannelGrf::GetPresentation(
     SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/,
-    OUString &rText, const IntlWrapper* /*pIntl*/) const
+    OUString &rText, const IntlWrapper& /*rIntl*/) const
 {
     if( SfxItemPresentation::Complete == ePres )
     {
@@ -767,7 +766,7 @@ bool SwChannelGrf::GetPresentation(
 
 bool SwGammaGrf::GetPresentation(
     SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/,
-    OUString &rText, const IntlWrapper* /*pIntl*/) const
+    OUString &rText, const IntlWrapper& /*rIntl*/) const
 {
     OUStringBuffer aText;
     if( SfxItemPresentation::Complete == ePres )
@@ -780,7 +779,7 @@ bool SwGammaGrf::GetPresentation(
 
 bool SwInvertGrf::GetPresentation(
     SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/,
-    OUString &rText, const IntlWrapper* /*pIntl*/) const
+    OUString &rText, const IntlWrapper& /*rIntl*/) const
 {
     rText.clear();
     if( SfxItemPresentation::Complete == ePres )
@@ -793,7 +792,7 @@ bool SwInvertGrf::GetPresentation(
 
 bool SwTransparencyGrf::GetPresentation(
     SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/,
-    OUString &rText, const IntlWrapper* /*pIntl*/) const
+    OUString &rText, const IntlWrapper& /*rIntl*/) const
 {
     if( SfxItemPresentation::Complete == ePres )
         rText = SwResId( STR_TRANSPARENCY );
@@ -806,7 +805,7 @@ bool SwTransparencyGrf::GetPresentation(
 
 bool SwDrawModeGrf::GetPresentation(
     SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/,
-    OUString &rText, const IntlWrapper* /*pIntl*/) const
+    OUString &rText, const IntlWrapper& /*rIntl*/) const
 {
     rText.clear();
     if( SfxItemPresentation::Complete == ePres )
@@ -829,7 +828,7 @@ bool SwFormatFollowTextFlow::GetPresentation( SfxItemPresentation ePres,
                                               MapUnit /*eCoreMetric*/,
                                               MapUnit /*ePresMetric*/,
                                               OUString &rText,
-                                              const IntlWrapper*    /*pIntl*/ ) const
+                                              const IntlWrapper& /*rIntl*/ ) const
 {
     rText.clear();
     if( SfxItemPresentation::Complete == ePres )
diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx
index ad4fefb2167c..da7c0e6b61e0 100644
--- a/sw/source/uibase/utlui/uiitems.cxx
+++ b/sw/source/uibase/utlui/uiitems.cxx
@@ -64,14 +64,14 @@ bool SwPageFootnoteInfoItem::GetPresentation
     MapUnit             eCoreUnit,
     MapUnit             ePresUnit,
     OUString&           rText,
-    const IntlWrapper*  pIntl
+    const IntlWrapper&  rIntl
 )   const
 {
     const SwTwips nHght = GetPageFootnoteInfo().GetHeight();
     if ( nHght )
     {
         rText = SwResId( STR_MAX_FTN_HEIGHT ) + " " +
-                ::GetMetricText( nHght, eCoreUnit, ePresUnit, pIntl ) + " " +
+                ::GetMetricText( nHght, eCoreUnit, ePresUnit, &rIntl ) + " " +
                 ::GetSvxString( ::GetMetricId( ePresUnit ) );
     }
     return true;