diff options
| -rw-r--r-- | include/vcl/toolkit/button.hxx | 14 | ||||
| -rw-r--r-- | vcl/qa/cppunit/lifecycle.cxx | 3 |
2 files changed, 6 insertions, 11 deletions
diff --git a/include/vcl/toolkit/button.hxx b/include/vcl/toolkit/button.hxx index 0c90976cbd70..49748cdc73d9 100644 --- a/include/vcl/toolkit/button.hxx +++ b/include/vcl/toolkit/button.hxx @@ -24,11 +24,11 @@ #include <vcl/button.hxx> -class VCL_DLLPUBLIC OKButton : public PushButton +class VCL_DLLPUBLIC OKButton final : public PushButton { -protected: - using PushButton::ImplInit; private: + using PushButton::ImplInit; + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); OKButton (const OKButton &) = delete; @@ -62,11 +62,10 @@ public: 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: + using PushButton::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); HelpButton( const HelpButton & ) = delete; @@ -169,10 +168,9 @@ public: class VCL_DLLPUBLIC ImageButton final : public PushButton { -protected: +private: using PushButton::ImplInitStyle; -private: SAL_DLLPRIVATE void ImplInitStyle(); ImageButton( const ImageButton & ) = delete; diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx index 078fb3266623..6ab9d30625b1 100644 --- a/vcl/qa/cppunit/lifecycle.cxx +++ b/vcl/qa/cppunit/lifecycle.cxx @@ -296,9 +296,6 @@ void LifecycleTest::testLeakage() VclPtr<vcl::Window> xParent = aObjects.back()->getRef(); 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<Edit>(xParent)); aObjects.push_back(LeakTestObject::Create<ComboBox>(xParent)); |