summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorTsutomu Uchino <hanya@apache.org>2014-01-18 09:52:44 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-01-20 12:45:55 +0000
commitaab6645595dc4210cc61a97aa9c137ecea5adace (patch)
treebab948ded78fbaaccdb147d21ebb99f2b4432c0a /vcl/source
parent96c0f5b1c712e72e4a5ad6b69e744d6187afdc83 (diff)
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
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/control/field.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 8df9c0e7163a..9a0e5694c5da 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 );
}