summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/sxcikitm.hxx2
-rw-r--r--svx/inc/sxmkitm.hxx2
-rw-r--r--svx/source/dialog/optgrid.cxx2
-rw-r--r--svx/source/dialog/rulritem.cxx10
-rw-r--r--svx/source/dialog/srchdlg.cxx5
-rw-r--r--svx/source/items/algitem.cxx20
-rw-r--r--svx/source/items/chrtitem.cxx17
-rw-r--r--svx/source/items/customshapeitem.cxx2
-rw-r--r--svx/source/items/drawitem.cxx14
-rw-r--r--svx/source/items/grfitem.cxx10
-rw-r--r--svx/source/items/numinf.cxx2
-rw-r--r--svx/source/items/pageitem.cxx4
-rw-r--r--svx/source/items/postattr.cxx6
-rw-r--r--svx/source/items/rotmodit.cxx2
-rw-r--r--svx/source/svdraw/svdattr.cxx71
-rw-r--r--svx/source/svdraw/svdibrow.cxx4
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx2
-rw-r--r--svx/source/xoutdev/xattr.cxx44
-rw-r--r--svx/source/xoutdev/xattr2.cxx32
-rw-r--r--svx/source/xoutdev/xattrbmp.cxx2
20 files changed, 118 insertions, 135 deletions
diff --git a/svx/inc/sxcikitm.hxx b/svx/inc/sxcikitm.hxx
index 5f918c28bcd8..0c9352ef658e 100644
--- a/svx/inc/sxcikitm.hxx
+++ b/svx/inc/sxcikitm.hxx
@@ -39,7 +39,7 @@ public:
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override;
- virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
+ virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override;
};
#endif
diff --git a/svx/inc/sxmkitm.hxx b/svx/inc/sxmkitm.hxx
index cc52193990cc..0362f8537353 100644
--- a/svx/inc/sxmkitm.hxx
+++ b/svx/inc/sxmkitm.hxx
@@ -39,7 +39,7 @@ public:
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override;
- virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
+ virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override;
};
#endif
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index 53521b4178bc..248d741e1c27 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -103,7 +103,7 @@ bool SvxGridItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText = "SvxGridItem";
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index 02b9f1fdf345..a74c55703c8f 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -121,7 +121,7 @@ bool SvxLongLRSpaceItem::GetPresentation(
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
OUString& /*rText*/,
- const IntlWrapper* /*pWrapper*/) const
+ const IntlWrapper& /*rWrapper*/) const
{
return false;
}
@@ -247,7 +247,7 @@ bool SvxLongULSpaceItem::GetPresentation(
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
OUString& /*rText*/,
- const IntlWrapper* /*pWrapper*/ ) const
+ const IntlWrapper& /*rWrapper*/ ) const
{
return false;
}
@@ -368,7 +368,7 @@ bool SvxPagePosSizeItem::GetPresentation(
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
OUString& /*rText*/,
- const IntlWrapper* /*pWrapper*/ ) const
+ const IntlWrapper& /*rWrapper*/ ) const
{
return false;
}
@@ -459,7 +459,7 @@ bool SvxColumnItem::GetPresentation(
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
OUString& /*rText*/,
- const IntlWrapper* /*pWrapper*/ ) const
+ const IntlWrapper& /*rWrapper*/ ) const
{
return false;
}
@@ -694,7 +694,7 @@ bool SvxObjectItem::GetPresentation(
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
OUString& /*rText*/,
- const IntlWrapper* /*pWrapper*/ ) const
+ const IntlWrapper& /*rWrapper*/ ) const
{
return false;
}
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 37b0b289dacf..47c409718971 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -26,6 +26,7 @@
#include <svl/slstitm.hxx>
#include <svl/itemiter.hxx>
#include <svl/style.hxx>
+#include <unotools/intlwrapper.hxx>
#include <unotools/moduleoptions.hxx>
#include <unotools/searchopt.hxx>
#include <sfx2/dispatch.hxx>
@@ -2155,6 +2156,7 @@ OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr,
default: ;//prevent warning
}
+ IntlWrapper aIntlWrapper(SvtSysLocale().GetUILanguageTag());
for ( sal_uInt16 i = 0; i < pList->Count(); ++i )
{
const SearchAttrItem& rItem = pList->GetObject(i);
@@ -2165,8 +2167,7 @@ OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr,
if ( !IsInvalidItem( rItem.pItem ) )
{
OUString aStr;
- rPool.GetPresentation( *rItem.pItem,
- eMapUnit, aStr );
+ rPool.GetPresentation(*rItem.pItem, eMapUnit, aStr, aIntlWrapper);
rStr += aStr;
}
else if ( rItem.nSlot == SID_ATTR_BRUSH_CHAR )
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index b06b0e482cdd..ca821835452a 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -71,7 +71,7 @@ bool SvxOrientationItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper * ) const
+ OUString& rText, const IntlWrapper& ) const
{
rText = GetValueText( GetValue() );
return true;
@@ -203,7 +203,7 @@ bool SvxMarginItem::GetPresentation
SfxItemPresentation ePres,
MapUnit eCoreUnit,
MapUnit ePresUnit,
- OUString& rText, const IntlWrapper *pIntl
+ OUString& rText, const IntlWrapper& rIntl
) const
{
OUString cpDelimTmp = OUString(cpDelim);
@@ -212,31 +212,31 @@ bool SvxMarginItem::GetPresentation
{
case SfxItemPresentation::Nameless:
{
- rText = GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ) +
+ rText = GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, &rIntl ) +
cpDelimTmp +
- GetMetricText( (long)nTopMargin, eCoreUnit, ePresUnit, pIntl ) +
+ GetMetricText( (long)nTopMargin, eCoreUnit, ePresUnit, &rIntl ) +
cpDelimTmp +
- GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, pIntl ) +
+ GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, &rIntl ) +
cpDelimTmp +
- GetMetricText( (long)nBottomMargin, eCoreUnit, ePresUnit, pIntl );
+ GetMetricText( (long)nBottomMargin, eCoreUnit, ePresUnit, &rIntl );
return true;
}
case SfxItemPresentation::Complete:
{
rText = SvxResId(RID_SVXITEMS_MARGIN_LEFT) +
- GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ) +
+ GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, &rIntl ) +
" " + EditResId(GetMetricId(ePresUnit)) +
cpDelimTmp +
SvxResId(RID_SVXITEMS_MARGIN_TOP) +
- GetMetricText( (long)nTopMargin, eCoreUnit, ePresUnit, pIntl ) +
+ GetMetricText( (long)nTopMargin, eCoreUnit, ePresUnit, &rIntl ) +
" " + EditResId(GetMetricId(ePresUnit)) +
cpDelimTmp +
SvxResId(RID_SVXITEMS_MARGIN_RIGHT) +
- GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, pIntl ) +
+ GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, &rIntl ) +
" " + EditResId(GetMetricId(ePresUnit)) +
cpDelimTmp +
SvxResId(RID_SVXITEMS_MARGIN_BOTTOM) +
- GetMetricText( (long)nBottomMargin, eCoreUnit, ePresUnit, pIntl ) +
+ GetMetricText( (long)nBottomMargin, eCoreUnit, ePresUnit, &rIntl ) +
" " + EditResId(GetMetricId(ePresUnit));
return true;
}
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index 4680ddefb144..e6150b94494c 100644
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -121,43 +121,32 @@ SvxDoubleItem::SvxDoubleItem(double fValue, sal_uInt16 nId) :
{
}
-
SvxDoubleItem::SvxDoubleItem(const SvxDoubleItem& rItem) :
SfxPoolItem(rItem),
fVal(rItem.fVal)
{
}
-
bool SvxDoubleItem::GetPresentation
( SfxItemPresentation /*ePresentation*/, MapUnit /*eCoreMetric*/,
MapUnit /*ePresentationMetric*/, OUString& rText,
- const IntlWrapper * pIntlWrapper) const
+ const IntlWrapper& rIntlWrapper) const
{
- DBG_ASSERT( pIntlWrapper, "SvxDoubleItem::GetPresentation: no IntlWrapper" );
- if ( pIntlWrapper )
- {
- rText = ::rtl::math::doubleToUString( fVal, rtl_math_StringFormat_E, 4,
- pIntlWrapper->getLocaleData()->getNumDecimalSep()[0], true );
- }
- else
- rText = rtl::math::doubleToUString( fVal, rtl_math_StringFormat_E, 4, '.' );
+ rText = ::rtl::math::doubleToUString( fVal, rtl_math_StringFormat_E, 4,
+ rIntlWrapper.getLocaleData()->getNumDecimalSep()[0], true );
return true;
}
-
bool SvxDoubleItem::operator == (const SfxPoolItem& rItem) const
{
return static_cast<const SvxDoubleItem&>(rItem).fVal == fVal;
}
-
SfxPoolItem* SvxDoubleItem::Clone(SfxItemPool* /*pPool*/) const
{
return new SvxDoubleItem(*this);
}
-
SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, sal_uInt16 /*nVersion*/) const
{
double _fVal;
diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx
index 9efc2c3eb01a..4c898344daab 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -253,7 +253,7 @@ bool SdrCustomShapeGeometryItem::operator==( const SfxPoolItem& rCmp ) const
bool SdrCustomShapeGeometryItem::GetPresentation(
SfxItemPresentation ePresentation, MapUnit /*eCoreMetric*/,
- MapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const
+ MapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper&) const
{
rText += " ";
if ( ePresentation == SfxItemPresentation::Complete )
diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx
index ce1864fc1d31..e3a850c25d75 100644
--- a/svx/source/items/drawitem.cxx
+++ b/svx/source/items/drawitem.cxx
@@ -55,7 +55,7 @@ bool SvxColorListItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
@@ -117,7 +117,7 @@ bool SvxGradientListItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
@@ -164,7 +164,7 @@ bool SvxHatchListItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
@@ -207,7 +207,7 @@ bool SvxBitmapListItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
@@ -248,7 +248,7 @@ bool SvxPatternListItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
@@ -290,7 +290,7 @@ bool SvxDashListItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
@@ -331,7 +331,7 @@ bool SvxLineEndListItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx
index 96bb8bf660ca..8f2d989e03ff 100644
--- a/svx/source/items/grfitem.cxx
+++ b/svx/source/items/grfitem.cxx
@@ -137,7 +137,7 @@ bool SvxGrfCrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
bool SvxGrfCrop::GetPresentation(
SfxItemPresentation ePres, MapUnit eCoreUnit, MapUnit /*ePresUnit*/,
- OUString &rText, const IntlWrapper* pIntl ) const
+ OUString &rText, const IntlWrapper& rIntl ) const
{
rText.clear();
switch( ePres )
@@ -145,10 +145,10 @@ bool SvxGrfCrop::GetPresentation(
case SfxItemPresentation::Nameless:
return true;
case SfxItemPresentation::Complete:
- rText = "L: " + ::GetMetricText( GetLeft(), eCoreUnit, MapUnit::MapMM, pIntl ) +
- " R: " + ::GetMetricText( GetRight(), eCoreUnit, MapUnit::MapMM, pIntl ) +
- " T: " + ::GetMetricText( GetTop(), eCoreUnit, MapUnit::MapMM, pIntl ) +
- " B: " + ::GetMetricText( GetBottom(), eCoreUnit, MapUnit::MapMM, pIntl );
+ rText = "L: " + ::GetMetricText( GetLeft(), eCoreUnit, MapUnit::MapMM, &rIntl ) +
+ " R: " + ::GetMetricText( GetRight(), eCoreUnit, MapUnit::MapMM, &rIntl ) +
+ " T: " + ::GetMetricText( GetTop(), eCoreUnit, MapUnit::MapMM, &rIntl ) +
+ " B: " + ::GetMetricText( GetBottom(), eCoreUnit, MapUnit::MapMM, &rIntl );
return true;
break;
diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx
index faefb80839b4..ec538b89119f 100644
--- a/svx/source/items/numinf.cxx
+++ b/svx/source/items/numinf.cxx
@@ -109,7 +109,7 @@ bool SvxNumberInfoItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index fc288024393a..0e59f4e72555 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -100,7 +100,7 @@ bool SvxPageItem::GetPresentation
SfxItemPresentation ePres,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
@@ -291,7 +291,7 @@ bool SvxSetItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx
index 9a3f4127e14b..282631f22ca4 100644
--- a/svx/source/items/postattr.cxx
+++ b/svx/source/items/postattr.cxx
@@ -46,7 +46,7 @@ bool SvxPostItAuthorItem::GetPresentation
SfxItemPresentation ePres,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
switch ( ePres )
@@ -86,7 +86,7 @@ bool SvxPostItDateItem::GetPresentation
SfxItemPresentation ePres,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
switch ( ePres )
@@ -124,7 +124,7 @@ bool SvxPostItTextItem::GetPresentation
SfxItemPresentation ePres,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
switch ( ePres )
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index dc4de5d8e1db..0a7b87322860 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -66,7 +66,7 @@ SfxPoolItem* SvxRotateModeItem::Create( SvStream& rStream, sal_uInt16 ) const
bool SvxRotateModeItem::GetPresentation(
SfxItemPresentation ePres,
MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper * ) const
+ OUString& rText, const IntlWrapper& ) const
{
rText.clear();
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 9c55222fd98f..34400847bd6d 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -364,14 +364,14 @@ SdrItemPool::~SdrItemPool()
bool SdrItemPool::GetPresentation(
const SfxPoolItem& rItem,
MapUnit ePresentationMetric, OUString& rText,
- const IntlWrapper * pIntlWrapper) const
+ const IntlWrapper& rIntlWrapper) const
{
if (!IsInvalidItem(&rItem)) {
sal_uInt16 nWhich=rItem.Which();
if (nWhich>=SDRATTR_SHADOW_FIRST && nWhich<=SDRATTR_END) {
rItem.GetPresentation(SfxItemPresentation::Nameless,
GetMetric(nWhich),ePresentationMetric,rText,
- pIntlWrapper);
+ rIntlWrapper);
OUString aStr;
TakeItemName(nWhich, aStr);
@@ -380,7 +380,7 @@ bool SdrItemPool::GetPresentation(
return true;
}
}
- return XOutdevItemPool::GetPresentation(rItem,ePresentationMetric,rText,pIntlWrapper);
+ return XOutdevItemPool::GetPresentation(rItem,ePresentationMetric,rText,rIntlWrapper);
}
void SdrItemPool::TakeItemName(sal_uInt16 nWhich, OUString& rItemName)
@@ -627,7 +627,7 @@ bool SdrFractionItem::operator==(const SfxPoolItem& rCmp) const
bool SdrFractionItem::GetPresentation(
SfxItemPresentation ePresentation, MapUnit /*eCoreMetric*/,
- MapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const
+ MapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper&) const
{
if(nValue.IsValid())
{
@@ -681,7 +681,7 @@ SfxPoolItem* SdrFractionItem::Clone(SfxItemPool * /*pPool*/) const
bool SdrScaleItem::GetPresentation(
SfxItemPresentation ePresentation, MapUnit /*eCoreMetric*/,
- MapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const
+ MapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper&) const
{
if(GetValue().IsValid())
{
@@ -737,7 +737,7 @@ OUString SdrOnOffItem::GetValueTextByVal(bool bVal) const
}
bool SdrOnOffItem::GetPresentation(SfxItemPresentation ePres,
- MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
+ MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const
{
rText=GetValueTextByVal(GetValue());
if (ePres==SfxItemPresentation::Complete) {
@@ -768,7 +768,7 @@ OUString SdrYesNoItem::GetValueTextByVal(bool bVal) const
}
bool SdrYesNoItem::GetPresentation(SfxItemPresentation ePres,
- MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
+ MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const
{
rText=GetValueTextByVal(GetValue());
if (ePres==SfxItemPresentation::Complete) {
@@ -796,7 +796,7 @@ SfxPoolItem* SdrPercentItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
bool SdrPercentItem::GetPresentation(
SfxItemPresentation ePres, MapUnit /*eCoreMetric*/,
- MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
+ MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const
{
rText = unicode::formatPercent(GetValue(),
Application::GetSettings().GetUILanguageTag());
@@ -828,7 +828,7 @@ SfxPoolItem* SdrAngleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
bool SdrAngleItem::GetPresentation(
SfxItemPresentation ePres, MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
- OUString& rText, const IntlWrapper * pIntlWrapper) const
+ OUString& rText, const IntlWrapper& rIntlWrapper) const
{
sal_Int32 nValue(GetValue());
bool bNeg(nValue < 0);
@@ -843,11 +843,6 @@ bool SdrAngleItem::GetPresentation(
sal_Unicode aUnicodeNull('0');
sal_Int32 nCount(2);
- const IntlWrapper* pMyIntlWrapper = nullptr;
- if(!pIntlWrapper)
- pIntlWrapper = pMyIntlWrapper = new IntlWrapper(
- Application::GetSettings().GetLanguageTag() );
-
if(LocaleDataWrapper::isNumLeadingZero())
nCount++;
@@ -867,7 +862,7 @@ bool SdrAngleItem::GetPresentation(
else
{
sal_Unicode cDec =
- pIntlWrapper->getLocaleData()->getNumDecimalSep()[0];
+ rIntlWrapper.getLocaleData()->getNumDecimalSep()[0];
aText.insert(nLen-2, cDec);
if(bNull1)
@@ -876,12 +871,6 @@ bool SdrAngleItem::GetPresentation(
if(bNeg)
aText.insert(0, '-');
-
- if ( pMyIntlWrapper )
- {
- delete pMyIntlWrapper;
- pIntlWrapper = nullptr;
- }
}
aText.insert(aText.getLength(), sal_Unicode(DEGREE_CHAR));
@@ -930,7 +919,7 @@ void SdrMetricItem::ScaleMetrics(long nMul, long nDiv)
}
bool SdrMetricItem::GetPresentation(SfxItemPresentation ePres,
- MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper *) const
+ MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const
{
long nValue=GetValue();
SdrFormatter aFmt(eCoreMetric,ePresMetric);
@@ -963,7 +952,7 @@ OUString SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos) const
}
bool SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePres,
- MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
+ MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const
{
rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SfxItemPresentation::Complete) {
@@ -988,7 +977,7 @@ OUString SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos) const
}
bool SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation ePres,
- MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
+ MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const
{
rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SfxItemPresentation::Complete) {
@@ -1020,7 +1009,7 @@ OUString SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos) const
}
bool SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentation ePres,
- MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
+ MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const
{
rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SfxItemPresentation::Complete) {
@@ -1079,7 +1068,7 @@ OUString SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const
}
bool SdrTextVertAdjustItem::GetPresentation(SfxItemPresentation ePres,
- MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
+ MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const
{
rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SfxItemPresentation::Complete) {
@@ -1134,7 +1123,7 @@ OUString SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const
}
bool SdrTextHorzAdjustItem::GetPresentation(SfxItemPresentation ePres,
- MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
+ MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const
{
rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SfxItemPresentation::Complete) {
@@ -1182,7 +1171,7 @@ OUString SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos) const
}
bool SdrTextAniKindItem::GetPresentation(SfxItemPresentation ePres,
- MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
+ MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const
{
rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SfxItemPresentation::Complete) {
@@ -1229,7 +1218,7 @@ OUString SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos) const
}
bool SdrTextAniDirectionItem::GetPresentation(SfxItemPresentation ePres,
- MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
+ MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const
{
rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SfxItemPresentation::Complete) {
@@ -1271,7 +1260,7 @@ SfxPoolItem* SdrTextAniDelayItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) con
bool SdrTextAniDelayItem::GetPresentation(
SfxItemPresentation ePres, MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
- OUString& rText, const IntlWrapper *) const
+ OUString& rText, const IntlWrapper&) const
{
rText = OUString::number(GetValue()) + "ms";
@@ -1309,7 +1298,7 @@ void SdrTextAniAmountItem::ScaleMetrics(long nMul, long nDiv)
bool SdrTextAniAmountItem::GetPresentation(
SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric,
- OUString& rText, const IntlWrapper *) const
+ OUString& rText, const IntlWrapper&) const
{
sal_Int32 nValue(GetValue());
@@ -1358,7 +1347,7 @@ SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( SvStream & rStream, sal_
}
bool SdrTextFixedCellHeightItem::GetPresentation( SfxItemPresentation ePres,
MapUnit /*eCoreMetric*/, MapUnit /*ePresentationMetric*/,
- OUString &rText, const IntlWrapper * ) const
+ OUString &rText, const IntlWrapper& ) const
{
rText = GetValueTextByVal( GetValue() );
if (ePres==SfxItemPresentation::Complete)
@@ -1449,7 +1438,7 @@ bool SdrCustomShapeAdjustmentItem::operator==( const SfxPoolItem& rCmp ) const
bool SdrCustomShapeAdjustmentItem::GetPresentation(
SfxItemPresentation ePresentation, MapUnit /*eCoreMetric*/,
- MapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const
+ MapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper&) const
{
sal_uInt32 i, nCount = GetCount();
rText += OUString::number( nCount );
@@ -1563,7 +1552,7 @@ OUString SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos) const
}
bool SdrEdgeKindItem::GetPresentation(SfxItemPresentation ePres,
- MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
+ MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const
{
rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SfxItemPresentation::Complete) {
@@ -1728,7 +1717,7 @@ OUString SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos) const
}
bool SdrMeasureKindItem::GetPresentation(SfxItemPresentation ePres,
- MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
+ MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const
{
rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SfxItemPresentation::Complete) {
@@ -1775,7 +1764,7 @@ OUString SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos) const
}
bool SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation ePres,
- MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
+ MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const
{
rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SfxItemPresentation::Complete) {
@@ -1822,7 +1811,7 @@ OUString SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos) const
}
bool SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation ePres,
- MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
+ MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const
{
rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SfxItemPresentation::Complete) {
@@ -1875,7 +1864,7 @@ OUString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const
}
bool SdrMeasureUnitItem::GetPresentation(SfxItemPresentation ePres,
- MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
+ MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const
{
rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SfxItemPresentation::Complete) {
@@ -1916,7 +1905,7 @@ OUString SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const
}
bool SdrCircKindItem::GetPresentation(SfxItemPresentation ePres,
- MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
+ MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const
{
rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SfxItemPresentation::Complete) {
@@ -1966,7 +1955,7 @@ SfxPoolItem* SdrSignedPercentItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) c
bool SdrSignedPercentItem::GetPresentation(
SfxItemPresentation ePres, MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
- OUString& rText, const IntlWrapper *) const
+ OUString& rText, const IntlWrapper&) const
{
rText = unicode::formatPercent(GetValue(),
Application::GetSettings().GetUILanguageTag());
@@ -2135,7 +2124,7 @@ OUString SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const
bool SdrGrafModeItem::GetPresentation( SfxItemPresentation ePres,
MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
- OUString& rText, const IntlWrapper *) const
+ OUString& rText, const IntlWrapper&) const
{
rText = GetValueTextByPos( sal::static_int_cast< sal_uInt16 >( GetValue() ) );
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 769eac8311fa..b7bd3b4388de 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -55,6 +55,7 @@
#include <svx/xlnedwit.hxx>
#include <svx/xlnstwit.hxx>
#include <svx/xtextit0.hxx>
+#include <unotools/intlwrapper.hxx>
using namespace com::sun::star;
@@ -887,6 +888,7 @@ void SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItemS
{
SetMode(MYBROWSEMODE & BrowserMode(~BrowserMode::KEEPHIGHLIGHT));
if (pSet!=nullptr) {
+ IntlWrapper aIntlWrapper(SvtSysLocale().GetUILanguageTag());
sal_uInt16 nEntryNum=0;
SfxWhichIter aIter(*pSet);
const SfxItemPool* pPool=pSet->GetPool();
@@ -989,7 +991,7 @@ void SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItemS
rItem.GetPresentation(SfxItemPresentation::Nameless,
pPool->GetMetric(nWhich),
- MapUnit::MapMM, aEntry.aValue);
+ MapUnit::MapMM, aEntry.aValue, aIntlWrapper);
if (aEntry.bCanNum)
{
aEntry.aValue = OUString::number(aEntry.nVal) + ": " + aEntry.aValue;
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 3621d7f0938c..9e9152304ecc 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -311,7 +311,7 @@ sal_Int32 DictionaryList::ColumnCompare( SvTreeListEntry* pLeft, SvTreeListEntry
if (nRightKind == SvLBoxItemType::String &&
nLeftKind == SvLBoxItemType::String)
{
- IntlWrapper aIntlWrapper( Application::GetSettings().GetLanguageTag() );
+ IntlWrapper aIntlWrapper(SvtSysLocale().GetUILanguageTag());
const CollatorWrapper* pCollator = aIntlWrapper.getCaseCollator();
nCompare = pCollator->compareString( static_cast<SvLBoxString*>(pLeftItem)->GetText(),
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 0ef8ede2fdea..17d40cccc111 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -56,6 +56,7 @@
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/vector/b2dvector.hxx>
#include <basegfx/tools/unotools.hxx>
+#include <unotools/intlwrapper.hxx>
#include <vcl/gradient.hxx>
#include <libxml/xmlwriter.h>
@@ -386,7 +387,7 @@ bool XLineStyleItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
@@ -728,7 +729,7 @@ bool XLineDashItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText = GetName();
@@ -1043,11 +1044,11 @@ bool XLineWidthItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit eCoreUnit,
MapUnit ePresUnit,
- OUString& rText, const IntlWrapper * pIntl
+ OUString& rText, const IntlWrapper& rIntl
) const
{
rText = GetMetricText( (long) GetValue(),
- eCoreUnit, ePresUnit, pIntl) +
+ eCoreUnit, ePresUnit, &rIntl) +
" " + EditResId( GetMetricId( ePresUnit) );
return true;
}
@@ -1105,7 +1106,7 @@ bool XLineColorItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText = GetName();
@@ -1291,7 +1292,7 @@ bool XLineStartItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText = GetName();
@@ -1853,7 +1854,7 @@ bool XLineEndItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText = GetName();
@@ -1932,11 +1933,11 @@ bool XLineStartWidthItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit eCoreUnit,
MapUnit ePresUnit,
- OUString& rText, const IntlWrapper * pIntl
+ OUString& rText, const IntlWrapper& rIntl
) const
{
rText = GetMetricText( (long) GetValue(),
- eCoreUnit, ePresUnit, pIntl) +
+ eCoreUnit, ePresUnit, &rIntl) +
" " + EditResId( GetMetricId( ePresUnit) );
return true;
}
@@ -1980,11 +1981,11 @@ bool XLineEndWidthItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit eCoreUnit,
MapUnit ePresUnit,
- OUString& rText, const IntlWrapper *pIntl
+ OUString& rText, const IntlWrapper& rIntl
) const
{
rText = GetMetricText( (long) GetValue(),
- eCoreUnit, ePresUnit, pIntl) +
+ eCoreUnit, ePresUnit, &rIntl) +
" " + EditResId( GetMetricId( ePresUnit) );
return true;
}
@@ -2028,7 +2029,7 @@ bool XLineStartCenterItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText = SvxResId(GetValue() ? RID_SVXSTR_CENTERED : RID_SVXSTR_NOTCENTERED);
@@ -2077,7 +2078,7 @@ bool XLineEndCenterItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText = SvxResId(GetValue() ? RID_SVXSTR_CENTERED : RID_SVXSTR_NOTCENTERED);
@@ -2131,7 +2132,7 @@ bool XFillStyleItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
@@ -2201,7 +2202,8 @@ void XFillStyleItem::dumpAsXml(xmlTextWriterPtr pWriter) const
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), BAD_CAST(OString::number((sal_Int16)GetValue()).getStr()));
OUString aPresentation;
- GetPresentation(SfxItemPresentation::Nameless, MapUnit::Map100thMM, MapUnit::Map100thMM, aPresentation);
+ IntlWrapper aIntlWrapper(SvtSysLocale().GetUILanguageTag());
+ GetPresentation(SfxItemPresentation::Nameless, MapUnit::Map100thMM, MapUnit::Map100thMM, aPresentation, aIntlWrapper);
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("presentation"), BAD_CAST(aPresentation.toUtf8().getStr()));
xmlTextWriterEndElement(pWriter);
@@ -2240,7 +2242,7 @@ bool XFillColorItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText = GetName();
@@ -2305,7 +2307,7 @@ bool XSecondaryFillColorItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText = GetName();
@@ -2495,7 +2497,7 @@ bool XFillGradientItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText = GetName();
@@ -2806,9 +2808,9 @@ bool XFillFloatTransparenceItem::PutValue( const css::uno::Any& rVal, sal_uInt8
bool XFillFloatTransparenceItem::GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreUnit, MapUnit ePresUnit,
OUString& rText,
- const IntlWrapper * pIntlWrapper ) const
+ const IntlWrapper& rIntlWrapper ) const
{
- return XFillGradientItem::GetPresentation( ePres, eCoreUnit, ePresUnit, rText, pIntlWrapper );
+ return XFillGradientItem::GetPresentation( ePres, eCoreUnit, ePresUnit, rText, rIntlWrapper );
}
bool XFillFloatTransparenceItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
@@ -2956,7 +2958,7 @@ bool XFillHatchItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText = GetName();
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 8bd12e6682df..7d7114c56d84 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -60,7 +60,7 @@ bool XLineTransparenceItem::GetPresentation
SfxItemPresentation ePres,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
@@ -113,7 +113,7 @@ SfxPoolItem* XLineJointItem::Clone(SfxItemPool* /*pPool*/) const
}
bool XLineJointItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/,
- MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const
+ MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper&) const
{
rText.clear();
@@ -317,7 +317,7 @@ SfxPoolItem* XLineCapItem::Clone(SfxItemPool* /*pPool*/) const
}
bool XLineCapItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/,
- MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const
+ MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper&) const
{
rText.clear();
@@ -418,7 +418,7 @@ bool XFillTransparenceItem::GetPresentation
SfxItemPresentation ePres,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
@@ -493,7 +493,7 @@ bool XGradientStepCountItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
@@ -528,7 +528,7 @@ bool XFillBmpTileItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
@@ -571,7 +571,7 @@ bool XFillBmpPosItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
@@ -618,7 +618,7 @@ bool XFillBmpSizeXItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
@@ -658,7 +658,7 @@ bool XFillBmpSizeYItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
@@ -697,7 +697,7 @@ bool XFillBmpSizeLogItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
@@ -732,7 +732,7 @@ bool XFillBmpTileOffsetXItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
@@ -766,7 +766,7 @@ bool XFillBmpTileOffsetYItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
@@ -798,7 +798,7 @@ bool XFillBmpStretchItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
@@ -840,7 +840,7 @@ bool XFillBmpPosOffsetXItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
@@ -874,7 +874,7 @@ bool XFillBmpPosOffsetYItem::GetPresentation
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper *
+ OUString& rText, const IntlWrapper&
) const
{
rText.clear();
@@ -902,7 +902,7 @@ SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) con
}
bool XFillBackgroundItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/,
- MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const
+ MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper&) const
{
rText.clear();
return true;
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index c8de391e6fee..e3e51300469c 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -327,7 +327,7 @@ bool XFillBitmapItem::GetPresentation(
MapUnit /*eCoreUnit*/,
MapUnit /*ePresUnit*/,
OUString& rText,
- const IntlWrapper*) const
+ const IntlWrapper&) const
{
rText += GetName();
return true;
generated by cgit (git 2.34.1) at 2024-12-29 08:03:31 +0000