diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-07-28 11:48:54 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-07-30 15:27:38 +0000 |
| commit | 41d1b01a906ed5872cc8f0b70439c6891a874f60 (patch) | |
| tree | ead922246ea3eef6f71caafab271adddab1006a3 | |
| parent | 6465a9708bd04fa60639f52c39ec0496901a83e7 (diff) | |
API CHANGE: remove update() from X3DChartWindowProvider
Revert the API change from e41c33b376d8b5776e400979eb8544db596c5bbe
and use the existing css::util::XUpdatable instead.
Change-Id: I3eba4c7def98c8765a970d54a7fe84a320d4313e
Reviewed-on: https://gerrit.libreoffice.org/17382
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
| -rw-r--r-- | chart2/inc/ChartModel.hxx | 3 | ||||
| -rw-r--r-- | chart2/source/controller/main/ChartWindow.cxx | 8 | ||||
| -rw-r--r-- | offapi/com/sun/star/chart2/X3DChartWindowProvider.idl | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index 874d195a994b..4dab666495ea 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -25,6 +25,7 @@ #include <com/sun/star/frame/XStorable2.hpp> #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/util/XCloseable.hpp> +#include <com/sun/star/util/XUpdatable.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/document/XUndoManagerSupplier.hpp> #include <com/sun/star/document/XFilter.hpp> @@ -98,6 +99,7 @@ typedef cppu::WeakImplHelper< ,::com::sun::star::chart2::data::XDataSource ,::com::sun::star::document::XUndoManagerSupplier ,::com::sun::star::chart2::X3DChartWindowProvider + ,::com::sun::star::util::XUpdatable ,::com::sun::star::qa::XDumper > ChartModel_Base; @@ -588,6 +590,7 @@ public: virtual void SAL_CALL setWindow( sal_uInt64 nWindowPtr ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // XUpdatable virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 15117e0ddf42..91969a4d689d 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -66,7 +66,9 @@ ChartWindow::ChartWindow( ChartController* pController, vcl::Window* pParent, Wi uno::Reference< chart2::X3DChartWindowProvider > x3DWindowProvider(pController->getModel(), uno::UNO_QUERY_THROW); sal_uInt64 nWindowPtr = reinterpret_cast<sal_uInt64>(m_pOpenGLWindow.get()); x3DWindowProvider->setWindow(nWindowPtr); - x3DWindowProvider->update(); + uno::Reference<util::XUpdatable> const xUpdatable(x3DWindowProvider, + uno::UNO_QUERY_THROW); + xUpdatable->update(); } } @@ -81,7 +83,9 @@ void ChartWindow::dispose() { uno::Reference< chart2::X3DChartWindowProvider > x3DWindowProvider(m_pWindowController->getModel(), uno::UNO_QUERY_THROW); x3DWindowProvider->setWindow(0); - x3DWindowProvider->update(); + uno::Reference<util::XUpdatable> const xUpdatable(x3DWindowProvider, + uno::UNO_QUERY_THROW); + xUpdatable->update(); } m_pOpenGLWindow.disposeAndClear(); vcl::Window::dispose(); diff --git a/offapi/com/sun/star/chart2/X3DChartWindowProvider.idl b/offapi/com/sun/star/chart2/X3DChartWindowProvider.idl index 604d023b69ed..ff67fc323553 100644 --- a/offapi/com/sun/star/chart2/X3DChartWindowProvider.idl +++ b/offapi/com/sun/star/chart2/X3DChartWindowProvider.idl @@ -24,8 +24,6 @@ module com { module sun { module star { module chart2 { interface X3DChartWindowProvider { void setWindow( [in] unsigned hyper window ); - - void update(); }; }; }; }; }; |