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

3 files changed, 21 insertions, 19 deletions

diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index bd88e973aa0d..6fd91136ec60 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 1207f36a2478..8b1e59fa2665 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 d1832368662a..276870c5e723 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