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

6 files changed, 17 insertions, 16 deletions

diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index ede9f6eab76e..6dede3649173 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 33733fe22085..a672e9a1ac8e 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 f22a89922828..d4330a29a638 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 2c5c2bc9607f..620ec2709469 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 54c0e7e77b08..58e5dd679c6e 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 cdd7dac5e5a3..1cfe73891633 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;