sw/Library_sw.mk | 1
sw/source/uibase/cctrl/popbox.cxx | 43 --------------------------------------
sw/source/uibase/inc/navipi.hxx | 6 ++---
sw/source/uibase/inc/popbox.hxx | 41 ------------------------------------
sw/source/uibase/utlui/navipi.cxx | 10 ++++----
5 files changed, 8 insertions(+), 93 deletions(-)
New commits:
commit 6fd363af3432d054eb92a2bac4893f5baf1d50ef
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Oct 10 15:50:34 2016 +0100
SwHelpToolBox doesn't do anything now
Change-Id: I5b8865218d3cd8492d148af8d69389c256bbb27f
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index fa18519..403e29b 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 7853e94..0000000
--- 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 7e50ebf..6c93a1b 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 3e9dbf9..0000000
--- 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 3c39a85..dd7d770 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))),
commit ca7915037c2fedc0d69908a6d2d9ccb67aa02a15
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Oct 10 15:46:46 2016 +0100
dropping document into these toolbars does nothing already
so might as well drop that support here. Dropping into the
main panel works (for master documents its quite sensible)
Change-Id: Ic7a088d7ff7054430d55032158a186d610f10da1
diff --git a/sw/source/uibase/cctrl/popbox.cxx
b/sw/source/uibase/cctrl/popbox.cxx
index 6a1f301..7853e94 100644
--- a/sw/source/uibase/cctrl/popbox.cxx
+++ b/sw/source/uibase/cctrl/popbox.cxx
@@ -23,21 +23,10 @@
#include <navipi.hxx>
SwHelpToolBox::SwHelpToolBox( SwNavigationPI* pParent, const ResId& rResId )
- : ToolBox( pParent, rResId ),
- DropTargetHelper( this )
+ : ToolBox( pParent, rResId )
{
}
SwHelpToolBox::~SwHelpToolBox() {}
-sal_Int8 SwHelpToolBox::AcceptDrop( const AcceptDropEvent& rEvt )
-{
- return static_cast<SwNavigationPI*>(GetParent())->AcceptDrop( rEvt );
-}
-
-sal_Int8 SwHelpToolBox::ExecuteDrop( const ExecuteDropEvent& rEvt )
-{
- return static_cast<SwNavigationPI*>(GetParent())->ExecuteDrop( rEvt );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/popbox.hxx b/sw/source/uibase/inc/popbox.hxx
index af89d0e..3e9dbf9 100644
--- a/sw/source/uibase/inc/popbox.hxx
+++ b/sw/source/uibase/inc/popbox.hxx
@@ -24,12 +24,8 @@
class SwNavigationPI;
-class SwHelpToolBox: public ToolBox, public DropTargetHelper
+class SwHelpToolBox: public ToolBox
{
-protected:
- virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override;
- virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override;
-
public:
SwHelpToolBox(SwNavigationPI* pParent, const ResId &);
virtual ~SwHelpToolBox() override;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
