summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorTsutomu Uchino <hanya@apache.org>2014-01-19 13:40:29 +0000
committerTsutomu Uchino <hanya@apache.org>2014-01-19 13:40:29 +0000
commit4f5b26a97dbaef964af1fe323f24109b987cb952 (patch)
tree4bdf759fb4eb9f433b577b3831051f5fa84ba58f /cui
parentf17513bf90f3ad1dd0cd991f6569a38d9c8c0782 (diff)
#i56998# use FUNIT_PERCENT instead of FUNIT_CUSTOM with parcent CustomUnitText on metric fields
Notes
Notes: merged as: 260df50ae67e0d9f9d80e0686e6a12903c53c130
Diffstat (limited to 'cui')
-rw-r--r--cui/source/dialogs/colorpicker.src18
-rw-r--r--cui/source/dialogs/grfflt.src6
-rw-r--r--cui/source/dialogs/zoom.src5
-rw-r--r--cui/source/options/optgdlg.src6
-rw-r--r--cui/source/tabpages/autocdlg.src3
-rw-r--r--cui/source/tabpages/backgrnd.src6
-rw-r--r--cui/source/tabpages/chardlg.src9
-rw-r--r--cui/source/tabpages/grfpage.src6
-rw-r--r--cui/source/tabpages/numpages.src3
-rw-r--r--cui/source/tabpages/paragrph.src3
-rw-r--r--cui/source/tabpages/tabarea.src59
-rw-r--r--cui/source/tabpages/tabline.src6
-rw-r--r--cui/source/tabpages/tparea.cxx4
-rw-r--r--cui/source/tabpages/tplnedef.cxx8
14 files changed, 48 insertions, 94 deletions
diff --git a/cui/source/dialogs/colorpicker.src b/cui/source/dialogs/colorpicker.src
index 988d7bdeef6e..72c91566a186 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 38939b36886e..ffb725dd32a0 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 154184999e92..5f636f3202d8 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 252920aff46d..49ece8cf94d0 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 a25a2b34c9d5..f93090fe2714 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 4df7a1fad5c9..e99b440aa858 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 d935611c9bd0..9f6bac3eebfe 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 4daafad2cbf3..9aa91e4d4563 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 d0ce92319ca5..6520a6650554 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 b90d2aa63cf3..bc2d4ed881a9 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 480194117ce0..0d750d582ba2 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 6a2288e77068..5790643415b1 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 eb2ac3ae4bdd..4f70a9246942 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 bd20097acd5f..8675272b15ca 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 );
generated by cgit (git 2.34.1) at 2025-02-03 14:08:27 +0000