diff options
| -rw-r--r-- | chart2/source/controller/dialogs/tp_ChartType.cxx | 3 | ||||
| -rw-r--r-- | sc/qa/uitest/chart/tdf142851.py | 38 | ||||
| -rw-r--r-- | sc/qa/uitest/data/tdf142851.xlsx | bin | 0 -> 14141 bytes |
3 files changed, 40 insertions, 1 deletions
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 19084e9e5180..ce38e10511d1 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -349,7 +349,8 @@ void ChartTypeTabPage::initializePage() if( !bFound ) { - m_xSubTypeList->Hide(); + m_xMainTypeList->show(); + m_xSubTypeList->Show(); m_pDim3DLookResourceGroup->showControls( false ); m_pStackingResourceGroup->showControls( false ); m_pSplineResourceGroup->showControls( false ); diff --git a/sc/qa/uitest/chart/tdf142851.py b/sc/qa/uitest/chart/tdf142851.py new file mode 100644 index 000000000000..73c9bd68d6d0 --- /dev/null +++ b/sc/qa/uitest/chart/tdf142851.py @@ -0,0 +1,38 @@ +# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*- +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +from uitest.framework import UITestCase +from libreoffice.uno.propertyvalue import mkPropertyValues +from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file + +# Bug 142851 - UI Chart Type dialog empty with unsupported combo chart + +class tdf142851(UITestCase): + def test_tdf142851_combo_chart_type(self): + calc_doc = self.ui_test.load_file(get_url_for_data_file("tdf142851.xlsx")) + xCalcDoc = self.xUITest.getTopFocusWindow() + gridwin = xCalcDoc.getChild("grid_window") + document = self.ui_test.get_component() + + gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Diagram 1"})) + gridwin.executeAction("ACTIVATE", tuple()) + xChartMainTop = self.xUITest.getTopFocusWindow() + xChartMain = xChartMainTop.getChild("chart_window") + xChart = xChartMain.getChild("CID/Page=") + + self.ui_test.execute_dialog_through_action(xChart, "COMMAND", + mkPropertyValues({"COMMAND" : "DiagramType"})) + xDialog = self.xUITest.getTopFocusWindow() + chartTypeVisible = get_state_as_dict(xDialog.getChild("charttype"))['Visible'] + subTypeVisible = get_state_as_dict(xDialog.getChild("subtype"))['Visible'] + xOKBtn = xDialog.getChild("ok") + self.ui_test.close_dialog_through_button(xOKBtn) + + self.assertEqual('true', chartTypeVisible) + self.assertEqual('true', subTypeVisible) + + self.ui_test.close_doc() +# vim: set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sc/qa/uitest/data/tdf142851.xlsx b/sc/qa/uitest/data/tdf142851.xlsx Binary files differnew file mode 100644 index 000000000000..e2cdaf7c1233 --- /dev/null +++ b/sc/qa/uitest/data/tdf142851.xlsx |