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>

9 files changed, 105 insertions, 105 deletions

diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index a8c9110e0b39..c9b419f5c3a8 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -337,7 +337,7 @@ bool SvxBulletItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper *
+    OUString&           rText, const IntlWrapper&
 )   const
 {
     rText = GetFullText();
diff --git a/editeng/source/items/charhiddenitem.cxx b/editeng/source/items/charhiddenitem.cxx
index c27a188af5aa..ca298c717fef 100644
--- a/editeng/source/items/charhiddenitem.cxx
+++ b/editeng/source/items/charhiddenitem.cxx
@@ -38,7 +38,7 @@ bool SvxCharHiddenItem::GetPresentation
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
     OUString&           rText,
-    const IntlWrapper * /*pIntl*/
+    const IntlWrapper & /*rIntl*/
 )   const
 {
     const char* pId = RID_SVXITEMS_CHARHIDDEN_FALSE;
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index ec920d1cdde6..ff1d7f839c04 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -182,7 +182,7 @@ bool SvxPaperBinItem::GetPresentation
     SfxItemPresentation ePres,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper *
+    OUString&           rText, const IntlWrapper&
 )   const
 {
     switch ( ePres )
@@ -320,25 +320,25 @@ bool SvxSizeItem::GetPresentation
     SfxItemPresentation ePres,
     MapUnit             eCoreUnit,
     MapUnit             ePresUnit,
-    OUString&           rText, const IntlWrapper *pIntl
+    OUString&           rText, const IntlWrapper& rIntl
 )   const
 {
     OUString cpDelimTmp(cpDelim);
     switch ( ePres )
     {
         case SfxItemPresentation::Nameless:
-            rText = GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, pIntl ) +
+            rText = GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, &rIntl ) +
                     cpDelimTmp +
-                    GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, pIntl );
+                    GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, &rIntl );
             return true;
 
         case SfxItemPresentation::Complete:
             rText = EditResId(RID_SVXITEMS_SIZE_WIDTH) +
-                    GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, pIntl ) +
+                    GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, &rIntl ) +
                     " " + EditResId(GetMetricId(ePresUnit)) +
                     cpDelimTmp +
                     EditResId(RID_SVXITEMS_SIZE_HEIGHT) +
-                    GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, pIntl ) +
+                    GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, &rIntl ) +
                     " " + EditResId(GetMetricId(ePresUnit));
             return true;
         // no break necessary
@@ -594,7 +594,7 @@ bool SvxLRSpaceItem::GetPresentation
     SfxItemPresentation ePres,
     MapUnit             eCoreUnit,
     MapUnit             ePresUnit,
-    OUString&           rText, const IntlWrapper* pIntl
+    OUString&           rText, const IntlWrapper& rIntl
 )   const
 {
     switch ( ePres )
@@ -608,7 +608,7 @@ bool SvxLRSpaceItem::GetPresentation
             }
             else
                 rText = GetMetricText( (long)nLeftMargin,
-                                       eCoreUnit, ePresUnit, pIntl );
+                                       eCoreUnit, ePresUnit, &rIntl );
             rText += OUString(cpDelim);
             if ( 100 != nPropFirstLineOfst )
             {
@@ -617,7 +617,7 @@ bool SvxLRSpaceItem::GetPresentation
             }
             else
                 rText += GetMetricText( (long)nFirstLineOfst,
-                                        eCoreUnit, ePresUnit, pIntl );
+                                        eCoreUnit, ePresUnit, &rIntl );
             rText += OUString(cpDelim);
             if ( 100 != nRightMargin )
             {
@@ -626,7 +626,7 @@ bool SvxLRSpaceItem::GetPresentation
             }
             else
                 rText += GetMetricText( (long)nRightMargin,
-                                        eCoreUnit, ePresUnit, pIntl );
+                                        eCoreUnit, ePresUnit, &rIntl );
             return true;
         }
         case SfxItemPresentation::Complete:
@@ -638,7 +638,7 @@ bool SvxLRSpaceItem::GetPresentation
             else
             {
                 rText = rText +
-                        GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ) +
+                        GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, &rIntl ) +
                         " " + EditResId(GetMetricId(ePresUnit));
             }
             rText += OUString(cpDelim);
@@ -652,7 +652,7 @@ bool SvxLRSpaceItem::GetPresentation
                 {
                     rText = rText +
                             GetMetricText( (long)nFirstLineOfst,
-                                            eCoreUnit, ePresUnit, pIntl ) +
+                                            eCoreUnit, ePresUnit, &rIntl ) +
                             " " + EditResId(GetMetricId(ePresUnit));
                 }
                 rText += OUString(cpDelim);
