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 /cui | |
| 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 'cui')
| -rw-r--r-- | cui/source/dialogs/colorpicker.src | 18 | ||||
| -rw-r--r-- | cui/source/dialogs/grfflt.src | 6 | ||||
| -rw-r--r-- | cui/source/tabpages/tplnedef.cxx | 9 |
3 files changed, 12 insertions, 21 deletions
diff --git a/cui/source/dialogs/colorpicker.src b/cui/source/dialogs/colorpicker.src index 7f9c6af7ad91..63ab6345fc5c 100644 --- a/cui/source/dialogs/colorpicker.src +++ b/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 ; }; // ------------------------------------------------------ diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src index 73b1094f7f69..ff1cfb2492c0 100644 --- a/cui/source/dialogs/grfflt.src +++ b/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 ; diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 1d09382d4c4d..451fcf82906a 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/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 ); |