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

3 files changed, 28 insertions, 6 deletions

diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 540a987e58af..7d6326f40d3f 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 41e961ac0133..850817872e5f 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 677bca225367..00fc7e1bd642 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;
         }