summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-08-29 09:27:01 +0100
committerAndras Timar <andras.timar@collabora.com>2014-08-29 03:36:59 -0500
commita5fedcf7fe56a56475dea484a78971c504e52272 (patch)
tree95eff7c2a64f31ffaed1533af7e1a591f47c4932
parenteed9b96cd65816f2f03b3ad00994d26d6a3cf783 (diff)
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@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r--svtools/source/control/ctrlbox.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index d54dcb43598e..415750ba5c45 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;