[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - include/vcl vcl/source
Noel Grandin
noel at peralex.com
Mon Jun 13 08:03:09 UTC 2016
include/vcl/outdev.hxx | 2 +-
vcl/source/outdev/outdev.cxx | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 790944461439208ef25e8592ba70c589f7dfff14
Author: Noel Grandin <noel at peralex.com>
Date: Mon Jun 13 09:01:07 2016 +0200
loplugin:vclwidgets
Change-Id: I3567c3f9c5fe8374abd81d3f6e9a4a41e6a4c23d
(cherry picked from commit de9333d9b6f87d6f6d13e5ddf1fc65b8fef635e8)
Reviewed-on: https://gerrit.libreoffice.org/26213
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
Tested-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index a2f9014..f6f5354 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -425,7 +425,7 @@ private:
protected:
OutputDevice();
-protected:
+ virtual ~OutputDevice();
virtual void dispose() override;
public:
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index 43f24fa..01aedbb 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -139,6 +139,11 @@ OutputDevice::OutputDevice() :
mpOutDevData->mpInverseViewTransform = nullptr;
}
+OutputDevice::~OutputDevice()
+{
+ disposeOnce();
+}
+
void OutputDevice::dispose()
{
if ( GetUnoGraphicsList() )
More information about the Libreoffice-commits
mailing list