diff options
| author | Katarina Behrens <bubli@bubli.org> | 2014-03-29 22:15:41 +0100 |
|---|---|---|
| committer | Katarina Behrens <bubli@bubli.org> | 2014-03-29 22:32:00 +0100 |
| commit | 654cea3304572e4d33030c8e60503750b06156a3 (patch) | |
| tree | d957efbbc72215afb69dd95464d243759ed53dc9 /cui/source | |
| parent | f754176e0fe5a4780694450f65810466e0f4bd99 (diff) | |
fdo#74287: Correctly enable/disable widgets w/ invisible lines
Restore pre-ui behaviour - disable transparency & width control,
but keep colour control active when line contains symbols (e.g.
scatter chart)
Change-Id: I4005fc376fa1640c5b9d7e736fbdac7417f0edd9
Diffstat (limited to 'cui/source')
| -rw-r--r-- | cui/source/inc/cuitabline.hxx | 4 | ||||
| -rw-r--r-- | cui/source/tabpages/tpline.cxx | 17 |
2 files changed, 12 insertions, 9 deletions
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index e7954531b159..0a8a09b8279c 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -91,10 +91,12 @@ class SvxLineTabPage : public SvxTabPage using TabPage::ActivatePage; using TabPage::DeactivatePage; private: - VclBox* m_pBoxStyle; + VclBox* m_pBoxColor; LineLB* m_pLbLineStyle; ColorLB* m_pLbColor; + VclBox* m_pBoxWidth; MetricField* m_pMtrLineWidth; + VclBox* m_pBoxTransparency; MetricField* m_pMtrTransparent; VclFrame* m_pFlLineEnds; diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index a9a27e4c6c4c..9afc604d5464 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -110,9 +110,11 @@ SvxLineTabPage::SvxLineTabPage nPageType ( 0 ) { get(m_pLbLineStyle,"LB_LINE_STYLE"); + get(m_pBoxColor,"boxCOLOR"); get(m_pLbColor,"LB_COLOR"); - get(m_pBoxStyle,"boxSTYLE_ATTR"); + get(m_pBoxWidth,"boxWIDTH"); get(m_pMtrLineWidth,"MTR_FLD_LINE_WIDTH"); + get(m_pBoxTransparency,"boxTRANSPARENCY"); get(m_pMtrTransparent,"MTR_LINE_TRANSPARENT"); get(m_pFlLineEnds,"FL_LINE_ENDS"); @@ -1545,13 +1547,11 @@ IMPL_LINK( SvxLineTabPage, ChangePreviewHdl_Impl, void *, pCntrl ) // Make transparency accessible accordingly if( m_pLbLineStyle->GetSelectEntryPos() == 0 ) // invisible { -// aFtTransparent.Disable(); - m_pMtrTransparent->Disable(); + m_pBoxTransparency->Disable(); } else { -// aFtTransparent.Enable(); - m_pMtrTransparent->Enable(); + m_pBoxTransparency->Enable(); } const bool bHasLineStyle = m_pLbLineStyle->GetSelectEntryPos() !=0; @@ -1611,9 +1611,9 @@ IMPL_LINK_NOARG(SvxLineTabPage, ClickInvisibleHdl_Impl) if( m_pLbLineStyle->GetSelectEntryPos() == 0 ) // invisible { if(!bSymbols) - m_pLbColor->Disable(); + m_pBoxColor->Disable(); - m_pBoxStyle->Disable(); + m_pBoxWidth->Disable(); if( m_pFlLineEnds->IsEnabled() ) { @@ -1627,7 +1627,8 @@ IMPL_LINK_NOARG(SvxLineTabPage, ClickInvisibleHdl_Impl) } else { - m_pBoxStyle->Enable(); + m_pBoxColor->Enable(); + m_pBoxWidth->Enable(); if( m_pFlLineEnds->IsEnabled() ) { |