mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mark OKButton and HelpButton as final

Browse Source 
Change-Id: Ifc17271a202a36cc2801fcb67057c294791033ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101499
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2020-08-27 20:09:20 +01:00
parent fe72feef80
commit faa36a5310
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/vcl/toolkit/button.hxx
View File

@@ -24,11 +24,11 @@
#include <vcl/button.hxx> #include <vcl/button.hxx>
class VCL_DLLPUBLIC OKButton : public PushButton class VCL_DLLPUBLIC OKButton final : public PushButton
{ {
protected:
using PushButton::ImplInit;
private: private:
using PushButton::ImplInit;
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
OKButton (const OKButton &) = delete; OKButton (const OKButton &) = delete;
@@ -62,11 +62,10 @@ public:
explicit CloseButton(vcl::Window* pParent, WinBits nStyle = 0); explicit CloseButton(vcl::Window* pParent, WinBits nStyle = 0);
}; };
class VCL_DLLPUBLIC HelpButton : public PushButton class VCL_DLLPUBLIC HelpButton final : public PushButton
{ {
protected:
using PushButton::ImplInit;
private: private:
using PushButton::ImplInit;
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
HelpButton( const HelpButton & ) = delete; HelpButton( const HelpButton & ) = delete;
@@ -169,10 +168,9 @@ public:
class VCL_DLLPUBLIC ImageButton final : public PushButton class VCL_DLLPUBLIC ImageButton final : public PushButton
{ {
protected: private:
using PushButton::ImplInitStyle; using PushButton::ImplInitStyle;
private:
SAL_DLLPRIVATE void ImplInitStyle(); SAL_DLLPRIVATE void ImplInitStyle();
ImageButton( const ImageButton & ) = delete; ImageButton( const ImageButton & ) = delete;

3
vcl/qa/cppunit/lifecycle.cxx
View File

@@ -296,9 +296,6 @@ void LifecycleTest::testLeakage()
VclPtr<vcl::Window> xParent = aObjects.back()->getRef(); VclPtr<vcl::Window> xParent = aObjects.back()->getRef();
aObjects.push_back(LeakTestObject::Create<PushButton>(xParent)); aObjects.push_back(LeakTestObject::Create<PushButton>(xParent));
aObjects.push_back(LeakTestObject::Create<OKButton>(xParent));
aObjects.push_back(LeakTestObject::Create<CancelButton>(xParent));
aObjects.push_back(LeakTestObject::Create<HelpButton>(xParent));
aObjects.push_back(LeakTestObject::Create<CheckBox>(xParent)); aObjects.push_back(LeakTestObject::Create<CheckBox>(xParent));
aObjects.push_back(LeakTestObject::Create<Edit>(xParent)); aObjects.push_back(LeakTestObject::Create<Edit>(xParent));
aObjects.push_back(LeakTestObject::Create<ComboBox>(xParent)); aObjects.push_back(LeakTestObject::Create<ComboBox>(xParent));