@@ -665,7 +665,7 @@ bool SvxLRSpaceItem::GetPresentation
             {
                 rText = rText +
                         GetMetricText( (long)nRightMargin,
-                                       eCoreUnit, ePresUnit, pIntl ) +
+                                       eCoreUnit, ePresUnit, &rIntl ) +
                         " " + EditResId(GetMetricId(ePresUnit));
             }
             return true;
@@ -972,7 +972,7 @@ bool SvxULSpaceItem::GetPresentation
     MapUnit             eCoreUnit,
     MapUnit             ePresUnit,
     OUString&           rText,
-    const IntlWrapper  *pIntl
+    const IntlWrapper&  rIntl
 )   const
 {
     switch ( ePres )
@@ -985,7 +985,7 @@ bool SvxULSpaceItem::GetPresentation
                     Application::GetSettings().GetUILanguageTag());
             }
             else
-                rText = GetMetricText( (long)nUpper, eCoreUnit, ePresUnit, pIntl );
+                rText = GetMetricText( (long)nUpper, eCoreUnit, ePresUnit, &rIntl );
             rText += OUString(cpDelim);
             if ( 100 != nPropLower )
             {
@@ -993,7 +993,7 @@ bool SvxULSpaceItem::GetPresentation
                     Application::GetSettings().GetUILanguageTag());
             }
             else
-                rText += GetMetricText( (long)nLower, eCoreUnit, ePresUnit, pIntl );
+                rText += GetMetricText( (long)nLower, eCoreUnit, ePresUnit, &rIntl );
             return true;
         }
         case SfxItemPresentation::Complete:
@@ -1007,7 +1007,7 @@ bool SvxULSpaceItem::GetPresentation
             else
             {
                 rText = rText +
-                        GetMetricText( (long)nUpper, eCoreUnit, ePresUnit, pIntl ) +
+                        GetMetricText( (long)nUpper, eCoreUnit, ePresUnit, &rIntl ) +
                         " " + EditResId(GetMetricId(ePresUnit));
             }
             rText = rText + OUString(cpDelim) + EditResId(RID_SVXITEMS_ULSPACE_LOWER);
@@ -1019,7 +1019,7 @@ bool SvxULSpaceItem::GetPresentation
             else
             {
                 rText = rText +
-                        GetMetricText( (long)nLower, eCoreUnit, ePresUnit, pIntl ) +
+                        GetMetricText( (long)nLower, eCoreUnit, ePresUnit, &rIntl ) +
                         " " + EditResId(GetMetricId(ePresUnit));
             }
             return true;
@@ -1121,7 +1121,7 @@ bool SvxPrintItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper *
+    OUString&           rText, const IntlWrapper&
 )   const
 {
     const char* pId = RID_SVXITEMS_PRINT_FALSE;
@@ -1159,7 +1159,7 @@ bool SvxOpaqueItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper *
+    OUString&           rText, const IntlWrapper&
 )   const
 {
     const char* pId = RID_SVXITEMS_OPAQUE_FALSE;
@@ -1229,7 +1229,7 @@ bool SvxProtectItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper *
+    OUString&           rText, const IntlWrapper&
 )   const
 {
     const char* pId = RID_SVXITEMS_PROT_CONTENT_FALSE;
@@ -1463,7 +1463,7 @@ bool SvxShadowItem::GetPresentation
     SfxItemPresentation ePres,
     MapUnit             eCoreUnit,
     MapUnit             ePresUnit,
-    OUString&           rText, const IntlWrapper *pIntl
+    OUString&           rText, const IntlWrapper& rIntl
 )   const
 {
     switch ( ePres )
@@ -1478,7 +1478,7 @@ bool SvxShadowItem::GetPresentation
             rText = rText +
                     EditResId(pId) +
                     OUString(cpDelim) +
-                    GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl ) +
+                    GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, &rIntl ) +
                     OUString(cpDelim) +
                     EditResId(RID_SVXITEMS_SHADOW[(int)eLocation]);
             return true;
@@ -1495,7 +1495,7 @@ bool SvxShadowItem::GetPresentation
             rText = rText +
                     EditResId(pId) +
                     OUString(cpDelim) +
-                    GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl ) +
+                    GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, &rIntl ) +
                     " " + EditResId(GetMetricId(ePresUnit)) +
                     OUString(cpDelim) +
                     EditResId(RID_SVXITEMS_SHADOW[(int)eLocation]);
@@ -2063,7 +2063,7 @@ bool SvxBoxItem::GetPresentation
     SfxItemPresentation ePres,
     MapUnit             eCoreUnit,
     MapUnit             ePresUnit,
-    OUString&           rText, const IntlWrapper *pIntl
+    OUString&           rText, const IntlWrapper& rIntl
 )   const
 {
     OUString cpDelimTmp = OUString(cpDelim);
@@ -2075,37 +2075,37 @@ bool SvxBoxItem::GetPresentation
 
             if ( pTop )
             {
-                rText = pTop->GetValueString( eCoreUnit, ePresUnit, pIntl ) + cpDelimTmp;
+                rText = pTop->GetValueString( eCoreUnit, ePresUnit, &rIntl ) + cpDelimTmp;
             }
             if( !(pTop && pBottom && pLeft && pRight &&
                   *pTop == *pBottom && *pTop == *pLeft && *pTop == *pRight) )
             {
                 if ( pBottom )
                 {
-                    rText = rText + pBottom->GetValueString( eCoreUnit, ePresUnit, pIntl ) + cpDelimTmp;
+                    rText = rText + pBottom->GetValueString( eCoreUnit, ePresUnit, &rIntl ) + cpDelimTmp;
                 }
                 if ( pLeft )
                 {
-                    rText = rText + pLeft->GetValueString( eCoreUnit, ePresUnit, pIntl ) + cpDelimTmp;
+                    rText = rText + pLeft->GetValueString( eCoreUnit, ePresUnit, &rIntl ) + cpDelimTmp;
                 }
                 if ( pRight )
                 {
-                    rText = rText + pRight->GetValueString( eCoreUnit, ePresUnit, pIntl ) + cpDelimTmp;
+                    rText = rText + pRight->GetValueString( eCoreUnit, ePresUnit, &rIntl ) + cpDelimTmp;
                 }
             }
-            rText += GetMetricText( (long)nTopDist, eCoreUnit, ePresUnit, pIntl );
+            rText += GetMetricText( (long)nTopDist, eCoreUnit, ePresUnit, &rIntl );
             if( nTopDist != nBottomDist || nTopDist != nLeftDist ||
                 nTopDist != nRightDist )
             {
                 rText = rText +
                         cpDelimTmp +
                         GetMetricText( (long)nBottomDist, eCoreUnit,
-                                        ePresUnit, pIntl ) +
+                                        ePresUnit, &rIntl ) +
                         cpDelimTmp +
-                        GetMetricText( (long)nLeftDist, eCoreUnit, ePresUnit, pIntl ) +
+                        GetMetricText( (long)nLeftDist, eCoreUnit, ePresUnit, &rIntl ) +
                         cpDelimTmp +
                         GetMetricText( (long)nRightDist, eCoreUnit,
-                                        ePresUnit, pIntl );
+                                        ePresUnit, &rIntl );
             }
             return true;
         }
@@ -2121,7 +2121,7 @@ bool SvxBoxItem::GetPresentation
                 if( pTop && pBottom && pLeft && pRight &&
                     *pTop == *pBottom && *pTop == *pLeft && *pTop == *pRight )
                 {
-                    rText += pTop->GetValueString( eCoreUnit, ePresUnit, pIntl, true ) + cpDelimTmp;
+                    rText += pTop->GetValueString( eCoreUnit, ePresUnit, &rIntl, true ) + cpDelimTmp;
                 }
                 else
                 {
@@ -2129,28 +2129,28 @@ bool SvxBoxItem::GetPresentation
                     {
                         rText = rText +
                                 EditResId(RID_SVXITEMS_BORDER_TOP) +
-                                pTop->GetValueString( eCoreUnit, ePresUnit, pIntl, true ) +
+                                pTop->GetValueString( eCoreUnit, ePresUnit, &rIntl, true ) +
                                 cpDelimTmp;
                     }
                     if ( pBottom )
                     {
                         rText = rText +
                                 EditResId(RID_SVXITEMS_BORDER_BOTTOM) +
-                                pBottom->GetValueString( eCoreUnit, ePresUnit, pIntl, true ) +
+                                pBottom->GetValueString( eCoreUnit, ePresUnit, &rIntl, true ) +
                                 cpDelimTmp;
                     }
                     if ( pLeft )
                     {
                         rText = rText +
                                 EditResId(RID_SVXITEMS_BORDER_LEFT) +
-                                pLeft->GetValueString( eCoreUnit, ePresUnit, pIntl, true ) +
+                                pLeft->GetValueString( eCoreUnit, ePresUnit, &rIntl, true ) +
                                 cpDelimTmp;
                     }
                     if ( pRight )
                     {
                         rText = rText +
                                 EditResId(RID_SVXITEMS_BORDER_RIGHT) +
-                                pRight->GetValueString( eCoreUnit, ePresUnit, pIntl, true ) +
+                                pRight->GetValueString( eCoreUnit, ePresUnit, &rIntl, true ) +
                                 cpDelimTmp;
                     }
                 }
@@ -2162,7 +2162,7 @@ bool SvxBoxItem::GetPresentation
             {
                 rText = rText +
                         GetMetricText( (long)nTopDist, eCoreUnit,
-                                            ePresUnit, pIntl ) +
+                                            ePresUnit, &rIntl ) +
                         " " + EditResId(GetMetricId(ePresUnit));
             }
             else
@@ -2170,22 +2170,22 @@ bool SvxBoxItem::GetPresentation
                 rText = rText +
                         EditResId(RID_SVXITEMS_BORDER_TOP) +
                         GetMetricText( (long)nTopDist, eCoreUnit,
-                                        ePresUnit, pIntl ) +
+                                        ePresUnit, &rIntl ) +
                         " " + EditResId(GetMetricId(ePresUnit)) +
                         cpDelimTmp +
                         EditResId(RID_SVXITEMS_BORDER_BOTTOM) +
                         GetMetricText( (long)nBottomDist, eCoreUnit,
-                                        ePresUnit, pIntl ) +
+                                        ePresUnit, &rIntl ) +
                         " " + EditResId(GetMetricId(ePresUnit)) +
                         cpDelimTmp +
                         EditResId(RID_SVXITEMS_BORDER_LEFT) +
                         GetMetricText( (long)nLeftDist, eCoreUnit,
-                                        ePresUnit, pIntl ) +
+                                        ePresUnit, &rIntl ) +
                         " " + EditResId(GetMetricId(ePresUnit)) +
                         cpDelimTmp +
                         EditResId(RID_SVXITEMS_BORDER_RIGHT) +
                         GetMetricText( (long)nRightDist, eCoreUnit,
-                                        ePresUnit, pIntl ) +
+                                        ePresUnit, &rIntl ) +
                         " " + EditResId(GetMetricId(ePresUnit));
             }
             return true;
