[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - svtools/source

[Caolán McNamara]

 svtools/source/control/ctrlbox.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a5fedcf7fe56a56475dea484a78971c504e52272
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 29 09:27:01 2014 +0100

    Resolves: fdo#83068 ignore spaces in font-size unit detection
    
    Change-Id: Id9a5c2ee576bd533d8b0a2b4356e319354abbbac
    (cherry picked from commit d54b2bd8dcc393bb168386a5c0ec4ce40bb3c6d4)
    Reviewed-on: https://gerrit.libreoffice.org/11186
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index d54dcb4..415750b 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -19,6 +19,7 @@
 
 #include <config_folders.h>
 
+#include <i18nutil/unicode.hxx>
 #include <tools/stream.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/svapp.hxx>
@@ -1724,7 +1725,7 @@ void FontSizeBox::Modify()
             const sal_Unicode* pStr = aStr.getStr();
             while ( *pStr )
             {
-                if ( ((*pStr < '0') || (*pStr > '9')) && (*pStr != '%') )
+                if ( ((*pStr < '0') || (*pStr > '9')) && (*pStr != '%') && !unicode::isSpace(*pStr) )
                 {
                     if ( ('-' == *pStr || '+' == *pStr) && !bPtRelative )
                         bPtRelative = true;