chart2/source/controller/inc/ChartController.hxx | 2 ++
chart2/source/controller/main/ChartController.cxx | 7 ++++++-
chart2/source/controller/main/ChartController_Insert.cxx | 8 ++++----
chart2/source/controller/main/ChartController_Properties.cxx | 2 +-
chart2/source/controller/main/ChartController_Tools.cxx | 4 ++--
chart2/source/controller/main/ChartController_Window.cxx | 2 +-
6 files changed, 16 insertions(+), 9 deletions(-)
New commits:
commit cb65cf92b91873bfd13c96250c782998f1eef337
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Jan 19 13:09:42 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Jan 19 14:20:00 2022 +0100
add ChartController::getFirstDiagram code
utility method to simplify some code
Change-Id: I24225e993ef03e7e859a96e7ff2434df158c318b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128599
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/chart2/source/controller/inc/ChartController.hxx
b/chart2/source/controller/inc/ChartController.hxx
index 01019e39473e..d50800fd67ad 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -88,6 +88,7 @@ class DrawModelWrapper;
class DrawViewWrapper;
class ReferenceSizeProvider;
class ViewElementListProvider;
+class Diagram;
enum ChartDrawMode { CHARTDRAW_INSERT, CHARTDRAW_SELECT };
@@ -337,6 +338,7 @@ public:
css::uno::Reference<css::uno::XInterface> const & getChartView() const;
rtl::Reference<::chart::ChartModel> getChartModel();
+ rtl::Reference<::chart::Diagram> getFirstDiagram();
private:
class TheModel : public salhelper::SimpleReferenceObject
diff --git a/chart2/source/controller/main/ChartController.cxx
b/chart2/source/controller/main/ChartController.cxx
index a55e07149290..fd9ec38c3175 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -642,6 +642,11 @@ rtl::Reference<::chart::ChartModel>
ChartController::getChartModel()
return nullptr;
}
+rtl::Reference<::chart::Diagram> ChartController::getFirstDiagram()
+{
+ return ChartModelHelper::findDiagram(
uno::Reference<chart2::XChartDocument>(getChartModel()) );
+}
+
uno::Any SAL_CALL ChartController::getViewData()
{
//provides access to current view status
@@ -1403,7 +1408,7 @@ void ChartController::executeDispatch_MoveSeries( bool
bForward )
SchResId(STR_OBJECT_DATASERIES)),
m_xUndoManager );
- bool bChanged = DiagramHelper::moveSeries( ChartModelHelper::findDiagram(
uno::Reference<chart2::XChartDocument>(getChartModel()) ), xGivenDataSeries,
bForward );
+ bool bChanged = DiagramHelper::moveSeries( getFirstDiagram(),
xGivenDataSeries, bForward );
if( bChanged )
{
m_aSelection.setSelection( ObjectIdentifier::getMovedSeriesCID(
aObjectCID, bForward ) );
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx
b/chart2/source/controller/main/ChartController_Insert.cxx
index c44431d8e71f..d64d7f5ef500 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -95,7 +95,7 @@ void ChartController::executeDispatch_InsertAxes()
try
{
InsertAxisOrGridDialogData aDialogInput;
- rtl::Reference< Diagram > xDiagram =
ChartModelHelper::findDiagram(uno::Reference<chart2::XChartDocument>(getChartModel()));
+ rtl::Reference< Diagram > xDiagram = getFirstDiagram();
AxisHelper::getAxisOrGridExistence( aDialogInput.aExistenceList,
xDiagram );
AxisHelper::getAxisOrGridPossibilities( aDialogInput.aPossibilityList,
xDiagram );
@@ -133,7 +133,7 @@ void ChartController::executeDispatch_InsertGrid()
try
{
InsertAxisOrGridDialogData aDialogInput;
- rtl::Reference< Diagram > xDiagram =
ChartModelHelper::findDiagram(uno::Reference<chart2::XChartDocument>(getChartModel()));
+ rtl::Reference< Diagram > xDiagram = getFirstDiagram();
AxisHelper::getAxisOrGridExistence( aDialogInput.aExistenceList,
xDiagram, false );
AxisHelper::getAxisOrGridPossibilities( aDialogInput.aPossibilityList,
xDiagram, false );
@@ -329,7 +329,7 @@ void
ChartController::executeDispatch_InsertMenu_MeanValues()
else
{
std::vector< uno::Reference< chart2::XDataSeries > > aSeries(
- DiagramHelper::getDataSeriesFromDiagram(
ChartModelHelper::findDiagram(
uno::Reference<chart2::XChartDocument>(getChartModel()) )));
+ DiagramHelper::getDataSeriesFromDiagram( getFirstDiagram()));
for( const auto& xSrs : aSeries )
lcl_InsertMeanValueLine( xSrs );
@@ -716,7 +716,7 @@ void ChartController::executeDispatch_InsertAxisTitle()
sal_Int32 nDimensionIndex = -1;
sal_Int32 nCooSysIndex = -1;
sal_Int32 nAxisIndex = -1;
- AxisHelper::getIndicesForAxis( xAxis,
ChartModelHelper::findDiagram(uno::Reference<chart2::XChartDocument>(getChartModel())),
nCooSysIndex, nDimensionIndex, nAxisIndex );
+ AxisHelper::getIndicesForAxis( xAxis, getFirstDiagram(),
nCooSysIndex, nDimensionIndex, nAxisIndex );
TitleHelper::eTitleType eTitleType = TitleHelper::X_AXIS_TITLE;
if( nDimensionIndex==0 )
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx
b/chart2/source/controller/main/ChartController_Properties.cxx
index 0f8e4f1dfa43..43beea79db7c 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -720,7 +720,7 @@ bool
ChartController::executeDlg_ObjectProperties_withoutUndoGuard(
}
if( eObjectType==OBJECTTYPE_DIAGRAM_WALL ||
eObjectType==OBJECTTYPE_DIAGRAM_FLOOR )
{
- if( !DiagramHelper::isSupportingFloorAndWall(
ChartModelHelper::findDiagram(
uno::Reference<chart2::XChartDocument>(getChartModel()) ) ) )
+ if( !DiagramHelper::isSupportingFloorAndWall( getFirstDiagram() ) )
return bRet;
}
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx
b/chart2/source/controller/main/ChartController_Tools.cxx
index 835492594db3..280cbf420371 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -856,7 +856,7 @@ void ChartController::executeDispatch_ToggleGridHorizontal()
{
UndoGuard aUndoGuard(
SchResId( STR_ACTION_TOGGLE_GRID_HORZ ), m_xUndoManager );
- rtl::Reference< Diagram > xDiagram( ChartModelHelper::findDiagram(
uno::Reference<chart2::XChartDocument>(getChartModel()) ));
+ rtl::Reference< Diagram > xDiagram( getFirstDiagram() );
if( !xDiagram.is())
return;
@@ -889,7 +889,7 @@ void ChartController::executeDispatch_ToggleGridVertical()
{
UndoGuard aUndoGuard(
SchResId( STR_ACTION_TOGGLE_GRID_VERTICAL ), m_xUndoManager );
- rtl::Reference< Diagram > xDiagram( ChartModelHelper::findDiagram(
uno::Reference<chart2::XChartDocument>(getChartModel()) ));
+ rtl::Reference< Diagram > xDiagram( getFirstDiagram() );
if( !xDiagram.is())
return;
diff --git a/chart2/source/controller/main/ChartController_Window.cxx
b/chart2/source/controller/main/ChartController_Window.cxx
index ffd6b044076d..14795d4878ee 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1032,7 +1032,7 @@ void ChartController::execute_Command( const
CommandEvent& rCEvt )
xPopupMenu->insertSeparator( -1 );
ObjectType eObjectType = ObjectIdentifier::getObjectType(
m_aSelection.getSelectedCID() );
- rtl::Reference< Diagram > xDiagram =
ChartModelHelper::findDiagram(
uno::Reference<chart2::XChartDocument>(getChartModel()) );
+ rtl::Reference< Diagram > xDiagram = getFirstDiagram();
OUString aFormatCommand( lcl_getFormatCommandForObjectCID(
m_aSelection.getSelectedCID() ) );
lcl_insertMenuCommand( xPopupMenu, nUniqueId++, aFormatCommand
);