@@ -2597,7 +2597,7 @@ bool SvxBoxInfoItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper *
+    OUString&           rText, const IntlWrapper&
 )   const
 {
     rText.clear();
@@ -2933,7 +2933,7 @@ bool SvxFormatBreakItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper *
+    OUString&           rText, const IntlWrapper&
 )   const
 {
     rText = GetValueTextByPos( GetEnumValue() );
@@ -3072,7 +3072,7 @@ bool SvxFormatKeepItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper *
+    OUString&           rText, const IntlWrapper&
     ) const
 {
     const char* pId = RID_SVXITEMS_FMTKEEP_FALSE;
@@ -3201,13 +3201,13 @@ bool SvxLineItem::GetPresentation
     SfxItemPresentation ePres,
     MapUnit             eCoreUnit,
     MapUnit             ePresUnit,
-    OUString&           rText, const IntlWrapper *pIntl
+    OUString&           rText, const IntlWrapper& rIntl
 )   const
 {
     rText.clear();
 
     if ( pLine )
-        rText = pLine->GetValueString( eCoreUnit, ePresUnit, pIntl,
+        rText = pLine->GetValueString( eCoreUnit, ePresUnit, &rIntl,
             (SfxItemPresentation::Complete == ePres) );
     return true;
 }
@@ -3672,7 +3672,7 @@ bool SvxBrushItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper *
+    OUString&           rText, const IntlWrapper&
     ) const
 {
     if ( GPOS_NONE  == eGraphicPos )
@@ -4043,7 +4043,7 @@ bool SvxFrameDirectionItem::GetPresentation(
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper *) const
+    OUString&           rText, const IntlWrapper&) const
 {
     rText = EditResId(getFrmDirResId(GetEnumValue()));
     return true;
diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx
index fc9f48e3a6a8..540d4f244150 100644
--- a/editeng/source/items/justifyitem.cxx
+++ b/editeng/source/items/justifyitem.cxx
@@ -54,7 +54,7 @@ bool SvxHorJustifyItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper *)    const
+    OUString&           rText, const IntlWrapper&)    const
 {
     rText = GetValueText( (sal_uInt16)GetValue() );
     return true;
@@ -203,7 +203,7 @@ bool SvxVerJustifyItem::GetPresentation
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
     OUString&           rText,
-    const IntlWrapper * )    const
+    const IntlWrapper& )    const
 {
     rText = GetValueText( GetValue() );
     return true;
@@ -334,7 +334,7 @@ bool SvxJustifyMethodItem::GetPresentation
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
     OUString&           rText,
-    const IntlWrapper * )    const
+    const IntlWrapper& )    const
 {
     rText = GetValueText( GetEnumValue() );
     return true;
diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx
index 920c30f7f4fd..89b6fdaf5fb9 100644
--- a/editeng/source/items/optitems.cxx
+++ b/editeng/source/items/optitems.cxx
@@ -55,7 +55,7 @@ bool SfxSpellCheckItem::GetPresentation
     MapUnit             ,
     MapUnit             ,
     OUString&           ,
-    const IntlWrapper*
+    const IntlWrapper&
 )   const
 {
     return true;
@@ -115,7 +115,7 @@ bool SfxHyphenRegionItem::GetPresentation
     MapUnit             ,
     MapUnit             ,
     OUString&           rText,
-    const IntlWrapper*
+    const IntlWrapper&
 )   const
 {
     rText = rText +
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 166c8ff359da..dde08b33510c 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -228,7 +228,7 @@ bool SvxLineSpacingItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper *
+    OUString&           rText, const IntlWrapper&
 )   const
 {
 #ifdef DBG_UTIL
@@ -407,7 +407,7 @@ bool SvxAdjustItem::GetPresentation
     SfxItemPresentation ePres,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper *
+    OUString&           rText, const IntlWrapper&
 )   const
 {
     switch ( ePres )
@@ -529,7 +529,7 @@ bool SvxWidowsItem::GetPresentation
     SfxItemPresentation ePres,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper *
+    OUString&           rText, const IntlWrapper&
 )   const
 {
     switch ( ePres )
@@ -590,7 +590,7 @@ bool SvxOrphansItem::GetPresentation
     SfxItemPresentation ePres,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper *
+    OUString&           rText, const IntlWrapper&
 )   const
 {
     switch ( ePres )
@@ -702,7 +702,7 @@ bool SvxHyphenZoneItem::GetPresentation
     SfxItemPresentation ePres,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper *
+    OUString&           rText, const IntlWrapper&
 )   const
 {
     OUString cpDelimTmp(cpDelim);
@@ -1027,7 +1027,7 @@ bool SvxTabStopItem::GetPresentation
     SfxItemPresentation ePres,
     MapUnit             eCoreUnit,
     MapUnit             ePresUnit,
-    OUString&           rText, const IntlWrapper *pIntl
+    OUString&           rText, const IntlWrapper& rIntl
 )   const
 {
     rText.clear();
@@ -1041,7 +1041,7 @@ bool SvxTabStopItem::GetPresentation
             if ( bComma )
                 rText += ",";
             rText += GetMetricText(
-                ((*this)[i]).GetTabPos(), eCoreUnit, ePresUnit, pIntl );
+                ((*this)[i]).GetTabPos(), eCoreUnit, ePresUnit, &rIntl );
             if ( SfxItemPresentation::Complete == ePres )
             {
                 rText += " " + EditResId(GetMetricId(ePresUnit));
@@ -1185,7 +1185,7 @@ bool SvxFormatSplitItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper *
+    OUString&           rText, const IntlWrapper&
 )   const
 {
     const char* pId = RID_SVXITEMS_FMTSPLIT_FALSE;
@@ -1245,7 +1245,7 @@ bool SvxPageModelItem::GetPresentation
     SfxItemPresentation ePres,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper *
+    OUString&           rText, const IntlWrapper&
 )   const
 {
     rText.clear();
@@ -1300,7 +1300,7 @@ sal_uInt16  SvxScriptSpaceItem::GetVersion( sal_uInt16 nFFVer ) const
 bool SvxScriptSpaceItem::GetPresentation(
         SfxItemPresentation /*ePres*/,
         MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
-        OUString &rText, const IntlWrapper* /*pIntl*/ ) const
+        OUString &rText, const IntlWrapper& /*rIntl*/ ) const
 {
     rText = EditResId( !GetValue()
                             ? RID_SVXITEMS_SCRPTSPC_OFF
@@ -1340,7 +1340,7 @@ sal_uInt16 SvxHangingPunctuationItem::GetVersion( sal_uInt16 nFFVer ) const
 bool SvxHangingPunctuationItem::GetPresentation(
         SfxItemPresentation /*ePres*/,
         MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
-        OUString &rText, const IntlWrapper* /*pIntl*/ ) const
+        OUString &rText, const IntlWrapper& /*rIntl*/ ) const
 {
     rText = EditResId( !GetValue()
                             ? RID_SVXITEMS_HNGPNCT_OFF
@@ -1380,7 +1380,7 @@ sal_uInt16 SvxForbiddenRuleItem::GetVersion( sal_uInt16 nFFVer ) const
 bool SvxForbiddenRuleItem::GetPresentation(
         SfxItemPresentation /*ePres*/,
         MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
-        OUString &rText, const IntlWrapper* /*pIntl*/ ) const
+        OUString &rText, const IntlWrapper& /*rIntl*/ ) const
 {
     rText = EditResId( !GetValue()
                             ? RID_SVXITEMS_FORBIDDEN_RULE_OFF
@@ -1424,7 +1424,7 @@ sal_uInt16 SvxParaVertAlignItem::GetVersion( sal_uInt16 nFFVer ) const
 bool SvxParaVertAlignItem::GetPresentation(
         SfxItemPresentation /*ePres*/,
         MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
-        OUString &rText, const IntlWrapper*  ) const
+        OUString &rText, const IntlWrapper& ) const
 {
     const char* pTmp;
     switch( GetValue() )
@@ -1496,7 +1496,7 @@ sal_uInt16  SvxParaGridItem::GetVersion( sal_uInt16 nFFVer ) const
 bool SvxParaGridItem::GetPresentation(
         SfxItemPresentation /*ePres*/,
         MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
-        OUString &rText, const IntlWrapper* /*pIntl*/ ) const
+        OUString &rText, const IntlWrapper& /*rIntl*/ ) const
 {
     rText = GetValue() ?
             EditResId( RID_SVXITEMS_PARASNAPTOGRID_ON ) :
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 37af9cfa6a76..220c99e417a5 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -176,7 +176,7 @@ bool SvxFontListItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper * /*pIntl*/
+    OUString&           rText, const IntlWrapper& /*rIntl*/
 )   const
 {
     rText.clear();
@@ -411,7 +411,7 @@ bool SvxFontItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper * /*pIntl*/
+    OUString&           rText, const IntlWrapper& /*rIntl*/
 )   const
 {
     rText = aFamilyName;
@@ -476,7 +476,7 @@ bool SvxPostureItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper * /*pIntl*/
+    OUString&           rText, const IntlWrapper& /*rIntl*/
 )   const
 {
     rText = GetValueTextByPos( GetValue() );
@@ -623,7 +623,7 @@ bool SvxWeightItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper * /*pIntl*/
+    OUString&           rText, const IntlWrapper& /*rIntl*/
 )   const
 {
     rText = GetValueTextByPos( GetValue() );
@@ -1006,7 +1006,7 @@ bool SvxFontHeightItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             eCoreUnit,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper *pIntl
+    OUString&           rText, const IntlWrapper& rIntl
 )   const
 {
     if( MapUnit::MapRelative != ePropUnit )
@@ -1019,7 +1019,7 @@ bool SvxFontHeightItem::GetPresentation
     else if( 100 == nProp )
     {
         rText = GetMetricText( (long)nHeight,
-                                eCoreUnit, MapUnit::MapPoint, pIntl ) +
+                                eCoreUnit, MapUnit::MapPoint, &rIntl ) +
                 " " + EditResId(GetMetricId(MapUnit::MapPoint));
     }
     else
@@ -1191,13 +1191,13 @@ bool SvxFontWidthItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             eCoreUnit,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper *pIntl
+    OUString&           rText, const IntlWrapper& rIntl
 )   const
 {
     if ( 100 == nProp )
     {
         rText = GetMetricText( (long)nWidth,
-                                eCoreUnit, MapUnit::MapPoint, pIntl ) +
+                                eCoreUnit, MapUnit::MapPoint, &rIntl ) +
                 " " + EditResId(GetMetricId(MapUnit::MapPoint));
     }
     else
@@ -1265,7 +1265,7 @@ bool SvxTextLineItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper * /*pIntl*/
+    OUString&           rText, const IntlWrapper& /*rIntl*/
 )   const
 {
     rText = GetValueTextByPos( GetValue() );
@@ -1514,7 +1514,7 @@ bool SvxCrossedOutItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper * /*pIntl*/
+    OUString&           rText, const IntlWrapper& /*rIntl*/
 )   const
 {
     rText = GetValueTextByPos( GetValue() );
@@ -1606,7 +1606,7 @@ bool SvxShadowedItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper * /*pIntl*/
+    OUString&           rText, const IntlWrapper& /*rIntl*/
 )   const
 {
     const char* pId = RID_SVXITEMS_SHADOWED_FALSE;
@@ -1651,7 +1651,7 @@ bool SvxAutoKernItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper * /*pIntl*/
+    OUString&           rText, const IntlWrapper& /*rIntl*/
 )   const
 {
     const char* pId = RID_SVXITEMS_AUTOKERN_FALSE;
@@ -1697,7 +1697,7 @@ bool SvxWordLineModeItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper * /*pIntl*/
+    OUString&           rText, const IntlWrapper& /*rIntl*/
 )   const
 {
     const char* pId = RID_SVXITEMS_WORDLINE_FALSE;
@@ -1742,7 +1742,7 @@ bool SvxContourItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper * /*pIntl*/
+    OUString&           rText, const IntlWrapper& /*rIntl*/
 )   const
 {
     const char* pId = RID_SVXITEMS_CONTOUR_FALSE;
@@ -1787,7 +1787,7 @@ bool SvxPropSizeItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper * /*pIntl*/
+    OUString&           rText, const IntlWrapper& /*rIntl*/
 )   const
 {
     rText.clear();
@@ -1971,7 +1971,7 @@ bool SvxColorItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper * /*pIntl*/
+    OUString&           rText, const IntlWrapper& /*rIntl*/
 )   const
 {
     rText = ::GetColorString( mColor );
@@ -2033,7 +2033,7 @@ bool SvxCharSetColorItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper * /*pIntl*/
+    OUString&           rText, const IntlWrapper& /*rIntl*/
 )   const
 {
     rText.clear();
@@ -2086,13 +2086,13 @@ bool SvxKerningItem::GetPresentation
     SfxItemPresentation ePres,
     MapUnit             eCoreUnit,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper *pIntl
+    OUString&           rText, const IntlWrapper& rIntl
 )   const
 {
     switch ( ePres )
     {
         case SfxItemPresentation::Nameless:
-            rText = GetMetricText( (long)GetValue(), eCoreUnit, MapUnit::MapPoint, pIntl ) +
+            rText = GetMetricText( (long)GetValue(), eCoreUnit, MapUnit::MapPoint, &rIntl ) +
                     " " + EditResId(GetMetricId(MapUnit::MapPoint));
             return true;
         case SfxItemPresentation::Complete:
@@ -2108,7 +2108,7 @@ bool SvxKerningItem::GetPresentation
             if (pId)
                 rText += EditResId(pId);
             rText = rText +
-                    GetMetricText( (long)GetValue(), eCoreUnit, MapUnit::MapPoint, pIntl ) +
+                    GetMetricText( (long)GetValue(), eCoreUnit, MapUnit::MapPoint, &rIntl ) +
                     " " + EditResId(GetMetricId(MapUnit::MapPoint));
             return true;
         }
@@ -2177,7 +2177,7 @@ bool SvxCaseMapItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper * /*pIntl*/
+    OUString&           rText, const IntlWrapper& /*rIntl*/
 )   const
 {
     rText = GetValueTextByPos( (sal_uInt16)GetValue() );
@@ -2318,7 +2318,7 @@ bool SvxEscapementItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper * /*pIntl*/
+    OUString&           rText, const IntlWrapper& /*rIntl*/
 )   const
 {
     rText = GetValueTextByPos( GetEnumValue() );
@@ -2468,7 +2468,7 @@ bool SvxLanguageItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper * /*pIntl*/
+    OUString&           rText, const IntlWrapper& /*rIntl*/
 )   const
 {
     rText = SvtLanguageTable::GetLanguageString( GetValue() );
@@ -2551,7 +2551,7 @@ bool SvxNoLinebreakItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper * /*pIntl*/
+    OUString&           rText, const IntlWrapper& /*rIntl*/
 )   const
 {
     rText.clear();
@@ -2592,7 +2592,7 @@ bool SvxNoHyphenItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper * /*pIntl*/
+    OUString&           rText, const IntlWrapper& /*rIntl*/
 )   const
 {
     rText.clear();
@@ -2640,7 +2640,7 @@ bool SvxBlinkItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper * /*pIntl*/
+    OUString&           rText, const IntlWrapper& /*rIntl*/
 )   const
 {
     const char* pId = RID_SVXITEMS_BLINK_FALSE;
@@ -2688,7 +2688,7 @@ bool SvxEmphasisMarkItem::GetPresentation
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
     OUString&           rText,
-    const IntlWrapper * /*pIntl*/
+    const IntlWrapper& /*rIntl*/
 )   const
 {
     static const char* RID_SVXITEMS_EMPHASIS[] =
@@ -2882,7 +2882,7 @@ bool SvxTwoLinesItem::PutValue( const css::uno::Any& rVal,
 
 bool SvxTwoLinesItem::GetPresentation( SfxItemPresentation /*ePres*/,
                             MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
-                            OUString &rText, const IntlWrapper* /*pIntl*/ ) const
+                            OUString &rText, const IntlWrapper& /*rIntl*/ ) const
 {
     if( !GetValue() )
         rText = EditResId( RID_SVXITEMS_TWOLINES_OFF );
@@ -2958,7 +2958,7 @@ sal_uInt16 SvxTextRotateItem::GetVersion(sal_uInt16 nFFVer) const
 bool SvxTextRotateItem::GetPresentation(
     SfxItemPresentation /*ePres*/,
     MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
-    OUString &rText, const IntlWrapper*) const
+    OUString &rText, const IntlWrapper&) const
 {
     if (!GetValue())
         rText = EditResId(RID_SVXITEMS_TEXTROTATE_OFF);
@@ -3063,7 +3063,7 @@ sal_uInt16 SvxCharRotateItem::GetVersion( sal_uInt16 nFFVer ) const
 bool SvxCharRotateItem::GetPresentation(
         SfxItemPresentation /*ePres*/,
         MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
-        OUString &rText, const IntlWrapper*  ) const
+        OUString &rText, const IntlWrapper&) const
 {
     if( !GetValue() )
         rText = EditResId( RID_SVXITEMS_CHARROTATE_OFF );
@@ -3196,7 +3196,7 @@ sal_uInt16 SvxCharScaleWidthItem::GetVersion( sal_uInt16 nFFVer ) const
 bool SvxCharScaleWidthItem::GetPresentation(
         SfxItemPresentation /*ePres*/,
         MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
-        OUString &rText, const IntlWrapper*  ) const
+        OUString &rText, const IntlWrapper&) const
 {
     if( !GetValue() )
         rText = EditResId( RID_SVXITEMS_CHARSCALE_OFF );
@@ -3289,7 +3289,7 @@ bool SvxCharReliefItem::GetPresentation
     SfxItemPresentation /*ePres*/,
     MapUnit             /*eCoreUnit*/,
     MapUnit             /*ePresUnit*/,
-    OUString&           rText, const IntlWrapper * /*pIntl*/
+    OUString&           rText, const IntlWrapper& /*rIntl*/
 )   const
 {
     rText = GetValueTextByPos( (sal_uInt16)GetValue() );
diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx
index fbac64aaba46..c3a53475d635 100644
--- a/editeng/source/items/writingmodeitem.cxx
+++ b/editeng/source/items/writingmodeitem.cxx
@@ -69,7 +69,7 @@ bool SvxWritingModeItem::GetPresentation( SfxItemPresentation /*ePres*/,
         MapUnit /*eCoreMetric*/,
         MapUnit /*ePresMetric*/,
         OUString &rText,
-        const IntlWrapper *  ) const
+        const IntlWrapper& ) const
 {
     rText = EditResId(getFrmDirResId((int)GetValue()));
     return true;
diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx
index 33f07dd5882a..c71f15d20692 100644
--- a/editeng/source/items/xmlcnitm.cxx
+++ b/editeng/source/items/xmlcnitm.cxx
@@ -61,7 +61,7 @@ bool SvXMLAttrContainerItem::GetPresentation(
                     MapUnit /*eCoreMetric*/,
                     MapUnit /*ePresentationMetric*/,
                     OUString & /*rText*/,
-                    const IntlWrapper * /*pIntlWrapper*/ ) const
+                    const IntlWrapper& /*rIntlWrapper*/ ) const
 {
     return false;
 }