chart2/source/controller/dialogs/tp_SeriesToAxis.src | 4 +- cui/source/dialogs/colorpicker.cxx | 4 -- cui/source/dialogs/colorpicker.src | 12 ++++---- cui/source/dialogs/grfflt.src | 4 +- cui/source/dialogs/zoom.src | 2 - cui/source/tabpages/tabline.src | 6 ++-- editeng/source/items/frmitems.cxx | 22 +++++++++++++--- editeng/source/items/paraitem.cxx | 3 ++ editeng/source/items/textitem.cxx | 9 +++++- sc/source/core/data/docpool.cxx | 2 + sd/source/ui/animations/CustomAnimationDialog.src | 6 ++-- sd/source/ui/animations/SlideTransitionPane.src | 2 - svx/source/dialog/bmpmask.src | 8 ++--- svx/source/engine3d/float3d.src | 6 ++-- svx/source/items/algitem.cxx | 4 ++ svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 2 + svx/source/sidebar/text/TextPropertyPanel.src | 8 ++--- svx/source/svdraw/svdattr.cxx | 1 svx/source/svdraw/svdomeas.cxx | 5 ++- svx/source/xoutdev/xattr.cxx | 3 ++ sw/source/ui/utlui/attrdesc.cxx | 4 ++ sw/source/ui/utlui/uiitems.cxx | 1 vcl/source/control/field.cxx | 5 ++- vcl/source/window/printdlg.cxx | 6 ++-- 24 files changed, 86 insertions(+), 43 deletions(-)
New commits: commit acac627b8aed3353e542ce41fa9a7064e4d1790b Author: Tsutomu Uchino <[email protected]> Date: Sat Jan 18 09:52:44 2014 +0000 #i56998# percent value should not takes space separator before the character diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index bd990f2..2e0c738 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -1586,7 +1586,7 @@ XubString MetricFormatter::CreateFieldText( sal_Int64 nValue ) const aStr += maCustomUnitText; else { - if ( meUnit != FUNIT_NONE || meUnit != FUNIT_PERCENT ) + if ( meUnit != FUNIT_NONE && meUnit != FUNIT_PERCENT ) aStr += xub_Unicode( ' ' ); aStr += ImplMetricToString( meUnit ); } commit 99d599a9ff636dc16b42889ca5d2d7323f45cae4 Author: Tsutomu Uchino <[email protected]> Date: Sat Jan 18 08:49:15 2014 +0000 #i56998# add space separator between value and unit in fixed line around the preview on print dialog diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index c874b5e..50f1889 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -366,7 +366,8 @@ void PrintDialog::PrintPreviewWindow::setPreview( const GDIMetaFile& i_rNewPrevi } Size aLogicPaperSize( LogicToLogic( i_rOrigSize, MapMode( MAP_100TH_MM ), MapMode( eUnit ) ) ); String aNumText( rLocWrap.getNum( aLogicPaperSize.Width(), nDigits ) ); - aBuf.append( aNumText ); + aBuf.append( aNumText ) + .append( sal_Unicode( ' ' ) ); aBuf.appendAscii( eUnit == MAP_MM ? "mm" : "in" ); if( i_rPaperName.getLength() ) { @@ -377,7 +378,8 @@ void PrintDialog::PrintPreviewWindow::setPreview( const GDIMetaFile& i_rNewPrevi maHorzDim.SetText( aBuf.makeStringAndClear() ); aNumText = rLocWrap.getNum( aLogicPaperSize.Height(), nDigits ); - aBuf.append( aNumText ); + aBuf.append( aNumText ) + .append( sal_Unicode( ' ' ) ); aBuf.appendAscii( eUnit == MAP_MM ? "mm" : "in" ); maVertDim.SetText( aBuf.makeStringAndClear() ); commit 0cea884e3f417e4b58d2fdcfc7b0111f3bfc6f30 Author: Tsutomu Uchino <[email protected]> Date: Sat Jan 18 08:14:47 2014 +0000 #i56998# add a space separater between value and unit and remove separator between value and percent to match with ISO 31-0 diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.src b/chart2/source/controller/dialogs/tp_SeriesToAxis.src index d782f68..ae43dfc 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.src +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.src @@ -78,7 +78,7 @@ TabPage TP_OPTIONS Maximum = 100 ; StrictFormat = TRUE ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; First = 1 ; Last = 100 ; SpinSize = 1 ; @@ -105,7 +105,7 @@ TabPage TP_OPTIONS Maximum = 600 ; StrictFormat = TRUE ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; First = 1 ; Last = 100 ; SpinSize = 1 ; diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 2eb67cd..eb343a6 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -1196,9 +1196,7 @@ ColorPickerDialog::ColorPickerDialog( Window* pParent, sal_Int32 nColor, sal_Int { FreeResource(); - String sUnitText; - sUnitText.Append( ' ' ); - sUnitText.Append( (sal_Unicode) 0xb0 ); + String sUnitText( (sal_Unicode) 0xb0 ); maMFHue.SetCustomUnitText( sUnitText ); diff --git a/cui/source/dialogs/colorpicker.src b/cui/source/dialogs/colorpicker.src index a7e3f82..988d7bd 100644 --- a/cui/source/dialogs/colorpicker.src +++ b/cui/source/dialogs/colorpicker.src @@ -323,7 +323,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Maximum = 100 ; Last = 100 ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; }; FixedText CT_BRIGHTNESS @@ -345,7 +345,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Maximum = 100 ; Last = 100 ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; }; // ------------------------------------------------------------------------- @@ -378,7 +378,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Maximum = 100 ; Last = 100 ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; }; FixedText CT_MAGENTA @@ -400,7 +400,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Maximum = 100 ; Last = 100 ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; }; FixedText CT_YELLOW @@ -422,7 +422,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Maximum = 100 ; Last = 100 ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; }; FixedText CT_KEY @@ -444,7 +444,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Maximum = 100 ; Last = 100 ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; }; // ------------------------------------------------------ diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src index 46442c9..38939b3 100644 --- a/cui/source/dialogs/grfflt.src +++ b/cui/source/dialogs/grfflt.src @@ -179,7 +179,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE Maximum = 100 ; StrictFormat = TRUE ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; Last = 100 ; SpinSize = 1 ; }; @@ -260,7 +260,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA Maximum = 100 ; StrictFormat = TRUE ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; First = 1 ; Last = 100 ; SpinSize = 1 ; diff --git a/cui/source/dialogs/zoom.src b/cui/source/dialogs/zoom.src index 4b7d5f0..1541849 100644 --- a/cui/source/dialogs/zoom.src +++ b/cui/source/dialogs/zoom.src @@ -67,7 +67,7 @@ ModalDialog RID_SVXDLG_ZOOM HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_100"; Pos = MAP_APPFONT ( 12 , 53 ) ; Size = MAP_APPFONT ( 105, 10 ) ; - Text = "~100 %" ; + Text = "~100%" ; }; RadioButton BTN_USER { diff --git a/cui/source/tabpages/tabline.src b/cui/source/tabpages/tabline.src index 4538b01..6a2288e 100644 --- a/cui/source/tabpages/tabline.src +++ b/cui/source/tabpages/tabline.src @@ -541,7 +541,7 @@ TabPage RID_SVXPAGE_LINE_DEF DecimalDigits = 2 ; Value = 1 ; Unit = FUNIT_MM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; SpinSize = 10 ; }; MetricField MTR_FLD_LENGTH_2 @@ -562,7 +562,7 @@ TabPage RID_SVXPAGE_LINE_DEF DecimalDigits = 2 ; Value = 1 ; Unit = FUNIT_MM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; SpinSize = 10 ; }; FixedText FT_DISTANCE @@ -586,7 +586,7 @@ TabPage RID_SVXPAGE_LINE_DEF DecimalDigits = 2 ; Value = 1 ; Unit = FUNIT_MM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; Last = 5000 ; SpinSize = 10 ; }; diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 540a987..7d6326f 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -336,10 +336,12 @@ SfxItemPresentation SvxSizeItem::GetPresentation case SFX_ITEM_PRESENTATION_COMPLETE: rText = EE_RESSTR(RID_SVXITEMS_SIZE_WIDTH); rText += GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, pIntl ); + rText += sal_Unicode(' '); rText += EE_RESSTR(GetMetricId(ePresUnit)); rText += cpDelim; rText += EE_RESSTR(RID_SVXITEMS_SIZE_HEIGHT); rText += GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, pIntl ); + rText += sal_Unicode(' '); rText += EE_RESSTR(GetMetricId(ePresUnit)); return SFX_ITEM_PRESENTATION_COMPLETE; //no break necessary @@ -609,6 +611,7 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation { rText += GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ); + rText += sal_Unicode(' '); rText += EE_RESSTR(GetMetricId(ePresUnit)); } rText += cpDelim; @@ -622,6 +625,7 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation { rText += GetMetricText( (long)nFirstLineOfst, eCoreUnit, ePresUnit, pIntl ); + rText += sal_Unicode(' '); rText += EE_RESSTR(GetMetricId(ePresUnit)); } rText += cpDelim; @@ -633,6 +637,7 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation { rText += GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, pIntl ); + rText += sal_Unicode(' '); rText += EE_RESSTR(GetMetricId(ePresUnit)); } return SFX_ITEM_PRESENTATION_COMPLETE; @@ -958,6 +963,7 @@ SfxItemPresentation SvxULSpaceItem::GetPresentation else { rText += GetMetricText( (long)nUpper, eCoreUnit, ePresUnit, pIntl ); + rText += sal_Unicode(' '); rText += EE_RESSTR(GetMetricId(ePresUnit)); } rText += cpDelim; @@ -967,6 +973,7 @@ SfxItemPresentation SvxULSpaceItem::GetPresentation else { rText += GetMetricText( (long)nLower, eCoreUnit, ePresUnit, pIntl ); + rText += sal_Unicode(' '); rText += EE_RESSTR(GetMetricId(ePresUnit)); } return SFX_ITEM_PRESENTATION_COMPLETE; @@ -1477,6 +1484,7 @@ SfxItemPresentation SvxShadowItem::GetPresentation rText += EE_RESSTR(nId); rText += cpDelim; rText += GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl ); + rText += sal_Unicode(' '); rText += EE_RESSTR(GetMetricId(ePresUnit)); rText += cpDelim; rText += EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation); @@ -1682,6 +1690,7 @@ XubString SvxBorderLine::GetValueString( SfxMapUnit eSrcUnit, else { String sMetric = EE_RESSTR(GetMetricId( eDestUnit )); + sMetric.Insert( sal_Unicode(' '), 0 ); aStr += GetMetricText( (long)nInWidth, eSrcUnit, eDestUnit, pIntl ); if ( bMetricStr ) aStr += sMetric; @@ -2219,28 +2228,33 @@ SfxItemPresentation SvxBoxItem::GetPresentation { rText += GetMetricText( (long)nTopDist, eCoreUnit, ePresUnit, pIntl ); + rText += sal_Unicode(' '); rText += EE_RESSTR(GetMetricId(ePresUnit)); } else { - (((rText += EE_RESSTR(RID_SVXITEMS_BORDER_TOP)) + ((((rText += EE_RESSTR(RID_SVXITEMS_BORDER_TOP)) += GetMetricText( (long)nTopDist, eCoreUnit, ePresUnit, pIntl )) + += sal_Unicode(' ')) += EE_RESSTR(GetMetricId(ePresUnit))) += cpDelim; - (((rText += EE_RESSTR(RID_SVXITEMS_BORDER_BOTTOM)) + ((((rText += EE_RESSTR(RID_SVXITEMS_BORDER_BOTTOM)) += GetMetricText( (long)nBottomDist, eCoreUnit, ePresUnit, pIntl )) + += sal_Unicode(' ')) += EE_RESSTR(GetMetricId(ePresUnit))) += cpDelim; - (((rText += EE_RESSTR(RID_SVXITEMS_BORDER_LEFT)) + ((((rText += EE_RESSTR(RID_SVXITEMS_BORDER_LEFT)) += GetMetricText( (long)nLeftDist, eCoreUnit, ePresUnit, pIntl )) + += sal_Unicode(' ')) += EE_RESSTR(GetMetricId(ePresUnit))) += cpDelim; - ((rText += EE_RESSTR(RID_SVXITEMS_BORDER_RIGHT)) + (((rText += EE_RESSTR(RID_SVXITEMS_BORDER_RIGHT)) += GetMetricText( (long)nRightDist, eCoreUnit, ePresUnit, pIntl )) + += sal_Unicode(' ')) += EE_RESSTR(GetMetricId(ePresUnit)); } return SFX_ITEM_PRESENTATION_COMPLETE; diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 41e961a..8508178 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -1196,7 +1196,10 @@ SfxItemPresentation SvxTabStopItem::GetPresentation rText += GetMetricText( (long)((*this)[i]).GetTabPos(), eCoreUnit, ePresUnit, pIntl ); if ( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) + { + rText += sal_Unicode(' '); rText += EE_RESSTR(GetMetricId(ePresUnit)); + } bComma = sal_True; } } diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 677bca2..00fc7e1 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -1105,8 +1105,9 @@ SfxItemPresentation SvxFontHeightItem::GetPresentation { if( SFX_MAPUNIT_RELATIVE != ePropUnit ) { - ( rText = String::CreateFromInt32( (short)nProp ) ) += - EE_RESSTR( GetMetricId( ePropUnit ) ); + rText = String::CreateFromInt32( (short)nProp ); + rText += sal_Unicode(' '); + rText += EE_RESSTR( GetMetricId( ePropUnit ) ); if( 0 <= (short)nProp ) rText.Insert( sal_Unicode('+'), 0 ); } @@ -1114,6 +1115,7 @@ SfxItemPresentation SvxFontHeightItem::GetPresentation { rText = GetMetricText( (long)nHeight, eCoreUnit, SFX_MAPUNIT_POINT, pIntl ); + rText += sal_Unicode(' '); rText += EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT)); } else @@ -1319,6 +1321,7 @@ SfxItemPresentation SvxFontWidthItem::GetPresentation { rText = GetMetricText( (long)nWidth, eCoreUnit, SFX_MAPUNIT_POINT, pIntl ); + rText += sal_Unicode(' '); rText += EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT)); } else @@ -2257,6 +2260,7 @@ SfxItemPresentation SvxKerningItem::GetPresentation return ePres; case SFX_ITEM_PRESENTATION_NAMELESS: rText = GetMetricText( (long)GetValue(), eCoreUnit, SFX_MAPUNIT_POINT, pIntl ); + rText += sal_Unicode(' '); rText += EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT)); return ePres; case SFX_ITEM_PRESENTATION_COMPLETE: @@ -2272,6 +2276,7 @@ SfxItemPresentation SvxKerningItem::GetPresentation if ( nId ) rText += EE_RESSTR(nId); rText += GetMetricText( (long)GetValue(), eCoreUnit, SFX_MAPUNIT_POINT, pIntl ); + rText += sal_Unicode(' '); rText += EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT)); return ePres; } diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index be80626..90c5766 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -734,6 +734,7 @@ SfxItemPresentation lcl_HFPresentation { aText += GetMetricText( (long)nLeftMargin, eCoreMetric, ePresentationMetric, pIntl ); + aText += sal_Unicode(' '); aText += EE_RESSTR(GetMetricId(ePresentationMetric)); } aText += cpDelim; @@ -750,6 +751,7 @@ SfxItemPresentation lcl_HFPresentation { aText += GetMetricText( (long)nRightMargin, eCoreMetric, ePresentationMetric, pIntl ); + aText += sal_Unicode(' '); aText += EE_RESSTR(GetMetricId(ePresentationMetric)); } } diff --git a/sd/source/ui/animations/CustomAnimationDialog.src b/sd/source/ui/animations/CustomAnimationDialog.src index a6192a5..5846101 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.src +++ b/sd/source/ui/animations/CustomAnimationDialog.src @@ -242,7 +242,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT Maximum = 9999 ; DecimalDigits = 1 ; Unit = FUNIT_CUSTOM ; - CustomUnitText [ en-US ] = "sec"; + CustomUnitText [ en-US ] = " sec"; SpinSize = 5 ; Hide = TRUE; }; @@ -510,7 +510,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION Maximum = 9999 ; DecimalDigits = 1 ; Unit = FUNIT_CUSTOM ; - CustomUnitText [ en-US ] = "sec"; + CustomUnitText [ en-US ] = " sec"; SpinSize = 5 ; }; @@ -660,7 +660,7 @@ TabPage RID_TP_CUSTOMANIMATION_TEXT Maximum = 9999 ; DecimalDigits = 1 ; Unit = FUNIT_CUSTOM ; - CustomUnitText [ en-US ] = "sec"; + CustomUnitText [ en-US ] = " sec"; SpinSize = 5 ; }; diff --git a/sd/source/ui/animations/SlideTransitionPane.src b/sd/source/ui/animations/SlideTransitionPane.src index 1f82676..30a6220 100644 --- a/sd/source/ui/animations/SlideTransitionPane.src +++ b/sd/source/ui/animations/SlideTransitionPane.src @@ -156,7 +156,7 @@ Control DLG_SLIDE_TRANSITION_PANE SpinSize = 1 ; Unit = FUNIT_CUSTOM ; - CustomUnitText [ en-US ] = "sec"; + CustomUnitText [ en-US ] = " sec"; }; FixedLine FL_EMPTY1 diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src index b4c72ea..0ab5853 100644 --- a/svx/source/dialog/bmpmask.src +++ b/svx/source/dialog/bmpmask.src @@ -100,7 +100,7 @@ DockingWindow RID_SVXDLG_BMPMASK Last = 99 ; SpinSize = 1 ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; }; ListBox LB_1 { @@ -143,7 +143,7 @@ DockingWindow RID_SVXDLG_BMPMASK Last = 99 ; SpinSize = 1 ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; }; ListBox LB_2 { @@ -186,7 +186,7 @@ DockingWindow RID_SVXDLG_BMPMASK Last = 99 ; SpinSize = 1 ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; }; ListBox LB_3 { @@ -229,7 +229,7 @@ DockingWindow RID_SVXDLG_BMPMASK Last = 99 ; SpinSize = 1 ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; }; ListBox LB_4 { diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src index b5b42be..843ff67 100644 --- a/svx/source/engine3d/float3d.src +++ b/svx/source/engine3d/float3d.src @@ -251,7 +251,7 @@ DockingWindow RID_SVXFLOAT_3D Maximum = 100 ; Last = 100 ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; }; FixedText FT_BACKSCALE { @@ -272,7 +272,7 @@ DockingWindow RID_SVXFLOAT_3D SpinSize = 5 ; Maximum = 10000 ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; Last = 10000 ; }; FixedText FT_END_ANGLE @@ -1169,7 +1169,7 @@ DockingWindow RID_SVXFLOAT_3D Repeat = TRUE ; Spin = TRUE ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; Minimum = 1 ; First = 1 ; Maximum = 100 ; diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index 167d488..1a0c327 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -600,18 +600,22 @@ SfxItemPresentation SvxMarginItem::GetPresentation { rText = SVX_RESSTR(RID_SVXITEMS_MARGIN_LEFT); rText += GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ); + rText += sal_Unicode(' '); rText += SVX_RESSTR(GetMetricId(ePresUnit)); rText += cpDelim; rText += SVX_RESSTR(RID_SVXITEMS_MARGIN_TOP); rText += GetMetricText( (long)nTopMargin, eCoreUnit, ePresUnit, pIntl ); + rText += sal_Unicode(' '); rText += SVX_RESSTR(GetMetricId(ePresUnit)); rText += cpDelim; rText += SVX_RESSTR(RID_SVXITEMS_MARGIN_RIGHT); rText += GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, pIntl ); + rText += sal_Unicode(' '); rText += SVX_RESSTR(GetMetricId(ePresUnit)); rText += cpDelim; rText += SVX_RESSTR(RID_SVXITEMS_MARGIN_BOTTOM); rText += GetMetricText( (long)nBottomMargin, eCoreUnit, ePresUnit, pIntl ); + rText += sal_Unicode(' '); rText += SVX_RESSTR(GetMetricId(ePresUnit)); return SFX_ITEM_PRESENTATION_COMPLETE; } diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index 153ae7b..698184e 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -185,6 +185,7 @@ void TextCharacterSpacingControl::Rearrange(bool bLBAvailable,bool bAvailable, l { String aStrTip( maStrCusE); //LAST CUSTOM no tip defect //add aStrTip.Append( String::CreateFromDouble( (double)mnCustomKern / 10)); + aStrTip.Append( xub_Unicode(' ') ); aStrTip.Append(maStrUnit); // modify maVSSpacing.SetItemText(6,aStrTip); } @@ -192,6 +193,7 @@ void TextCharacterSpacingControl::Rearrange(bool bLBAvailable,bool bAvailable, l { String aStrTip(maStrCusC) ; //LAST CUSTOM no tip defect //add aStrTip.Append( String::CreateFromDouble( (double)-mnCustomKern / 10)); + aStrTip.Append( xub_Unicode( ' ' ) ); aStrTip.Append(maStrUnit); // modify maVSSpacing.SetItemText( 6, aStrTip ); } diff --git a/svx/source/sidebar/text/TextPropertyPanel.src b/svx/source/sidebar/text/TextPropertyPanel.src index 71940cb..70f255e 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.src +++ b/svx/source/sidebar/text/TextPropertyPanel.src @@ -623,11 +623,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 { @@ -635,11 +635,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 b118f55..a3e4449 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -1011,6 +1011,7 @@ SfxItemPresentation __EXPORT SdrMetricItem::GetPresentation(SfxItemPresentation aFmt.TakeStr(nValue,rText); String aStr; aFmt.TakeUnitStr((MapUnit)ePresMetric,aStr); + rText += sal_Unicode(' '); rText+=aStr; if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr2; diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 554b6b4..2b89831 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -608,8 +608,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(String(sal_Unicode(' ')), 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 daf3add..d5f73ba 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -1478,6 +1478,7 @@ SfxItemPresentation XLineWidthItem::GetPresentation case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetMetricText( (long) GetValue(), eCoreUnit, ePresUnit, pIntl); + rText += sal_Unicode(' '); rText += SVX_RESSTR( GetMetricId( ePresUnit) ); return ePres; default: @@ -2754,6 +2755,7 @@ SfxItemPresentation XLineStartWidthItem::GetPresentation case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetMetricText( (long) GetValue(), eCoreUnit, ePresUnit, pIntl); + rText += sal_Unicode(' '); rText += SVX_RESSTR( GetMetricId( ePresUnit) ); return ePres; default: @@ -2861,6 +2863,7 @@ SfxItemPresentation XLineEndWidthItem::GetPresentation case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetMetricText( (long) GetValue(), eCoreUnit, ePresUnit, pIntl); + rText += sal_Unicode(' '); rText += SVX_RESSTR( GetMetricId( ePresUnit) ); return ePres; default: diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx index 9ec9694..e8bc749 100644 --- a/sw/source/ui/utlui/attrdesc.cxx +++ b/sw/source/ui/utlui/attrdesc.cxx @@ -388,6 +388,7 @@ SfxItemPresentation SwFmtFrmSize::GetPresentation else { rText += ::GetMetricText( GetWidth(), eCoreUnit, ePresUnit, pIntl ); + rText += sal_Unicode(' '); rText += ::GetSvxString( ::GetMetricId( ePresUnit ) ); } if ( ATT_VAR_SIZE != GetHeightSizeType() ) @@ -406,6 +407,7 @@ SfxItemPresentation SwFmtFrmSize::GetPresentation else { rText += ::GetMetricText( GetHeight(), eCoreUnit, ePresUnit, pIntl ); + rText += sal_Unicode(' '); rText += ::GetSvxString( ::GetMetricId( ePresUnit ) ); } } @@ -562,6 +564,7 @@ SfxItemPresentation SwFmtVertOrient::GetPresentation rText += SW_RESSTR( STR_POS_Y ); rText += ' '; rText += ::GetMetricText( GetPos(), eCoreUnit, ePresUnit, pIntl ); + rText += sal_Unicode(' '); rText += ::GetSvxString( ::GetMetricId( ePresUnit ) ); } break; @@ -623,6 +626,7 @@ SfxItemPresentation SwFmtHoriOrient::GetPresentation rText += SW_RESSTR( STR_POS_X ); rText += ' '; rText += ::GetMetricText( GetPos(), eCoreUnit, ePresUnit, pIntl ); + rText += sal_Unicode(' '); rText += ::GetSvxString( ::GetMetricId( ePresUnit ) ); } break; diff --git a/sw/source/ui/utlui/uiitems.cxx b/sw/source/ui/utlui/uiitems.cxx index c58dd2a..468d43f 100644 --- a/sw/source/ui/utlui/uiitems.cxx +++ b/sw/source/ui/utlui/uiitems.cxx @@ -110,6 +110,7 @@ SfxItemPresentation SwPageFtnInfoItem::GetPresentation rText = SW_RESSTR( STR_MAX_FTN_HEIGHT ); rText += ' '; rText += ::GetMetricText( nHght, eCoreUnit, ePresUnit, pIntl ); + rText += sal_Unicode(' '); rText += ::GetSvxString( ::GetMetricId( ePresUnit ) ); } return ePres; diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index f62aab0..bd990f2 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -1585,8 +1585,11 @@ XubString MetricFormatter::CreateFieldText( sal_Int64 nValue ) const if( meUnit == FUNIT_CUSTOM ) aStr += maCustomUnitText; else + { + if ( meUnit != FUNIT_NONE || meUnit != FUNIT_PERCENT ) + aStr += xub_Unicode( ' ' ); aStr += ImplMetricToString( meUnit ); - + } return aStr; } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
