diff options
| -rw-r--r-- | include/vcl/outdev.hxx | 6 | ||||
| -rw-r--r-- | vcl/source/outdev/outdev.cxx | 22 |
2 files changed, 0 insertions, 28 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 1f32068a598c..22d1979c3a77 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -418,7 +418,6 @@ private: mutable bool mbTextSpecial : 1; mutable bool mbRefPoint : 1; mutable bool mbEnableRTL : 1; - mutable bool mbDisposed : 1; /** @name Initialization and accessor functions */ @@ -426,15 +425,10 @@ private: protected: OutputDevice(); -public: - virtual ~OutputDevice(); protected: virtual void dispose() override; public: - void disposeOnce(); - -public: /** Get the graphic context that the output device uses to draw on. diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index b1e6d6178cbf..a1c5f12d49b3 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -137,28 +137,6 @@ OutputDevice::OutputDevice() : // #i75163# mpOutDevData->mpViewTransform = nullptr; mpOutDevData->mpInverseViewTransform = nullptr; - - mbDisposed = false; -} - -OutputDevice::~OutputDevice() -{ - disposeOnce(); -} - -void OutputDevice::disposeOnce() -{ - if ( mbDisposed ) - return; - mbDisposed = true; - - // catch badness where our OutputDevice sub-class was not - // wrapped safely in a VclPtr cosily. - // FIXME: as/when we make our destructors all protected, - // we should introduce this assert: - // assert( mnRefCnt > 0 ); - - dispose(); } void OutputDevice::dispose() |