Related: #i56998# use FUNIT_PERCENT instead of FUNIT_CUSTOM...

with percent CustomUnitText on metric fields

(cherry picked from commit 4f5b26a9)

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

cui/source/dialogs/colorpicker.src

@@ -321,8 +321,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
         Spin = TRUE ;
         Maximum = 100 ;
         Last = 100 ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText = "%" ;
+        Unit = FUNIT_PERCENT ;
     };
 
     FixedText CT_BRIGHTNESS
@@ -343,8 +342,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
         Spin = TRUE ;
         Maximum = 100 ;
         Last = 100 ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText = "%" ;
+        Unit = FUNIT_PERCENT ;
     };
 
 // -------------------------------------------------------------------------
@@ -376,8 +374,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
         Spin = TRUE ;
         Maximum = 100 ;
         Last = 100 ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText = "%" ;
+        Unit = FUNIT_PERCENT ;
     };
 
     FixedText CT_MAGENTA
@@ -398,8 +395,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
         Spin = TRUE ;
         Maximum = 100 ;
         Last = 100 ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText = "%" ;
+        Unit = FUNIT_PERCENT ;
     };
 
     FixedText CT_YELLOW
@@ -420,8 +416,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
         Spin = TRUE ;
         Maximum = 100 ;
         Last = 100 ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText = "%" ;
+        Unit = FUNIT_PERCENT ;
     };
 
     FixedText CT_KEY
@@ -442,8 +437,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
         Spin = TRUE ;
         Maximum = 100 ;
         Last = 100 ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText = "%" ;
+        Unit = FUNIT_PERCENT ;
     };
 
     // ------------------------------------------------------

cui/source/dialogs/grfflt.src

@@ -174,8 +174,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE
         Spin = TRUE ;
         Maximum = 100 ;
         StrictFormat = TRUE ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText = "%" ;
+        Unit = FUNIT_PERCENT ;
         Last = 100 ;
         SpinSize = 1 ;
     };
@@ -255,8 +254,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 ;

cui/source/tabpages/tplnedef.cxx

@@ -445,7 +445,7 @@ IMPL_LINK( SvxLineDefTabPage, ChangeMetricHdl_Impl, void *, p )
         SetMetricValue( *m_pMtrLength2, nTmp2, ePoolUnit );
         SetMetricValue( *m_pMtrDistance, nTmp3, ePoolUnit );
     }
-    else if( m_pCbxSynchronize->IsChecked() && m_pMtrLength1->GetUnit() != FUNIT_CUSTOM )
+    else if( m_pCbxSynchronize->IsChecked() && m_pMtrLength1->GetUnit() != FUNIT_PERCENT )
     {
         long nTmp1, nTmp2, nTmp3;
 
@@ -467,10 +467,9 @@ IMPL_LINK( SvxLineDefTabPage, ChangeMetricHdl_Impl, void *, p )
         m_pMtrLength2->SetDecimalDigits( 0 );
         m_pMtrDistance->SetDecimalDigits( 0 );
 
-        m_pMtrLength1->SetUnit( FUNIT_CUSTOM );
-        m_pMtrLength2->SetUnit( FUNIT_CUSTOM );
-        m_pMtrDistance->SetUnit( FUNIT_CUSTOM );
-
+        m_pMtrLength1->SetUnit( FUNIT_PERCENT );
+        m_pMtrLength2->SetUnit( FUNIT_PERCENT );
+        m_pMtrDistance->SetUnit( FUNIT_PERCENT );
 
         SetMetricValue( *m_pMtrLength1, nTmp1, ePoolUnit );
         SetMetricValue( *m_pMtrLength2, nTmp2, ePoolUnit );

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
         {

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
         {

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
     {

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
     {

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);

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
     {

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 ;

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 ;
     };

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;