#i56998# add a space separater between value and unit and remove separator between value and percent to match with ISO 31-0

8 files changed, 24 insertions, 13 deletions

diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src
index b4c72ea478a8..0ab5853ec470 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 b5b42be5c083..843ff67c1fd8 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 167d488473c0..1a0c327b704a 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 153ae7b5e26a..698184e6a034 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 71940cb02a4c..70f255e7a651 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 b118f5524e55..a3e444991d11 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 554b6b4f85eb..2b8983183242 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 daf3addd18ce..d5f73ba1ec11 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: