[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - avmedia/source svx/source vcl/source

[Tsutomu Uchino]

 avmedia/source/framework/mediacontrol.src |    6 +++---
 svx/source/items/svxitems.src             |    6 +++---
 svx/source/stbctrls/stbctrls.src          |   10 +++++-----
 vcl/source/control/field.cxx              |    2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit f17513bf90f3ad1dd0cd991f6569a38d9c8c0782
Author: Tsutomu Uchino <hanya at apache.org>
Date:   Sun Jan 19 12:02:25 2014 +0000

    #i56998 add space before percent in zoom strings

diff --git a/avmedia/source/framework/mediacontrol.src b/avmedia/source/framework/mediacontrol.src
index 7d1246a..91f166d 100644
--- a/avmedia/source/framework/mediacontrol.src
+++ b/avmedia/source/framework/mediacontrol.src
@@ -81,21 +81,21 @@ String AVMEDIA_STR_ZOOM
 
 String AVMEDIA_STR_ZOOM_50
 {
-    Text[en-US] = "50%";
+    Text[en-US] = "50 %";
 };
 
 // ------------------------------------------------------------------------------
 
 String AVMEDIA_STR_ZOOM_100
 {
-    Text[en-US] = "100%";
+    Text[en-US] = "100 %";
 };
 
 // ------------------------------------------------------------------------------
 
 String AVMEDIA_STR_ZOOM_200
 {
-    Text[en-US] = "200%";
+    Text[en-US] = "200 %";
 };
 
 // ------------------------------------------------------------------------------
diff --git a/svx/source/items/svxitems.src b/svx/source/items/svxitems.src
index cf064cd..ba0abd1 100644
--- a/svx/source/items/svxitems.src
+++ b/svx/source/items/svxitems.src
@@ -197,15 +197,15 @@ String RID_SVXITEMS_BRUSHSTYLE_DOWNDIAG
 };
 String RID_SVXITEMS_BRUSHSTYLE_25
 {
-    Text = "25%" ;
+    Text = "25 %" ;
 };
 String RID_SVXITEMS_BRUSHSTYLE_50
 {
-    Text = "50%" ;
+    Text = "50 %" ;
 };
 String RID_SVXITEMS_BRUSHSTYLE_75
 {
-    Text = "75%" ;
+    Text = "75 %" ;
 };
 String RID_SVXITEMS_BRUSHSTYLE_BITMAP
 {
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index 37ea191..c02f38e 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -93,31 +93,31 @@ Menu RID_SVXMNU_ZOOM
         {
             Identifier = ZOOM_200 ;
             HelpId = HID_MNU_ZOOM_200 ;
-            Text = "200%" ;
+            Text = "200 %" ;
         };
         MenuItem
         {
             Identifier = ZOOM_150 ;
             HelpId = HID_MNU_ZOOM_150 ;
-            Text = "150%" ;
+            Text = "150 %" ;
         };
         MenuItem
         {
             Identifier = ZOOM_100 ;
             HelpId = HID_MNU_ZOOM_100 ;
-            Text = "100%" ;
+            Text = "100 %" ;
         };
         MenuItem
         {
             Identifier = ZOOM_75 ;
             HelpId = HID_MNU_ZOOM_75 ;
-            Text = "75%" ;
+            Text = "75 %" ;
         };
         MenuItem
         {
             Identifier = ZOOM_50 ;
             HelpId = HID_MNU_ZOOM_50 ;
-            Text = "50%" ;
+            Text = "50 %" ;
         };
         MenuItem
         {
commit 20f2a4b272f9fa879b8c30495fed3c462ea78a2f
Author: Tsutomu Uchino <hanya at apache.org>
Date:   Sun Jan 19 11:50:38 2014 +0000

    #i56998# space separater required before parcent character in metric field

diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 2e0c738..86b6019 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 )
             aStr += xub_Unicode( ' ' );
         aStr += ImplMetricToString( meUnit );
     }