diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-06-12 16:18:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-06-12 19:07:10 +0100 |
| commit | bcd0360f0bf3536267c02783a220be34684576f9 (patch) | |
| tree | 687e240c478744b6b783620377a72eb18bfd9ed5 /include | |
| parent | 652026f0e2f9c323229151e854ad6591791e098e (diff) | |
Resolves: tdf#100313 OutputDevice::isDisposed doesn't work anymore
since
commit 51fe4d63dfdf0ea24d2fecf75d25cbe607ed1c09
Author: melikeyurtoglu <aysemelikeyurtoglu@gmail.com>
Date: Tue May 3 00:34:05 2016 +0300
tdf#97527 vcl: reference-count Menu
Change-Id: Ia12434fede69ad247ed67691517437a9ada31acd
Signed-off-by: melikeyurtoglu <aysemelikeyurtoglu@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/24596
which created a base-class VclReferenceBase for OutputDevice and
Menu and so moved isDisposed from OutputDevice to VclReferenceBase,
but *duplicated* the mbDisposed in VclReferenceBase so the
bit set by disposeOnce in OutputDevice was a different bit to the
bit returned by isDisposed from VclReferenceBase.
Which meant that the fix of...
commit 26c32cfee9fc9a769adba19f455e4d6c13b6d89d
Author: Caolán McNamara <caolanm@redhat.com>
Date: Fri Nov 27 16:10:10 2015 +0000
Resolves: rhbz#1283426 using vdevs based on now dead physical devs is unsafe
no longer worked.
Finish moving the mbDisposed to VclReferenceBase to fix this
Change-Id: I9bc1ba3d03f3aae7c3f58eb277176d9521bdb05d
(cherry picked from commit 29eac0e49e372092cb119898e9f1116ab4e00532)
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/outdev.hxx | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 95e3756f408e..a2f90143c5ec 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. |