chart2/source/controller/dialogs/tp_3D_SceneGeometry.src | 3 chart2/source/controller/dialogs/tp_SeriesToAxis.src | 6 - cui/source/dialogs/colorpicker.src | 18 +--- cui/source/dialogs/grfflt.src | 6 - cui/source/dialogs/zoom.src | 5 - cui/source/options/optgdlg.src | 6 - cui/source/tabpages/autocdlg.src | 3 cui/source/tabpages/backgrnd.src | 6 - cui/source/tabpages/chardlg.src | 9 -- cui/source/tabpages/grfpage.src | 6 - cui/source/tabpages/numpages.src | 3 cui/source/tabpages/paragrph.src | 3 cui/source/tabpages/tabarea.src | 59 ++++----------- cui/source/tabpages/tabline.src | 6 - cui/source/tabpages/tparea.cxx | 4 - cui/source/tabpages/tplnedef.cxx | 8 +- sc/source/ui/pagedlg/pagedlg.src | 3 sd/source/ui/animations/CustomAnimationDialog.src | 3 starmath/source/dialog.cxx | 3 starmath/source/smres.src | 27 ++---- svx/source/dialog/bmpmask.src | 12 +-- svx/source/dialog/contdlg.src | 3 svx/source/dialog/fontwork.cxx | 2 svx/source/dialog/fontwork.src | 1 svx/source/engine3d/float3d.src | 9 -- svx/source/sidebar/area/AreaPropertyPanel.src | 28 ++----- svx/source/sidebar/graphic/GraphicPropertyPanel.src | 20 +---- svx/source/sidebar/line/LinePropertyPanel.src | 3 svx/source/sidebar/paragraph/ParaPropertyPanel.src | 3 svx/source/tbxctrls/fontworkgallery.src | 3 sw/source/ui/frmdlg/column.src | 3 sw/source/ui/misc/pgfnote.src | 3 32 files changed, 95 insertions(+), 182 deletions(-)
New commits: commit 4f5b26a97dbaef964af1fe323f24109b987cb952 Author: Tsutomu Uchino <ha...@apache.org> Date: Sun Jan 19 13:40:29 2014 +0000 #i56998# use FUNIT_PERCENT instead of FUNIT_CUSTOM with parcent CustomUnitText on metric fields diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src index 0a5c463..879d7e3 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src @@ -143,8 +143,7 @@ TabPage TP_3D_SCENEGEOMETRY First = 0 ; Last = 100 ; SpinSize = 5 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; }; }; diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.src b/chart2/source/controller/dialogs/tp_SeriesToAxis.src index ae43dfc..d0a3944 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.src +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.src @@ -77,8 +77,7 @@ TabPage TP_OPTIONS Minimum = -100 ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; First = 1 ; Last = 100 ; SpinSize = 1 ; @@ -104,8 +103,7 @@ TabPage TP_OPTIONS Minimum = 0 ; Maximum = 600 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; First = 1 ; Last = 100 ; SpinSize = 1 ; diff --git a/cui/source/dialogs/colorpicker.src b/cui/source/dialogs/colorpicker.src index 988d7bd..72c9156 100644 --- a/cui/source/dialogs/colorpicker.src +++ b/cui/source/dialogs/colorpicker.src @@ -322,8 +322,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Spin = TRUE ; Maximum = 100 ; Last = 100 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; }; FixedText CT_BRIGHTNESS @@ -344,8 +343,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Spin = TRUE ; Maximum = 100 ; Last = 100 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; }; // ------------------------------------------------------------------------- @@ -377,8 +375,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Spin = TRUE ; Maximum = 100 ; Last = 100 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; }; FixedText CT_MAGENTA @@ -399,8 +396,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Spin = TRUE ; Maximum = 100 ; Last = 100 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; }; FixedText CT_YELLOW @@ -421,8 +417,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Spin = TRUE ; Maximum = 100 ; Last = 100 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; }; FixedText CT_KEY @@ -443,8 +438,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Spin = TRUE ; Maximum = 100 ; Last = 100 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; }; // ------------------------------------------------------ diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src index 38939b3..ffb725d 100644 --- a/cui/source/dialogs/grfflt.src +++ b/cui/source/dialogs/grfflt.src @@ -178,8 +178,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE Spin = TRUE ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 1 ; }; @@ -259,8 +258,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA Minimum = 1 ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; First = 1 ; Last = 100 ; SpinSize = 1 ; diff --git a/cui/source/dialogs/zoom.src b/cui/source/dialogs/zoom.src index 1541849..5f636f3 100644 --- a/cui/source/dialogs/zoom.src +++ b/cui/source/dialogs/zoom.src @@ -67,7 +67,7 @@ ModalDialog RID_SVXDLG_ZOOM HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_100"; Pos = MAP_APPFONT ( 12 , 53 ) ; Size = MAP_APPFONT ( 105, 10 ) ; - Text = "~100%" ; + Text = "~100 %" ; }; RadioButton BTN_USER { @@ -86,8 +86,7 @@ ModalDialog RID_SVXDLG_ZOOM Left = TRUE ; Repeat = TRUE ; Spin = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; SpinSize = 1 ; }; FixedLine FL_VIEWLAYOUT diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src index 252920a..49ece8c 100644 --- a/cui/source/options/optgdlg.src +++ b/cui/source/options/optgdlg.src @@ -211,8 +211,7 @@ TabPage OFA_TP_VIEW First = 80 ; Last = 130 ; SpinSize = 1 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; }; FixedText FT_ICONSIZESTYLE { @@ -448,8 +447,7 @@ TabPage OFA_TP_VIEW First = 10 ; Last = 90 ; SpinSize = 5 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText [ en-US ] = "%" ; + Unit = FUNIT_PERCENT ; }; }; // ******************************************************************* diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src index a25a2b3..f93090f 100644 --- a/cui/source/tabpages/autocdlg.src +++ b/cui/source/tabpages/autocdlg.src @@ -280,8 +280,7 @@ ModalDialog RID_OFADLG_PRCNT_SET Spin = TRUE ; Maximum = 100 ; Value = 77 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; First = 10 ; Last = 100 ; SpinSize = 5 ; diff --git a/cui/source/tabpages/backgrnd.src b/cui/source/tabpages/backgrnd.src index 4df7a1f..e99b440 100644 --- a/cui/source/tabpages/backgrnd.src +++ b/cui/source/tabpages/backgrnd.src @@ -148,8 +148,7 @@ TabPage RID_SVXPAGE_BACKGROUND Left = TRUE ; Repeat = TRUE ; Spin = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; SpinSize = 5 ; Minimum = 0; Maximum = 100; @@ -245,8 +244,7 @@ TabPage RID_SVXPAGE_BACKGROUND Left = TRUE ; Repeat = TRUE ; Spin = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; SpinSize = 5 ; Minimum = 0; Maximum = 100; diff --git a/cui/source/tabpages/chardlg.src b/cui/source/tabpages/chardlg.src index d935611..9f6bac3 100644 --- a/cui/source/tabpages/chardlg.src +++ b/cui/source/tabpages/chardlg.src @@ -747,8 +747,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION Spin = TRUE ; Minimum = 1 ; Maximum = 100 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; First = 1 ; Last = 100 ; SpinSize = 1 ; @@ -778,8 +777,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION Spin = TRUE ; Minimum = 1 ; Maximum = 100 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; First = 1 ; Last = 100 ; SpinSize = 1 ; @@ -845,8 +843,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION Spin = TRUE ; Minimum = 1 ; Maximum = 999 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; First = 50 ; Last = 200 ; SpinSize = 1 ; diff --git a/cui/source/tabpages/grfpage.src b/cui/source/tabpages/grfpage.src index 4daafad..9aa91e4 100644 --- a/cui/source/tabpages/grfpage.src +++ b/cui/source/tabpages/grfpage.src @@ -197,8 +197,7 @@ TabPage RID_SVXPAGE_GRFCROP Last = 1000 ; Maximum = 9999 ; Value = 100 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; SpinSize = 10 ; }; FixedText FT_HEIGHTZOOM @@ -224,8 +223,7 @@ TabPage RID_SVXPAGE_GRFCROP Last = 1000 ; Maximum = 9999 ; Value = 100 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; SpinSize = 10 ; }; FixedLine FL_SIZE diff --git a/cui/source/tabpages/numpages.src b/cui/source/tabpages/numpages.src index d0ce923..6520a66 100644 --- a/cui/source/tabpages/numpages.src +++ b/cui/source/tabpages/numpages.src @@ -296,8 +296,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS Left = TRUE ; Repeat = TRUE ; Spin = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; SpinSize = 1 ; Minimum = 1; Maximum = 250; diff --git a/cui/source/tabpages/paragrph.src b/cui/source/tabpages/paragrph.src index b90d2aa..bc2d4ed 100644 --- a/cui/source/tabpages/paragrph.src +++ b/cui/source/tabpages/paragrph.src @@ -212,8 +212,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH Minimum = 50 ; Maximum = 200 ; Value = 100 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; First = 50 ; Last = 200 ; SpinSize = 1 ; diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src index 4801941..0d750d5 100644 --- a/cui/source/tabpages/tabarea.src +++ b/cui/source/tabpages/tabarea.src @@ -70,8 +70,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE Spin = TRUE ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 5 ; }; @@ -123,8 +122,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE Spin = TRUE ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 5 ; }; @@ -145,8 +143,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE Spin = TRUE ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 5 ; }; @@ -188,8 +185,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE Spin = TRUE ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 5 ; }; @@ -210,8 +206,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE Spin = TRUE ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 5 ; }; @@ -232,8 +227,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE Spin = TRUE ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 5 ; }; @@ -428,7 +422,6 @@ TabPage RID_SVXPAGE_AREA StrictFormat = TRUE ; DecimalDigits = 2 ; Unit = FUNIT_MM ; - CustomUnitText = "%" ; Minimum = 5 ; Maximum = 100 ; First = 5 ; @@ -453,7 +446,6 @@ TabPage RID_SVXPAGE_AREA StrictFormat = TRUE ; DecimalDigits = 2 ; Unit = FUNIT_MM ; - CustomUnitText = "%" ; Minimum = 5 ; Maximum = 100 ; First = 5 ; @@ -497,8 +489,7 @@ TabPage RID_SVXPAGE_AREA Repeat = TRUE ; Spin = TRUE ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Maximum = 100 ; Last = 100 ; SpinSize = 5 ; @@ -514,8 +505,7 @@ TabPage RID_SVXPAGE_AREA Spin = TRUE ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 5 ; }; @@ -566,8 +556,7 @@ TabPage RID_SVXPAGE_AREA Spin = TRUE ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 5 ; }; @@ -664,8 +653,7 @@ TabPage RID_SVXPAGE_SHADOW Spin = TRUE ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 5 ; }; @@ -1047,8 +1035,7 @@ TabPage RID_SVXPAGE_GRADIENT Spin = TRUE ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 5 ; }; @@ -1069,8 +1056,7 @@ TabPage RID_SVXPAGE_GRADIENT Spin = TRUE ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 5 ; }; @@ -1112,8 +1098,7 @@ TabPage RID_SVXPAGE_GRADIENT Spin = TRUE ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 5 ; }; @@ -1144,8 +1129,7 @@ TabPage RID_SVXPAGE_GRADIENT Spin = TRUE ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 5 ; }; @@ -1176,8 +1160,7 @@ TabPage RID_SVXPAGE_GRADIENT Spin = TRUE ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 5 ; }; @@ -1356,8 +1339,7 @@ TabPage RID_SVXPAGE_COLOR Repeat = TRUE ; Spin = TRUE ; Maximum = 100 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; }; FixedText FT_2 @@ -1376,8 +1358,7 @@ TabPage RID_SVXPAGE_COLOR Repeat = TRUE ; Spin = TRUE ; Maximum = 100 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; }; FixedText FT_3 @@ -1396,8 +1377,7 @@ TabPage RID_SVXPAGE_COLOR Repeat = TRUE ; Spin = TRUE ; Maximum = 100 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; }; FixedText FT_4 @@ -1416,8 +1396,7 @@ TabPage RID_SVXPAGE_COLOR Repeat = TRUE ; Spin = TRUE ; Maximum = 100 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; }; PushButton BTN_ADD diff --git a/cui/source/tabpages/tabline.src b/cui/source/tabpages/tabline.src index 6a2288e..5790643 100644 --- a/cui/source/tabpages/tabline.src +++ b/cui/source/tabpages/tabline.src @@ -116,8 +116,7 @@ TabPage RID_SVXPAGE_LINE Spin = TRUE ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 5 ; }; @@ -541,7 +540,6 @@ TabPage RID_SVXPAGE_LINE_DEF DecimalDigits = 2 ; Value = 1 ; Unit = FUNIT_MM ; - CustomUnitText = "%" ; SpinSize = 10 ; }; MetricField MTR_FLD_LENGTH_2 @@ -562,7 +560,6 @@ TabPage RID_SVXPAGE_LINE_DEF DecimalDigits = 2 ; Value = 1 ; Unit = FUNIT_MM ; - CustomUnitText = "%" ; SpinSize = 10 ; }; FixedText FT_DISTANCE @@ -586,7 +583,6 @@ TabPage RID_SVXPAGE_LINE_DEF DecimalDigits = 2 ; Value = 1 ; Unit = FUNIT_MM ; - CustomUnitText = "%" ; Last = 5000 ; SpinSize = 10 ; }; diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index eb2ac3a..4f70a92 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -2523,13 +2523,13 @@ IMPL_LINK( SvxAreaTabPage, ClickScaleHdl_Impl, void *, EMPTYARG ) if( aTsbScale.GetState() == STATE_CHECK ) { aMtrFldXSize.SetDecimalDigits( 0 ); - aMtrFldXSize.SetUnit( FUNIT_CUSTOM ); + aMtrFldXSize.SetUnit( FUNIT_PERCENT ); aMtrFldXSize.SetValue( 100 ); aMtrFldXSize.SetMax( 100 ); aMtrFldXSize.SetLast( 100 ); aMtrFldYSize.SetDecimalDigits( 0 ); - aMtrFldYSize.SetUnit( FUNIT_CUSTOM ); + aMtrFldYSize.SetUnit( FUNIT_PERCENT ); aMtrFldYSize.SetValue( 100 ); aMtrFldYSize.SetMax( 100 ); aMtrFldYSize.SetLast( 100 ); diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index bd20097..8675272 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -508,7 +508,7 @@ IMPL_LINK( SvxLineDefTabPage, ChangeMetricHdl_Impl, void *, p ) SetMetricValue( aMtrLength2, nTmp2, ePoolUnit ); SetMetricValue( aMtrDistance, nTmp3, ePoolUnit ); } - else if( aCbxSynchronize.IsChecked() && aMtrLength1.GetUnit() != FUNIT_CUSTOM ) + else if( aCbxSynchronize.IsChecked() && aMtrLength1.GetUnit() != FUNIT_PERCENT ) { long nTmp1, nTmp2, nTmp3; @@ -530,9 +530,9 @@ IMPL_LINK( SvxLineDefTabPage, ChangeMetricHdl_Impl, void *, p ) aMtrLength2.SetDecimalDigits( 0 ); aMtrDistance.SetDecimalDigits( 0 ); - aMtrLength1.SetUnit( FUNIT_CUSTOM ); - aMtrLength2.SetUnit( FUNIT_CUSTOM ); - aMtrDistance.SetUnit( FUNIT_CUSTOM ); + aMtrLength1.SetUnit( FUNIT_PERCENT ); + aMtrLength2.SetUnit( FUNIT_PERCENT ); + aMtrDistance.SetUnit( FUNIT_PERCENT ); SetMetricValue( aMtrLength1, nTmp1, ePoolUnit ); diff --git a/sc/source/ui/pagedlg/pagedlg.src b/sc/source/ui/pagedlg/pagedlg.src index cd7fdb6..384bbdc 100644 --- a/sc/source/ui/pagedlg/pagedlg.src +++ b/sc/source/ui/pagedlg/pagedlg.src @@ -331,8 +331,7 @@ TabPage RID_SCPAGE_TABLE First = 15 ; Last = 200 ; SpinSize = 1 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; }; NumericField ED_SCALEPAGEWIDTH { diff --git a/sd/source/ui/animations/CustomAnimationDialog.src b/sd/source/ui/animations/CustomAnimationDialog.src index 5846101..0b87338 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.src +++ b/sd/source/ui/animations/CustomAnimationDialog.src @@ -447,8 +447,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT Minimum = 0 ; Maximum = 1024 ; DecimalDigits = 1 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText [ en-US ] = "%"; + Unit = FUNIT_PERCENT ; SpinSize = 1 ; }; diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 250082f..3e8b8dd 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -865,9 +865,8 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory) sal_uInt16 nDigits; if (nCategory < 9) { - eUnit = FUNIT_CUSTOM; + eUnit = FUNIT_PERCENT; nDigits = 0; - pMF->SetCustomUnitText( '%' ); } else { diff --git a/starmath/source/smres.src b/starmath/source/smres.src index 113a8bd..dffcfe3 100644 --- a/starmath/source/smres.src +++ b/starmath/source/smres.src @@ -153,8 +153,7 @@ ModalDialog RID_FONTSIZEDIALOG Spin = TRUE ; Minimum = 5 ; Maximum = 200 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; }; FixedText 5 { @@ -175,8 +174,7 @@ ModalDialog RID_FONTSIZEDIALOG Spin = TRUE ; Minimum = 5 ; Maximum = 200 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; }; FixedText 6 { @@ -197,8 +195,7 @@ ModalDialog RID_FONTSIZEDIALOG Spin = TRUE ; Minimum = 5 ; Maximum = 200 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; }; FixedText 7 { @@ -219,8 +216,7 @@ ModalDialog RID_FONTSIZEDIALOG Spin = TRUE ; Minimum = 5 ; Maximum = 200 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; }; FixedText 8 { @@ -241,8 +237,7 @@ ModalDialog RID_FONTSIZEDIALOG Spin = TRUE ; Minimum = 5 ; Maximum = 200 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; }; FixedLine 1 { @@ -462,7 +457,6 @@ ModalDialog RID_DISTANCEDIALOG Repeat = TRUE; Pos = MAP_APPFONT ( 78 , 18 ) ; Size = MAP_APPFONT ( 38 , 12 ) ; - CustomUnitText [ en-US ] = "%" ; }; FixedText 2 { @@ -483,7 +477,6 @@ ModalDialog RID_DISTANCEDIALOG Repeat = TRUE; Pos = MAP_APPFONT ( 78 , 34 ) ; Size = MAP_APPFONT ( 38 , 12 ) ; - CustomUnitText [ en-US ] = "%" ; }; CheckBox 1 { @@ -512,7 +505,6 @@ ModalDialog RID_DISTANCEDIALOG Repeat = TRUE; Pos = MAP_APPFONT ( 78 , 50 ) ; Size = MAP_APPFONT ( 38 , 12 ) ; - CustomUnitText [ en-US ] = "%" ; }; FixedText 4 { @@ -1078,8 +1070,7 @@ TabPage RID_PRINTOPTIONPAGE Spin = TRUE ; Minimum = 10 ; Maximum = 400 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; }; FixedLine FL_MISC_OPTIONS { @@ -1459,19 +1450,19 @@ Menu RID_VIEWMENU { Identifier = SID_VIEW050 ; HelpId = CMD_SID_VIEW050 ; - Text [ en-US ] = "~View 50%" ; + Text [ en-US ] = "~View 50 %" ; }; MenuItem { Identifier = SID_VIEW100 ; HelpId = CMD_SID_VIEW100 ; - Text [ en-US ] = "View ~100%" ; + Text [ en-US ] = "View ~100 %" ; }; MenuItem { Identifier = SID_VIEW200 ; HelpId = CMD_SID_VIEW200 ; - Text [ en-US ] = "View ~200%" ; + Text [ en-US ] = "View ~200 %" ; }; MenuItem { diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src index 0ab5853..c957d3f 100644 --- a/svx/source/dialog/bmpmask.src +++ b/svx/source/dialog/bmpmask.src @@ -99,8 +99,7 @@ DockingWindow RID_SVXDLG_BMPMASK Maximum = 99 ; Last = 99 ; SpinSize = 1 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; }; ListBox LB_1 { @@ -142,8 +141,7 @@ DockingWindow RID_SVXDLG_BMPMASK Maximum = 99 ; Last = 99 ; SpinSize = 1 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; }; ListBox LB_2 { @@ -185,8 +183,7 @@ DockingWindow RID_SVXDLG_BMPMASK Maximum = 99 ; Last = 99 ; SpinSize = 1 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; }; ListBox LB_3 { @@ -228,8 +225,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 09ee06a..2acd819 100644 --- a/svx/source/dialog/contdlg.src +++ b/svx/source/dialog/contdlg.src @@ -183,9 +183,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 73e80a5..5d08631 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -600,7 +600,7 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem, aMtrFldShadowX.SetSpinSize(10); // aFbShadowY.SetBitmap( Bitmap( ResId( RID_SVXBMP_SHADOW_SIZE, _pMgr ) ) ); - 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 31c7fd7..6312825 100644 --- a/svx/source/dialog/fontwork.src +++ b/svx/source/dialog/fontwork.src @@ -293,7 +293,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 843ff67..7e41846 100644 --- a/svx/source/engine3d/float3d.src +++ b/svx/source/engine3d/float3d.src @@ -250,8 +250,7 @@ DockingWindow RID_SVXFLOAT_3D SpinSize = 5 ; Maximum = 100 ; Last = 100 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; }; FixedText FT_BACKSCALE { @@ -271,8 +270,7 @@ DockingWindow RID_SVXFLOAT_3D Spin = TRUE ; SpinSize = 5 ; Maximum = 10000 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 10000 ; }; FixedText FT_END_ANGLE @@ -1168,8 +1166,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 7801d24..dba3cfe 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.src +++ b/svx/source/sidebar/area/AreaPropertyPanel.src @@ -167,14 +167,13 @@ Control RID_SIDEBAR_AREA_PANEL Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL + MBOX_WIDTH + CONTROL_SPACING_HORIZONTAL , SECTIONPAGE_MARGIN_VERTICAL_TOP + 2*(FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL) + CBOX_HEIGHT + CONTROL_SPACING_VERTICAL ) ; Size = MAP_APPFONT ( MBOX_WIDTH + 1 ,MBOX_HEIGHT ) ; HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRANSPARENT ; - QuickHelpText [ en-US ] = "Specify 0% for fully opaque through 100% for fully transparent." ; + QuickHelpText [ en-US ] = "Specify 0 % for fully opaque through 100 % for fully transparent." ; TabStop = TRUE ; Repeat = TRUE ; Spin = TRUE ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 5 ; }; @@ -226,14 +225,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 ; }; @@ -247,14 +245,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 ; }; @@ -288,14 +285,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 ; }; @@ -309,14 +305,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 ; }; @@ -336,8 +331,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/graphic/GraphicPropertyPanel.src b/svx/source/sidebar/graphic/GraphicPropertyPanel.src index fa97c6b..6b14f59 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.src +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.src @@ -69,8 +69,7 @@ Control RID_SIDEBAR_GRAPHIC_PANEL Maximum = 100 ; Minimum = -100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; SpinSize = 1 ; }; FixedText FT_CONTRAST @@ -92,8 +91,7 @@ Control RID_SIDEBAR_GRAPHIC_PANEL Maximum = 100 ; Minimum = -100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; SpinSize = 1 ; }; FixedText FT_COLOR_MODE @@ -124,14 +122,13 @@ Control RID_SIDEBAR_GRAPHIC_PANEL Pos = MAP_APPFONT (X2, Y3) ; Size = MAP_APPFONT ( MBOX_WIDTH ,MBOX_HEIGHT ) ; HelpID = HID_PROPERTY_PANEL_GRAPHIC_MTR_TRANSP; - QuickHelpText [ en-US ] = "Specify the percentage of transparency; 0% is fully opaque and 100% is fully transparent."; + QuickHelpText [ en-US ] = "Specify the percentage of transparency; 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 ; SpinSize = 1 ; }; MetricField MF_RED @@ -147,8 +144,7 @@ Control RID_SIDEBAR_GRAPHIC_PANEL Maximum = 100 ; Minimum = -100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; SpinSize = 1 ; }; MetricField MF_GREEN @@ -164,8 +160,7 @@ Control RID_SIDEBAR_GRAPHIC_PANEL Maximum = 100 ; Minimum = -100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; SpinSize = 1 ; }; MetricField MF_BLUE @@ -181,8 +176,7 @@ Control RID_SIDEBAR_GRAPHIC_PANEL Maximum = 100 ; Minimum = -100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; SpinSize = 1 ; }; MetricField MF_GAMMA diff --git a/svx/source/sidebar/line/LinePropertyPanel.src b/svx/source/sidebar/line/LinePropertyPanel.src index dc8980a..c95108d 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.src +++ b/svx/source/sidebar/line/LinePropertyPanel.src @@ -131,8 +131,7 @@ Control RID_SIDEBAR_LINE_PANEL Spin = TRUE ; Maximum = 100 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 5 ; QuickHelpText [ en-US ] = "Specify the transparency of the line."; diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.src b/svx/source/sidebar/paragraph/ParaPropertyPanel.src index 1dbc2d5..ffa10f7 100755 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.src +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.src @@ -661,8 +661,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; diff --git a/svx/source/tbxctrls/fontworkgallery.src b/svx/source/tbxctrls/fontworkgallery.src index 6f5001d..b65025a 100644 --- a/svx/source/tbxctrls/fontworkgallery.src +++ b/svx/source/tbxctrls/fontworkgallery.src @@ -315,8 +315,7 @@ ModalDialog RID_SVX_MDLG_FONTWORK_CHARSPACING Spin = TRUE ; Maximum = 500 ; StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 5 ; }; diff --git a/sw/source/ui/frmdlg/column.src b/sw/source/ui/frmdlg/column.src index 98296b4..3c8a2c0 100644 --- a/sw/source/ui/frmdlg/column.src +++ b/sw/source/ui/frmdlg/column.src @@ -293,8 +293,7 @@ TabPage TP_COLUMN Minimum = 25 ; Maximum = 100 ; Value = 100 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; First = 25 ; Last = 100 ; }; diff --git a/sw/source/ui/misc/pgfnote.src b/sw/source/ui/misc/pgfnote.src index 774ca99..008f98d 100644 --- a/sw/source/ui/misc/pgfnote.src +++ b/sw/source/ui/misc/pgfnote.src @@ -157,8 +157,7 @@ TabPage TP_FOOTNOTE_PAGE Spin = TRUE ; Maximum = 100 ; Value = 100 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; + Unit = FUNIT_PERCENT ; First = 10 ; Last = 100 ; }; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits