summaryrefslogtreecommitdiff
path: root/svx/source/items
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/items')
-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
9 files changed, 33 insertions, 44 deletions
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();
generated by cgit (git 2.34.1) at 2024-12-29 08:21:12 +0000