diff options
author | Thorsten Behrens <tbehrens@novell.com> | 2011-04-08 16:44:28 +0200 |
---|---|---|
committer | Thorsten Behrens <tbehrens@novell.com> | 2011-04-08 16:47:25 +0200 |
commit | 09b546cf9c1d0d9f78066e70a0348c7678cdcb14 (patch) | |
tree | ea9fb80453a70202a8f8d4bff4710d92259ac5b1 /canvas/source/vcl/canvas.cxx | |
parent | 55961e2dfdac4491aa8a56d86930e5999b7d523b (diff) |
Fix overloaded-virtual warning in canvas
With enabled -Woverloaded-virtual gcc warning (see
http://lists.freedesktop.org/archives/libreoffice/2011-March/009567.html),
canvas exposed a nasty clash between WeakComponentImplHelper::disposing
and XEventListener::disposing. Fixed by overriding *once* in baseclass,
and then calling disambiguated, renamed methods.
Diffstat (limited to 'canvas/source/vcl/canvas.cxx')
-rw-r--r-- | canvas/source/vcl/canvas.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx index 81ce996015c2..c3dd0c569f89 100644 --- a/canvas/source/vcl/canvas.cxx +++ b/canvas/source/vcl/canvas.cxx @@ -133,14 +133,14 @@ namespace vclcanvas OSL_TRACE( "Canvas destroyed" ); } - void SAL_CALL Canvas::disposing() + void Canvas::disposeThis() { SolarMutexGuard aGuard; mxComponentContext.clear(); // forward to parent - CanvasBaseT::disposing(); + CanvasBaseT::disposeThis(); } ::rtl::OUString SAL_CALL Canvas::getServiceName( ) throw (::com::sun::star::uno::RuntimeException) |