diff options
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog2.cxx | 13 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 22 | ||||
| -rw-r--r-- | include/svtools/extensionlistbox.hxx | 56 | ||||
| -rw-r--r-- | solenv/clang-format/blacklist | 1 |
5 files changed, 27 insertions, 67 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index eaab2ff54e72..cff9f7b5feb0 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -45,7 +45,6 @@ #include <osl/mutex.hxx> #include <sal/log.hxx> -#include <svtools/extensionlistbox.hxx> #include <svtools/restartdialog.hxx> #include <sfx2/filedlghelper.hxx> @@ -173,7 +172,7 @@ void ExtBoxWithBtns_Impl::RecalcAll() { const sal_Int32 nActive = getSelIndex(); - if ( nActive != svt::IExtensionListBox::ENTRY_NOTFOUND ) + if ( nActive != IExtensionListBox::ENTRY_NOTFOUND ) { SetButtonStatus( GetEntryData( nActive) ); } @@ -310,7 +309,7 @@ void ExtBoxWithBtns_Impl::MouseButtonDown( const MouseEvent& rMEvt ) { const SolarMutexGuard aGuard; if ( rMEvt.IsMod1() && HasActive() ) - selectEntry( svt::IExtensionListBox::ENTRY_NOTFOUND ); + selectEntry( IExtensionListBox::ENTRY_NOTFOUND ); // selecting a not existing entry will deselect the current one else selectEntry( nPos ); @@ -324,7 +323,7 @@ void ExtBoxWithBtns_Impl::enableButtons( bool bEnable ) if ( bEnable ) { sal_Int32 nIndex = getSelIndex(); - if ( nIndex != svt::IExtensionListBox::ENTRY_NOTFOUND ) + if ( nIndex != IExtensionListBox::ENTRY_NOTFOUND ) SetButtonStatus( GetEntryData( nIndex ) ); } else @@ -911,7 +910,7 @@ IMPL_LINK_NOARG(ExtMgrDialog, HandleOptionsBtn, Button*, void) { const sal_Int32 nActive = m_pExtensionBox->getSelIndex(); - if ( nActive != svt::IExtensionListBox::ENTRY_NOTFOUND ) + if ( nActive != IExtensionListBox::ENTRY_NOTFOUND ) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); @@ -940,7 +939,7 @@ IMPL_LINK_NOARG(ExtMgrDialog, HandleRemoveBtn, Button*, void) { const sal_Int32 nActive = m_pExtensionBox->getSelIndex(); - if ( nActive != svt::IExtensionListBox::ENTRY_NOTFOUND ) + if ( nActive != IExtensionListBox::ENTRY_NOTFOUND ) { TEntry_Impl pEntry = m_pExtensionBox->GetEntryData( nActive ); removePackage( pEntry->m_xPackage ); @@ -951,7 +950,7 @@ IMPL_LINK_NOARG(ExtMgrDialog, HandleEnableBtn, Button*, void) { const sal_Int32 nActive = m_pExtensionBox->getSelIndex(); - if ( nActive != svt::IExtensionListBox::ENTRY_NOTFOUND ) + if ( nActive != IExtensionListBox::ENTRY_NOTFOUND ) { TEntry_Impl pEntry = m_pExtensionBox->GetEntryData( nActive ); diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 6e13917875c8..94fb3069d7f3 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -260,7 +260,7 @@ void ExtensionBox_Impl::dispose() m_pLocale.reset(); m_pCollator.reset(); - ::svt::IExtensionListBox::dispose(); + IExtensionListBox::dispose(); } diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index 245f1fd4d259..90282c1142be 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -26,7 +26,6 @@ #include <vcl/fixedhyper.hxx> #include <vcl/dialog.hxx> -#include <svtools/extensionlistbox.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/weakref.hxx> #include <unotools/collatorwrapper.hxx> @@ -104,8 +103,27 @@ public: virtual void SAL_CALL disposing(css::lang::EventObject const& evt) override; }; +/** This abstract class provides methods to implement an extension list box. + This header is needed for the automatic test tool +*/ +class IExtensionListBox: public Control +{ +public: + enum { ENTRY_NOTFOUND = -1 }; + + IExtensionListBox( vcl::Window* pParent ): Control( pParent, WB_BORDER | WB_TABSTOP ){} + + /** @return The count of the entries in the list box. */ + virtual sal_Int32 getItemCount() const = 0; + + /** @return The index of the first selected entry in the list box. + When nothing is selected, which is the case when getItemCount returns '0', + then this function returns ENTRY_NOTFOUND */ + virtual sal_Int32 getSelIndex() const = 0; + +}; -class ExtensionBox_Impl : public ::svt::IExtensionListBox +class ExtensionBox_Impl : public IExtensionListBox { bool m_bHasScrollBar : 1; bool m_bHasActive : 1; diff --git a/include/svtools/extensionlistbox.hxx b/include/svtools/extensionlistbox.hxx deleted file mode 100644 index f246c5a02448..000000000000 --- a/include/svtools/extensionlistbox.hxx +++ /dev/null @@ -1,56 +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_SVTOOLS_EXTENSIONLISTBOX_HXX -#define INCLUDED_SVTOOLS_EXTENSIONLISTBOX_HXX - -#include <vcl/ctrl.hxx> - - -namespace svt -{ - - -/** This abstract class provides methods to implement an extension list box. - This header is needed for the automatic test tool -*/ -class IExtensionListBox: public Control -{ -public: - enum { ENTRY_NOTFOUND = -1 }; - - IExtensionListBox( vcl::Window* pParent ): Control( pParent, WB_BORDER | WB_TABSTOP ){} - - /** @return The count of the entries in the list box. */ - virtual sal_Int32 getItemCount() const = 0; - - /** @return The index of the first selected entry in the list box. - When nothing is selected, which is the case when getItemCount returns '0', - then this function returns ENTRY_NOTFOUND */ - virtual sal_Int32 getSelIndex() const = 0; - -}; - - -} // namespace svt - - -#endif // INCLUDED_SVTOOLS_EXTENSIONLISTBOX_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 27dbe2dde227..c1cb77b9209f 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -6951,7 +6951,6 @@ include/svtools/ehdl.hxx include/svtools/embedhlp.hxx include/svtools/embedtransfer.hxx include/svtools/extcolorcfg.hxx -include/svtools/extensionlistbox.hxx include/svtools/filechangedchecker.hxx include/svtools/filectrl.hxx include/svtools/fileurlbox.hxx |