diff options
| author | Tsutomu Uchino <hanya@apache.org> | 2014-01-18 08:14:47 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-20 12:08:54 +0000 |
| commit | ab50bc9d4a72193c1fefcbf0652938995094bc41 (patch) | |
| tree | 5c9f9b107edd1e59cb88606e8a7152d68adf0832 /vcl/source/control/field.cxx | |
| parent | d98d35b3293b3b4b27db4d578348f43a86201cfc (diff) | |
Resolves: #i56998# add a space separater between value and unit...
and remove separator between value and percent to match with ISO 31-0
(cherry picked from commit 0cea884e3f417e4b58d2fdcfc7b0111f3bfc6f30)
Conflicts:
chart2/source/controller/dialogs/tp_SeriesToAxis.src
cui/source/dialogs/colorpicker.cxx
cui/source/dialogs/colorpicker.src
cui/source/dialogs/grfflt.src
cui/source/dialogs/zoom.src
cui/source/tabpages/tabline.src
editeng/source/items/frmitems.cxx
editeng/source/items/textitem.cxx
sd/source/ui/animations/CustomAnimationDialog.src
sd/source/ui/animations/SlideTransitionPane.src
svx/source/dialog/bmpmask.src
svx/source/engine3d/float3d.src
svx/source/items/algitem.cxx
svx/source/sidebar/text/TextCharacterSpacingControl.cxx
svx/source/xoutdev/xattr.cxx
sw/source/ui/utlui/attrdesc.cxx
sw/source/ui/utlui/uiitems.cxx
Change-Id: I554309cb72dd8956077c5ca6866a982cdd6529aa
Diffstat (limited to 'vcl/source/control/field.cxx')
| -rw-r--r-- | vcl/source/control/field.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index c0dd2efc1937..885b35d4c3ce 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -1428,8 +1428,11 @@ OUString MetricFormatter::CreateFieldText( sal_Int64 nValue ) const if( meUnit == FUNIT_CUSTOM ) aStr += maCustomUnitText; else + { + if ( meUnit != FUNIT_NONE || meUnit != FUNIT_PERCENT ) + aStr += " "; aStr += ImplMetricToString( meUnit ); - + } return aStr; } |