[Libreoffice-commits] .: cui/source

[Andras Timar]

 cui/source/dialogs/colorpicker.cxx |    6 ------
 cui/source/dialogs/colorpicker.src |   13 +++++++------
 cui/source/dialogs/zoom.src        |    2 +-
 3 files changed, 8 insertions(+), 13 deletions(-)

New commits:
commit 6a8350377bbcc7e1bf9877ab71bf19510b0c0abe
Author: Andras Timar <atimar at suse.com>
Date:   Mon Nov 28 15:47:09 2011 +0100

    no space between number and percent or degree mark - consistency

diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 3f3110d..5ae4a10 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -1151,12 +1151,6 @@ ColorPickerDialog::ColorPickerDialog( Window* pParent, sal_Int32 nColor, sal_Int
 {
     FreeResource();
 
-    String sUnitText;
-    sUnitText.Append( ' ' );
-    sUnitText.Append( (sal_Unicode) 0xb0 );
-
-    maMFHue.SetCustomUnitText( sUnitText );
-
     Link aLink( LINK( this, ColorPickerDialog, ColorModifyHdl ) );
     maColorField.SetModifyHdl( aLink );
     maColorSlider.SetModifyHdl( aLink );
diff --git a/cui/source/dialogs/colorpicker.src b/cui/source/dialogs/colorpicker.src
index b444f74..6fee862 100644
--- a/cui/source/dialogs/colorpicker.src
+++ b/cui/source/dialogs/colorpicker.src
@@ -312,6 +312,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
         Maximum = 360 ;
         Last = 360 ;
         Unit = FUNIT_CUSTOM ;
+        CustomUnitText = "°" ;
     };
 
     FixedText CT_SATURATION
@@ -333,7 +334,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
         Maximum = 100 ;
         Last = 100 ;
         Unit = FUNIT_CUSTOM ;
-        CustomUnitText = " %" ;
+        CustomUnitText = "%" ;
     };
 
     FixedText CT_BRIGHTNESS
@@ -355,7 +356,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
         Maximum = 100 ;
         Last = 100 ;
         Unit = FUNIT_CUSTOM ;
-        CustomUnitText = " %" ;
+        CustomUnitText = "%" ;
     };
 
 // -------------------------------------------------------------------------
@@ -388,7 +389,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
         Maximum = 100 ;
         Last = 100 ;
         Unit = FUNIT_CUSTOM ;
-        CustomUnitText = " %" ;
+        CustomUnitText = "%" ;
     };
 
     FixedText CT_MAGENTA
@@ -410,7 +411,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
         Maximum = 100 ;
         Last = 100 ;
         Unit = FUNIT_CUSTOM ;
-        CustomUnitText = " %" ;
+        CustomUnitText = "%" ;
     };
 
     FixedText CT_YELLOW
@@ -432,7 +433,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
         Maximum = 100 ;
         Last = 100 ;
         Unit = FUNIT_CUSTOM ;
-        CustomUnitText = " %" ;
+        CustomUnitText = "%" ;
     };
 
     FixedText CT_KEY
@@ -454,7 +455,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
         Maximum = 100 ;
         Last = 100 ;
         Unit = FUNIT_CUSTOM ;
-        CustomUnitText = " %" ;
+        CustomUnitText = "%" ;
     };
 
     // ------------------------------------------------------
diff --git a/cui/source/dialogs/zoom.src b/cui/source/dialogs/zoom.src
index f96323a..26729fa 100644
--- a/cui/source/dialogs/zoom.src
+++ b/cui/source/dialogs/zoom.src
@@ -71,7 +71,7 @@ ModalDialog RID_SVXDLG_ZOOM
         HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_100";
         Pos = MAP_APPFONT ( 12 , 53 ) ;
         Size = MAP_APPFONT ( 105, 10 ) ;
-        Text = "~100 %" ;
+        Text = "~100%" ;
     };
     RadioButton BTN_USER
     {