diff options
author | melikeyurtoglu <aysemelikeyurtoglu@gmail.com> | 2016-05-03 00:34:05 +0300 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2016-05-16 15:01:08 +0000 |
commit | 51fe4d63dfdf0ea24d2fecf75d25cbe607ed1c09 (patch) | |
tree | 46e6ef7423c5628b626794cf039d79023273956c /include | |
parent | 03701c986cd1082c5cd9aea7b479811c7a079bca (diff) |
tdf#97527 vcl: reference-count Menu
Change-Id: Ia12434fede69ad247ed67691517437a9ada31acd
Signed-off-by: melikeyurtoglu <aysemelikeyurtoglu@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/24596
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/vcl/outdev.hxx | 32 | ||||
-rw-r--r-- | include/vcl/vclreferencebase.hxx | 67 |
2 files changed, 71 insertions, 28 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index f381f2e37bfa..492f1c1a6ecb 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -40,6 +40,7 @@ #include <vcl/salnativewidgets.hxx> #include <vcl/outdevstate.hxx> #include <vcl/outdevmap.hxx> +#include <vcl/vclreferencebase.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/vector/b2enums.hxx> @@ -98,6 +99,7 @@ class FontSelectPattern; class VCLXGraphics; class OutDevStateStack; struct BitmapSystemData; +class VclReferenceBase; namespace vcl { @@ -319,7 +321,7 @@ namespace vcl { typedef OutputDevice RenderContext; } -class VCL_DLLPUBLIC OutputDevice +class VCL_DLLPUBLIC OutputDevice :public VclReferenceBase { friend class Printer; friend class VirtualDevice; @@ -328,28 +330,6 @@ class VCL_DLLPUBLIC OutputDevice friend class vcl::PDFWriterImpl; friend void ImplHandleResize( vcl::Window* pWindow, long nNewWidth, long nNewHeight ); - // All of this will need to be replicated in Window - // or a shared base-class as/when we can break the - // OutputDevice -> Window inheritance. -private: - mutable int mnRefCnt; // reference count - - template<typename T> friend class ::rtl::Reference; - template<typename T> friend class ::VclPtr; - - inline void acquire() const - { - assert(mnRefCnt>0); - mnRefCnt++; - } - - inline void release() const - { - assert(mnRefCnt>0); - if (!--mnRefCnt) - delete this; - } - private: OutputDevice(const OutputDevice&) = delete; OutputDevice& operator=(const OutputDevice&) = delete; @@ -448,15 +428,11 @@ protected: OutputDevice(); public: virtual ~OutputDevice(); - protected: - /// release all references to other objects. - virtual void dispose(); + virtual void dispose(); public: - /// call the dispose() method if we have not already been disposed. void disposeOnce(); - bool isDisposed() const { return mbDisposed; } public: diff --git a/include/vcl/vclreferencebase.hxx b/include/vcl/vclreferencebase.hxx new file mode 100644 index 000000000000..16fd4ec84eb3 --- /dev/null +++ b/include/vcl/vclreferencebase.hxx @@ -0,0 +1,67 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ +#ifndef INCLUDED_VCL_Reference_HXX +#define INCLUDED_VCL_Reference_HXX + +#include <vcl/dllapi.h> +#include <vcl/vclptr.hxx> +#include <cassert> + +class VclReferenceBase; + +class VCL_DLLPUBLIC VclReferenceBase +{ + mutable int mnRefCnt; + + template<typename T> friend class ::rtl::Reference; + template<typename T> friend class ::VclPtr; + +public: + inline void acquire() const + { + assert(mnRefCnt>0); + mnRefCnt++; + } + + inline void release() const + { + assert(mnRefCnt>0); + if (!--mnRefCnt) + delete this; + } +private: + VclReferenceBase(const VclReferenceBase&) = delete; + VclReferenceBase& operator=(const VclReferenceBase&) = delete; + + bool mbDisposed : 1; + +protected: + VclReferenceBase(); +public: + virtual ~VclReferenceBase(); + +protected: + virtual void dispose(); + +public: + void disposeOnce(); + bool isDisposed() const { return mbDisposed; } + +}; +#endif |