Kaydet (Commit) 734dc3c3 authored tarafından Gabor Kelemen's avatar Gabor Kelemen Kaydeden (comit) Miklos Vajna

tdf#42949 Fix IWYU warnings in ucbhelper/

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Also include/ucbhelper had some false positives not yet on the blacklist

Change-Id: I4500271ea35efd7e140c76255df95ff7bbdf9f27
Reviewed-on: https://gerrit.libreoffice.org/70745
Tested-by: Jenkins
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.com>
üst 2e3e9d7c
...@@ -88,6 +88,18 @@ blacklist: ...@@ -88,6 +88,18 @@ blacklist:
include/cppuhelper/interfacecontainer.h: include/cppuhelper/interfacecontainer.h:
#Needed for implicit destructor #Needed for implicit destructor
- com/sun/star/uno/Sequence.hxx - com/sun/star/uno/Sequence.hxx
include/ucbhelper/activedatasink.hxx:
# base class has to be a complete type
- com/sun/star/io/XActiveDataSink.hpp
include/ucbhelper/activedatastreamer.hxx:
# base class has to be a complete type
- com/sun/star/io/XActiveDataStreamer.hpp
include/ucbhelper/commandenvironment.hxx:
# base class has to be a complete type
- com/sun/star/ucb/XCommandEnvironment.hpp
include/ucbhelper/interceptedinteraction.hxx:
# base class has to be a complete type
- com/sun/star/task/XInteractionHandler.hpp
include/ucbhelper/fd_inputstream.hxx: include/ucbhelper/fd_inputstream.hxx:
# Needed for typedef # Needed for typedef
- com/sun/star/io/XInputStream.hpp - com/sun/star/io/XInputStream.hpp
......
...@@ -24,10 +24,11 @@ ...@@ -24,10 +24,11 @@
#include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/task/XInteractionRequest.hpp>
#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase.hxx>
#include <ucbhelper/ucbhelperdllapi.h> #include <ucbhelper/ucbhelperdllapi.h>
namespace com::sun::star::task { class XInteractionRequest; }
namespace ucbhelper{ namespace ucbhelper{
......
---
assumeFilename: ucbhelper/source/provider/resultset.cxx
blacklist:
ucbhelper/source/client/content.cxx:
# Needed for direct member access
- com/sun/star/ucb/XCommandInfo.hpp
- com/sun/star/beans/XPropertySetInfo.hpp
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
- com/sun/star/sdbc/XArray.hpp
- com/sun/star/sdbc/XBlob.hpp
- com/sun/star/sdbc/XClob.hpp
- com/sun/star/sdbc/XRef.hpp
- com/sun/star/util/Date.hpp
- com/sun/star/util/Time.hpp
- com/sun/star/util/DateTime.hpp
...@@ -23,18 +23,18 @@ ...@@ -23,18 +23,18 @@
************************************************************************** **************************************************************************
*************************************************************************/ *************************************************************************/
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/ucb/XContentIdentifierFactory.hpp>
#include <com/sun/star/ucb/XContentProvider.hpp>
#include <com/sun/star/ucb/XContentProviderManager.hpp>
#include <ucbhelper/commandenvironment.hxx> #include <ucbhelper/commandenvironment.hxx>
#include <com/sun/star/uno/Reference.hxx>
using namespace com::sun::star::lang; using namespace com::sun::star::lang;
using namespace com::sun::star::task; using namespace com::sun::star::task;
using namespace com::sun::star::ucb; using namespace com::sun::star::ucb;
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
namespace com::sun::star::task { class XInteractionHandler; }
namespace com::sun::star::ucb { class XProgressHandler; }
namespace ucbhelper namespace ucbhelper
{ {
// struct CommandEnvironment_Impl. // struct CommandEnvironment_Impl.
......
...@@ -33,22 +33,16 @@ ...@@ -33,22 +33,16 @@
#include <com/sun/star/ucb/ContentCreationError.hpp> #include <com/sun/star/ucb/ContentCreationError.hpp>
#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/ContentCreationException.hpp>
#include <com/sun/star/ucb/IllegalIdentifierException.hpp> #include <com/sun/star/ucb/IllegalIdentifierException.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <com/sun/star/ucb/XCommandInfo.hpp> #include <com/sun/star/ucb/XCommandInfo.hpp>
#include <com/sun/star/ucb/XCommandProcessor.hpp> #include <com/sun/star/ucb/XCommandProcessor.hpp>
#include <com/sun/star/ucb/Command.hpp> #include <com/sun/star/ucb/Command.hpp>
#include <com/sun/star/ucb/CommandInfo.hpp>
#include <com/sun/star/ucb/ContentAction.hpp> #include <com/sun/star/ucb/ContentAction.hpp>
#include <com/sun/star/ucb/OpenCommandArgument2.hpp> #include <com/sun/star/ucb/OpenCommandArgument2.hpp>
#include <com/sun/star/ucb/InsertCommandArgument.hpp> #include <com/sun/star/ucb/InsertCommandArgument.hpp>
#include <com/sun/star/ucb/GlobalTransferCommandArgument2.hpp> #include <com/sun/star/ucb/GlobalTransferCommandArgument2.hpp>
#include <com/sun/star/ucb/NameClash.hpp>
#include <com/sun/star/ucb/OpenMode.hpp> #include <com/sun/star/ucb/OpenMode.hpp>
#include <com/sun/star/ucb/XContentCreator.hpp> #include <com/sun/star/ucb/XContentCreator.hpp>
#include <com/sun/star/ucb/XContentEventListener.hpp> #include <com/sun/star/ucb/XContentEventListener.hpp>
#include <com/sun/star/ucb/XContentIdentifierFactory.hpp>
#include <com/sun/star/ucb/XContentProvider.hpp>
#include <com/sun/star/ucb/XContentProviderManager.hpp>
#include <com/sun/star/ucb/XDynamicResultSet.hpp> #include <com/sun/star/ucb/XDynamicResultSet.hpp>
#include <com/sun/star/ucb/SortedDynamicResultSetFactory.hpp> #include <com/sun/star/ucb/SortedDynamicResultSetFactory.hpp>
#include <com/sun/star/ucb/UniversalContentBroker.hpp> #include <com/sun/star/ucb/UniversalContentBroker.hpp>
...@@ -56,17 +50,18 @@ ...@@ -56,17 +50,18 @@
#include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/beans/Property.hpp> #include <com/sun/star/beans/Property.hpp>
#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/beans/UnknownPropertyException.hpp> #include <com/sun/star/beans/UnknownPropertyException.hpp>
#include <ucbhelper/macros.hxx>
#include <ucbhelper/content.hxx> #include <ucbhelper/content.hxx>
#include <ucbhelper/activedatasink.hxx> #include <ucbhelper/activedatasink.hxx>
#include <ucbhelper/activedatastreamer.hxx> #include <ucbhelper/activedatastreamer.hxx>
#include <ucbhelper/interactionrequest.hxx>
#include <ucbhelper/cancelcommandexecution.hxx> #include <ucbhelper/cancelcommandexecution.hxx>
namespace com::sun::star::ucb { class XCommandEnvironment; }
namespace com::sun::star::ucb { class XContentProvider; }
namespace com::sun::star::sdbc { class XResultSet; }
using namespace com::sun::star::container; using namespace com::sun::star::container;
using namespace com::sun::star::beans; using namespace com::sun::star::beans;
using namespace com::sun::star::io; using namespace com::sun::star::io;
......
...@@ -26,10 +26,7 @@ ...@@ -26,10 +26,7 @@
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/exc_hlp.hxx>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/ucb/CommandFailedException.hpp> #include <com/sun/star/ucb/CommandFailedException.hpp>
#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
#include <com/sun/star/ucb/NameClashException.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <ucbhelper/interactionrequest.hxx> #include <ucbhelper/interactionrequest.hxx>
#include <ucbhelper/cancelcommandexecution.hxx> #include <ucbhelper/cancelcommandexecution.hxx>
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/lang/NoSupportException.hpp>
#include <com/sun/star/ucb/ContentAction.hpp> #include <com/sun/star/ucb/ContentAction.hpp>
#include <com/sun/star/ucb/CommandInfoChange.hpp>
#include <com/sun/star/ucb/IllegalIdentifierException.hpp> #include <com/sun/star/ucb/IllegalIdentifierException.hpp>
#include <com/sun/star/ucb/XPersistentPropertySet.hpp> #include <com/sun/star/ucb/XPersistentPropertySet.hpp>
#include <com/sun/star/beans/IllegalTypeException.hpp> #include <com/sun/star/beans/IllegalTypeException.hpp>
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
************************************************************************** **************************************************************************
*************************************************************************/ *************************************************************************/
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/contentidentifier.hxx>
#include <cppuhelper/typeprovider.hxx> #include <cppuhelper/typeprovider.hxx>
#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/queryinterface.hxx>
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
************************************************************************** **************************************************************************
*************************************************************************/ *************************************************************************/
#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/ucb/UnsupportedCommandException.hpp> #include <com/sun/star/ucb/UnsupportedCommandException.hpp>
#include <com/sun/star/ucb/XPropertySetRegistry.hpp> #include <com/sun/star/ucb/XPersistentPropertySet.hpp>
#include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/ucb/XCommandInfo.hpp> #include <com/sun/star/ucb/XCommandInfo.hpp>
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <ucbhelper/fd_inputstream.hxx> #include <ucbhelper/fd_inputstream.hxx>
#include <com/sun/star/io/IOException.hpp> #include <com/sun/star/io/IOException.hpp>
#include <rtl/alloc.h>
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <sal/log.hxx> #include <sal/log.hxx>
#include <algorithm> #include <algorithm>
......
...@@ -20,11 +20,12 @@ ...@@ -20,11 +20,12 @@
#include <sal/config.h> #include <sal/config.h>
#include <com/sun/star/beans/XPropertySet.hpp> #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/Reference.hxx>
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
#include <ucbhelper/getcomponentcontext.hxx> #include <ucbhelper/getcomponentcontext.hxx>
namespace com::sun::star::lang { class XMultiServiceFactory; }
css::uno::Reference< css::uno::XComponentContext > css::uno::Reference< css::uno::XComponentContext >
ucbhelper::getComponentContext( ucbhelper::getComponentContext(
css::uno::Reference< css::lang::XMultiServiceFactory > const & factory) css::uno::Reference< css::lang::XMultiServiceFactory > const & factory)
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include <cppuhelper/supportsservice.hxx> #include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/queryinterface.hxx>
#include <ucbhelper/contenthelper.hxx> #include <ucbhelper/contenthelper.hxx>
#include <ucbhelper/contentidentifier.hxx>
#include <ucbhelper/providerhelper.hxx> #include <ucbhelper/providerhelper.hxx>
#include <ucbhelper/macros.hxx> #include <ucbhelper/macros.hxx>
......
...@@ -18,8 +18,7 @@ ...@@ -18,8 +18,7 @@
*/ */
#include <ucbhelper/registerucb.hxx> #include <ucbhelper/registerucb.hxx>
#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/ucb/DuplicateProviderException.hpp> #include <com/sun/star/ucb/DuplicateProviderException.hpp>
#include <com/sun/star/ucb/XContentProviderManager.hpp> #include <com/sun/star/ucb/XContentProviderManager.hpp>
#include <com/sun/star/ucb/XParameterizedContentProvider.hpp> #include <com/sun/star/ucb/XParameterizedContentProvider.hpp>
......
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/queryinterface.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/ucb/ResultSetException.hpp> #include <com/sun/star/sdbc/SQLException.hpp>
#include <ucbhelper/getcomponentcontext.hxx>
#include <ucbhelper/resultset.hxx> #include <ucbhelper/resultset.hxx>
#include <ucbhelper/resultsetmetadata.hxx> #include <ucbhelper/resultsetmetadata.hxx>
#include <ucbhelper/macros.hxx> #include <ucbhelper/macros.hxx>
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <cppuhelper/interfacecontainer.h> #include <cppuhelper/interfacecontainer.h>
#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/queryinterface.hxx>
#include <ucbhelper/resultsethelper.hxx> #include <ucbhelper/resultsethelper.hxx>
#include <ucbhelper/getcomponentcontext.hxx>
#include <ucbhelper/macros.hxx> #include <ucbhelper/macros.hxx>
#include <osl/diagnose.h> #include <osl/diagnose.h>
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <com/sun/star/beans/Property.hpp> #include <com/sun/star/beans/Property.hpp>
#include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/XArray.hpp> #include <com/sun/star/sdbc/XArray.hpp>
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <com/sun/star/task/XMasterPasswordHandling.hpp>
#include <com/sun/star/ucb/URLAuthenticationRequest.hpp> #include <com/sun/star/ucb/URLAuthenticationRequest.hpp>
#include <ucbhelper/simpleauthenticationrequest.hxx> #include <ucbhelper/simpleauthenticationrequest.hxx>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment