[Libreoffice-commits] core.git: cui/Library_cui.mk cui/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Tue Jul 30 15:46:58 UTC 2019
cui/Library_cui.mk | 1
cui/source/inc/radiobtnbox.hxx | 53 ----------------------
cui/source/options/optjava.cxx | 1
cui/source/options/radiobtnbox.cxx | 86 -------------------------------------
4 files changed, 141 deletions(-)
New commits:
commit f356fbd7585ab2a41bcc6554a65b8a51588d0469
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jul 30 13:08:11 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jul 30 17:45:22 2019 +0200
drop newly unused SvxRadioButtonListBox
Change-Id: Idb80fa73fad6e4bb2a1eaa3d55d7fe90e86c8965
Reviewed-on: https://gerrit.libreoffice.org/76605
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 620d3de8fa69..df4a94126a63 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -182,7 +182,6 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/options/optupdt \
$(call gb_Helper_optional,DESKTOP,\
cui/source/options/personalization) \
- cui/source/options/radiobtnbox \
cui/source/options/sdbcdriverenum \
cui/source/options/securityoptions \
cui/source/options/treeopt \
diff --git a/cui/source/inc/radiobtnbox.hxx b/cui/source/inc/radiobtnbox.hxx
deleted file mode 100644
index b9af0af621a0..000000000000
--- a/cui/source/inc/radiobtnbox.hxx
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- 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_CUI_SOURCE_INC_RADIOBTNBOX_HXX
-#define INCLUDED_CUI_SOURCE_INC_RADIOBTNBOX_HXX
-
-#include <svtools/simptabl.hxx>
-
-namespace svx {
-
-// class SvxRadioButtonListBox -------------------------------------------
-
-class SvxRadioButtonListBox : public SvSimpleTable
-{
- using SvSimpleTable::SetTabs;
-
-private:
- Point m_aCurMousePoint;
-
-protected:
- virtual void MouseButtonUp( const MouseEvent& _rMEvt ) override;
- virtual void KeyInput( const KeyEvent& rKEvt ) override;
-
-public:
- SvxRadioButtonListBox(SvSimpleTableContainer& rParent, WinBits nBits);
-
- void HandleEntryChecked( SvTreeListEntry* _pEntry );
-
- const Point& GetCurMousePoint() const { return m_aCurMousePoint;}
-
- long GetControlColumnWidth() const;
-};
-
-} // end of namespace ::svx
-
-#endif // INCLUDED_CUI_SOURCE_INC_RADIOBTNBOX_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 23b61e7e8184..654d96ac879a 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -29,7 +29,6 @@
#include "optjava.hxx"
#include <treeopt.hxx>
#include <dialmgr.hxx>
-#include <radiobtnbox.hxx>
#include <officecfg/Office/Common.hxx>
#include <svtools/miscopt.hxx>
diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx
deleted file mode 100644
index 555232026a3e..000000000000
--- a/cui/source/options/radiobtnbox.cxx
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- 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 <radiobtnbox.hxx>
-
-#include <vcl/event.hxx>
-#include <vcl/svlbitm.hxx>
-
-namespace svx {
-
-// class SvxRadioButtonListBox ----------------------------------------------------
-
-SvxRadioButtonListBox::SvxRadioButtonListBox(SvSimpleTableContainer& rParent, WinBits nBits)
- : SvSimpleTable(rParent, nBits)
-
-{
- EnableCheckButton( new SvLBoxButtonData( this, true ) );
-}
-
-void SvxRadioButtonListBox::MouseButtonUp( const MouseEvent& _rMEvt )
-{
- m_aCurMousePoint = _rMEvt.GetPosPixel();
- SvSimpleTable::MouseButtonUp( _rMEvt );
-}
-
-void SvxRadioButtonListBox::KeyInput( const KeyEvent& rKEvt )
-{
- if ( !rKEvt.GetKeyCode().GetModifier() && KEY_SPACE == rKEvt.GetKeyCode().GetCode() )
- {
- SvTreeListEntry* pEntry = FirstSelected();
- if ( GetCheckButtonState( pEntry ) == SvButtonState::Unchecked )
- {
- SetCheckButtonState( pEntry, SvButtonState::Checked );
- GetCheckButtonHdl().Call( nullptr );
- return ;
- }
- }
-
- SvSimpleTable::KeyInput( rKEvt );
-}
-
-void SvxRadioButtonListBox::HandleEntryChecked( SvTreeListEntry* _pEntry )
-{
- Select( _pEntry );
- SvButtonState eState = GetCheckButtonState( _pEntry );
-
- if ( SvButtonState::Checked == eState )
- {
- // we have radio button behavior -> so uncheck the other entries
- SvTreeListEntry* pEntry = First();
- while ( pEntry )
- {
- if ( pEntry != _pEntry )
- SetCheckButtonState( pEntry, SvButtonState::Unchecked );
- pEntry = Next( pEntry );
- }
- }
- else
- SetCheckButtonState( _pEntry, SvButtonState::Checked );
-}
-
-
-long SvxRadioButtonListBox::GetControlColumnWidth() const
-{
- return pCheckButtonData->Width();
-}
-
-} // end of namespace ::svx
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list