diff options
| author | Laurent Balland-Poirier <laurent.balland-poirier@laposte.net> | 2016-04-18 19:33:10 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-04-20 13:33:06 +0000 |
| commit | b24cc067695d7986f231303218e7b853d827b316 (patch) | |
| tree | b4def15e8277e83f9d9a8a393da2afd7f9ad004b /cui/source/inc | |
| parent | 840a48b5ff2e0262680d3ef02c63173f98c07d1c (diff) | |
tdf#99361 Separate checkbox in Number dialog
"Thousands Separator" and "Engineering notation" used the same checkbox,
so help tips texts were the same.
This commit creates a second checkbox
which is hiden/shown according to category selected
Change-Id: I94913e63e47b760deb747ce7cd3d74ab4c109599
Reviewed-on: https://gerrit.libreoffice.org/24224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'cui/source/inc')
| -rw-r--r-- | cui/source/inc/cuires.hrc | 3 | ||||
| -rw-r--r-- | cui/source/inc/numfmt.hxx | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index ac4b7e6734f8..98cbb8dc7e23 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -444,9 +444,6 @@ #define RID_SVXSTR_PERSONA_MUSIC (RID_SVX_START + 1288) #define RID_SVXSTR_PERSONA_NATURE (RID_SVX_START + 1289) -#define RID_SVXSTR_THOUSAND_SEP (RID_SVX_START + 1290) -#define RID_SVXSTR_ENGINEERING (RID_SVX_START + 1291) - #define RID_SVXPAGE_OPENCL (RID_SVX_START + 254) #endif diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index df61c578320f..b94788e4ddfe 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -105,6 +105,7 @@ private: VclPtr<FixedText> m_pFtLeadZeroes; VclPtr<NumericField> m_pEdLeadZeroes; VclPtr<CheckBox> m_pBtnThousand; + VclPtr<CheckBox> m_pBtnEngineering; VclPtr<VclContainer> m_pFormatCodeFrame; VclPtr<Edit> m_pEdFormat; @@ -127,8 +128,6 @@ private: short nFixedCategory; OUString sAutomaticEntry; - OUString sThousandSeparator; - OUString sEngineeringNotation; VclPtr<vcl::Window> pLastActivWindow; @@ -137,7 +136,7 @@ private: void FillFormatListBox_Impl( std::vector<OUString>& rEntries ); void UpdateOptions_Impl( bool bCheckCatChange ); void UpdateFormatListBox_Impl( bool bCat, bool bUpdateEdit ); - void UpdateThousandEngineeringText(); + void UpdateThousandEngineeringCheckBox(); void Obstructing(); void EnableBySourceFormat_Impl(); void SetCategory( sal_uInt16 nPos ); |