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 /svx/source/sidebar | |
| 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 'svx/source/sidebar')
| -rw-r--r-- | svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 4 | ||||
| -rw-r--r-- | svx/source/sidebar/text/TextPropertyPanel.src | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index 33733fe22085..a672e9a1ac8e 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -173,14 +173,14 @@ void TextCharacterSpacingControl::Rearrange(bool bLBAvailable,bool bAvailable, l { OUString aStrTip( maStrCusE); //LAST CUSTOM no tip defect //add aStrTip += OUString::number( (double)mnCustomKern / 10); - aStrTip += maStrUnit; // modify + aStrTip += " " + maStrUnit; // modify maVSSpacing.SetItemText(6,aStrTip); } else if(mnCustomKern < 0) { OUString aStrTip(maStrCusC) ; //LAST CUSTOM no tip defect //add aStrTip += OUString::number( (double)-mnCustomKern / 10); - aStrTip += maStrUnit; // modify + aStrTip += " " + maStrUnit; // modify maVSSpacing.SetItemText( 6, aStrTip ); } else diff --git a/svx/source/sidebar/text/TextPropertyPanel.src b/svx/source/sidebar/text/TextPropertyPanel.src index f22a89922828..d4330a29a638 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.src +++ b/svx/source/sidebar/text/TextPropertyPanel.src @@ -350,11 +350,11 @@ Control RID_POPUPPANEL_TEXTPAGE_SPACING String STR_VERY_TIGHT_TIP { - Text [ en-US ] = " Spacing: Condensed By: 3pt"; + Text [ en-US ] = " Spacing: Condensed By: 3 pt"; }; String STR_TIGHT_TIP { - Text [ en-US ] = " Spacing: Condensed By: 1.5pt"; + Text [ en-US ] = " Spacing: Condensed By: 1.5 pt"; }; String STR_NORMAL_TIP { @@ -362,11 +362,11 @@ Control RID_POPUPPANEL_TEXTPAGE_SPACING }; String STR_LOOSE_TIP { - Text [ en-US ] = " Spacing: Expanded By: 3pt"; + Text [ en-US ] = " Spacing: Expanded By: 3 pt"; }; String STR_VERY_LOOSE_TIP { - Text [ en-US ] = " Spacing: Expanded By: 6pt"; + Text [ en-US ] = " Spacing: Expanded By: 6 pt"; }; String STR_CUSTOM_C_TIP { |