[Libreoffice-commits] core.git: chart2/source
Noel (via logerrit)
logerrit at kemper.freedesktop.org
Wed Feb 17 07:51:27 UTC 2021
chart2/source/controller/accessibility/AccessibleBase.cxx | 2 +-
chart2/source/controller/main/ControllerCommandDispatch.cxx | 10 +++++-----
chart2/source/controller/sidebar/ChartAreaPanel.cxx | 8 ++++----
chart2/source/controller/sidebar/ChartAxisPanel.cxx | 2 +-
chart2/source/controller/sidebar/ChartLinePanel.cxx | 8 ++++----
chart2/source/controller/sidebar/ChartSeriesPanel.cxx | 2 +-
chart2/source/model/main/ChartModel.cxx | 2 +-
7 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 2f9a61e3c92932569f8bffbd254a4a71f3354440
Author: Noel <noel.grandin at collabora.co.uk>
AuthorDate: Tue Feb 16 19:59:26 2021 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Feb 17 08:50:44 2021 +0100
loplugin:referencecasting in chart2
Change-Id: I4864b5f73a65de04ed3e3524e1331094049b1263
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111002
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 6f9192eba064..7d9e244bfa1b 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -565,7 +565,7 @@ Reference< XAccessibleStateSet > SAL_CALL AccessibleBase::getAccessibleStateSet(
m_bStateSetInitialized = true;
}
- return m_xStateSetHelper.get();
+ return m_xStateSetHelper;
}
lang::Locale SAL_CALL AccessibleBase::getLocale()
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index 6edaaff79592..2f0e13f56155 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -505,7 +505,7 @@ void ControllerCommandDispatch::initialize()
m_apModelState->update( xModel );
if( m_apControllerState && xModel.is())
- m_apControllerState->update( m_xChartController.get(), xModel );
+ m_apControllerState->update( m_xChartController, xModel );
updateCommandAvailability();
}
@@ -740,7 +740,7 @@ void ControllerCommandDispatch::fireStatusEvent(
if( rURL.isEmpty() || bIsChartSelectorURL )
{
uno::Any aArg;
- aArg <<= Reference< frame::XController >(m_xChartController.get());
+ aArg <<= Reference< frame::XController >(m_xChartController);
fireStatusEventForURL( ".uno:ChartElementSelector", aArg, true, xSingleListener );
}
@@ -756,7 +756,7 @@ void ControllerCommandDispatch::fireStatusEvent(
// @todo: remove if Issue 68864 is fixed
if( rURL.isEmpty() || rURL == ".uno:StatusBarVisible" )
{
- bool bIsStatusBarVisible( lcl_isStatusBarVisible( m_xChartController.get() ));
+ bool bIsStatusBarVisible( lcl_isStatusBarVisible( m_xChartController ));
fireStatusEventForURL( ".uno:StatusBarVisible", uno::Any( bIsStatusBarVisible ), true, xSingleListener );
}
}
@@ -802,7 +802,7 @@ void SAL_CALL ControllerCommandDispatch::modified( const lang::EventObject& aEve
// Update the "ControllerState" Struct.
if( m_apControllerState && m_xChartController.is())
{
- m_apControllerState->update( m_xChartController.get(), m_xChartController->getModel());
+ m_apControllerState->update( m_xChartController, m_xChartController->getModel());
bUpdateCommandAvailability = true;
}
@@ -825,7 +825,7 @@ void SAL_CALL ControllerCommandDispatch::selectionChanged( const lang::EventObje
// Update the "ControllerState" Struct.
if( m_apControllerState && m_xChartController.is())
{
- m_apControllerState->update( m_xChartController.get(), m_xChartController->getModel());
+ m_apControllerState->update( m_xChartController, m_xChartController->getModel());
updateCommandAvailability();
}
diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index fc887fc91aae..313943eb3d92 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -300,7 +300,7 @@ void ChartAreaPanel::dispose()
css::uno::Reference<css::view::XSelectionSupplier> xSelectionSupplier(mxModel->getCurrentController(), css::uno::UNO_QUERY);
if (xSelectionSupplier.is())
- xSelectionSupplier->removeSelectionChangeListener(mxSelectionListener.get());
+ xSelectionSupplier->removeSelectionChangeListener(mxSelectionListener);
AreaPropertyPanelBase::dispose();
}
@@ -312,7 +312,7 @@ void ChartAreaPanel::Initialize()
css::uno::Reference<css::view::XSelectionSupplier> xSelectionSupplier(mxModel->getCurrentController(), css::uno::UNO_QUERY);
if (xSelectionSupplier.is())
- xSelectionSupplier->addSelectionChangeListener(mxSelectionListener.get());
+ xSelectionSupplier->addSelectionChangeListener(mxSelectionListener);
SvxColorToolBoxControl* pToolBoxColor = getColorToolBoxControl(*mxColorDispatch);
pToolBoxColor->setColorSelectFunction(maFillColorWrapper);
@@ -532,7 +532,7 @@ void ChartAreaPanel::updateModel(
css::uno::Reference<css::view::XSelectionSupplier> oldSelectionSupplier(
mxModel->getCurrentController(), css::uno::UNO_QUERY);
if (oldSelectionSupplier.is()) {
- oldSelectionSupplier->removeSelectionChangeListener(mxSelectionListener.get());
+ oldSelectionSupplier->removeSelectionChangeListener(mxSelectionListener);
}
mxModel = xModel;
@@ -543,7 +543,7 @@ void ChartAreaPanel::updateModel(
css::uno::Reference<css::view::XSelectionSupplier> xSelectionSupplier(mxModel->getCurrentController(), css::uno::UNO_QUERY);
if (xSelectionSupplier.is())
- xSelectionSupplier->addSelectionChangeListener(mxSelectionListener.get());
+ xSelectionSupplier->addSelectionChangeListener(mxSelectionListener);
}
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
index c1d9a4e62871..aca063e84575 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
@@ -338,7 +338,7 @@ void ChartAxisPanel::updateModel(
css::uno::Reference<css::view::XSelectionSupplier> oldSelectionSupplier(
mxModel->getCurrentController(), css::uno::UNO_QUERY);
if (oldSelectionSupplier.is()) {
- oldSelectionSupplier->removeSelectionChangeListener(mxSelectionListener.get());
+ oldSelectionSupplier->removeSelectionChangeListener(mxSelectionListener);
}
mxModel = xModel;
diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx
index 9a54f913dca9..3853c8c2aa69 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx
@@ -154,7 +154,7 @@ void ChartLinePanel::dispose()
css::uno::Reference<css::view::XSelectionSupplier> xSelectionSupplier(mxModel->getCurrentController(), css::uno::UNO_QUERY);
if (xSelectionSupplier.is())
- xSelectionSupplier->removeSelectionChangeListener(mxSelectionListener.get());
+ xSelectionSupplier->removeSelectionChangeListener(mxSelectionListener);
LinePropertyPanelBase::dispose();
}
@@ -166,7 +166,7 @@ void ChartLinePanel::Initialize()
css::uno::Reference<css::view::XSelectionSupplier> xSelectionSupplier(mxModel->getCurrentController(), css::uno::UNO_QUERY);
if (xSelectionSupplier.is())
- xSelectionSupplier->addSelectionChangeListener(mxSelectionListener.get());
+ xSelectionSupplier->addSelectionChangeListener(mxSelectionListener);
SvxColorToolBoxControl* pToolBoxColor = getColorToolBoxControl(*mxColorDispatch);
pToolBoxColor->setColorSelectFunction(maLineColorWrapper);
@@ -225,7 +225,7 @@ void ChartLinePanel::updateModel(
css::uno::Reference<css::view::XSelectionSupplier> oldSelectionSupplier(
mxModel->getCurrentController(), css::uno::UNO_QUERY);
if (oldSelectionSupplier.is()) {
- oldSelectionSupplier->removeSelectionChangeListener(mxSelectionListener.get());
+ oldSelectionSupplier->removeSelectionChangeListener(mxSelectionListener);
}
mxModel = xModel;
@@ -239,7 +239,7 @@ void ChartLinePanel::updateModel(
css::uno::Reference<css::view::XSelectionSupplier> xSelectionSupplier(mxModel->getCurrentController(), css::uno::UNO_QUERY);
if (xSelectionSupplier.is())
- xSelectionSupplier->addSelectionChangeListener(mxSelectionListener.get());
+ xSelectionSupplier->addSelectionChangeListener(mxSelectionListener);
}
void ChartLinePanel::setLineJoint(const XLineJointItem* pItem)
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index 727aabbc2458..70693fe27d5e 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -435,7 +435,7 @@ void ChartSeriesPanel::updateModel(
css::uno::Reference<css::view::XSelectionSupplier> oldSelectionSupplier(
mxModel->getCurrentController(), css::uno::UNO_QUERY);
if (oldSelectionSupplier.is()) {
- oldSelectionSupplier->removeSelectionChangeListener(mxSelectionListener.get());
+ oldSelectionSupplier->removeSelectionChangeListener(mxSelectionListener);
}
mxModel = xModel;
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 0ac958b88a11..47684b21f060 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -657,7 +657,7 @@ Reference< document::XUndoManager > SAL_CALL ChartModel::getUndoManager( )
::osl::MutexGuard aGuard( m_aModelMutex );
if ( !m_pUndoManager.is() )
m_pUndoManager.set( new UndoManager( *this, m_aModelMutex ) );
- return m_pUndoManager.get();
+ return m_pUndoManager;
}
// chart2::XChartDocument
More information about the Libreoffice-commits
mailing list