chart2/inc/ChartModel.hxx | 3 +++
chart2/source/controller/main/ChartWindow.cxx | 8 ++++++--
offapi/com/sun/star/chart2/X3DChartWindowProvider.idl | 2 --
3 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit a5a70ab80b151351f207fc1a34e99b005b3fca85
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Jul 28 11:48:54 2015 +0200
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.mohrh...@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
(cherry picked from commit 41d1b01a906ed5872cc8f0b70439c6891a874f60)
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index d1f5e4f..a19f74b 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;
@@ -593,6 +595,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 f3e41c6..8db4af6 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 604d023..ff67fc3 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();
};
}; }; }; };
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
