vcl/source/control/field.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit aab6645595dc4210cc61a97aa9c137ecea5adace
Author: Tsutomu Uchino <ha...@apache.org>
Date: Sat Jan 18 09:52:44 2014 +0000
Related: #i56998# percent value should not takes space separator...
before the character
(cherry picked from commit acac627b8aed3353e542ce41fa9a7064e4d1790b)
Conflicts:
vcl/source/control/field.cxx
Change-Id: Ia9c5496e1e2345f6249dc03efaf2c60f4231aecd
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 8df9c0e..9a0e569 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1429,7 +1429,7 @@ OUString MetricFormatter::CreateFieldText( sal_Int64
nValue ) const
aStr += maCustomUnitText;
else
{
- if (meUnit != FUNIT_NONE || meUnit != FUNIT_PERCENT || meUnit !=
FUNIT_DEGREE)
+ if (meUnit != FUNIT_NONE && meUnit != FUNIT_PERCENT && meUnit !=
FUNIT_DEGREE)
aStr += " ";
aStr += ImplMetricToString( meUnit );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
