[Libreoffice-commits] core.git: cui/source dbaccess/source sd/source sw/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Wed Aug 12 18:24:23 UTC 2020
cui/source/inc/optlingu.hxx | 1
dbaccess/source/ui/app/AppController.cxx | 29 ----------------------------
dbaccess/source/ui/app/AppController.hxx | 4 ---
dbaccess/source/ui/app/AppDetailView.hxx | 7 ------
dbaccess/source/ui/app/AppView.hxx | 1
dbaccess/source/ui/browser/dsbrowserDnD.cxx | 5 ----
dbaccess/source/ui/browser/unodatbr.cxx | 5 ----
dbaccess/source/ui/inc/TableCopyHelper.hxx | 1
dbaccess/source/ui/inc/TableWindow.hxx | 2 -
dbaccess/source/ui/inc/callbacks.hxx | 3 --
dbaccess/source/ui/inc/unodatbr.hxx | 5 ----
sd/source/ui/inc/sdtreelb.hxx | 1
sw/source/uibase/inc/optload.hxx | 1
13 files changed, 65 deletions(-)
New commits:
commit 866855dcf8ee3c2afbdf081ad3161df3cce0be6c
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Aug 12 15:30:13 2020 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Aug 12 20:23:40 2020 +0200
cleanup some unused leftovers
Change-Id: I5971ec431471c528c33b2f3a3f2353a3a825f286
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100603
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 5f64e47c2017..7b9ac01cd6d9 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -35,7 +35,6 @@ namespace com::sun::star{
}
}
-class SvTreeListEntry;
class SvxLinguData_Impl;
// define ----------------------------------------------------------------
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 8c097c6a2fb0..739f7a43be9d 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -2268,40 +2268,11 @@ Any OApplicationController::getCurrentSelection( Control& _rControl ) const
return makeAny( aSelection );
}
-bool OApplicationController::requestQuickHelp( const SvTreeListEntry* /*_pEntry*/, OUString& /*_rText*/ ) const
-{
- return false;
-}
-
bool OApplicationController::requestQuickHelp(const void* /*pUserData*/, OUString& /*rText*/) const
{
return false;
}
-bool OApplicationController::requestDrag( const Point& /*_rPosPixel*/ )
-{
- rtl::Reference<TransferableHelper> pTransfer;
- if ( getContainer() && getContainer()->getSelectionCount() )
- {
- try
- {
- pTransfer = copyObject( );
-
- if ( pTransfer && getContainer()->getDetailView() )
- {
- ElementType eType = getContainer()->getElementType();
- pTransfer->StartDrag( getContainer()->getDetailView()->getTreeWindow(), ((eType == E_FORM || eType == E_REPORT) ? DND_ACTION_COPYMOVE : DND_ACTION_COPY) );
- }
- }
- catch(const Exception& )
- {
- DBG_UNHANDLED_EXCEPTION("dbaccess");
- }
- }
-
- return pTransfer.is();
-}
-
bool OApplicationController::requestDrag(const weld::TreeIter& /*rEntry*/)
{
rtl::Reference<TransferableHelper> pTransfer;
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index 1abf501328fb..afd496068650 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -42,8 +42,6 @@
#include <memory>
-class SvTreeListEntry;
-class SvTreeListBox;
class TransferableHelper;
class TransferableClipboardListener;
@@ -486,9 +484,7 @@ namespace dbaui
virtual bool isDataSourceReadOnly() const override;
// IControlActionListener overridables
- virtual bool requestQuickHelp( const SvTreeListEntry* _pEntry, OUString& _rText ) const override;
virtual bool requestQuickHelp(const void* pUserData, OUString& rText) const override;
- virtual bool requestDrag( const Point& _rPosPixel ) override;
virtual bool requestDrag(const weld::TreeIter& rEntry) override;
virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ) override;
virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt ) override;
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index c551db1a3adc..5e4612b48abf 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -33,8 +33,6 @@
#include <vector>
-class SvTreeListEntry;
-
namespace dbaui
{
class OAppBorderWindow;
@@ -79,11 +77,6 @@ namespace dbaui
DECL_LINK(FocusInHdl, weld::Widget&, void);
DECL_LINK(FocusOutHdl, weld::Widget&, void);
- /** sets a new current entry, and invalidates the old and the new one, if necessary
- @return <TRUE/> if and only if the "current entry" changed
- */
- bool setCurrentEntryInvalidate( SvTreeListEntry* _pEntry );
-
void updateHelpText();
virtual void DataChanged(const DataChangedEvent& rDCEvt) override;
diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx
index d8f222433685..598385331ff4 100644
--- a/dbaccess/source/ui/app/AppView.hxx
+++ b/dbaccess/source/ui/app/AppView.hxx
@@ -30,7 +30,6 @@
namespace com::sun::star::beans { class XPropertySet; }
class Control;
-class SvTreeListEntry;
namespace weld
{
class TreeIter;
diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
index f04ea5db5b91..8c2101a9b02f 100644
--- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx
+++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
@@ -175,11 +175,6 @@ namespace dbaui
return DND_ACTION_NONE;
}
- bool SbaTableQueryBrowser::requestDrag( const Point& /*rPosPixel*/ )
- {
- return false;
- }
-
bool SbaTableQueryBrowser::requestDrag(const weld::TreeIter& rEntry)
{
// it must be a query/table
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 375df3480a73..1b380a6b314a 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -3485,11 +3485,6 @@ void SbaTableQueryBrowser::implAdministrate(weld::TreeIter& rApplyTo)
}
}
-bool SbaTableQueryBrowser::requestQuickHelp( const SvTreeListEntry* , OUString& ) const
-{
- return false;
-}
-
bool SbaTableQueryBrowser::requestQuickHelp(const void* pUserData, OUString& rText) const
{
const DBTreeListUserData* pData = static_cast<const DBTreeListUserData*>(pUserData);
diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx
index 5049c47cd756..b3f03e2a7ff2 100644
--- a/dbaccess/source/ui/inc/TableCopyHelper.hxx
+++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx
@@ -28,7 +28,6 @@
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
-class SvTreeListEntry;
namespace dbaui
{
class OGenericUnoController;
diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx
index f45020de008f..7f5b4d47d10c 100644
--- a/dbaccess/source/ui/inc/TableWindow.hxx
+++ b/dbaccess/source/ui/inc/TableWindow.hxx
@@ -32,8 +32,6 @@
#include <cppuhelper/basemutex.hxx>
#include <o3tl/typed_flags_set.hxx>
-class SvTreeListEntry;
-
// Flags for the size adjustment of SbaJoinTabWins
enum class SizingFlags {
NONE = 0x0000,
diff --git a/dbaccess/source/ui/inc/callbacks.hxx b/dbaccess/source/ui/inc/callbacks.hxx
index e18a6556036f..e3a0ce03751a 100644
--- a/dbaccess/source/ui/inc/callbacks.hxx
+++ b/dbaccess/source/ui/inc/callbacks.hxx
@@ -22,7 +22,6 @@
#include <sot/exchange.hxx>
-class SvTreeListEntry;
class Point;
class PopupMenu;
class Control;
@@ -47,13 +46,11 @@ namespace dbaui
/** requests a quick help text to display
@return <FALSE/> if the default quick help text should be used
*/
- virtual bool requestQuickHelp( const SvTreeListEntry* _pEntry, OUString& _rText ) const = 0;
virtual bool requestQuickHelp(const void* pUserData, OUString& rText) const = 0;
/** handler for StartDrag requests
@return <TRUE/> if a drag operation was started
*/
- virtual bool requestDrag(const Point& _rPosPixel) = 0;
virtual bool requestDrag(const weld::TreeIter& rEntry) = 0;
/** check whether or not a drop request should be accepted
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index f1891596f16d..8c3b99004534 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -39,14 +39,11 @@
#include "TableCopyHelper.hxx"
#include "commontypes.hxx"
-class SvTreeListEntry;
class Splitter;
-struct SvSortData;
class ODataClipboard;
namespace com::sun::star::container { class XNameContainer; }
-class SvTreeList;
namespace dbaui
{
@@ -211,9 +208,7 @@ namespace dbaui
virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override;
// IControlActionListener overridables
- virtual bool requestQuickHelp( const SvTreeListEntry* _pEntry, OUString& _rText ) const override;
virtual bool requestQuickHelp(const void* pUserData, OUString& rText) const override;
- virtual bool requestDrag( const Point& _rPosPixel ) override;
virtual bool requestDrag(const weld::TreeIter& rEntry) override;
virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ) override;
virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt ) override;
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 4119ace36a47..888fbfcf3b9c 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -36,7 +36,6 @@ class SdNavigatorWin;
class SdrObject;
class SdrObjList;
class SdPage;
-class SvTreeListEntry;
struct ImplSVEvent;
namespace sd {
diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx
index 22fef4bcd5ea..e1b0abe2f4ff 100644
--- a/sw/source/uibase/inc/optload.hxx
+++ b/sw/source/uibase/inc/optload.hxx
@@ -30,7 +30,6 @@
#include <SwCapObjType.hxx>
class SwFieldMgr;
-class SvTreeListEntry;
class SwWrtShell;
class SwFieldUnitTable
More information about the Libreoffice-commits
mailing list