chart2/source/controller/dialogs/tp_SeriesToAxis.cxx | 7 ++++++-
chart2/source/controller/dialogs/tp_SeriesToAxis.hxx | 1 +
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 0522c77fd2f979a444a0060fdd5b98d6314228f0
Author: Katarina Behrens <bu...@bubli.org>
Date: Thu Feb 12 22:48:39 2015 +0100
tdf#84514: don't hide grid along with checkbox if not needed
Regression from .ui migration, which unconditionally (and wrongly)
hides the grid with radiobuttons. Do what the old code did - hide
the whole frame iff the grid has been hidden already.
Change-Id: Ia9dc8b166f4031b4c07fbb1969908d314cc3456c
Reviewed-on: https://gerrit.libreoffice.org/14511
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index aebb527..826eec3 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -52,6 +52,7 @@ SchOptionTabPage::SchOptionTabPage(vcl::Window* pWindow,const
SfxItemSet& rInAtt
get(m_pCBConnect,"CB_CONNECTOR");
get(m_pCBAxisSideBySide,"CB_BARS_SIDE_BY_SIDE");
+ get(m_pGrpPlotOptions,"frameFL_PLOT_OPTIONS" );
get(m_pGridPlotOptions,"gridPLOT_OPTIONS");
get(m_pRB_DontPaint,"RB_DONT_PAINT");
get(m_pRB_AssumeZero,"RB_ASSUME_ZERO");
@@ -213,7 +214,11 @@ void SchOptionTabPage::Reset(const SfxItemSet* rInAttrs)
else
{
m_pCBIncludeHiddenCells->Show(false);
- m_pGridPlotOptions->Show(false);
+ // check if the radiobutton guys above
+ // are visible. If they aren't, we can
+ // as well hide the whole frame
+ if(!m_pGridPlotOptions->IsVisible())
+ m_pGrpPlotOptions->Show(false);
}
AdaptControlPositionsAndVisibility();
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index db4afb6..ff81b28 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -53,6 +53,7 @@ private: //member
CheckBox* m_pCBConnect;
CheckBox* m_pCBAxisSideBySide;
+ VclFrame* m_pGrpPlotOptions;
VclGrid* m_pGridPlotOptions;
RadioButton* m_pRB_DontPaint;
RadioButton* m_pRB_AssumeZero;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
