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 /vcl | |
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 'vcl')
-rw-r--r-- | vcl/Library_vcl.mk | 1 | ||||
-rw-r--r-- | vcl/source/outdev/outdev.cxx | 1 | ||||
-rw-r--r-- | vcl/source/outdev/vclreferencebase.cxx | 48 |
3 files changed, 49 insertions, 1 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 11c4dae3c22e..6929256d9b1a 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -241,6 +241,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/outdev/gradient \ vcl/source/outdev/curvedshapes \ vcl/source/outdev/wallpaper \ + vcl/source/outdev/vclreferencebase \ vcl/source/outdev/nativecontrols \ vcl/source/outdev/map \ vcl/source/gdi/alpha \ diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index fd875f526c8b..6c9991bba824 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -42,7 +42,6 @@ namespace { // Begin initializer and accessor public functions OutputDevice::OutputDevice() : - mnRefCnt(1), // cf. VclPtrInstance and README.lifecycle maRegion(true), maFillColor( COL_WHITE ), maTextLineColor( COL_TRANSPARENT ), diff --git a/vcl/source/outdev/vclreferencebase.cxx b/vcl/source/outdev/vclreferencebase.cxx new file mode 100644 index 000000000000..0125e554fae1 --- /dev/null +++ b/vcl/source/outdev/vclreferencebase.cxx @@ -0,0 +1,48 @@ +/* -*- 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 . + */ + +#include <vcl/vclreferencebase.hxx> +#include "svdata.hxx" +#include "window.h" +#include "outdev.h" +#include "outdevstatestack.hxx" + +VclReferenceBase::VclReferenceBase() : + mnRefCnt(1), // cf. VclPtrInstance and README.lifecycle + mbDisposed(false) +{ +} + +VclReferenceBase::~VclReferenceBase() +{ + disposeOnce(); +} + +void VclReferenceBase::disposeOnce() +{ + if ( mbDisposed ) + return; + mbDisposed = true; + dispose(); +} + +void VclReferenceBase::dispose() +{ +} + |