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/directx/dx_canvasbitmap.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/directx/dx_canvasbitmap.cxx')
| -rw-r--r-- | canvas/source/directx/dx_canvasbitmap.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/canvas/source/directx/dx_canvasbitmap.cxx b/canvas/source/directx/dx_canvasbitmap.cxx index ad8680d44db1..7ad5b18800de 100644 --- a/canvas/source/directx/dx_canvasbitmap.cxx +++ b/canvas/source/directx/dx_canvasbitmap.cxx @@ -60,13 +60,13 @@ namespace dxcanvas maCanvasHelper.setTarget( mpBitmap ); } - void SAL_CALL CanvasBitmap::disposing() + void CanvasBitmap::disposeThis() { mpBitmap.reset(); mpDevice.clear(); // forward to parent - CanvasBitmap_Base::disposing(); + CanvasBitmap_Base::disposeThis(); } struct AlphaDIB |