Kaydet (Commit) a5a70ab8 authored tarafından Michael Stahl's avatar Michael Stahl

API CHANGE: remove update() from X3DChartWindowProvider

Revert the API change from e41c33b3
and use the existing css::util::XUpdatable instead.

Change-Id: I3eba4c7def98c8765a970d54a7fe84a320d4313e
Reviewed-on: https://gerrit.libreoffice.org/17382Reviewed-by: 's avatarMarkus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: 's avatarMarkus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 41d1b01a)
üst b27af0af
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <com/sun/star/frame/XStorable2.hpp> #include <com/sun/star/frame/XStorable2.hpp>
#include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/util/XModifiable.hpp>
#include <com/sun/star/util/XCloseable.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/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/document/XUndoManagerSupplier.hpp> #include <com/sun/star/document/XUndoManagerSupplier.hpp>
#include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/document/XFilter.hpp>
...@@ -98,6 +99,7 @@ typedef cppu::WeakImplHelper< ...@@ -98,6 +99,7 @@ typedef cppu::WeakImplHelper<
,::com::sun::star::chart2::data::XDataSource ,::com::sun::star::chart2::data::XDataSource
,::com::sun::star::document::XUndoManagerSupplier ,::com::sun::star::document::XUndoManagerSupplier
,::com::sun::star::chart2::X3DChartWindowProvider ,::com::sun::star::chart2::X3DChartWindowProvider
,::com::sun::star::util::XUpdatable
,::com::sun::star::qa::XDumper ,::com::sun::star::qa::XDumper
> >
ChartModel_Base; ChartModel_Base;
...@@ -593,6 +595,7 @@ public: ...@@ -593,6 +595,7 @@ public:
virtual void SAL_CALL setWindow( sal_uInt64 nWindowPtr ) virtual void SAL_CALL setWindow( sal_uInt64 nWindowPtr )
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XUpdatable
virtual void SAL_CALL update() virtual void SAL_CALL update()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
......
...@@ -66,7 +66,9 @@ ChartWindow::ChartWindow( ChartController* pController, vcl::Window* pParent, Wi ...@@ -66,7 +66,9 @@ ChartWindow::ChartWindow( ChartController* pController, vcl::Window* pParent, Wi
uno::Reference< chart2::X3DChartWindowProvider > x3DWindowProvider(pController->getModel(), uno::UNO_QUERY_THROW); uno::Reference< chart2::X3DChartWindowProvider > x3DWindowProvider(pController->getModel(), uno::UNO_QUERY_THROW);
sal_uInt64 nWindowPtr = reinterpret_cast<sal_uInt64>(m_pOpenGLWindow.get()); sal_uInt64 nWindowPtr = reinterpret_cast<sal_uInt64>(m_pOpenGLWindow.get());
x3DWindowProvider->setWindow(nWindowPtr); 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() ...@@ -81,7 +83,9 @@ void ChartWindow::dispose()
{ {
uno::Reference< chart2::X3DChartWindowProvider > x3DWindowProvider(m_pWindowController->getModel(), uno::UNO_QUERY_THROW); uno::Reference< chart2::X3DChartWindowProvider > x3DWindowProvider(m_pWindowController->getModel(), uno::UNO_QUERY_THROW);
x3DWindowProvider->setWindow(0); x3DWindowProvider->setWindow(0);
x3DWindowProvider->update(); uno::Reference<util::XUpdatable> const xUpdatable(x3DWindowProvider,
uno::UNO_QUERY_THROW);
xUpdatable->update();
} }
m_pOpenGLWindow.disposeAndClear(); m_pOpenGLWindow.disposeAndClear();
vcl::Window::dispose(); vcl::Window::dispose();
......
...@@ -24,8 +24,6 @@ module com { module sun { module star { module chart2 { ...@@ -24,8 +24,6 @@ module com { module sun { module star { module chart2 {
interface X3DChartWindowProvider interface X3DChartWindowProvider
{ {
void setWindow( [in] unsigned hyper window ); void setWindow( [in] unsigned hyper window );
void update();
}; };
}; }; }; }; }; }; }; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment