tdf#39593 Remove chart::ExplicitValueProvider::getExplicitValueProvider
Replace with comphelper::getUnoTunnelImplementation.
Change-Id: I8a457dc2aa701957f463b31bd6cc112337999aad
Reviewed-on: https://gerrit.libreoffice.org/74377
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 7f545b3..ff1008a 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -34,6 +34,7 @@
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <sal/log.hxx>
#include <vcl/svapp.hxx>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <vcl/unohelp.hxx>
#include <toolkit/helper/vclunohelper.hxx>
@@ -631,7 +632,7 @@
awt::Rectangle SAL_CALL AccessibleBase::getBounds()
{
ExplicitValueProvider *pExplicitValueProvider(
ExplicitValueProvider::getExplicitValueProvider( m_aAccInfo.m_xView ));
comphelper::getUnoTunnelImplementation<ExplicitValueProvider>( m_aAccInfo.m_xView ));
if( pExplicitValueProvider )
{
VclPtr<vcl::Window> pWindow( VCLUnoHelper::GetWindow( m_aAccInfo.m_xWindow ));
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx
index 15ec18a..4d5e1d8 100644
--- a/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx
@@ -30,6 +30,8 @@
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <comphelper/servicehelper.hxx>
#include <rtl/ustring.hxx>
#include <vcl/window.hxx>
#include <toolkit/helper/vclunohelper.hxx>
@@ -296,7 +298,7 @@
Reference< chart2::XChartDocument > xChartDoc( xChartModel, uno::UNO_QUERY );
if( xChartDoc.is())
m_spObjectHierarchy.reset(
new ObjectHierarchy( xChartDoc, ExplicitValueProvider::getExplicitValueProvider(m_xChartView) ));
new ObjectHierarchy( xChartDoc, comphelper::getUnoTunnelImplementation<ExplicitValueProvider>(m_xChartView) ));
else
m_spObjectHierarchy.reset();
}
diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
index 65c2012..634840e 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
@@ -27,6 +27,8 @@
#include <AxisHelper.hxx>
#include <ObjectNameProvider.hxx>
#include <comphelper/servicehelper.hxx>
using ::com::sun::star::uno::Reference;
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
@@ -67,7 +69,7 @@
{
double fStepWidth = 0.001;
ExplicitValueProvider* pExplicitValueProvider( ExplicitValueProvider::getExplicitValueProvider(xChartView) );
ExplicitValueProvider* pExplicitValueProvider( comphelper::getUnoTunnelImplementation<ExplicitValueProvider>(xChartView) );
if( pExplicitValueProvider )
{
Reference< XAxis > xAxis;
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 15a3076..6473cd6 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1466,7 +1466,7 @@
{
if( !m_pDrawModelWrapper.get() )
{
ExplicitValueProvider* pProvider = ExplicitValueProvider::getExplicitValueProvider( m_xChartView );
ExplicitValueProvider* pProvider = comphelper::getUnoTunnelImplementation<ExplicitValueProvider>( m_xChartView );
if( pProvider )
m_pDrawModelWrapper = pProvider->getDrawModelWrapper();
if ( m_pDrawModelWrapper.get() )
diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx
index 8df27d3..4033a82 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -31,6 +31,7 @@
#include <CommonConverters.hxx>
#include <svx/ActionDescriptionProvider.hxx>
#include <comphelper/servicehelper.hxx>
#include <sal/log.hxx>
#include <svx/svxids.hrc>
#include <svx/rectenum.hxx>
@@ -116,7 +117,7 @@
return;
awt::Size aSelectedSize;
ExplicitValueProvider* pProvider( ExplicitValueProvider::getExplicitValueProvider( m_xChartView ) );
ExplicitValueProvider* pProvider( comphelper::getUnoTunnelImplementation<ExplicitValueProvider>( m_xChartView ) );
if( pProvider )
aSelectedSize = ToSize( pProvider->getRectangleOfObject( aCID ) );
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index 32688d3..ef29211 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -53,6 +53,7 @@
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/util/CloseVetoException.hpp>
#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
#include <comphelper/servicehelper.hxx>
#include <memory>
@@ -740,7 +741,7 @@
std::unique_ptr<wrapper::ItemConverter> pItemConverter(
createItemConverter( rObjectCID, getModel(), m_xCC,
m_pDrawModelWrapper->getSdrModel(),
ExplicitValueProvider::getExplicitValueProvider(m_xChartView),
comphelper::getUnoTunnelImplementation<ExplicitValueProvider>(m_xChartView),
pRefSizeProv.get()));
if (!pItemConverter)
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 97f5158..a0dbd98 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1355,7 +1355,7 @@
{
// Navigation (Tab/F3/Home/End)
uno::Reference< XChartDocument > xChartDoc( getModel(), uno::UNO_QUERY );
ObjectKeyNavigation aObjNav( m_aSelection.getSelectedOID(), xChartDoc, ExplicitValueProvider::getExplicitValueProvider( m_xChartView ));
ObjectKeyNavigation aObjNav( m_aSelection.getSelectedOID(), xChartDoc, comphelper::getUnoTunnelImplementation<ExplicitValueProvider>( m_xChartView ));
awt::KeyEvent aKeyEvent( ::svt::AcceleratorExecute::st_VCLKey2AWTKey( aKeyCode ));
bReturn = aObjNav.handleKeyEvent( aKeyEvent );
if( bReturn )
@@ -1601,7 +1601,7 @@
// set rectangle
ExplicitValueProvider * pValueProvider(
ExplicitValueProvider::getExplicitValueProvider( m_xChartView ));
comphelper::getUnoTunnelImplementation<ExplicitValueProvider>( m_xChartView ));
if( pValueProvider )
rOutEqualRect = pValueProvider->getRectangleOfObject( aCID, true );
}
@@ -1769,7 +1769,7 @@
( aRefSize.Width > 0 && aRefSize.Height > 0 ) )
{
ExplicitValueProvider * pValueProvider(
ExplicitValueProvider::getExplicitValueProvider( m_xChartView ));
comphelper::getUnoTunnelImplementation<ExplicitValueProvider>( m_xChartView ));
if( pValueProvider )
{
awt::Rectangle aRect( pValueProvider->getRectangleOfObject( rCID ));
diff --git a/chart2/source/controller/uitest/uiobject.cxx b/chart2/source/controller/uitest/uiobject.cxx
index 7dd9697..0bc697a 100644
--- a/chart2/source/controller/uitest/uiobject.cxx
+++ b/chart2/source/controller/uitest/uiobject.cxx
@@ -16,6 +16,8 @@
#include <chartview/ExplicitValueProvider.hxx>
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <comphelper/servicehelper.hxx>
#include <vcl/svapp.hxx>
#include <algorithm>
@@ -173,7 +175,7 @@
css::uno::Reference< css::chart2::XChartDocument > xChartDoc( pController->getModel(), css::uno::UNO_QUERY );
css::uno::Reference<css::uno::XInterface> xChartView = pController->getChartView();
chart::ExplicitValueProvider* pValueProvider = chart::ExplicitValueProvider::getExplicitValueProvider( xChartView );
chart::ExplicitValueProvider* pValueProvider = comphelper::getUnoTunnelImplementation<chart::ExplicitValueProvider>( xChartView );
chart::ObjectHierarchy aHierarchy(xChartDoc, pValueProvider, true);
chart::ObjectIdentifier aIdentifier = chart::ObjectHierarchy::getRootNodeOID();
aChildren.insert(aIdentifier.getObjectCID());
diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
index 241fe10..7fec9b2 100644
--- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx
+++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
@@ -69,7 +69,6 @@
virtual std::shared_ptr< DrawModelWrapper > getDrawModelWrapper() = 0;
static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
static ExplicitValueProvider* getExplicitValueProvider( const css::uno::Reference< css::uno::XInterface >& xChartView );
static css::awt::Rectangle
AddSubtractAxisTitleSizes(
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 18c9380..4fc6b67 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1047,20 +1047,6 @@
return theExplicitValueProviderUnoTunnelId::get().getSeq();
}
ExplicitValueProvider* ExplicitValueProvider::getExplicitValueProvider(
const Reference< uno::XInterface >& xChartView )
{
ExplicitValueProvider* pExplicitValueProvider=nullptr;
Reference< lang::XUnoTunnel > xTunnel( xChartView, uno::UNO_QUERY );
if( xTunnel.is() )
{
pExplicitValueProvider = reinterpret_cast<ExplicitValueProvider*>(xTunnel->getSomething(
ExplicitValueProvider::getUnoTunnelId() ));
}
return pExplicitValueProvider;
}
ChartView::ChartView(
uno::Reference<uno::XComponentContext> const & xContext,
ChartModel& rModel)
@@ -1977,7 +1963,7 @@
uno::Reference< chart2::XTitle > xSecondTitle_Width( TitleHelper::getTitle( TitleHelper::SECONDARY_Y_AXIS_TITLE, rModel ) );
if( xTitle_Height.is() || xTitle_Width.is() || xSecondTitle_Height.is() || xSecondTitle_Width.is() )
{
ExplicitValueProvider* pExplicitValueProvider = ExplicitValueProvider::getExplicitValueProvider(xChartView);
ExplicitValueProvider* pExplicitValueProvider = comphelper::getUnoTunnelImplementation<ExplicitValueProvider>(xChartView);
if( pExplicitValueProvider )
{
//detect whether x axis points into x direction or not
