[Libreoffice-commits] core.git: dbaccess/Library_dbu.mk dbaccess/source include/ucbhelper include/vcl solenv/clang-format ucbhelper/IwyuFilter_ucbhelper.yaml ucbhelper/Library_ucbhelper.mk ucbhelper/source ucb/source vcl/inc vcl/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Sun Aug 16 13:27:16 UTC 2020
dbaccess/Library_dbu.mk | 1
dbaccess/source/ui/control/ScrollHelper.cxx | 52 -----------------
dbaccess/source/ui/control/tabletree.cxx | 13 ----
dbaccess/source/ui/inc/ScrollHelper.hxx | 67 ----------------------
dbaccess/source/ui/inc/dbtreelistbox.hxx | 2
dbaccess/source/ui/inc/imageprovider.hxx | 12 ---
dbaccess/source/ui/inc/tabletree.hxx | 37 ------------
dbaccess/source/ui/misc/imageprovider.cxx | 28 ---------
include/ucbhelper/getcomponentcontext.hxx | 47 ---------------
include/vcl/toolkit/svlbitm.hxx | 1
include/vcl/toolkit/treelist.hxx | 3
include/vcl/toolkit/treelistbox.hxx | 7 --
solenv/clang-format/excludelist | 3
ucb/source/cacher/cachedcontentresultset.cxx | 1
ucb/source/cacher/cacheddynamicresultset.cxx | 1
ucb/source/cacher/cacheddynamicresultsetstub.cxx | 1
ucb/source/core/ucb.cxx | 1
ucb/source/core/ucbstore.cxx | 1
ucb/source/sorter/sortdynres.cxx | 1
ucb/source/ucp/cmis/cmis_provider.cxx | 1
ucb/source/ucp/ftp/ftpcontentprovider.cxx | 1
ucb/source/ucp/gio/gio_provider.cxx | 1
ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 1
ucb/source/ucp/hierarchy/hierarchyprovider.cxx | 1
ucb/source/ucp/package/pkgprovider.cxx | 1
ucb/source/ucp/tdoc/tdoc_provider.cxx | 1
ucb/source/ucp/webdav-neon/webdavprovider.cxx | 1
ucb/source/ucp/webdav/webdavprovider.cxx | 1
ucbhelper/IwyuFilter_ucbhelper.yaml | 3
ucbhelper/Library_ucbhelper.mk | 1
ucbhelper/source/provider/getcomponentcontext.cxx | 39 ------------
vcl/inc/svimpbox.hxx | 1
vcl/source/treelist/svimpbox.cxx | 20 ------
vcl/source/treelist/svlbitm.cxx | 6 -
vcl/source/treelist/treelist.cxx | 13 ----
vcl/source/treelist/treelistbox.cxx | 21 ------
36 files changed, 392 deletions(-)
New commits:
commit 3f9940c2e050830051a31e4b70736132e034a9db
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sun Aug 16 12:45:21 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Aug 16 15:26:37 2020 +0200
loplugin:unusedmethods
Change-Id: I2dd10873be73256a3689233c7b1e37bde8f685ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100820
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 07da91b74f4f..a1e608df0f8c 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -102,7 +102,6 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
dbaccess/source/ui/control/FieldDescControl \
dbaccess/source/ui/control/opendoccontrols \
dbaccess/source/ui/control/RelationControl \
- dbaccess/source/ui/control/ScrollHelper \
dbaccess/source/ui/control/sqledit \
dbaccess/source/ui/control/SqlNameEdit \
dbaccess/source/ui/control/TableGrantCtrl \
diff --git a/dbaccess/source/ui/control/ScrollHelper.cxx b/dbaccess/source/ui/control/ScrollHelper.cxx
deleted file mode 100644
index a9fcacca957f..000000000000
--- a/dbaccess/source/ui/control/ScrollHelper.cxx
+++ /dev/null
@@ -1,52 +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 <ScrollHelper.hxx>
-
-#define LISTBOX_SCROLLING_AREA 12
-namespace dbaui
-{
-
- OScrollHelper::OScrollHelper()
- {
- }
- OScrollHelper::~OScrollHelper()
- {
-
- }
- void OScrollHelper::scroll(const Point& _rPoint, const Size& _rOutputSize)
- {
- // Scrolling Areas
- tools::Rectangle aScrollArea( Point(0, _rOutputSize.Height() - LISTBOX_SCROLLING_AREA),
- Size(_rOutputSize.Width(), LISTBOX_SCROLLING_AREA) );
-
- // if pointer in bottom area begin scroll
- if( aScrollArea.IsInside(_rPoint) )
- m_aUpScroll.Call(nullptr);
- else
- {
- aScrollArea.SetPos(Point(0,0));
- // if pointer in top area begin scroll
- if( aScrollArea.IsInside(_rPoint) )
- m_aDownScroll.Call(nullptr);
- }
- }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index a4de1dc9a4f4..ead1d5483cbf 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -447,24 +447,11 @@ void TableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConne
m_xTreeView->make_sorted();
}
-bool OTableTreeListBox::isWildcardChecked(const weld::TreeIter& rEntry)
-{
- return m_xTreeView->get_text_emphasis(rEntry, 0);
-}
-
bool TableTreeListBox::isWildcardChecked(const weld::TreeIter& rEntry)
{
return m_xTreeView->get_text_emphasis(rEntry, 0);
}
-void OTableTreeListBox::checkWildcard(weld::TreeIter& rEntry)
-{
- if (!m_bShowToggles)
- return;
- m_xTreeView->set_toggle(rEntry, TRISTATE_TRUE);
- checkedButton_noBroadcast(rEntry);
-}
-
void TableTreeListBox::checkWildcard(weld::TreeIter& rEntry)
{
if (!m_bShowToggles)
diff --git a/dbaccess/source/ui/inc/ScrollHelper.hxx b/dbaccess/source/ui/inc/ScrollHelper.hxx
deleted file mode 100644
index 87e50018aa2d..000000000000
--- a/dbaccess/source/ui/inc/ScrollHelper.hxx
+++ /dev/null
@@ -1,67 +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_DBACCESS_SOURCE_UI_INC_SCROLLHELPER_HXX
-#define INCLUDED_DBACCESS_SOURCE_UI_INC_SCROLLHELPER_HXX
-
-#include <tools/link.hxx>
-#include <tools/gen.hxx>
-
-namespace dbaui
-{
- class OScrollHelper
- {
- Link<LinkParamNone*,void> m_aUpScroll;
- Link<LinkParamNone*,void> m_aDownScroll;
- public:
- /** default constructor
- */
- OScrollHelper();
-
- ~OScrollHelper();
-
- /** set the memthod which should be called when scrolling up
- @param _rUpScroll
- the method to set
- */
- void setUpScrollMethod( const Link<LinkParamNone*,void>& _rUpScroll )
- {
- m_aUpScroll = _rUpScroll;
- }
-
- /** set the memthod which should be called when scrolling down
- @param _rDownScroll
- the method to set
- */
- void setDownScrollMethod( const Link<LinkParamNone*,void>& _rDownScroll )
- {
- m_aDownScroll = _rDownScroll;
- }
-
- /** check if a scroll method has to be called
- @param _rPoint
- the current selection point
- @param _rOutputSize
- the output size of the window
- */
- void scroll(const Point& _rPoint, const Size& _rOutputSize);
- };
-}
-#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_SCROLLHELPER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx
index 56ac5d5aef25..2c631875dabe 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx
@@ -19,8 +19,6 @@
#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBTREELISTBOX_HXX
#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBTREELISTBOX_HXX
-#include "ScrollHelper.hxx"
-
#include <com/sun/star/frame/XPopupMenuController.hpp>
#include <vcl/InterimItemWindow.hxx>
diff --git a/dbaccess/source/ui/inc/imageprovider.hxx b/dbaccess/source/ui/inc/imageprovider.hxx
index a85c7df7d50c..6be020922bd0 100644
--- a/dbaccess/source/ui/inc/imageprovider.hxx
+++ b/dbaccess/source/ui/inc/imageprovider.hxx
@@ -116,18 +116,6 @@ namespace dbaui
*/
static OUString getDefaultImageResourceID(sal_Int32 _nDatabaseObjectType);
- /** retrieves the image to be used for folders of database objects
- @param _nDatabaseObjectType
- the type of the object. Must be one of the css.sdb.application.DatabaseObject
- constants.
- @param _rName
- the name of the object
- @return
- the image to be used for folders of the given type
- */
- static Image getFolderImage(
- sal_Int32 _nDatabaseObjectType
- );
static OUString getFolderImageId(
sal_Int32 _nDatabaseObjectType
);
diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx
index 6279129eb112..aee9412cd4c7 100644
--- a/dbaccess/source/ui/inc/tabletree.hxx
+++ b/dbaccess/source/ui/inc/tabletree.hxx
@@ -46,13 +46,9 @@ public:
OTableTreeListBox(vcl::Window* pParent, bool bShowToggles);
virtual ~OTableTreeListBox();
- void init() { m_bVirtualRoot = true; }
-
typedef std::pair< OUString, bool > TTableViewName;
typedef std::vector< TTableViewName > TNames;
- void SuppressEmptyFolders() { m_bNoEmptyFolders = true; }
-
/** determines whether the given entry denotes a tables folder
*/
bool isFolderEntry(const weld::TreeIter& rEntry) const;
@@ -82,23 +78,9 @@ public:
std::unique_ptr<weld::TreeIter> getAllObjectsEntry() const;
- /** does a wildcard check of the given entry
- <p>There are two different 'checked' states: If the user checks all children of an entry, this is different
- from checking the entry itself. The second is called 'wildcard' checking, 'cause in the resulting
- table filter it's represented by a wildcard.</p>
- */
- void checkWildcard(weld::TreeIter& rEntry);
-
- /** determine if the given entry is 'wildcard checked'
- @see checkWildcard
- */
- bool isWildcardChecked(const weld::TreeIter& rEntry);
-
void CheckButtons(); // make the button states consistent (bottom-up)
private:
- void CheckButtonHdl();
-
void checkedButton_noBroadcast(const weld::TreeIter& rEntry);
void implEmphasize(const weld::TreeIter& rEntry, bool _bChecked, bool _bUpdateDescendants = true, bool _bUpdateAncestors = true);
@@ -198,14 +180,6 @@ public:
const css::uno::Sequence< OUString>& _rViews
);
- /** to be used if a foreign instance added a table
- */
- std::unique_ptr<weld::TreeIter> addedTable( const OUString& _rName );
-
- /** to be used if a foreign instance removed a table
- */
- void removedTable( const OUString& _rName );
-
std::unique_ptr<weld::TreeIter> getAllObjectsEntry() const;
/** does a wildcard check of the given entry
@@ -253,17 +227,6 @@ public:
const css::uno::Reference< css::sdbc::XConnection >& _rxConnection,
const TNames& _rTables
);
-
- /** returns a NamedDatabaseObject record which describes the given entry
- */
- css::sdb::application::NamedDatabaseObject
- describeObject(weld::TreeIter& rEntry);
-
- /** returns the fully qualified name of a table entry
- @param _pEntry
- the entry whose name is to be obtained. Must not denote a folder entry.
- */
- OUString getQualifiedTableName(weld::TreeIter& rEntry) const;
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx
index f3d9a7372092..585b87bc9294 100644
--- a/dbaccess/source/ui/misc/imageprovider.cxx
+++ b/dbaccess/source/ui/misc/imageprovider.cxx
@@ -203,34 +203,6 @@ namespace dbaui
return sImageResourceID;
}
- Image ImageProvider::getFolderImage( sal_Int32 _nDatabaseObjectType )
- {
- OUString sImageResourceID;
- switch ( _nDatabaseObjectType )
- {
- case DatabaseObject::QUERY:
- sImageResourceID = QUERYFOLDER_TREE_ICON;
- break;
- case DatabaseObject::FORM:
- sImageResourceID = FORMFOLDER_TREE_ICON;
- break;
- case DatabaseObject::REPORT:
- sImageResourceID = REPORTFOLDER_TREE_ICON;
- break;
- case DatabaseObject::TABLE:
- sImageResourceID = TABLEFOLDER_TREE_ICON;
- break;
- default:
- OSL_FAIL( "ImageProvider::getDefaultImage: invalid database object type!" );
- break;
- }
-
- Image aFolderImage;
- if (!sImageResourceID.isEmpty())
- aFolderImage = Image(StockImage::Yes, sImageResourceID);
- return aFolderImage;
- }
-
OUString ImageProvider::getFolderImageId( sal_Int32 _nDatabaseObjectType )
{
OUString sImageResourceID;
diff --git a/include/ucbhelper/getcomponentcontext.hxx b/include/ucbhelper/getcomponentcontext.hxx
deleted file mode 100644
index 8c2a14a88845..000000000000
--- a/include/ucbhelper/getcomponentcontext.hxx
+++ /dev/null
@@ -1,47 +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_UCBHELPER_GETCOMPONENTCONTEXT_HXX
-#define INCLUDED_UCBHELPER_GETCOMPONENTCONTEXT_HXX
-
-#include <sal/config.h>
-
-#include <com/sun/star/uno/Reference.h>
-#include <ucbhelper/ucbhelperdllapi.h>
-
-namespace com::sun::star {
- namespace lang { class XMultiServiceFactory; }
- namespace uno { class XComponentContext; }
-}
-
-namespace ucbhelper {
-
-//TODO: a duplicate of comphelper::getComponentContext
-// (comphelper/processfactory.hxx)
-UCBHELPER_DLLPUBLIC
-css::uno::Reference< css::uno::XComponentContext >
-getComponentContext(
- css::uno::Reference< css::lang::XMultiServiceFactory >
- const & factory);
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/toolkit/svlbitm.hxx b/include/vcl/toolkit/svlbitm.hxx
index 850763abf76d..fa36fe88f9f6 100644
--- a/include/vcl/toolkit/svlbitm.hxx
+++ b/include/vcl/toolkit/svlbitm.hxx
@@ -73,7 +73,6 @@ private:
VCL_DLLPRIVATE void InitData( bool _bRadioBtn, const Control* pControlForSettings );
public:
// include creating default images (CheckBox or RadioButton)
- SvLBoxButtonData( const Control* pControlForSettings );
SvLBoxButtonData( const Control* pControlForSettings, bool _bRadioBtn );
~SvLBoxButtonData();
diff --git a/include/vcl/toolkit/treelist.hxx b/include/vcl/toolkit/treelist.hxx
index 3ca4a05b009b..78846381e3fb 100644
--- a/include/vcl/toolkit/treelist.hxx
+++ b/include/vcl/toolkit/treelist.hxx
@@ -162,9 +162,6 @@ public:
bool Remove( const SvTreeListEntry* pEntry );
void Clear();
- bool HasChildren( const SvTreeListEntry* pEntry ) const;
- bool HasParent( const SvTreeListEntry* pEntry ) const;
-
bool IsChild(const SvTreeListEntry* pParent, const SvTreeListEntry* pChild) const;
SvTreeListEntry* GetEntry( SvTreeListEntry* pParent, sal_uLong nPos ) const;
SvTreeListEntry* GetEntry( sal_uLong nRootPos ) const;
diff --git a/include/vcl/toolkit/treelistbox.hxx b/include/vcl/toolkit/treelistbox.hxx
index fd2ce95cb755..ccb9db9557ee 100644
--- a/include/vcl/toolkit/treelistbox.hxx
+++ b/include/vcl/toolkit/treelistbox.hxx
@@ -384,7 +384,6 @@ public:
using Window::GetParent;
SvTreeListEntry* GetParent( SvTreeListEntry* pEntry ) const;
- SvTreeListEntry* GetRootLevelParent(SvTreeListEntry* pEntry ) const;
using Window::GetChildCount;
sal_uLong GetChildCount( SvTreeListEntry const * pParent ) const;
@@ -665,18 +664,12 @@ public:
virtual void ModelNotification( SvListAction nActionId, SvTreeListEntry* pEntry1,
SvTreeListEntry* pEntry2, sal_uLong nPos ) override;
- void EndSelection();
-
SvTreeListEntry* GetFirstEntryInView() const;
SvTreeListEntry* GetNextEntryInView(SvTreeListEntry*) const;
void ScrollToAbsPos( long nPos );
- void ShowFocusRect( const SvTreeListEntry* pEntry );
-
static VclPtr<PopupMenu> CreateContextMenu();
- void EnableContextMenuHandling();
-
long getPreferredDimensions(std::vector<long> &rWidths) const;
virtual Size GetOptimalSize() const override;
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 281b92c86875..c8c282228d6a 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -3126,7 +3126,6 @@ dbaccess/source/ui/control/ColumnControlWindow.cxx
dbaccess/source/ui/control/FieldControls.cxx
dbaccess/source/ui/control/FieldDescControl.cxx
dbaccess/source/ui/control/RelationControl.cxx
-dbaccess/source/ui/control/ScrollHelper.cxx
dbaccess/source/ui/control/SqlNameEdit.cxx
dbaccess/source/ui/control/TableGrantCtrl.cxx
dbaccess/source/ui/control/VertSplitView.cxx
@@ -7152,7 +7151,6 @@ include/ucbhelper/content.hxx
include/ucbhelper/contenthelper.hxx
include/ucbhelper/contentidentifier.hxx
include/ucbhelper/fd_inputstream.hxx
-include/ucbhelper/getcomponentcontext.hxx
include/ucbhelper/interactionrequest.hxx
include/ucbhelper/interceptedinteraction.hxx
include/ucbhelper/macros.hxx
@@ -16185,7 +16183,6 @@ ucbhelper/source/provider/contentidentifier.cxx
ucbhelper/source/provider/contentinfo.cxx
ucbhelper/source/provider/contentinfo.hxx
ucbhelper/source/provider/fd_inputstream.cxx
-ucbhelper/source/provider/getcomponentcontext.cxx
ucbhelper/source/provider/interactionrequest.cxx
ucbhelper/source/provider/propertyvalueset.cxx
ucbhelper/source/provider/providerhelper.cxx
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index 07a18041c11f..90448ff45bd5 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -31,7 +31,6 @@
#include <osl/diagnose.h>
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/queryinterface.hxx>
-#include <ucbhelper/getcomponentcontext.hxx>
#include <ucbhelper/macros.hxx>
#include <memory>
diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx
index eaac536179bd..c21bbf852bfb 100644
--- a/ucb/source/cacher/cacheddynamicresultset.cxx
+++ b/ucb/source/cacher/cacheddynamicresultset.cxx
@@ -22,7 +22,6 @@
#include "cachedcontentresultset.hxx"
#include <osl/diagnose.h>
#include <cppuhelper/queryinterface.hxx>
-#include <ucbhelper/getcomponentcontext.hxx>
#include <ucbhelper/macros.hxx>
using namespace com::sun::star::lang;
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
index d0841bb89ea1..8428f12283ca 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
@@ -23,7 +23,6 @@
#include <com/sun/star/ucb/ContentResultSetCapability.hpp>
#include <com/sun/star/ucb/SortedDynamicResultSetFactory.hpp>
#include <osl/diagnose.h>
-#include <ucbhelper/getcomponentcontext.hxx>
#include <ucbhelper/macros.hxx>
#include <cppuhelper/queryinterface.hxx>
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 93a8db613bf8..304e37c37728 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -40,7 +40,6 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <ucbhelper/cancelcommandexecution.hxx>
-#include <ucbhelper/getcomponentcontext.hxx>
#include <ucbhelper/macros.hxx>
#include <rtl/ref.hxx>
#include "identify.hxx"
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 5dbc1e3557be..617207efd31b 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -45,7 +45,6 @@
#include <com/sun/star/util/XChangesBatch.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <cppuhelper/implbase.hxx>
-#include <ucbhelper/getcomponentcontext.hxx>
#include <ucbhelper/macros.hxx>
#include <tools/diagnose_ex.h>
#include "ucbstore.hxx"
diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index cd5d5f7282b4..cbacf231e233 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -27,7 +27,6 @@
#include <com/sun/star/ucb/WelcomeDynamicResultSetStruct.hpp>
#include <com/sun/star/ucb/CachedDynamicResultSetStubFactory.hpp>
#include <com/sun/star/ucb/XSourceInitialization.hpp>
-#include <ucbhelper/getcomponentcontext.hxx>
using namespace com::sun::star::beans;
using namespace com::sun::star::lang;
diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx
index 6f8a6be3c0e8..219d1f5f0d6f 100644
--- a/ucb/source/ucp/cmis/cmis_provider.cxx
+++ b/ucb/source/ucp/cmis/cmis_provider.cxx
@@ -10,7 +10,6 @@
#include <comphelper/processfactory.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <ucbhelper/contenthelper.hxx>
-#include <ucbhelper/getcomponentcontext.hxx>
#include <ucbhelper/macros.hxx>
#include <com/sun/star/ucb/ContentCreationException.hpp>
#include <com/sun/star/ucb/IllegalIdentifierException.hpp>
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
index c906f361eec6..72d848aa6b2c 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
@@ -27,7 +27,6 @@
#include <cppuhelper/typeprovider.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/factory.hxx>
-#include <ucbhelper/getcomponentcontext.hxx>
#include "ftpcontentprovider.hxx"
#include "ftpcontent.hxx"
#include "ftploaderthread.hxx"
diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx
index f0999d054b9c..21936f0db721 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -19,7 +19,6 @@
#include <sal/log.hxx>
#include <ucbhelper/contenthelper.hxx>
-#include <ucbhelper/getcomponentcontext.hxx>
#include <ucbhelper/macros.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <com/sun/star/ucb/ContentCreationException.hpp>
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index e082994b0105..8dcd90b9e641 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -38,7 +38,6 @@
#include <com/sun/star/util/XChangesBatch.hpp>
#include <com/sun/star/util/XChangesNotifier.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <ucbhelper/getcomponentcontext.hxx>
#include <ucbhelper/macros.hxx>
#include <rtl/ref.hxx>
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
index 342b686f2286..977ed4fb980d 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
@@ -32,7 +32,6 @@
#include <com/sun/star/util/theOfficeInstallationDirectories.hpp>
#include <cppuhelper/queryinterface.hxx>
#include <ucbhelper/contentidentifier.hxx>
-#include <ucbhelper/getcomponentcontext.hxx>
#include <ucbhelper/macros.hxx>
#include "hierarchyprovider.hxx"
#include "hierarchycontent.hxx"
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index 775ee6a5c692..206224c30fda 100644
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -28,7 +28,6 @@
#include <cppuhelper/weak.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <ucbhelper/contentidentifier.hxx>
-#include <ucbhelper/getcomponentcontext.hxx>
#include <ucbhelper/macros.hxx>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx
index e1d0f30e1ca9..e4a7c8ca346b 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx
@@ -32,7 +32,6 @@
#include <com/sun/star/ucb/IllegalIdentifierException.hpp>
#include <cppuhelper/queryinterface.hxx>
#include <ucbhelper/contentidentifier.hxx>
-#include <ucbhelper/getcomponentcontext.hxx>
#include <ucbhelper/macros.hxx>
#include "tdoc_provider.hxx"
diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx
index 40534e80a614..e63fd5c9d40a 100644
--- a/ucb/source/ucp/webdav-neon/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavprovider.cxx
@@ -31,7 +31,6 @@
#include <com/sun/star/ucb/IllegalIdentifierException.hpp>
#include <comphelper/processfactory.hxx>
#include <ucbhelper/contentidentifier.hxx>
-#include <ucbhelper/getcomponentcontext.hxx>
#include <ucbhelper/macros.hxx>
#include <cppuhelper/queryinterface.hxx>
#include "webdavprovider.hxx"
diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx
index 366d341b1591..462e4e5a98f7 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -18,7 +18,6 @@
*/
#include <ucbhelper/contentidentifier.hxx>
-#include <ucbhelper/getcomponentcontext.hxx>
#include <ucbhelper/macros.hxx>
#include "webdavprovider.hxx"
#include "webdavcontent.hxx"
diff --git a/ucbhelper/IwyuFilter_ucbhelper.yaml b/ucbhelper/IwyuFilter_ucbhelper.yaml
index 93cc261ddad2..d566f7a0e437 100644
--- a/ucbhelper/IwyuFilter_ucbhelper.yaml
+++ b/ucbhelper/IwyuFilter_ucbhelper.yaml
@@ -8,9 +8,6 @@ excludelist:
ucbhelper/source/provider/cancelcommandexecution.cxx:
# Needed for linker visibility
- ucbhelper/cancelcommandexecution.hxx
- ucbhelper/source/provider/getcomponentcontext.cxx:
- # Needed to for ucbhelper::getComponentContext
- - ucbhelper/getcomponentcontext.hxx
ucbhelper/source/provider/resultsetmetadata.cxx:
# Needed for UnoType types
- com/sun/star/io/XInputStream.hpp
diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk
index 8734c5291d91..5b6285d351d0 100644
--- a/ucbhelper/Library_ucbhelper.mk
+++ b/ucbhelper/Library_ucbhelper.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_add_exception_objects,ucbhelper,\
ucbhelper/source/provider/contentidentifier \
ucbhelper/source/provider/contentinfo \
ucbhelper/source/provider/fd_inputstream \
- ucbhelper/source/provider/getcomponentcontext \
ucbhelper/source/provider/interactionrequest \
ucbhelper/source/provider/propertyvalueset \
ucbhelper/source/provider/providerhelper \
diff --git a/ucbhelper/source/provider/getcomponentcontext.cxx b/ucbhelper/source/provider/getcomponentcontext.cxx
deleted file mode 100644
index 1a73d2f23211..000000000000
--- a/ucbhelper/source/provider/getcomponentcontext.cxx
+++ /dev/null
@@ -1,39 +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 <sal/config.h>
-
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <ucbhelper/getcomponentcontext.hxx>
-
-css::uno::Reference< css::uno::XComponentContext >
-ucbhelper::getComponentContext(
- css::uno::Reference< css::lang::XMultiServiceFactory > const & factory)
-{
- return css::uno::Reference< css::uno::XComponentContext >(
- css::uno::Reference< css::beans::XPropertySet >(
- factory, css::uno::UNO_QUERY_THROW)->getPropertyValue(
- "DefaultContext"),
- css::uno::UNO_QUERY_THROW);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/svimpbox.hxx b/vcl/inc/svimpbox.hxx
index 02f8de6d8c72..70173e25a1a7 100644
--- a/vcl/inc/svimpbox.hxx
+++ b/vcl/inc/svimpbox.hxx
@@ -307,7 +307,6 @@ public:
bool GetUpdateMode() const { return m_bUpdateMode; }
tools::Rectangle GetClipRegionRect() const;
bool HasHorScrollBar() const { return m_aHorSBar->IsVisible(); }
- void ShowFocusRect( const SvTreeListEntry* pEntry );
void CallEventListeners( VclEventId nEvent, void* pData = nullptr );
bool IsSelectable( const SvTreeListEntry* pEntry );
diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index a52e3419ad62..4dfe1a9205ef 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -3225,26 +3225,6 @@ void SvImpLBox::StopUserEvent()
}
}
-void SvImpLBox::ShowFocusRect( const SvTreeListEntry* pEntry )
-{
- if( pEntry )
- {
- long nY = GetEntryLine(pEntry);
- tools::Rectangle aRect = m_pView->GetFocusRect(pEntry, nY);
- vcl::Region aOldClip( m_pView->GetClipRegion());
- vcl::Region aClipRegion( GetClipRegionRect() );
- m_pView->SetClipRegion( aClipRegion );
- m_pView->ShowFocus( aRect );
- m_pView->SetClipRegion( aOldClip );
-
- }
- else
- {
- m_pView->HideFocus();
- }
-}
-
-
void SvImpLBox::implInitDefaultNodeImages()
{
if ( s_pDefCollapsed )
diff --git a/vcl/source/treelist/svlbitm.cxx b/vcl/source/treelist/svlbitm.cxx
index 87a32e9612a9..a98814bb5de9 100644
--- a/vcl/source/treelist/svlbitm.cxx
+++ b/vcl/source/treelist/svlbitm.cxx
@@ -50,12 +50,6 @@ void SvLBoxButtonData::InitData( bool _bRadioBtn, const Control* pCtrl )
SetDefaultImages( pCtrl );
}
-SvLBoxButtonData::SvLBoxButtonData( const Control* pControlForSettings )
- : pImpl( new SvLBoxButtonData_Impl )
-{
- InitData( false, pControlForSettings );
-}
-
SvLBoxButtonData::SvLBoxButtonData( const Control* pControlForSettings, bool _bRadioBtn )
: pImpl( new SvLBoxButtonData_Impl )
{
diff --git a/vcl/source/treelist/treelist.cxx b/vcl/source/treelist/treelist.cxx
index 537cf2a5429c..a09ca22baef3 100644
--- a/vcl/source/treelist/treelist.cxx
+++ b/vcl/source/treelist/treelist.cxx
@@ -1493,19 +1493,6 @@ void SvTreeList::GetInsertionPos( SvTreeListEntry const * pEntry, SvTreeListEntr
rPos = k;
}
-bool SvTreeList::HasChildren( const SvTreeListEntry* pEntry ) const
-{
- if ( !pEntry )
- pEntry = pRootItem.get();
-
- return !pEntry->m_Children.empty();
-}
-
-bool SvTreeList::HasParent( const SvTreeListEntry* pEntry ) const
-{
- return pEntry->pParent != pRootItem.get();
-}
-
SvTreeListEntry* SvTreeList::GetEntry( SvTreeListEntry* pParent, sal_uLong nPos ) const
{ if ( !pParent )
pParent = pRootItem.get();
diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx
index f1ac3f23f01f..7544eef8e563 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -786,11 +786,6 @@ SvTreeListEntry* SvTreeListBox::GetParent( SvTreeListEntry* pEntry ) const
return pModel->GetParent(pEntry);
}
-SvTreeListEntry* SvTreeListBox::GetRootLevelParent( SvTreeListEntry* pEntry ) const
-{
- return pModel->GetRootLevelParent(pEntry);
-}
-
sal_uLong SvTreeListBox::GetChildCount( SvTreeListEntry const * pParent ) const
{
return pModel->GetChildCount(pParent);
@@ -3339,11 +3334,6 @@ void SvTreeListBox::ModelNotification( SvListAction nActionId, SvTreeListEntry*
}
}
-void SvTreeListBox::EndSelection()
-{
- pImpl->EndSelection();
-}
-
SvTreeListEntry* SvTreeListBox::GetFirstEntryInView() const
{
return GetEntry( Point() );
@@ -3363,11 +3353,6 @@ SvTreeListEntry* SvTreeListBox::GetNextEntryInView(SvTreeListEntry* pEntry ) con
}
-void SvTreeListBox::ShowFocusRect( const SvTreeListEntry* pEntry )
-{
- pImpl->ShowFocusRect( pEntry );
-}
-
void SvTreeListBox::DataChanged( const DataChangedEvent& rDCEvt )
{
if( (rDCEvt.GetType()==DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
@@ -3429,12 +3414,6 @@ VclPtr<PopupMenu> SvTreeListBox::CreateContextMenu()
return nullptr;
}
-void SvTreeListBox::EnableContextMenuHandling()
-{
- assert(pImpl && "-SvTreeListBox::EnableContextMenuHandling(): No implementation!");
- pImpl->m_bContextMenuHandling = true;
-}
-
css::uno::Reference< XAccessible > SvTreeListBox::CreateAccessible()
{
vcl::Window* pParent = GetAccessibleParentWindow();
More information about the Libreoffice-commits
mailing list