Kaydet (Commit) aa1e9c89 authored tarafından Jens-Heiner Rechtien's avatar Jens-Heiner Rechtien

INTEGRATION: CWS os7 (1.23.150); FILE MERGED

2003/03/28 12:06:08 os 1.23.150.1: #108241# set decimal separator correctly in SfxPoolItem::GetPresentation() methods
üst 6c48b0f8
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: xattr.cxx,v $ * $RCSfile: xattr.cxx,v $
* *
* $Revision: 1.23 $ * $Revision: 1.24 $
* *
* last change: $Author: cl $ $Date: 2002-06-10 09:25:10 $ * last change: $Author: hr $ $Date: 2003-04-04 18:04:48 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -1254,7 +1254,7 @@ SfxItemPresentation XLineWidthItem::GetPresentation ...@@ -1254,7 +1254,7 @@ SfxItemPresentation XLineWidthItem::GetPresentation
SfxItemPresentation ePres, SfxItemPresentation ePres,
SfxMapUnit eCoreUnit, SfxMapUnit eCoreUnit,
SfxMapUnit ePresUnit, SfxMapUnit ePresUnit,
XubString& rText, const IntlWrapper * XubString& rText, const IntlWrapper * pIntl
) const ) const
{ {
switch ( ePres ) switch ( ePres )
...@@ -1265,7 +1265,7 @@ SfxItemPresentation XLineWidthItem::GetPresentation ...@@ -1265,7 +1265,7 @@ SfxItemPresentation XLineWidthItem::GetPresentation
case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE: case SFX_ITEM_PRESENTATION_COMPLETE:
rText = GetMetricText( (long) GetValue(), rText = GetMetricText( (long) GetValue(),
eCoreUnit, ePresUnit); eCoreUnit, ePresUnit, pIntl);
rText += SVX_RESSTR( GetMetricId( ePresUnit) ); rText += SVX_RESSTR( GetMetricId( ePresUnit) );
return ePres; return ePres;
} }
...@@ -2438,7 +2438,7 @@ SfxItemPresentation XLineStartWidthItem::GetPresentation ...@@ -2438,7 +2438,7 @@ SfxItemPresentation XLineStartWidthItem::GetPresentation
SfxItemPresentation ePres, SfxItemPresentation ePres,
SfxMapUnit eCoreUnit, SfxMapUnit eCoreUnit,
SfxMapUnit ePresUnit, SfxMapUnit ePresUnit,
XubString& rText, const IntlWrapper * XubString& rText, const IntlWrapper * pIntl
) const ) const
{ {
switch ( ePres ) switch ( ePres )
...@@ -2449,7 +2449,7 @@ SfxItemPresentation XLineStartWidthItem::GetPresentation ...@@ -2449,7 +2449,7 @@ SfxItemPresentation XLineStartWidthItem::GetPresentation
case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE: case SFX_ITEM_PRESENTATION_COMPLETE:
rText = GetMetricText( (long) GetValue(), rText = GetMetricText( (long) GetValue(),
eCoreUnit, ePresUnit); eCoreUnit, ePresUnit, pIntl);
rText += SVX_RESSTR( GetMetricId( ePresUnit) ); rText += SVX_RESSTR( GetMetricId( ePresUnit) );
return ePres; return ePres;
} }
...@@ -2544,7 +2544,7 @@ SfxItemPresentation XLineEndWidthItem::GetPresentation ...@@ -2544,7 +2544,7 @@ SfxItemPresentation XLineEndWidthItem::GetPresentation
SfxItemPresentation ePres, SfxItemPresentation ePres,
SfxMapUnit eCoreUnit, SfxMapUnit eCoreUnit,
SfxMapUnit ePresUnit, SfxMapUnit ePresUnit,
XubString& rText, const IntlWrapper * XubString& rText, const IntlWrapper *pIntl
) const ) const
{ {
switch ( ePres ) switch ( ePres )
...@@ -2555,7 +2555,7 @@ SfxItemPresentation XLineEndWidthItem::GetPresentation ...@@ -2555,7 +2555,7 @@ SfxItemPresentation XLineEndWidthItem::GetPresentation
case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE: case SFX_ITEM_PRESENTATION_COMPLETE:
rText = GetMetricText( (long) GetValue(), rText = GetMetricText( (long) GetValue(),
eCoreUnit, ePresUnit); eCoreUnit, ePresUnit, pIntl);
rText += SVX_RESSTR( GetMetricId( ePresUnit) ); rText += SVX_RESSTR( GetMetricId( ePresUnit) );
return ePres; return ePres;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment