diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2018-05-27 14:07:43 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-06-05 10:56:36 +0200 |
commit | 8ddca0648a2b673b7dd5357871f79a83c3830ed8 (patch) | |
tree | 33f6f1eaaa2d3f5f73ddbf25f40c60cbb365d663 /framework | |
parent | Append error number if no message available (diff) | |
download | core-8ddca0648a2b673b7dd5357871f79a83c3830ed8.tar.gz core-8ddca0648a2b673b7dd5357871f79a83c3830ed8.zip |
tdf#42949 remove unused compheler includes ..
and fix the fallout
Change-Id: I15bc5d626f4d157cbc69a87392078b41e621d14e
Reviewed-on: https://gerrit.libreoffice.org/54882
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/macros/xserviceinfo.hxx | 1 | ||||
-rw-r--r-- | framework/inc/services/desktop.hxx | 2 | ||||
-rw-r--r-- | framework/source/dispatch/oxt_handler.cxx | 1 | ||||
-rw-r--r-- | framework/source/inc/loadenv/loadenv.hxx | 1 | ||||
-rw-r--r-- | framework/source/recording/dispatchrecorder.cxx | 1 | ||||
-rw-r--r-- | framework/source/services/desktop.cxx | 1 | ||||
-rw-r--r-- | framework/source/services/frame.cxx | 1 | ||||
-rw-r--r-- | framework/source/uiconfiguration/imagemanager.cxx | 1 | ||||
-rw-r--r-- | framework/source/uiconfiguration/moduleimagemanager.cxx | 1 | ||||
-rw-r--r-- | framework/source/uiconfiguration/uicategorydescription.cxx | 1 |
10 files changed, 3 insertions, 8 deletions
diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx index 37274b44eb8d..f617601720b6 100644 --- a/framework/inc/macros/xserviceinfo.hxx +++ b/framework/inc/macros/xserviceinfo.hxx @@ -32,7 +32,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/factory.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index a01e102df934..09a9318a2906 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -46,7 +46,7 @@ #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <comphelper/numberedcollection.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/propshlp.hxx> #include <unotools/cmdoptions.hxx> diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index 3781966bd11d..10c7da5049dc 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/frame/DispatchResultState.hpp> #include <com/sun/star/task/XJobExecutor.hpp> -#include <comphelper/sequenceashashmap.hxx> #include <rtl/ustrbuf.hxx> namespace framework{ diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index 90f9c7ac89f5..17ecb666322c 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -31,7 +31,6 @@ #include <com/sun/star/util/URL.hpp> #include <rtl/ref.hxx> #include <unotools/mediadescriptor.hxx> -#include <comphelper/sequenceashashmap.hxx> #include <o3tl/typed_flags_set.hxx> diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index 3887eac49779..658229302c33 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/script/CannotConvertException.hpp> #include <com/sun/star/script/Converter.hpp> #include <o3tl/any.hxx> +#include <osl/diagnose.h> #include <services.h> #include <vcl/svapp.hxx> #include <typelib/typedescription.h> diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index d88371979f20..16a84c2f84ac 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -59,6 +59,7 @@ #include <com/sun/star/document/UpdateDocMode.hpp> #include <com/sun/star/frame/XTerminateListener2.hpp> +#include <comphelper/numberedcollection.hxx> #include <comphelper/sequence.hxx> #include <comphelper/lok.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 959b78737cbf..c64bfa4efc81 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -66,7 +66,6 @@ #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <comphelper/sequenceashashmap.hxx> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/queryinterface.hxx> diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx index fc6779c2600e..5e2fe175f411 100644 --- a/framework/source/uiconfiguration/imagemanager.cxx +++ b/framework/source/uiconfiguration/imagemanager.cxx @@ -33,7 +33,6 @@ #include <vcl/svapp.hxx> #include <rtl/ref.hxx> #include <rtl/ustrbuf.hxx> -#include <comphelper/sequence.hxx> using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::XInterface; diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx index 1fe2501c20fb..afad4cb7ca99 100644 --- a/framework/source/uiconfiguration/moduleimagemanager.cxx +++ b/framework/source/uiconfiguration/moduleimagemanager.cxx @@ -38,7 +38,6 @@ #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> #include <osl/file.hxx> -#include <comphelper/sequence.hxx> // namespaces diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index 89287f145567..f30c2b88d799 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -38,7 +38,6 @@ #include <vcl/mnemonic.hxx> #include <comphelper/propertysequence.hxx> -#include <comphelper/sequence.hxx> #include <unordered_map> |