[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/source

[Andras Timar]

 vcl/source/control/field.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit a61ab93a2c4db7831ca87d6b6725e0df15a644a5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Apr 26 11:28:39 2012 +0100

    Resolves: fdo#42390 allow zwj, etc. in metric unit text
    
    Signed-off-by: Andras Timar <atimar at suse.com>

diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index b943938..8a29f7a 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1102,8 +1102,7 @@ static XubString ImplMetricGetUnitText( const XubString& rStr )
     for ( short i = rStr.Len()-1; i >= 0; i-- )
     {
         xub_Unicode c = rStr.GetChar( i );
-        if ( unicode::isAlpha( c ) ||
-             (c == '\'') || (c == '\"') || (c == '%' ) )
+        if ( (c == '\'') || (c == '\"') || (c == '%' ) || unicode::isAlpha(c) || unicode::isControl(c) )
             aStr.Insert( c, 0 );
         else
         {