[Libreoffice-commits] core.git: 2 commits - editeng/source sc/source svx/source sw/source vcl/source
Caolán McNamara
caolanm at redhat.com
Mon Jan 20 04:21:14 PST 2014
editeng/source/items/frmitems.cxx | 26 ++++++++--------
editeng/source/items/paraitem.cxx | 4 +-
editeng/source/items/textitem.cxx | 10 +++---
sc/source/core/data/docpool.cxx | 4 +-
svx/source/items/algitem.cxx | 8 ++--
svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 4 +-
svx/source/sidebar/text/TextPropertyPanel.src | 8 ++--
svx/source/svdraw/svdattr.cxx | 2 -
svx/source/svdraw/svdomeas.cxx | 5 +--
svx/source/xoutdev/xattr.cxx | 6 +--
sw/source/ui/utlui/attrdesc.cxx | 9 +++--
sw/source/ui/utlui/uiitems.cxx | 2 -
vcl/source/control/field.cxx | 5 ++-
vcl/source/src/units.src | 4 +-
14 files changed, 52 insertions(+), 45 deletions(-)
New commits:
commit 269af0448130df8b816cf868a1fe4490252cb713
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 20 12:20:06 2014 +0000
Related: #i56998# no space for degree symbol
and now space between number and pages is explicitly added by code
Change-Id: Ic4e73d2f30b93bd4a34b98f480f1ba111c9a285d
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 885b35d..8df9c0e 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1429,7 +1429,7 @@ OUString MetricFormatter::CreateFieldText( sal_Int64 nValue ) const
aStr += maCustomUnitText;
else
{
- if ( meUnit != FUNIT_NONE || meUnit != FUNIT_PERCENT )
+ if (meUnit != FUNIT_NONE || meUnit != FUNIT_PERCENT || meUnit != FUNIT_DEGREE)
aStr += " ";
aStr += ImplMetricToString( meUnit );
}
diff --git a/vcl/source/src/units.src b/vcl/source/src/units.src
index 3445e921..2e40585 100644
--- a/vcl/source/src/units.src
+++ b/vcl/source/src/units.src
@@ -43,8 +43,8 @@ StringArray SV_FUNIT_STRINGS
< "ch" ; FUNIT_CHAR ; > ;
< "line" ; FUNIT_LINE ; > ;
< "%" ; FUNIT_PERCENT ; > ;
- < " pixels" ; FUNIT_PIXEL ; > ;
- < " pixel" ; FUNIT_PIXEL ; > ;
+ < "pixels" ; FUNIT_PIXEL ; > ;
+ < "pixel" ; FUNIT_PIXEL ; > ;
< "°" ; FUNIT_DEGREE ; > ;
< "sec" ; FUNIT_SECOND ; > ;
< "ms" ; FUNIT_MILLISECOND ; > ;
commit ab50bc9d4a72193c1fefcbf0652938995094bc41
Author: Tsutomu Uchino <hanya at apache.org>
Date: Sat Jan 18 08:14:47 2014 +0000
Resolves: #i56998# add a space separater between value and unit...
and remove separator between value and percent to match with ISO 31-0
(cherry picked from commit 0cea884e3f417e4b58d2fdcfc7b0111f3bfc6f30)
Conflicts:
chart2/source/controller/dialogs/tp_SeriesToAxis.src
cui/source/dialogs/colorpicker.cxx
cui/source/dialogs/colorpicker.src
cui/source/dialogs/grfflt.src
cui/source/dialogs/zoom.src
cui/source/tabpages/tabline.src
editeng/source/items/frmitems.cxx
editeng/source/items/textitem.cxx
sd/source/ui/animations/CustomAnimationDialog.src
sd/source/ui/animations/SlideTransitionPane.src
svx/source/dialog/bmpmask.src
svx/source/engine3d/float3d.src
svx/source/items/algitem.cxx
svx/source/sidebar/text/TextCharacterSpacingControl.cxx
svx/source/xoutdev/xattr.cxx
sw/source/ui/utlui/attrdesc.cxx
sw/source/ui/utlui/uiitems.cxx
Change-Id: I554309cb72dd8956077c5ca6866a982cdd6529aa
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index bd88e97..6fd9113 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -352,11 +352,11 @@ SfxItemPresentation SvxSizeItem::GetPresentation
case SFX_ITEM_PRESENTATION_COMPLETE:
rText = EE_RESSTR(RID_SVXITEMS_SIZE_WIDTH) +
GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, pIntl ) +
- EE_RESSTR(GetMetricId(ePresUnit)) +
+ " " + EE_RESSTR(GetMetricId(ePresUnit)) +
cpDelimTmp +
EE_RESSTR(RID_SVXITEMS_SIZE_HEIGHT) +
GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, pIntl ) +
- EE_RESSTR(GetMetricId(ePresUnit));
+ " " + EE_RESSTR(GetMetricId(ePresUnit));
return SFX_ITEM_PRESENTATION_COMPLETE;
//no break necessary
default: ;//prevent warning
@@ -627,7 +627,7 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation
{
rText = rText +
GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ) +
- EE_RESSTR(GetMetricId(ePresUnit));
+ " " + EE_RESSTR(GetMetricId(ePresUnit));
}
rText += OUString(cpDelim);
if ( 100 != nPropFirstLineOfst || nFirstLineOfst )
@@ -640,7 +640,7 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation
rText = rText +
GetMetricText( (long)nFirstLineOfst,
eCoreUnit, ePresUnit, pIntl ) +
- EE_RESSTR(GetMetricId(ePresUnit));
+ " " + EE_RESSTR(GetMetricId(ePresUnit));
}
rText += OUString(cpDelim);
}
@@ -652,7 +652,7 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation
rText = rText +
GetMetricText( (long)nRightMargin,
eCoreUnit, ePresUnit, pIntl ) +
- EE_RESSTR(GetMetricId(ePresUnit));
+ " " + EE_RESSTR(GetMetricId(ePresUnit));
}
return SFX_ITEM_PRESENTATION_COMPLETE;
}
@@ -980,7 +980,7 @@ SfxItemPresentation SvxULSpaceItem::GetPresentation
{
rText = rText +
GetMetricText( (long)nUpper, eCoreUnit, ePresUnit, pIntl ) +
- EE_RESSTR(GetMetricId(ePresUnit));
+ " " + EE_RESSTR(GetMetricId(ePresUnit));
}
rText = rText + OUString(cpDelim) + EE_RESSTR(RID_SVXITEMS_ULSPACE_LOWER);
if ( 100 != nPropLower )
@@ -989,7 +989,7 @@ SfxItemPresentation SvxULSpaceItem::GetPresentation
{
rText = rText +
GetMetricText( (long)nLower, eCoreUnit, ePresUnit, pIntl ) +
- EE_RESSTR(GetMetricId(ePresUnit));
+ " " + EE_RESSTR(GetMetricId(ePresUnit));
}
return SFX_ITEM_PRESENTATION_COMPLETE;
}
@@ -1496,7 +1496,7 @@ SfxItemPresentation SvxShadowItem::GetPresentation
EE_RESSTR(nId) +
OUString(cpDelim) +
GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl ) +
- EE_RESSTR(GetMetricId(ePresUnit)) +
+ " " + EE_RESSTR(GetMetricId(ePresUnit)) +
OUString(cpDelim) +
EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation);
return ePres;
@@ -2164,7 +2164,7 @@ SfxItemPresentation SvxBoxItem::GetPresentation
rText = rText +
GetMetricText( (long)nTopDist, eCoreUnit,
ePresUnit, pIntl ) +
- EE_RESSTR(GetMetricId(ePresUnit));
+ " " + EE_RESSTR(GetMetricId(ePresUnit));
}
else
{
@@ -2172,22 +2172,22 @@ SfxItemPresentation SvxBoxItem::GetPresentation
EE_RESSTR(RID_SVXITEMS_BORDER_TOP) +
GetMetricText( (long)nTopDist, eCoreUnit,
ePresUnit, pIntl ) +
- EE_RESSTR(GetMetricId(ePresUnit)) +
+ " " + EE_RESSTR(GetMetricId(ePresUnit)) +
cpDelimTmp +
EE_RESSTR(RID_SVXITEMS_BORDER_BOTTOM) +
GetMetricText( (long)nBottomDist, eCoreUnit,
ePresUnit, pIntl ) +
- EE_RESSTR(GetMetricId(ePresUnit)) +
+ " " + EE_RESSTR(GetMetricId(ePresUnit)) +
cpDelimTmp +
EE_RESSTR(RID_SVXITEMS_BORDER_LEFT) +
GetMetricText( (long)nLeftDist, eCoreUnit,
ePresUnit, pIntl ) +
- EE_RESSTR(GetMetricId(ePresUnit)) +
+ " " + EE_RESSTR(GetMetricId(ePresUnit)) +
cpDelimTmp +
EE_RESSTR(RID_SVXITEMS_BORDER_RIGHT) +
GetMetricText( (long)nRightDist, eCoreUnit,
ePresUnit, pIntl ) +
- EE_RESSTR(GetMetricId(ePresUnit));
+ " " + EE_RESSTR(GetMetricId(ePresUnit));
}
return SFX_ITEM_PRESENTATION_COMPLETE;
}
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 1207f36..8b1e59f 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -1124,7 +1124,9 @@ SfxItemPresentation SvxTabStopItem::GetPresentation
rText += GetMetricText(
((*this)[i]).GetTabPos(), eCoreUnit, ePresUnit, pIntl );
if ( SFX_ITEM_PRESENTATION_COMPLETE == ePres )
- rText += EE_RESSTR(GetMetricId(ePresUnit));
+ {
+ rText += " " + EE_RESSTR(GetMetricId(ePresUnit));
+ }
bComma = sal_True;
}
}
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index d183236..276870c 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -1058,7 +1058,7 @@ SfxItemPresentation SvxFontHeightItem::GetPresentation
if( SFX_MAPUNIT_RELATIVE != ePropUnit )
{
rText = OUString::number( (short)nProp ) +
- EE_RESSTR( GetMetricId( ePropUnit ) );
+ " " + EE_RESSTR( GetMetricId( ePropUnit ) );
if( 0 <= (short)nProp )
rText = "+" + rText;
}
@@ -1066,7 +1066,7 @@ SfxItemPresentation SvxFontHeightItem::GetPresentation
{
rText = GetMetricText( (long)nHeight,
eCoreUnit, SFX_MAPUNIT_POINT, pIntl ) +
- EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
+ " " + EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
}
else
rText = OUString::number( nProp ) + "%";
@@ -1258,7 +1258,7 @@ SfxItemPresentation SvxFontWidthItem::GetPresentation
{
rText = GetMetricText( (long)nWidth,
eCoreUnit, SFX_MAPUNIT_POINT, pIntl ) +
- EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
+ " " + EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
}
else
rText = OUString::number( nProp ) + "%";
@@ -2174,7 +2174,7 @@ SfxItemPresentation SvxKerningItem::GetPresentation
return ePres;
case SFX_ITEM_PRESENTATION_NAMELESS:
rText = GetMetricText( (long)GetValue(), eCoreUnit, SFX_MAPUNIT_POINT, pIntl ) +
- EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
+ " " + EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
return ePres;
case SFX_ITEM_PRESENTATION_COMPLETE:
{
@@ -2190,7 +2190,7 @@ SfxItemPresentation SvxKerningItem::GetPresentation
rText += EE_RESSTR(nId);
rText = rText +
GetMetricText( (long)GetValue(), eCoreUnit, SFX_MAPUNIT_POINT, pIntl ) +
- EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
+ " " + EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
return ePres;
}
default: ; //prevent warning
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 1f8b872..098790c 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -749,7 +749,7 @@ static SfxItemPresentation lcl_HFPresentation
{
aText += GetMetricText( (long)nLeftMargin,
eCoreMetric, ePresentationMetric, pIntl );
- aText += EE_RESSTR(GetMetricId(ePresentationMetric));
+ aText += " " + EE_RESSTR(GetMetricId(ePresentationMetric));
}
aText += cpDelim;
@@ -764,7 +764,7 @@ static SfxItemPresentation lcl_HFPresentation
{
aText += GetMetricText( (long)nRightMargin,
eCoreMetric, ePresentationMetric, pIntl );
- aText += EE_RESSTR(GetMetricId(ePresentationMetric));
+ aText += " " + EE_RESSTR(GetMetricId(ePresentationMetric));
}
}
break;
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index ede9f6e..6dede36 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -266,19 +266,19 @@ SfxItemPresentation SvxMarginItem::GetPresentation
{
rText = SVX_RESSTR(RID_SVXITEMS_MARGIN_LEFT) +
GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ) +
- EE_RESSTR(GetMetricId(ePresUnit)) +
+ " " + EE_RESSTR(GetMetricId(ePresUnit)) +
cpDelimTmp +
SVX_RESSTR(RID_SVXITEMS_MARGIN_TOP) +
GetMetricText( (long)nTopMargin, eCoreUnit, ePresUnit, pIntl ) +
- EE_RESSTR(GetMetricId(ePresUnit)) +
+ " " + EE_RESSTR(GetMetricId(ePresUnit)) +
cpDelimTmp +
SVX_RESSTR(RID_SVXITEMS_MARGIN_RIGHT) +
GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, pIntl ) +
- EE_RESSTR(GetMetricId(ePresUnit)) +
+ " " + EE_RESSTR(GetMetricId(ePresUnit)) +
cpDelimTmp +
SVX_RESSTR(RID_SVXITEMS_MARGIN_BOTTOM) +
GetMetricText( (long)nBottomMargin, eCoreUnit, ePresUnit, pIntl ) +
- EE_RESSTR(GetMetricId(ePresUnit));
+ " " + EE_RESSTR(GetMetricId(ePresUnit));
return SFX_ITEM_PRESENTATION_COMPLETE;
}
default: ; //prevent warning
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index 33733fe..a672e9a 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -173,14 +173,14 @@ void TextCharacterSpacingControl::Rearrange(bool bLBAvailable,bool bAvailable, l
{
OUString aStrTip( maStrCusE); //LAST CUSTOM no tip defect //add
aStrTip += OUString::number( (double)mnCustomKern / 10);
- aStrTip += maStrUnit; // modify
+ aStrTip += " " + maStrUnit; // modify
maVSSpacing.SetItemText(6,aStrTip);
}
else if(mnCustomKern < 0)
{
OUString aStrTip(maStrCusC) ; //LAST CUSTOM no tip defect //add
aStrTip += OUString::number( (double)-mnCustomKern / 10);
- aStrTip += maStrUnit; // modify
+ aStrTip += " " + maStrUnit; // modify
maVSSpacing.SetItemText( 6, aStrTip );
}
else
diff --git a/svx/source/sidebar/text/TextPropertyPanel.src b/svx/source/sidebar/text/TextPropertyPanel.src
index f22a899..d4330a2 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.src
+++ b/svx/source/sidebar/text/TextPropertyPanel.src
@@ -350,11 +350,11 @@ Control RID_POPUPPANEL_TEXTPAGE_SPACING
String STR_VERY_TIGHT_TIP
{
- Text [ en-US ] = " Spacing: Condensed By: 3pt";
+ Text [ en-US ] = " Spacing: Condensed By: 3 pt";
};
String STR_TIGHT_TIP
{
- Text [ en-US ] = " Spacing: Condensed By: 1.5pt";
+ Text [ en-US ] = " Spacing: Condensed By: 1.5 pt";
};
String STR_NORMAL_TIP
{
@@ -362,11 +362,11 @@ Control RID_POPUPPANEL_TEXTPAGE_SPACING
};
String STR_LOOSE_TIP
{
- Text [ en-US ] = " Spacing: Expanded By: 3pt";
+ Text [ en-US ] = " Spacing: Expanded By: 3 pt";
};
String STR_VERY_LOOSE_TIP
{
- Text [ en-US ] = " Spacing: Expanded By: 6pt";
+ Text [ en-US ] = " Spacing: Expanded By: 6 pt";
};
String STR_CUSTOM_C_TIP
{
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 2c5c2bc..620ec27 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -980,7 +980,7 @@ SfxItemPresentation SdrMetricItem::GetPresentation(SfxItemPresentation ePres,
aFmt.TakeStr(nValue,rText);
OUString aStr;
aFmt.TakeUnitStr((MapUnit)ePresMetric,aStr);
- rText+=aStr;
+ rText += " " + aStr;
if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
OUString aStr2;
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 54c0e7e..58e5dd6 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -613,8 +613,9 @@ void SdrMeasureObj::UndirtyText() const
{
rOutliner.QuickInsertField(SvxFieldItem(SdrMeasureField(SDRMEASUREFIELD_ROTA90BLANCS), EE_FEATURE_FIELD), ESelection(0,0));
rOutliner.QuickInsertField(SvxFieldItem(SdrMeasureField(SDRMEASUREFIELD_VALUE), EE_FEATURE_FIELD),ESelection(0,1));
- rOutliner.QuickInsertField(SvxFieldItem(SdrMeasureField(SDRMEASUREFIELD_UNIT), EE_FEATURE_FIELD),ESelection(0,2));
- rOutliner.QuickInsertField(SvxFieldItem(SdrMeasureField(SDRMEASUREFIELD_ROTA90BLANCS), EE_FEATURE_FIELD),ESelection(0,3));
+ rOutliner.QuickInsertText(" ", ESelection(0,2));
+ rOutliner.QuickInsertField(SvxFieldItem(SdrMeasureField(SDRMEASUREFIELD_UNIT), EE_FEATURE_FIELD),ESelection(0,3));
+ rOutliner.QuickInsertField(SvxFieldItem(SdrMeasureField(SDRMEASUREFIELD_ROTA90BLANCS), EE_FEATURE_FIELD),ESelection(0,4));
if(GetStyleSheet())
rOutliner.SetStyleSheet(0, GetStyleSheet());
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index cdd7dac..1cfe738 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -1081,7 +1081,7 @@ SfxItemPresentation XLineWidthItem::GetPresentation
case SFX_ITEM_PRESENTATION_COMPLETE:
rText = GetMetricText( (long) GetValue(),
eCoreUnit, ePresUnit, pIntl) +
- EE_RESSTR( GetMetricId( ePresUnit) );
+ " " + EE_RESSTR( GetMetricId( ePresUnit) );
return ePres;
default:
return SFX_ITEM_PRESENTATION_NONE;
@@ -2028,7 +2028,7 @@ SfxItemPresentation XLineStartWidthItem::GetPresentation
case SFX_ITEM_PRESENTATION_COMPLETE:
rText = GetMetricText( (long) GetValue(),
eCoreUnit, ePresUnit, pIntl) +
- EE_RESSTR( GetMetricId( ePresUnit) );
+ " " + EE_RESSTR( GetMetricId( ePresUnit) );
return ePres;
default:
return SFX_ITEM_PRESENTATION_NONE;
@@ -2090,7 +2090,7 @@ SfxItemPresentation XLineEndWidthItem::GetPresentation
case SFX_ITEM_PRESENTATION_COMPLETE:
rText = GetMetricText( (long) GetValue(),
eCoreUnit, ePresUnit, pIntl) +
- EE_RESSTR( GetMetricId( ePresUnit) );
+ " " + EE_RESSTR( GetMetricId( ePresUnit) );
return ePres;
default:
return SFX_ITEM_PRESENTATION_NONE;
diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx
index 8b8a3e9..cf8f4c0 100644
--- a/sw/source/ui/utlui/attrdesc.cxx
+++ b/sw/source/ui/utlui/attrdesc.cxx
@@ -340,7 +340,8 @@ SfxItemPresentation SwFmtFrmSize::GetPresentation
}
else
{
- rText = rText + ::GetMetricText( GetWidth(), eCoreUnit, ePresUnit, pIntl ) + ::GetSvxString( ::GetMetricId( ePresUnit ) );
+ rText = rText + ::GetMetricText( GetWidth(), eCoreUnit, ePresUnit, pIntl ) +
+ " " + ::GetSvxString( ::GetMetricId( ePresUnit ) );
}
if ( ATT_VAR_SIZE != GetHeightSizeType() )
{
@@ -354,7 +355,7 @@ SfxItemPresentation SwFmtFrmSize::GetPresentation
else
{
rText = OUString( ::GetMetricText( GetHeight(), eCoreUnit, ePresUnit, pIntl ) ) +
- ::GetSvxString( ::GetMetricId( ePresUnit ) );
+ " " + ::GetSvxString( ::GetMetricId( ePresUnit ) );
}
}
return ePres;
@@ -502,7 +503,7 @@ SfxItemPresentation SwFmtVertOrient::GetPresentation
{
rText = rText + SW_RESSTR( STR_POS_Y ) + " " +
::GetMetricText( GetPos(), eCoreUnit, ePresUnit, pIntl ) +
- ::GetSvxString( ::GetMetricId( ePresUnit ) );
+ " " + ::GetSvxString( ::GetMetricId( ePresUnit ) );
}
break;
case text::VertOrientation::TOP:
@@ -560,7 +561,7 @@ SfxItemPresentation SwFmtHoriOrient::GetPresentation
{
rText = rText + SW_RESSTR( STR_POS_X ) + " " +
::GetMetricText( GetPos(), eCoreUnit, ePresUnit, pIntl ) +
- ::GetSvxString( ::GetMetricId( ePresUnit ) );
+ " " + ::GetSvxString( ::GetMetricId( ePresUnit ) );
}
break;
case text::HoriOrientation::RIGHT:
diff --git a/sw/source/ui/utlui/uiitems.cxx b/sw/source/ui/utlui/uiitems.cxx
index d5f3bc6..a3dc8d4 100644
--- a/sw/source/ui/utlui/uiitems.cxx
+++ b/sw/source/ui/utlui/uiitems.cxx
@@ -80,7 +80,7 @@ SfxItemPresentation SwPageFtnInfoItem::GetPresentation
if ( nHght )
{
rText = SW_RESSTR( STR_MAX_FTN_HEIGHT ) + " " +
- ::GetMetricText( nHght, eCoreUnit, ePresUnit, pIntl ) +
+ ::GetMetricText( nHght, eCoreUnit, ePresUnit, pIntl ) + " " +
::GetSvxString( ::GetMetricId( ePresUnit ) );
}
return ePres;
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index c0dd2ef..885b35d 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1428,8 +1428,11 @@ OUString MetricFormatter::CreateFieldText( sal_Int64 nValue ) const
if( meUnit == FUNIT_CUSTOM )
aStr += maCustomUnitText;
else
+ {
+ if ( meUnit != FUNIT_NONE || meUnit != FUNIT_PERCENT )
+ aStr += " ";
aStr += ImplMetricToString( meUnit );
-
+ }
return aStr;
}
More information about the Libreoffice-commits
mailing list