[Libreoffice-commits] core.git: avmedia/source connectivity/source cui/source editeng/source embeddedobj/Library_embobj.mk embeddedobj/source framework/source include/avmedia include/editeng include/sfx2 include/svl include/svx include/unotools sc/inc sc/source sfx2/source svl/source svtools/source svx/inc svx/source sw/inc sw/source unotools/source
Caolán McNamara
caolanm at redhat.com
Mon Jul 31 20:01:17 UTC 2017
avmedia/source/framework/mediaitem.cxx | 2
connectivity/source/drivers/evoab2/NResultSet.cxx | 10 -
cui/source/options/optdict.cxx | 2
editeng/source/items/bulitem.cxx | 2
editeng/source/items/charhiddenitem.cxx | 2
editeng/source/items/frmitems.cxx | 100 +++++-----
editeng/source/items/justifyitem.cxx | 6
editeng/source/items/optitems.cxx | 4
editeng/source/items/paraitem.cxx | 28 +-
editeng/source/items/textitem.cxx | 64 +++---
editeng/source/items/writingmodeitem.cxx | 2
editeng/source/items/xmlcnitm.cxx | 2
embeddedobj/Library_embobj.mk | 1
embeddedobj/source/general/docholder.cxx | 3
framework/source/uielement/toolbarsmenucontroller.cxx | 2
include/avmedia/mediaitem.hxx | 2
include/editeng/adjustitem.hxx | 2
include/editeng/autokernitem.hxx | 2
include/editeng/blinkitem.hxx | 2
include/editeng/boxitem.hxx | 4
include/editeng/brushitem.hxx | 2
include/editeng/bulletitem.hxx | 2
include/editeng/charhiddenitem.hxx | 2
include/editeng/charreliefitem.hxx | 2
include/editeng/charrotateitem.hxx | 4
include/editeng/charscaleitem.hxx | 2
include/editeng/charsetcoloritem.hxx | 2
include/editeng/cmapitem.hxx | 2
include/editeng/colritem.hxx | 2
include/editeng/contouritem.hxx | 2
include/editeng/crossedoutitem.hxx | 2
include/editeng/emphasismarkitem.hxx | 2
include/editeng/escapementitem.hxx | 2
include/editeng/fhgtitem.hxx | 2
include/editeng/flstitem.hxx | 2
include/editeng/fontitem.hxx | 2
include/editeng/forbiddenruleitem.hxx | 2
include/editeng/formatbreakitem.hxx | 2
include/editeng/frmdiritem.hxx | 2
include/editeng/fwdtitem.hxx | 2
include/editeng/hngpnctitem.hxx | 2
include/editeng/hyphenzoneitem.hxx | 2
include/editeng/justifyitem.hxx | 6
include/editeng/keepitem.hxx | 2
include/editeng/kernitem.hxx | 2
include/editeng/langitem.hxx | 2
include/editeng/lineitem.hxx | 2
include/editeng/lrspitem.hxx | 2
include/editeng/lspcitem.hxx | 2
include/editeng/nhypitem.hxx | 2
include/editeng/nlbkitem.hxx | 2
include/editeng/opaqitem.hxx | 2
include/editeng/optitems.hxx | 4
include/editeng/orphitem.hxx | 2
include/editeng/paravertalignitem.hxx | 2
include/editeng/pbinitem.hxx | 2
include/editeng/pgrditem.hxx | 2
include/editeng/pmdlitem.hxx | 2
include/editeng/postitem.hxx | 2
include/editeng/prntitem.hxx | 2
include/editeng/protitem.hxx | 2
include/editeng/prszitem.hxx | 2
include/editeng/scriptspaceitem.hxx | 2
include/editeng/shaditem.hxx | 2
include/editeng/shdditem.hxx | 2
include/editeng/sizeitem.hxx | 2
include/editeng/spltitem.hxx | 2
include/editeng/tstpitem.hxx | 2
include/editeng/twolinesitem.hxx | 2
include/editeng/udlnitem.hxx | 2
include/editeng/ulspitem.hxx | 2
include/editeng/wghtitem.hxx | 2
include/editeng/widwitem.hxx | 2
include/editeng/writingmodeitem.hxx | 2
include/editeng/wrlmitem.hxx | 2
include/editeng/xmlcnitm.hxx | 11 -
include/sfx2/evntconf.hxx | 2
include/svl/cenumitm.hxx | 2
include/svl/cintitem.hxx | 8
include/svl/ctypeitm.hxx | 2
include/svl/custritm.hxx | 2
include/svl/eitem.hxx | 6
include/svl/flagitem.hxx | 2
include/svl/inettype.hxx | 3
include/svl/int64item.hxx | 2
include/svl/intitem.hxx | 2
include/svl/itempool.hxx | 2
include/svl/macitem.hxx | 2
include/svl/poolitem.hxx | 6
include/svl/ptitem.hxx | 2
include/svl/rectitem.hxx | 2
include/svl/rngitem.hxx | 2
include/svl/slstitm.hxx | 2
include/svl/srchitem.hxx | 2
include/svl/szitem.hxx | 2
include/svl/visitem.hxx | 2
include/svx/algitem.hxx | 4
include/svx/chrtitem.hxx | 2
include/svx/drawitem.hxx | 14 -
include/svx/grfcrop.hxx | 2
include/svx/numinf.hxx | 2
include/svx/optgrid.hxx | 2
include/svx/pageitem.hxx | 4
include/svx/postattr.hxx | 6
include/svx/rotmodit.hxx | 2
include/svx/rulritem.hxx | 10 -
include/svx/sdangitm.hxx | 3
include/svx/sdasaitm.hxx | 2
include/svx/sdasitm.hxx | 2
include/svx/sdgmoitm.hxx | 2
include/svx/sdmetitm.hxx | 2
include/svx/sdooitm.hxx | 2
include/svx/sdprcitm.hxx | 4
include/svx/sdtaaitm.hxx | 2
include/svx/sdtaditm.hxx | 2
include/svx/sdtaitm.hxx | 4
include/svx/sdtakitm.hxx | 2
include/svx/sdtayitm.hxx | 2
include/svx/sdtfchim.hxx | 2
include/svx/sdtfsitm.hxx | 2
include/svx/sdynitm.hxx | 2
include/svx/svdpool.hxx | 2
include/svx/sxcecitm.hxx | 2
include/svx/sxctitm.hxx | 2
include/svx/sxekitm.hxx | 2
include/svx/sxfiitm.hxx | 2
include/svx/sxmtpitm.hxx | 4
include/svx/sxmuitm.hxx | 2
include/svx/sxsiitm.hxx | 2
include/svx/xbtmpit.hxx | 2
include/svx/xfillit0.hxx | 2
include/svx/xflbckit.hxx | 2
include/svx/xflbmpit.hxx | 2
include/svx/xflbmsli.hxx | 2
include/svx/xflbmsxy.hxx | 4
include/svx/xflbmtit.hxx | 2
include/svx/xflboxy.hxx | 4
include/svx/xflbstit.hxx | 2
include/svx/xflbtoxy.hxx | 4
include/svx/xflclit.hxx | 2
include/svx/xflftrit.hxx | 2
include/svx/xflgrit.hxx | 2
include/svx/xflhtit.hxx | 2
include/svx/xfltrit.hxx | 2
include/svx/xgrscit.hxx | 2
include/svx/xlineit0.hxx | 2
include/svx/xlinjoit.hxx | 2
include/svx/xlncapit.hxx | 2
include/svx/xlnclit.hxx | 2
include/svx/xlndsit.hxx | 2
include/svx/xlnedcit.hxx | 2
include/svx/xlnedit.hxx | 2
include/svx/xlnedwit.hxx | 2
include/svx/xlnstcit.hxx | 2
include/svx/xlnstit.hxx | 2
include/svx/xlnstwit.hxx | 2
include/svx/xlntrit.hxx | 2
include/svx/xlnwtit.hxx | 2
include/svx/xsflclit.hxx | 2
include/unotools/intlwrapper.hxx | 23 --
sc/inc/attrib.hxx | 10 -
sc/inc/docpool.hxx | 2
sc/inc/global.hxx | 1
sc/source/core/data/attrib.cxx | 10 -
sc/source/core/data/docpool.cxx | 20 --
sc/source/core/data/global.cxx | 10 -
sfx2/source/config/evntconf.cxx | 2
sfx2/source/dialog/templdlg.cxx | 2
svl/source/items/cenumitm.cxx | 4
svl/source/items/cintitem.cxx | 8
svl/source/items/ctypeitm.cxx | 12 -
svl/source/items/custritm.cxx | 2
svl/source/items/flagitem.cxx | 2
svl/source/items/int64item.cxx | 2
svl/source/items/intitem.cxx | 2
svl/source/items/itempool.cxx | 4
svl/source/items/macitem.cxx | 2
svl/source/items/poolitem.cxx | 9
svl/source/items/ptitem.cxx | 2
svl/source/items/rectitem.cxx | 2
svl/source/items/rngitem.cxx | 2
svl/source/items/sitem.cxx | 2
svl/source/items/slstitm.cxx | 2
svl/source/items/srchitem.cxx | 2
svl/source/items/style.cxx | 4
svl/source/items/szitem.cxx | 2
svl/source/items/visitem.cxx | 2
svl/source/misc/getstringresource.cxx | 46 ----
svl/source/misc/getstringresource.hxx | 10 -
svl/source/misc/inettype.cxx | 5
svtools/source/contnr/simptabl.cxx | 2
svtools/source/misc/svtresid.cxx | 14 -
svx/inc/sxcikitm.hxx | 2
svx/inc/sxmkitm.hxx | 2
svx/source/dialog/optgrid.cxx | 2
svx/source/dialog/rulritem.cxx | 10 -
svx/source/dialog/srchdlg.cxx | 5
svx/source/items/algitem.cxx | 20 +-
svx/source/items/chrtitem.cxx | 17 -
svx/source/items/customshapeitem.cxx | 2
svx/source/items/drawitem.cxx | 14 -
svx/source/items/grfitem.cxx | 10 -
svx/source/items/numinf.cxx | 2
svx/source/items/pageitem.cxx | 4
svx/source/items/postattr.cxx | 6
svx/source/items/rotmodit.cxx | 2
svx/source/svdraw/svdattr.cxx | 71 +++----
svx/source/svdraw/svdibrow.cxx | 4
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 2
svx/source/xoutdev/xattr.cxx | 44 ++--
svx/source/xoutdev/xattr2.cxx | 32 +--
svx/source/xoutdev/xattrbmp.cxx | 2
sw/inc/fchrfmt.hxx | 2
sw/inc/fmtanchr.hxx | 2
sw/inc/fmtautofmt.hxx | 2
sw/inc/fmtclds.hxx | 2
sw/inc/fmtcnct.hxx | 2
sw/inc/fmteiro.hxx | 2
sw/inc/fmtfollowtextflow.hxx | 2
sw/inc/fmtfsize.hxx | 2
sw/inc/fmtftntx.hxx | 2
sw/inc/fmthdft.hxx | 4
sw/inc/fmtinfmt.hxx | 2
sw/inc/fmtline.hxx | 2
sw/inc/fmtlsplt.hxx | 2
sw/inc/fmtornt.hxx | 4
sw/inc/fmtpdsc.hxx | 2
sw/inc/fmtrowsplt.hxx | 2
sw/inc/fmtruby.hxx | 2
sw/inc/fmtsrnd.hxx | 2
sw/inc/fmturl.hxx | 2
sw/inc/grfatr.hxx | 18 -
sw/inc/hfspacingitem.hxx | 2
sw/inc/paratr.hxx | 8
sw/inc/tgrditem.hxx | 2
sw/source/core/crsr/crstrvl.cxx | 6
sw/source/core/layout/atrfrm.cxx | 7
sw/source/uibase/app/docstyle.cxx | 6
sw/source/uibase/app/swmodule.cxx | 2
sw/source/uibase/inc/uiitems.hxx | 2
sw/source/uibase/utlui/attrdesc.cxx | 87 ++++----
sw/source/uibase/utlui/uiitems.cxx | 4
unotools/source/i18n/intlwrapper.cxx | 12 -
243 files changed, 581 insertions(+), 687 deletions(-)
New commits:
commit 90ac4671c13ed4f548bb4188355b02217b9e24ba
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 28 16:43:06 2017 +0100
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 at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 6b54e8d43271..bbb44b5931ca 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -119,7 +119,7 @@ bool MediaItem::GetPresentation( SfxItemPresentation,
MapUnit,
MapUnit,
OUString& rText,
- const IntlWrapper * ) const
+ const IntlWrapper& ) const
{
rText.clear();
return false;
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index 52bc5b567de1..6fc4365e0f21 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -86,9 +86,9 @@ struct ComparisonData
const SortDescriptor& rSortOrder;
IntlWrapper aIntlWrapper;
- ComparisonData( const SortDescriptor& _rSortOrder, const Reference< XComponentContext >& _rxContext )
- :rSortOrder( _rSortOrder )
- ,aIntlWrapper( _rxContext, SvtSysLocale().GetLanguageTag() )
+ ComparisonData(const SortDescriptor& _rSortOrder)
+ : rSortOrder(_rSortOrder)
+ , aIntlWrapper(SvtSysLocale().GetUILanguageTag())
{
}
};
@@ -695,8 +695,8 @@ void OEvoabResultSet::construct( const QueryData& _rData )
if ( m_pVersionHelper->hasContacts() && !_rData.aSortOrder.empty() )
{
- ComparisonData aCompData( _rData.aSortOrder, comphelper::getComponentContext(getConnection()->getDriver().getMSFactory()) );
- m_pVersionHelper->sortContacts( aCompData );
+ ComparisonData aCompData(_rData.aSortOrder);
+ m_pVersionHelper->sortContacts(aCompData);
}
}
m_nLength = m_pVersionHelper->getNumContacts();
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 339eaef3914b..c6ae57d78673 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -381,7 +381,7 @@ sal_uLong SvxEditDictionaryDialog::GetLBInsertPos(const OUString &rDicWord)
{
sal_uLong nPos = TREELIST_ENTRY_NOTFOUND;
- IntlWrapper aIntlWrapper( Application::GetSettings().GetLanguageTag() );
+ IntlWrapper aIntlWrapper(SvtSysLocale().GetUILanguageTag());
const CollatorWrapper* pCollator = aIntlWrapper.getCollator();
sal_uLong j;
for( j = 0; j < pWordsLB->GetEntryCount(); j++ )
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;
}
diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk
index dc0f88667be7..3030e2ae70c5 100644
--- a/embeddedobj/Library_embobj.mk
+++ b/embeddedobj/Library_embobj.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_Library_use_libraries,embobj,\
cppuhelper \
sal \
svt \
+ utl \
vcl \
tl \
i18nlangtag \
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 751c7c0fff5a..b774ab6aa479 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -971,8 +971,7 @@ bool DocumentHolder::LoadDocToFrame( bool bInPlace )
css::uno::Reference< css::frame::XTitle > xModelTitle( xDoc, css::uno::UNO_QUERY );
if( xModelTitle.is() )
{
- LanguageTag aLocale( Application::GetSettings().GetUILanguageTag() );
- std::locale aResLoc = Translate::Create("sfx", aLocale);
+ std::locale aResLoc = Translate::Create("sfx", SvtSysLocale().GetUILanguageTag());
OUString sEmbedded = Translate::get(STR_EMBEDDED_TITLE, aResLoc);
xModelTitle->setTitle( m_pEmbedObj->getContainerName() + sEmbedded);
m_aContainerName = m_pEmbedObj->getContainerName();
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 35f12c14d9ad..8a4502443468 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -127,7 +127,7 @@ ToolbarsMenuController::ToolbarsMenuController( const css::uno::Reference< css::
m_aPropUIName( "UIName" ),
m_aPropResourceURL( "ResourceURL" ),
m_bResetActive( false ),
- m_aIntlWrapper( xContext, Application::GetSettings().GetLanguageTag() )
+ m_aIntlWrapper(SvtSysLocale().GetUILanguageTag())
{
}
diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx
index 4819d62c9d87..1f92d0b0d7b6 100644
--- a/include/avmedia/mediaitem.hxx
+++ b/include/avmedia/mediaitem.hxx
@@ -76,7 +76,7 @@ public:
MapUnit eCoreUnit,
MapUnit ePresUnit,
OUString& rText,
- const IntlWrapper *pIntl = nullptr ) const override;
+ const IntlWrapper& rIntl ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx
index 8c71878cae65..b74c45ef9596 100644
--- a/include/editeng/adjustitem.hxx
+++ b/include/editeng/adjustitem.hxx
@@ -61,7 +61,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual sal_uInt16 GetValueCount() const override;
virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
virtual sal_uInt16 GetEnumValue() const override;
diff --git a/include/editeng/autokernitem.hxx b/include/editeng/autokernitem.hxx
index 06b47f657190..ad2fc43d9367 100644
--- a/include/editeng/autokernitem.hxx
+++ b/include/editeng/autokernitem.hxx
@@ -47,7 +47,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
SvxAutoKernItem& operator=(const SvxAutoKernItem& rAutoKern)
{
diff --git a/include/editeng/blinkitem.hxx b/include/editeng/blinkitem.hxx
index fe034a02f5b5..77cad8dcefbe 100644
--- a/include/editeng/blinkitem.hxx
+++ b/include/editeng/blinkitem.hxx
@@ -46,7 +46,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
SvxBlinkItem& operator=(const SvxBlinkItem& rBlink) {
SetValue(rBlink.GetValue());
diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx
index 984bd389d7e4..85eba50c4ecd 100644
--- a/include/editeng/boxitem.hxx
+++ b/include/editeng/boxitem.hxx
@@ -78,7 +78,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
@@ -193,7 +193,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx
index d1b66da8890d..787fb3f1d8e0 100644
--- a/include/editeng/brushitem.hxx
+++ b/include/editeng/brushitem.hxx
@@ -82,7 +82,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx
index c73fcb2d8cb9..e112e9776f9e 100644
--- a/include/editeng/bulletitem.hxx
+++ b/include/editeng/bulletitem.hxx
@@ -90,7 +90,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
static void StoreFont( SvStream&, const vcl::Font& );
static vcl::Font CreateFont( SvStream&, sal_uInt16 nVer );
diff --git a/include/editeng/charhiddenitem.hxx b/include/editeng/charhiddenitem.hxx
index 7f53bcbe0c1f..ec2b1400adaf 100644
--- a/include/editeng/charhiddenitem.hxx
+++ b/include/editeng/charhiddenitem.hxx
@@ -38,7 +38,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
SvxCharHiddenItem& operator=(const SvxCharHiddenItem& rHidden) {
SetValue(rHidden.GetValue());
diff --git a/include/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx
index 6da13c4ee9bd..8bdc6f55ef23 100644
--- a/include/editeng/charreliefitem.hxx
+++ b/include/editeng/charreliefitem.hxx
@@ -51,7 +51,7 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText,
- const IntlWrapper * = nullptr ) const override;
+ const IntlWrapper& ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
diff --git a/include/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx
index 292712cc6823..19c7f9cbcd76 100644
--- a/include/editeng/charrotateitem.hxx
+++ b/include/editeng/charrotateitem.hxx
@@ -45,7 +45,7 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText,
- const IntlWrapper * = nullptr) const override;
+ const IntlWrapper&) const override;
virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override;
virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override;
@@ -99,7 +99,7 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText,
- const IntlWrapper * = nullptr ) const override;
+ const IntlWrapper& ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
diff --git a/include/editeng/charscaleitem.hxx b/include/editeng/charscaleitem.hxx
index 3c0539031b2a..8bec6b512341 100644
--- a/include/editeng/charscaleitem.hxx
+++ b/include/editeng/charscaleitem.hxx
@@ -49,7 +49,7 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText,
- const IntlWrapper * = nullptr ) const override;
+ const IntlWrapper& ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
diff --git a/include/editeng/charsetcoloritem.hxx b/include/editeng/charsetcoloritem.hxx
index 7223c2b9a944..03d7542b974c 100644
--- a/include/editeng/charsetcoloritem.hxx
+++ b/include/editeng/charsetcoloritem.hxx
@@ -42,7 +42,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx
index e651a1e4222e..728099361923 100644
--- a/include/editeng/cmapitem.hxx
+++ b/include/editeng/cmapitem.hxx
@@ -44,7 +44,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx
index 55bf50a8f4d1..b90f1e08ba90 100644
--- a/include/editeng/colritem.hxx
+++ b/include/editeng/colritem.hxx
@@ -51,7 +51,7 @@ public:
virtual bool GetPresentation(SfxItemPresentation ePres,
MapUnit eCoreMetric, MapUnit ePresMetric,
- OUString &rText, const IntlWrapper* pIntlWrapper = nullptr) const override;
+ OUString &rText, const IntlWrapper& rIntlWrapper) const override;
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const override;
diff --git a/include/editeng/contouritem.hxx b/include/editeng/contouritem.hxx
index c7865967373a..34602f575ede 100644
--- a/include/editeng/contouritem.hxx
+++ b/include/editeng/contouritem.hxx
@@ -44,7 +44,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
SvxContourItem& operator=(const SvxContourItem& rCont)
{
diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx
index b09654d946e2..6e460cd869ca 100644
--- a/include/editeng/crossedoutitem.hxx
+++ b/include/editeng/crossedoutitem.hxx
@@ -43,7 +43,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
diff --git a/include/editeng/emphasismarkitem.hxx b/include/editeng/emphasismarkitem.hxx
index fe9d92a915e9..356cd56a2a47 100644
--- a/include/editeng/emphasismarkitem.hxx
+++ b/include/editeng/emphasismarkitem.hxx
@@ -45,7 +45,7 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText,
- const IntlWrapper * = nullptr ) const override;
+ const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
diff --git a/include/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx
index 1e8585a0f116..0b0be8793cde 100644
--- a/include/editeng/escapementitem.hxx
+++ b/include/editeng/escapementitem.hxx
@@ -56,7 +56,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx
index ac021bcca0b3..a982e7a41e90 100644
--- a/include/editeng/fhgtitem.hxx
+++ b/include/editeng/fhgtitem.hxx
@@ -55,7 +55,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
diff --git a/include/editeng/flstitem.hxx b/include/editeng/flstitem.hxx
index f75ccca5cd23..527a38544c0b 100644
--- a/include/editeng/flstitem.hxx
+++ b/include/editeng/flstitem.hxx
@@ -54,7 +54,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
const FontList* GetFontList() const { return pFontList; }
};
diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx
index bd78542b72c1..558239f34f09 100644
--- a/include/editeng/fontitem.hxx
+++ b/include/editeng/fontitem.hxx
@@ -58,7 +58,7 @@ public:
virtual bool GetPresentation(SfxItemPresentation ePres,
MapUnit eCoreMetric, MapUnit ePresMetric,
- OUString &rText, const IntlWrapper* = nullptr) const override;
+ OUString &rText, const IntlWrapper&) const override;
// Access methods:
void SetFamilyName(const OUString& rFamilyName)
diff --git a/include/editeng/forbiddenruleitem.hxx b/include/editeng/forbiddenruleitem.hxx
index 47233b7a3c26..f28849ed6a46 100644
--- a/include/editeng/forbiddenruleitem.hxx
+++ b/include/editeng/forbiddenruleitem.hxx
@@ -43,7 +43,7 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText,
- const IntlWrapper * = nullptr ) const override;
+ const IntlWrapper& ) const override;
SvxForbiddenRuleItem& operator=(
const SvxForbiddenRuleItem& rItem )
diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx
index e0fd881162b1..64ca7346feed 100644
--- a/include/editeng/formatbreakitem.hxx
+++ b/include/editeng/formatbreakitem.hxx
@@ -51,7 +51,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx
index 4e3018848722..7ae1a2db2ccf 100644
--- a/include/editeng/frmdiritem.hxx
+++ b/include/editeng/frmdiritem.hxx
@@ -43,7 +43,7 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText,
- const IntlWrapper * = nullptr ) const override;
+ const IntlWrapper& ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
diff --git a/include/editeng/fwdtitem.hxx b/include/editeng/fwdtitem.hxx
index 00e146913360..a9a115ea9dc9 100644
--- a/include/editeng/fwdtitem.hxx
+++ b/include/editeng/fwdtitem.hxx
@@ -47,7 +47,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
diff --git a/include/editeng/hngpnctitem.hxx b/include/editeng/hngpnctitem.hxx
index ebb6ab406171..2a0d1f68b668 100644
--- a/include/editeng/hngpnctitem.hxx
+++ b/include/editeng/hngpnctitem.hxx
@@ -42,7 +42,7 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText,
- const IntlWrapper * = nullptr ) const override;
+ const IntlWrapper& ) const override;
SvxHangingPunctuationItem& operator=(
const SvxHangingPunctuationItem& rItem )
diff --git a/include/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx
index 3a46267d754d..9c15ae446d38 100644
--- a/include/editeng/hyphenzoneitem.hxx
+++ b/include/editeng/hyphenzoneitem.hxx
@@ -54,7 +54,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx
index 3f5633c33788..0b04ab39510b 100644
--- a/include/editeng/justifyitem.hxx
+++ b/include/editeng/justifyitem.hxx
@@ -39,7 +39,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
@@ -71,7 +71,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
@@ -99,7 +99,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
diff --git a/include/editeng/keepitem.hxx b/include/editeng/keepitem.hxx
index 115b8117879d..77b528d7c631 100644
--- a/include/editeng/keepitem.hxx
+++ b/include/editeng/keepitem.hxx
@@ -47,7 +47,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
};
inline SvxFormatKeepItem::SvxFormatKeepItem( const bool bKeep, const sal_uInt16 _nWhich ) :
diff --git a/include/editeng/kernitem.hxx b/include/editeng/kernitem.hxx
index d5eca73b3104..fa8dcd6e9030 100644
--- a/include/editeng/kernitem.hxx
+++ b/include/editeng/kernitem.hxx
@@ -51,7 +51,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
SvxKerningItem& operator=(const SvxKerningItem& rKern) {
SetValue( rKern.GetValue() );
diff --git a/include/editeng/langitem.hxx b/include/editeng/langitem.hxx
index 81bbe052e460..a71c9a9ceef7 100644
--- a/include/editeng/langitem.hxx
+++ b/include/editeng/langitem.hxx
@@ -52,7 +52,7 @@ public:
virtual bool GetPresentation(SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr) const override;
+ OUString &rText, const IntlWrapper&) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
diff --git a/include/editeng/lineitem.hxx b/include/editeng/lineitem.hxx
index 0fb4a787fcb2..2dcdc97a763b 100644
--- a/include/editeng/lineitem.hxx
+++ b/include/editeng/lineitem.hxx
@@ -52,7 +52,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx
index 82b2e3c57a40..b0d7e6b714ec 100644
--- a/include/editeng/lrspitem.hxx
+++ b/include/editeng/lrspitem.hxx
@@ -81,7 +81,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx
index 2c5c6ffcc33c..caec910755fa 100644
--- a/include/editeng/lspcitem.hxx
+++ b/include/editeng/lspcitem.hxx
@@ -58,7 +58,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
diff --git a/include/editeng/nhypitem.hxx b/include/editeng/nhypitem.hxx
index fe7a33678c49..b54d69867678 100644
--- a/include/editeng/nhypitem.hxx
+++ b/include/editeng/nhypitem.hxx
@@ -37,7 +37,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
SvxNoHyphenItem& operator=(const SvxNoHyphenItem& rNHH)
{
diff --git a/include/editeng/nlbkitem.hxx b/include/editeng/nlbkitem.hxx
index fb6a836ab318..f6a2c997bf0c 100644
--- a/include/editeng/nlbkitem.hxx
+++ b/include/editeng/nlbkitem.hxx
@@ -37,7 +37,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
SvxNoLinebreakItem& operator=(const SvxNoLinebreakItem& rLB)
{
diff --git a/include/editeng/opaqitem.hxx b/include/editeng/opaqitem.hxx
index 6b464e3507a3..d2a26feac987 100644
--- a/include/editeng/opaqitem.hxx
+++ b/include/editeng/opaqitem.hxx
@@ -46,7 +46,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
};
inline SvxOpaqueItem::SvxOpaqueItem( const sal_uInt16 nId, const bool bOpa )
diff --git a/include/editeng/optitems.hxx b/include/editeng/optitems.hxx
index 82c9b55748d5..d950d456ed14 100644
--- a/include/editeng/optitems.hxx
+++ b/include/editeng/optitems.hxx
@@ -44,7 +44,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
@@ -73,7 +73,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVer ) const override;
diff --git a/include/editeng/orphitem.hxx b/include/editeng/orphitem.hxx
index 8998056f02d1..108ef55edc7c 100644
--- a/include/editeng/orphitem.hxx
+++ b/include/editeng/orphitem.hxx
@@ -46,7 +46,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
SvxOrphansItem& operator=( const SvxOrphansItem& rOrphans )
{
diff --git a/include/editeng/paravertalignitem.hxx b/include/editeng/paravertalignitem.hxx
index 19aac0e99766..dc8d695e2c91 100644
--- a/include/editeng/paravertalignitem.hxx
+++ b/include/editeng/paravertalignitem.hxx
@@ -49,7 +49,7 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText,
- const IntlWrapper * = nullptr ) const override;
+ const IntlWrapper& ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
diff --git a/include/editeng/pbinitem.hxx b/include/editeng/pbinitem.hxx
index 3c390451d671..d0f03797e119 100644
--- a/include/editeng/pbinitem.hxx
+++ b/include/editeng/pbinitem.hxx
@@ -49,7 +49,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
};
inline SvxPaperBinItem::SvxPaperBinItem( const sal_uInt16 nId, const sal_uInt8 nT )
diff --git a/include/editeng/pgrditem.hxx b/include/editeng/pgrditem.hxx
index 6b3f297dabfd..741c88a73129 100644
--- a/include/editeng/pgrditem.hxx
+++ b/include/editeng/pgrditem.hxx
@@ -44,7 +44,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
};
#endif
diff --git a/include/editeng/pmdlitem.hxx b/include/editeng/pmdlitem.hxx
index 6ab2be2d7e47..a1c895fe98cb 100644
--- a/include/editeng/pmdlitem.hxx
+++ b/include/editeng/pmdlitem.hxx
@@ -47,7 +47,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx
index a558fbd5c7a1..1db525954f4d 100644
--- a/include/editeng/postitem.hxx
+++ b/include/editeng/postitem.hxx
@@ -44,7 +44,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
diff --git a/include/editeng/prntitem.hxx b/include/editeng/prntitem.hxx
index f276cf7f5643..087691c18f10 100644
--- a/include/editeng/prntitem.hxx
+++ b/include/editeng/prntitem.hxx
@@ -46,7 +46,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
};
inline SvxPrintItem::SvxPrintItem( const sal_uInt16 nId, const bool bPrt )
diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx
index 8c40da989a76..28f82763db41 100644
--- a/include/editeng/protitem.hxx
+++ b/include/editeng/protitem.hxx
@@ -50,7 +50,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
diff --git a/include/editeng/prszitem.hxx b/include/editeng/prszitem.hxx
index 20cb729505e1..ba4412308aad 100644
--- a/include/editeng/prszitem.hxx
+++ b/include/editeng/prszitem.hxx
@@ -43,7 +43,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
SvxPropSizeItem& operator=(const SvxPropSizeItem& rPropSize)
{
diff --git a/include/editeng/scriptspaceitem.hxx b/include/editeng/scriptspaceitem.hxx
index 3dc6e7473cc3..4e084fedd7f4 100644
--- a/include/editeng/scriptspaceitem.hxx
+++ b/include/editeng/scriptspaceitem.hxx
@@ -44,7 +44,7 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText,
- const IntlWrapper * = nullptr ) const override;
+ const IntlWrapper& ) const override;
SvxScriptSpaceItem& operator=(const SvxScriptSpaceItem& rItem )
{
diff --git a/include/editeng/shaditem.hxx b/include/editeng/shaditem.hxx
index 51d5ecfe86cc..bf85da422b58 100644
--- a/include/editeng/shaditem.hxx
+++ b/include/editeng/shaditem.hxx
@@ -55,7 +55,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
diff --git a/include/editeng/shdditem.hxx b/include/editeng/shdditem.hxx
index 2c8e21f806ab..a27b54ccc145 100644
--- a/include/editeng/shdditem.hxx
+++ b/include/editeng/shdditem.hxx
@@ -47,7 +47,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
SvxShadowedItem& operator=(const SvxShadowedItem& rShadow) {
SetValue(rShadow.GetValue());
diff --git a/include/editeng/sizeitem.hxx b/include/editeng/sizeitem.hxx
index 37fc8c8e5c07..101424e834dc 100644
--- a/include/editeng/sizeitem.hxx
+++ b/include/editeng/sizeitem.hxx
@@ -51,7 +51,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
diff --git a/include/editeng/spltitem.hxx b/include/editeng/spltitem.hxx
index 47112ca149ff..620c6bbd0c77 100644
--- a/include/editeng/spltitem.hxx
+++ b/include/editeng/spltitem.hxx
@@ -49,7 +49,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
};
inline SvxFormatSplitItem::SvxFormatSplitItem( const bool bSplit, const sal_uInt16 nWh ) :
diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx
index 880b46e10c22..c0f5c61649a9 100644
--- a/include/editeng/tstpitem.hxx
+++ b/include/editeng/tstpitem.hxx
@@ -144,7 +144,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const override;
diff --git a/include/editeng/twolinesitem.hxx b/include/editeng/twolinesitem.hxx
index e978c89ca544..28ca49feae7c 100644
--- a/include/editeng/twolinesitem.hxx
+++ b/include/editeng/twolinesitem.hxx
@@ -46,7 +46,7 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = nullptr ) const override;
+ const IntlWrapper& rIntl ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx
index f0702c6f6965..694e92ba43b6 100644
--- a/include/editeng/udlnitem.hxx
+++ b/include/editeng/udlnitem.hxx
@@ -43,7 +43,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
diff --git a/include/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx
index 97fd58990301..5e2ca0f834c7 100644
--- a/include/editeng/ulspitem.hxx
+++ b/include/editeng/ulspitem.hxx
@@ -55,7 +55,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx
index 1dbd1e875cd3..40fdfcf56d83 100644
--- a/include/editeng/wghtitem.hxx
+++ b/include/editeng/wghtitem.hxx
@@ -44,7 +44,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
diff --git a/include/editeng/widwitem.hxx b/include/editeng/widwitem.hxx
index 1d5d9eabf3db..d008c87a29cd 100644
--- a/include/editeng/widwitem.hxx
+++ b/include/editeng/widwitem.hxx
@@ -46,7 +46,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
SvxWidowsItem& operator=( const SvxWidowsItem& rWidows )
{
diff --git a/include/editeng/writingmodeitem.hxx b/include/editeng/writingmodeitem.hxx
index 518c087c83d2..55a0d5e2e9ea 100644
--- a/include/editeng/writingmodeitem.hxx
+++ b/include/editeng/writingmodeitem.hxx
@@ -45,7 +45,7 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText,
- const IntlWrapper * = nullptr ) const override;
+ const IntlWrapper& ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
diff --git a/include/editeng/wrlmitem.hxx b/include/editeng/wrlmitem.hxx
index 2459c2557cdb..1e36d391e008 100644
--- a/include/editeng/wrlmitem.hxx
+++ b/include/editeng/wrlmitem.hxx
@@ -48,7 +48,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ OUString &rText, const IntlWrapper& ) const override;
SvxWordLineModeItem& operator=( const SvxWordLineModeItem& rWLM )
{
diff --git a/include/editeng/xmlcnitm.hxx b/include/editeng/xmlcnitm.hxx
index 02e304ee1b22..41664c404c41 100644
--- a/include/editeng/xmlcnitm.hxx
+++ b/include/editeng/xmlcnitm.hxx
@@ -41,12 +41,11 @@ public:
virtual bool operator==( const SfxPoolItem& ) const override;
- virtual bool GetPresentation(
- SfxItemPresentation ePresentation,
- MapUnit eCoreMetric,
- MapUnit ePresentationMetric,
- OUString &rText,
- const IntlWrapper *pIntlWrapper = nullptr ) const override;
+ virtual bool GetPresentation(SfxItemPresentation ePresentation,
+ MapUnit eCoreMetric,
+ MapUnit ePresentationMetric,
+ OUString &rText,
+ const IntlWrapper& rIntlWrapper) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override;
diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx
index 7df7c6ae6f88..ec6a0604f569 100644
--- a/include/sfx2/evntconf.hxx
+++ b/include/sfx2/evntconf.hxx
@@ -79,7 +79,7 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText,
- const IntlWrapper * = nullptr ) const override;
+ const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override;
diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx
index e4ea233c2f8b..1857be8cc886 100644
--- a/include/svl/cenumitm.hxx
+++ b/include/svl/cenumitm.hxx
@@ -37,7 +37,7 @@ public:
virtual bool GetPresentation(SfxItemPresentation, MapUnit, MapUnit,
OUString & rText,
- const IntlWrapper * = nullptr) const override;
+ const IntlWrapper&) const override;
virtual bool QueryValue(css::uno::Any & rVal, sal_uInt8 = 0) const override;
diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx
index 2ccfd942d6f9..9b265179cd77 100644
--- a/include/svl/cintitem.hxx
+++ b/include/svl/cintitem.hxx
@@ -42,7 +42,7 @@ public:
virtual bool GetPresentation(SfxItemPresentation,
MapUnit, MapUnit,
OUString & rText,
- const IntlWrapper * = nullptr)
+ const IntlWrapper&)
const override;
virtual bool QueryValue(css::uno::Any& rVal,
@@ -89,7 +89,7 @@ public:
virtual bool GetPresentation(SfxItemPresentation,
MapUnit, MapUnit,
OUString & rText,
- const IntlWrapper * = nullptr)
+ const IntlWrapper&)
const override;
virtual bool QueryValue(css::uno::Any& rVal,
@@ -136,7 +136,7 @@ public:
virtual bool GetPresentation(SfxItemPresentation,
MapUnit, MapUnit,
OUString & rText,
- const IntlWrapper * = nullptr)
+ const IntlWrapper&)
const override;
virtual bool QueryValue(css::uno::Any& rVal,
@@ -183,7 +183,7 @@ public:
virtual bool GetPresentation(SfxItemPresentation,
MapUnit, MapUnit,
OUString & rText,
- const IntlWrapper * = nullptr)
+ const IntlWrapper&)
const override;
virtual bool QueryValue(css::uno::Any& rVal,
diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx
index 17da7e54be71..3fae7a61f215 100644
--- a/include/svl/ctypeitm.hxx
+++ b/include/svl/ctypeitm.hxx
@@ -50,7 +50,7 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString & rText,
- const IntlWrapper* pIntlWrapper = nullptr ) const override;
+ const IntlWrapper& rIntlWrapper ) const override;
virtual bool QueryValue( css::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) const override;
diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx
index 66f65a85b508..c48988448418 100644
--- a/include/svl/custritm.hxx
+++ b/include/svl/custritm.hxx
@@ -46,7 +46,7 @@ public:
virtual bool GetPresentation(SfxItemPresentation,
MapUnit, MapUnit,
OUString & rText,
- const IntlWrapper * = nullptr) const override;
+ const IntlWrapper&) const override;
virtual bool QueryValue(css::uno::Any& rVal,
sal_uInt8 nMemberId = 0) const override;
diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx
index 49b932985c2d..e8933f0bcdaf 100644
--- a/include/svl/eitem.hxx
+++ b/include/svl/eitem.hxx
@@ -110,9 +110,9 @@ public:
virtual bool operator ==(const SfxPoolItem & rItem) const override;
virtual bool GetPresentation(SfxItemPresentation,
- MapUnit, MapUnit,
- OUString & rText,
- const IntlWrapper * = nullptr)
+ MapUnit, MapUnit,
+ OUString & rText,
+ const IntlWrapper&)
const override;
virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx
index 34c5b67a2cd5..56965d68ba8b 100644
--- a/include/svl/flagitem.hxx
+++ b/include/svl/flagitem.hxx
@@ -44,7 +44,7 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString & rText,
- const IntlWrapper * = nullptr ) const override;
+ const IntlWrapper& ) const override;
sal_uInt16 GetValue() const { return nVal; }
void SetValue( sal_uInt16 nNewVal ) {
DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
diff --git a/include/svl/inettype.hxx b/include/svl/inettype.hxx
index a5282a53feea..1fbb036b4878 100644
--- a/include/svl/inettype.hxx
+++ b/include/svl/inettype.hxx
@@ -225,8 +225,7 @@ public:
static OUString GetContentType(INetContentType eTypeID);
- static OUString GetPresentation(INetContentType eTypeID,
- const LanguageTag& aLocale);
+ static OUString GetPresentation(INetContentType eTypeID);
static INetContentType GetContentType4Extension(OUString const & rExtension);
diff --git a/include/svl/int64item.hxx b/include/svl/int64item.hxx
index 46a3325a2d4b..3c2148e2411f 100644
--- a/include/svl/int64item.hxx
+++ b/include/svl/int64item.hxx
@@ -28,7 +28,7 @@ public:
virtual bool GetPresentation(
SfxItemPresentation, MapUnit, MapUnit,
- OUString& rText, const IntlWrapper* pIntlWrapper = nullptr ) const override;
+ OUString& rText, const IntlWrapper& rIntlWrapper ) const override;
virtual bool QueryValue(
css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx
index 6a0e4e92d439..5c73398864ad 100644
--- a/include/svl/intitem.hxx
+++ b/include/svl/intitem.hxx
@@ -60,7 +60,7 @@ public:
virtual bool GetPresentation(SfxItemPresentation,
MapUnit, MapUnit,
OUString & rText,
- const IntlWrapper * = nullptr)
+ const IntlWrapper&)
const override;
virtual bool QueryValue( css::uno::Any& rVal,
diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index eced0598bad6..f9285f9612bf 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -143,7 +143,7 @@ public:
virtual bool GetPresentation( const SfxPoolItem& rItem,
MapUnit ePresentationMetric,
OUString& rText,
- const IntlWrapper * pIntlWrapper = nullptr ) const;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list