diff options
| author | Tsutomu Uchino <hanya@apache.org> | 2014-01-19 13:40:29 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-20 11:40:09 +0000 |
| commit | 260df50ae67e0d9f9d80e0686e6a12903c53c130 (patch) | |
| tree | 9227999ccb4a76b2fdb6a1396de28fe873d93f56 /starmath | |
| parent | 4d1b8459f7ed8ba46dfaff00420fc1a698028d3e (diff) | |
Related: #i56998# use FUNIT_PERCENT instead of FUNIT_CUSTOM...
with percent CustomUnitText on metric fields
(cherry picked from commit 4f5b26a97dbaef964af1fe323f24109b987cb952)
Conflicts:
chart2/source/controller/dialogs/tp_3D_SceneGeometry.src
chart2/source/controller/dialogs/tp_SeriesToAxis.src
cui/source/dialogs/zoom.src
cui/source/options/optgdlg.src
cui/source/tabpages/autocdlg.src
cui/source/tabpages/backgrnd.src
cui/source/tabpages/chardlg.src
cui/source/tabpages/grfpage.src
cui/source/tabpages/numpages.src
cui/source/tabpages/paragrph.src
cui/source/tabpages/tabarea.src
cui/source/tabpages/tabline.src
cui/source/tabpages/tparea.cxx
cui/source/tabpages/tplnedef.cxx
sc/source/ui/pagedlg/pagedlg.src
sd/source/ui/animations/CustomAnimationDialog.src
starmath/source/dialog.cxx
starmath/source/smres.src
svx/source/dialog/fontwork.cxx
svx/source/sidebar/area/AreaPropertyPanel.src
svx/source/sidebar/graphic/GraphicPropertyPanel.src
svx/source/sidebar/line/LinePropertyPanel.src
svx/source/tbxctrls/fontworkgallery.src
sw/source/ui/frmdlg/column.src
sw/source/ui/misc/pgfnote.src
Change-Id: I8acc5f7fc80d4366750ad38fabbf49b02f013f7c
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/dialog.cxx | 3 | ||||
| -rw-r--r-- | starmath/source/smres.src | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 564fccc56b7f..0ede24777ee4 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -808,9 +808,8 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory) sal_uInt16 nDigits; if (nCategory < 9) { - eUnit = FUNIT_CUSTOM; + eUnit = FUNIT_PERCENT; nDigits = 0; - pMF->SetCustomUnitText(OUString('%')); } else { diff --git a/starmath/source/smres.src b/starmath/source/smres.src index 0907229d4912..0bebacab2330 100644 --- a/starmath/source/smres.src +++ b/starmath/source/smres.src @@ -303,19 +303,19 @@ Menu RID_VIEWMENU { Identifier = SID_ZOOM_50_PERCENT; HelpId = CMD_SID_VIEW050 ; - Text [ en-US ] = "~View 50%" ; + Text [ en-US ] = "~View 50 %" ; }; MenuItem { Identifier = SID_ZOOM_100_PERCENT ; HelpId = CMD_SID_VIEW100 ; - Text [ en-US ] = "View ~100%" ; + Text [ en-US ] = "View ~100 %" ; }; MenuItem { Identifier = SID_ZOOM_200_PERCENT ; HelpId = CMD_SID_VIEW200 ; - Text [ en-US ] = "View ~200%" ; + Text [ en-US ] = "View ~200 %" ; }; MenuItem { |