From 962bf806f655e3c631bc1b77f8419e5e8fc64c0c Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 7 May 2020 20:28:33 +0100 Subject: remove TriStateBox class MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia6c76a9f0fc0be7790d0c801cbca4a7b8d478976 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93680 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- vcl/source/control/button.cxx | 6 ------ vcl/source/window/builder.cxx | 7 +------ 2 files changed, 1 insertion(+), 12 deletions(-) (limited to 'vcl/source') diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 20528189da18..45c922dcb362 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -3696,10 +3696,4 @@ void ImageButton::ImplInitStyle() SetStyle( nStyle ); } -TriStateBox::TriStateBox( vcl::Window* pParent, WinBits nStyle ) : - CheckBox( pParent, nStyle ) -{ - EnableTriState(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 9aef02f6c887..6189412ac8b9 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1983,13 +1983,8 @@ VclPtr VclBuilder::makeObject(vcl::Window *pParent, const OString & OUString sWrap = BuilderUtils::extractCustomProperty(rMap); if (!sWrap.isEmpty()) nBits |= WB_WORDBREAK; - //maybe always import as TriStateBox and enable/disable tristate bool bIsTriState = extractInconsistent(rMap); - VclPtr xCheckBox; - if (bIsTriState && m_bLegacy) - xCheckBox = VclPtr::Create(pParent, nBits); - else - xCheckBox = VclPtr::Create(pParent, nBits); + VclPtr xCheckBox = VclPtr::Create(pParent, nBits); if (bIsTriState) { xCheckBox->EnableTriState(true); -- cgit