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 /svx | |
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 'svx')
-rw-r--r-- | svx/source/dialog/bmpmask.src | 12 | ||||
-rw-r--r-- | svx/source/dialog/contdlg.src | 3 | ||||
-rw-r--r-- | svx/source/dialog/fontwork.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/fontwork.src | 1 | ||||
-rw-r--r-- | svx/source/engine3d/float3d.src | 9 | ||||
-rw-r--r-- | svx/source/sidebar/area/AreaPropertyPanel.src | 23 | ||||
-rw-r--r-- | svx/source/sidebar/paragraph/ParaPropertyPanel.src | 3 |
7 files changed, 19 insertions, 34 deletions
diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src index e1c0a719113f..4d613641b27f 100644 --- a/svx/source/dialog/bmpmask.src +++ b/svx/source/dialog/bmpmask.src @@ -95,8 +95,7 @@ DockingWindow RID_SVXDLG_BMPMASK Maximum = 99 ; Last = 99 ; SpinSize = 1 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; }; ListBox LB_1 { @@ -138,8 +137,7 @@ DockingWindow RID_SVXDLG_BMPMASK Maximum = 99 ; Last = 99 ; SpinSize = 1 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; }; ListBox LB_2 { @@ -181,8 +179,7 @@ DockingWindow RID_SVXDLG_BMPMASK Maximum = 99 ; Last = 99 ; SpinSize = 1 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; }; ListBox LB_3 { @@ -224,8 +221,7 @@ DockingWindow RID_SVXDLG_BMPMASK Maximum = 99 ; Last = 99 ; SpinSize = 1 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; }; ListBox LB_4 { diff --git a/svx/source/dialog/contdlg.src b/svx/source/dialog/contdlg.src index 519b73c1b115..43f3f4d2a638 100644 --- a/svx/source/dialog/contdlg.src +++ b/svx/source/dialog/contdlg.src @@ -179,9 +179,8 @@ FloatingWindow RID_SVXDLG_CONTOUR Maximum = 99 ; Last = 99 ; SpinSize = 1 ; - Unit = FUNIT_CUSTOM ; + Unit = FUNIT_PERCENT ; QuickHelpText [ en-US ] = "Color Tolerance" ; - CustomUnitText [ en-US ] = "%" ; }; Control CTL_CONTOUR { diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index 1183bad6cfd1..f7ab7dae5d4e 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -516,7 +516,7 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem, aMtrFldShadowX.SetMax( 1800); aMtrFldShadowX.SetSpinSize(10); - aMtrFldShadowY.SetUnit(FUNIT_CUSTOM); + aMtrFldShadowY.SetUnit(FUNIT_PERCENT); aMtrFldShadowY.SetDecimalDigits(0); aMtrFldShadowY.SetMin(-999); aMtrFldShadowY.SetMax( 999); diff --git a/svx/source/dialog/fontwork.src b/svx/source/dialog/fontwork.src index f176e170ba5e..e0112cf9dc3f 100644 --- a/svx/source/dialog/fontwork.src +++ b/svx/source/dialog/fontwork.src @@ -288,7 +288,6 @@ DockingWindow RID_SVXDLG_FONTWORK Last = 5000000 ; SpinSize = 50 ; QuickHelpText [ en-US ] = "Distance Y" ; - CustomUnitText [ en-US ] = "%" ; }; ListBox CLB_SHADOW_COLOR { diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src index 954d71a9fee6..a2618aa1d6e3 100644 --- a/svx/source/engine3d/float3d.src +++ b/svx/source/engine3d/float3d.src @@ -240,8 +240,7 @@ DockingWindow RID_SVXFLOAT_3D SpinSize = 5 ; Maximum = 100 ; Last = 100 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; }; FixedText FT_BACKSCALE { @@ -261,8 +260,7 @@ DockingWindow RID_SVXFLOAT_3D Spin = TRUE ; SpinSize = 5 ; Maximum = 10000 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 10000 ; }; FixedText FT_END_ANGLE @@ -1148,8 +1146,7 @@ DockingWindow RID_SVXFLOAT_3D TabStop = TRUE ; Repeat = TRUE ; Spin = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Minimum = 1 ; First = 1 ; Maximum = 100 ; diff --git a/svx/source/sidebar/area/AreaPropertyPanel.src b/svx/source/sidebar/area/AreaPropertyPanel.src index 244b3047982b..812acfe74647 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.src +++ b/svx/source/sidebar/area/AreaPropertyPanel.src @@ -78,14 +78,13 @@ Control RID_POPUPPANEL_AREAPAGE_TRGR Border = TRUE ; Size = MAP_APPFONT ( CONTROL_WIDTH , MBOX_HEIGHT ) ; HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRGR_CENTER_X ; - QuickHelpText [ en-US ] = "Specify the horizontal offset percentage from the center for the gradient shading style. 50% is the horizontal center." ; + QuickHelpText [ en-US ] = "Specify the horizontal offset percentage from the center for the gradient shading style. 50 % is the horizontal center." ; TabStop = TRUE ; Repeat = TRUE ; Spin = TRUE ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 5 ; }; @@ -99,14 +98,13 @@ Control RID_POPUPPANEL_AREAPAGE_TRGR Border = TRUE ; Size = MAP_APPFONT ( CONTROL_WIDTH , MBOX_HEIGHT ) ; HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRGR_CENTER_Y ; - QuickHelpText [ en-US ] = "Specify the vertical offset percentage from the center for the gradient shading style. 50% is the vertical center." ; + QuickHelpText [ en-US ] = "Specify the vertical offset percentage from the center for the gradient shading style. 50 % is the vertical center." ; TabStop = TRUE ; Repeat = TRUE ; Spin = TRUE ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 5 ; }; @@ -140,14 +138,13 @@ Control RID_POPUPPANEL_AREAPAGE_TRGR Border = TRUE ; Size = MAP_APPFONT ( CONTROL_WIDTH , MBOX_HEIGHT ) ; HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRGR_SVALUE ; - QuickHelpText [ en-US ] = "Enter a transparency value for the beginning point of the gradient, where 0% is fully opaque and 100% is fully transparent." ; + QuickHelpText [ en-US ] = "Enter a transparency value for the beginning point of the gradient, where 0% is fully opaque and 100 % is fully transparent." ; TabStop = TRUE ; Repeat = TRUE ; Spin = TRUE ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 5 ; }; @@ -161,14 +158,13 @@ Control RID_POPUPPANEL_AREAPAGE_TRGR Border = TRUE ; Size = MAP_APPFONT ( CONTROL_WIDTH , MBOX_HEIGHT ) ; HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRGR_EVALUE ; - QuickHelpText [ en-US ] = "Enter a transparency value for the endpoint of the gradient, where 0% is fully opaque and 100% is fully transparent." ; + QuickHelpText [ en-US ] = "Enter a transparency value for the endpoint of the gradient, where 0 % is fully opaque and 100 % is fully transparent." ; TabStop = TRUE ; Repeat = TRUE ; Spin = TRUE ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 5 ; }; @@ -188,8 +184,7 @@ Control RID_POPUPPANEL_AREAPAGE_TRGR Spin = TRUE ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 5 ; }; diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.src b/svx/source/sidebar/paragraph/ParaPropertyPanel.src index 459ea6a668be..b3fd4b5ce2b2 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.src +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.src @@ -296,8 +296,7 @@ Control RID_POPUPPANEL_PARAPAGE_LINESPACING Maximum = 200; Value = 100; StrictFormat = TRUE; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%"; + Unit = FUNIT_PERCENT ; First = 50; Last = 200; SpinSize = 1; |