chart2/source/controller/inc/ChartController.hxx | 1 chart2/source/controller/main/ChartController.cxx | 3 + chart2/source/controller/main/ChartController_Insert.cxx | 19 ++++++++++ chart2/source/controller/main/ControllerCommandDispatch.cxx | 1 chart2/uiconfig/menubar/menubar.xml | 1 officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu | 5 ++ 6 files changed, 30 insertions(+)
New commits: commit ad19d370708d9c4efabee1cb88eeb63452ec9f68 Author: Tomaž Vajngerl <[email protected]> AuthorDate: Thu Jun 30 23:34:19 2022 +0200 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Thu Jun 30 23:34:19 2022 +0200 chart2: add "InsertDataTable" action to menu Change-Id: Ib60a2b061966eb61834480b63dc0653410a43a14 diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx index 505b109fdcc7..e8b78a309e12 100644 --- a/chart2/source/controller/inc/ChartController.hxx +++ b/chart2/source/controller/inc/ChartController.hxx @@ -440,6 +440,7 @@ private: void executeDispatch_OpenLegendDialog(); void executeDispatch_InsertAxes(); void executeDispatch_InsertGrid(); + void executeDispatch_InsertDataTable(); void executeDispatch_InsertMenu_DataLabels(); void executeDispatch_InsertMenu_Trendlines(); diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index a4bd7a3972cc..79e05b77e885 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -1169,6 +1169,8 @@ void SAL_CALL ChartController::dispatch( this->executeDispatch_InsertErrorBars(false); else if( aCommand == "InsertMenuYErrorBars" ) this->executeDispatch_InsertErrorBars(true); + else if( aCommand == "InsertDataTable" ) + this->executeDispatch_InsertDataTable(); else if( aCommand == "InsertSymbol" ) this->executeDispatch_InsertSpecialCharacter(); else if( aCommand == "InsertTrendline" ) @@ -1631,6 +1633,7 @@ const o3tl::sorted_vector< OUString >& ChartController::impl_getAvailableCommand "DeleteTrendline", "DeleteMeanValue", "DeleteTrendlineEquation", "DeleteXErrorBars", "DeleteYErrorBars", "DeleteDataLabels", "DeleteDataLabel", + "InsertDataTable", //format objects "FormatSelection", "TransformDialog", "DiagramType", "View3D", diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index 4f39f1068cdb..7c660af86f81 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -52,6 +52,7 @@ #include <ObjectNameProvider.hxx> #include <Legend.hxx> #include <LegendHelper.hxx> +#include <DataTable.hxx> #include <RegressionCurveModel.hxx> #include <com/sun/star/chart2/XRegressionCurve.hpp> @@ -155,6 +156,24 @@ void ChartController::executeDispatch_InsertGrid() } } +void ChartController::executeDispatch_InsertDataTable() +{ + rtl::Reference<Diagram> xDiagram = getFirstDiagram(); + SolarMutexGuard aGuard; + if (xDiagram->getDataTable().is()) + { + xDiagram->setDataTable(uno::Reference<chart2::XDataTable>()); + } + else + { + uno::Reference<chart2::XDataTable> xDataTable(new DataTable); + if (xDataTable.is()) + { + xDiagram->setDataTable(xDataTable); + } + } +} + void ChartController::executeDispatch_InsertTitles() { UndoGuard aUndoGuard( diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index e5035b4f053c..b7872b93e708 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -584,6 +584,7 @@ void ControllerCommandDispatch::updateCommandAvailability() m_aCommandAvailability[ ".uno:InsertMenuXErrorBars" ] = bIsWritable && m_apModelState->bSupportsStatistics; m_aCommandAvailability[ ".uno:InsertMenuYErrorBars" ] = bIsWritable && m_apModelState->bSupportsStatistics; m_aCommandAvailability[ ".uno:InsertSymbol" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bIsTextObject; + m_aCommandAvailability[ ".uno:InsertDataTable" ] = bIsWritable; // format objects bool bFormatObjectAvailable = bIsWritable && bControllerStateIsValid && m_apControllerState->bIsFormateableObjectSelected; diff --git a/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml index 354ebbc1903a..581aff37153b 100644 --- a/chart2/uiconfig/menubar/menubar.xml +++ b/chart2/uiconfig/menubar/menubar.xml @@ -56,6 +56,7 @@ <menu:menuitem menu:id=".uno:InsertMenuLegend"/> <menu:menuitem menu:id=".uno:InsertMenuAxes"/> <menu:menuitem menu:id=".uno:InsertMenuGrids"/> + <menu:menuitem menu:id=".uno:InsertDataTable"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:InsertMenuDataLabels"/> <menu:menuitem menu:id=".uno:InsertMenuTrendlines"/> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu index d3a54a052c8e..7739522a866e 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu @@ -64,6 +64,11 @@ <value xml:lang="en-US">Y Error ~Bars...</value> </prop> </node> + <node oor:name=".uno:InsertDataTable" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Data Table</value> + </prop> + </node> <!-- Menu - Format --> <node oor:name=".uno:FormatSelection" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string">
