diff options
-rw-r--r-- | sw/Library_sw.mk | 1 | ||||
-rw-r--r-- | sw/source/uibase/cctrl/popbox.cxx | 32 | ||||
-rw-r--r-- | sw/source/uibase/inc/navipi.hxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/inc/popbox.hxx | 37 | ||||
-rw-r--r-- | sw/source/uibase/utlui/navipi.cxx | 10 |
5 files changed, 8 insertions, 78 deletions
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index fa18519a6bab..403e29bf2320 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -572,7 +572,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\ sw/source/uibase/app/swmodule \ sw/source/uibase/app/swwait \ sw/source/uibase/cctrl/actctrl \ - sw/source/uibase/cctrl/popbox \ sw/source/uibase/cctrl/swlbox \ sw/source/uibase/chrdlg/ccoll \ sw/source/uibase/config/StoredChapterNumbering \ diff --git a/sw/source/uibase/cctrl/popbox.cxx b/sw/source/uibase/cctrl/popbox.cxx deleted file mode 100644 index 7853e942b1b2..000000000000 --- a/sw/source/uibase/cctrl/popbox.cxx +++ /dev/null @@ -1,32 +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 <cmdid.h> -#include <swtypes.hxx> -#include <popbox.hxx> -#include <navipi.hxx> - -SwHelpToolBox::SwHelpToolBox( SwNavigationPI* pParent, const ResId& rResId ) - : ToolBox( pParent, rResId ) -{ -} - -SwHelpToolBox::~SwHelpToolBox() {} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index 7e50ebf19aeb..6c93a1b9467a 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -20,6 +20,7 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_NAVIPI_HXX #include <vcl/lstbox.hxx> +#include <vcl/toolbox.hxx> #include <vcl/idle.hxx> #include <svl/lstner.hxx> #include <svtools/transfer.hxx> @@ -27,7 +28,6 @@ #include <sfx2/ctrlitem.hxx> #include <sfx2/tbxctrl.hxx> #include <conttree.hxx> -#include <popbox.hxx> class SwWrtShell; class SwNavigationPI; @@ -42,7 +42,7 @@ class SwNavigationPI; enum class RegionMode; class SpinField; -class SwNavHelpToolBox : public SwHelpToolBox +class SwNavHelpToolBox : public ToolBox { virtual void MouseButtonDown(const MouseEvent &rEvt) override; virtual void RequestHelp( const HelpEvent& rHEvt ) override; @@ -58,7 +58,7 @@ class SwNavigationPI : public vcl::Window, friend class SwGlobalTree; VclPtr<SwNavHelpToolBox> m_aContentToolBox; - VclPtr<SwHelpToolBox> m_aGlobalToolBox; + VclPtr<ToolBox> m_aGlobalToolBox; ImageList m_aContentImageList; VclPtr<SwContentTree> m_aContentTree; VclPtr<SwGlobalTree> m_aGlobalTree; diff --git a/sw/source/uibase/inc/popbox.hxx b/sw/source/uibase/inc/popbox.hxx deleted file mode 100644 index 3e9dbf90db08..000000000000 --- a/sw/source/uibase/inc/popbox.hxx +++ /dev/null @@ -1,37 +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_SW_SOURCE_UIBASE_INC_POPBOX_HXX -#define INCLUDED_SW_SOURCE_UIBASE_INC_POPBOX_HXX - -#include <vcl/toolbox.hxx> -#include <svtools/transfer.hxx> - -class SwNavigationPI; - -class SwHelpToolBox: public ToolBox -{ -public: - SwHelpToolBox(SwNavigationPI* pParent, const ResId &); - virtual ~SwHelpToolBox() override; -}; - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index 3c39a8522f18..dd7d770495ee 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -421,8 +421,8 @@ IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox, void ) } } -SwNavHelpToolBox::SwNavHelpToolBox(SwNavigationPI* pParent, const ResId &rResId) : - SwHelpToolBox(pParent, rResId) +SwNavHelpToolBox::SwNavHelpToolBox(SwNavigationPI* pParent, const ResId &rResId) + : ToolBox(pParent, rResId) {} void SwNavHelpToolBox::MouseButtonDown(const MouseEvent &rEvt) @@ -433,7 +433,7 @@ void SwNavHelpToolBox::MouseButtonDown(const MouseEvent &rEvt) static_cast<SwNavigationPI*>(GetParent())->CreateNavigationTool(GetItemRect(FN_CREATE_NAVIGATION), false, this); } else - SwHelpToolBox::MouseButtonDown(rEvt); + ToolBox::MouseButtonDown(rEvt); } void SwNavigationPI::CreateNavigationTool(const Rectangle& rRect, bool bSetFocus, vcl::Window *pParent) @@ -461,7 +461,7 @@ void SwNavHelpToolBox::RequestHelp( const HelpEvent& rHEvt ) { SetItemText(nItemId, SwScrollNaviPopup::GetQuickHelpText((FN_DOWN == nItemId))); } - SwHelpToolBox::RequestHelp(rHEvt); + ToolBox::RequestHelp(rHEvt); } // Action-Handler Edit: @@ -645,7 +645,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, SfxControllerItem( SID_DOCFULLNAME, *_pBindings ), m_aContentToolBox(VclPtr<SwNavHelpToolBox>::Create(this, SW_RES(TB_CONTENT))), - m_aGlobalToolBox(VclPtr<SwHelpToolBox>::Create(this, SW_RES(TB_GLOBAL))), + m_aGlobalToolBox(VclPtr<ToolBox>::Create(this, SW_RES(TB_GLOBAL))), m_aContentImageList(SW_RES(IL_CONTENT)), m_aContentTree(VclPtr<SwContentTree>::Create(this, SW_RES(TL_CONTENT))), m_aGlobalTree(VclPtr<SwGlobalTree>::Create(this, SW_RES(TL_GLOBAL))), |