diff options
55 files changed, 79 insertions, 166 deletions
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index 04631f47ea27..21c51ef2bb02 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -243,6 +243,9 @@ blacklist: include/unotools/fontcfg.hxx: # Needed for a sal_uLong enum - tools/solar.h + include/unotools/progresshandlerwrap.hxx: + # base class has to be a complete type + - com/sun/star/ucb/XProgressHandler.hpp include/unotools/streamwrap.hxx: # base class has to be a complete type - com/sun/star/io/XOutputStream.hpp diff --git a/include/unotools/compatibilityviewoptions.hxx b/include/unotools/compatibilityviewoptions.hxx index 573979714e7e..ce1f4aab42e4 100644 --- a/include/unotools/compatibilityviewoptions.hxx +++ b/include/unotools/compatibilityviewoptions.hxx @@ -10,9 +10,13 @@ #ifndef INCLUDED_SVTOOLS_COMPATIBILITYVIEWOPTIONS_HXX #define INCLUDED_SVTOOLS_COMPATIBILITYVIEWOPTIONS_HXX -#include <svtools/svtdllapi.h> +#include <unotools/unotoolsdllapi.h> #include <unotools/options.hxx> -#include <osl/mutex.hxx> + +namespace osl +{ +class Mutex; +} class SvtCompatibilityViewOptions_Impl; diff --git a/include/unotools/fontcvt.hxx b/include/unotools/fontcvt.hxx index 2877e18972ea..7fbf2cc9c917 100644 --- a/include/unotools/fontcvt.hxx +++ b/include/unotools/fontcvt.hxx @@ -22,7 +22,6 @@ #include <unotools/unotoolsdllapi.h> #include <rtl/ustring.hxx> -#include <o3tl/typed_flags_set.hxx> enum class FontToSubsFontFlags diff --git a/include/unotools/progresshandlerwrap.hxx b/include/unotools/progresshandlerwrap.hxx index 35f71eddc71f..6b4d56a99f0f 100644 --- a/include/unotools/progresshandlerwrap.hxx +++ b/include/unotools/progresshandlerwrap.hxx @@ -22,9 +22,10 @@ #include <unotools/unotoolsdllapi.h> #include <cppuhelper/implbase.hxx> -#include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/ucb/XProgressHandler.hpp> +namespace com::sun::star::task { class XStatusIndicator; } + namespace utl { diff --git a/include/unotools/ucbstreamhelper.hxx b/include/unotools/ucbstreamhelper.hxx index 0d7d867d21f6..fd7bd08cc5bf 100644 --- a/include/unotools/ucbstreamhelper.hxx +++ b/include/unotools/ucbstreamhelper.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_UNOTOOLS_UCBSTREAMHELPER_HXX #define INCLUDED_UNOTOOLS_UCBSTREAMHELPER_HXX -#include <com/sun/star/awt/XWindow.hpp> +#include <com/sun/star/uno/Reference.hxx> #include <unotools/unotoolsdllapi.h> @@ -40,7 +40,8 @@ namespace com } } } -namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } } + +namespace com::sun::star::awt { class XWindow; } namespace utl { diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 302e9ab115c2..177104414099 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -28,6 +28,7 @@ #include <uno/mapping.hxx> #include <com/sun/star/task/InteractionHandler.hpp> +#include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/container/XChild.hpp> diff --git a/unotools/IwyuFilter_unotools.yaml b/unotools/IwyuFilter_unotools.yaml new file mode 100644 index 000000000000..52d7e7da280d --- /dev/null +++ b/unotools/IwyuFilter_unotools.yaml @@ -0,0 +1,44 @@ +--- +assumeFilename: unotools/source/i18n/resmgr.cxx +blacklist: + unotools/inc/unotoolsservices.hxx: + # Needed for extern declaration + - namespace comphelper { namespace service_decl { class ServiceDecl; } } + unotools/source/config/itemholder1.hxx: + # Base class needs complete type + - com/sun/star/lang/XEventListener.hpp + unotools/source/ucbhelper/XTempFile.hxx: + # Base class needs complete type + - com/sun/star/io/XInputStream.hpp + - com/sun/star/io/XOutputStream.hpp + - com/sun/star/io/XTempFile.hpp + - com/sun/star/io/XTruncate.hpp + - com/sun/star/beans/XFastPropertySet.hpp + - com/sun/star/beans/XPropertyAccess.hpp + - com/sun/star/beans/XPropertySet.hpp + unotools/source/config/configpaths.cxx: + # Needed for linker visibility + - unotools/configpaths.hxx + unotools/source/config/lingucfg.cxx: + # Needed for direct member access + - com/sun/star/util/XChangesBatch.hpp + unotools/source/config/useroptions.cxx: + # Needed for direct member access + - com/sun/star/container/XNameAccess.hpp + unotools/source/i18n/resmgr.cxx: + # Boost wrappers, used only here + - boost/locale.hpp + - boost/locale/gnu_gettext.hpp + unotools/source/ucbhelper/tempfile.cxx: + # Needed for non-DBG_UTIL build + - unistd.h + unotools/source/ucbhelper/ucbhelper.cxx: + # Needed for namespaced function declarations + - unotools/ucbhelper.hxx + unotools/source/ucbhelper/ucblockbytes.cxx: + # Needed for direct member access + - com/sun/star/beans/PropertyValue.hpp + unotools/source/ucbhelper/ucbstreamhelper.cxx: + # Needed for direct member access + - com/sun/star/beans/PropertyValue.hpp + diff --git a/unotools/qa/unit/testGetEnglishSearchName.cxx b/unotools/qa/unit/testGetEnglishSearchName.cxx index 7909c6f8f0db..2889ffaedcf7 100644 --- a/unotools/qa/unit/testGetEnglishSearchName.cxx +++ b/unotools/qa/unit/testGetEnglishSearchName.cxx @@ -8,9 +8,7 @@ * */ -#include <cppunit/TestCase.h> #include <cppunit/TestFixture.h> -#include <cppunit/TestSuite.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> #include <unotools/fontdefs.hxx> diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 4adedc9db4af..b413e883ab2a 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -19,9 +19,6 @@ #include <config_folders.h> -#include <cstddef> -#include <stdio.h> - #include <unotools/bootstrap.hxx> #include <rtl/ustring.hxx> diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index 41e68c4eac37..2c8f18e76aea 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -21,14 +21,12 @@ #include <sal/log.hxx> #include <unotools/cmdoptions.hxx> -#include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> #include <tools/debug.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/frame/XFrame.hpp> #include <cppuhelper/weakref.hxx> -#include <rtl/ustrbuf.hxx> #include <rtl/instance.hxx> #include "itemholder1.hxx" diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx index 358decc82041..a1523d3aae41 100644 --- a/unotools/source/config/compatibility.cxx +++ b/unotools/source/config/compatibility.cxx @@ -18,7 +18,6 @@ */ #include <unotools/compatibility.hxx> -#include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> #include <unotools/syslocale.hxx> #include <tools/debug.hxx> diff --git a/unotools/source/config/compatibilityviewoptions.cxx b/unotools/source/config/compatibilityviewoptions.cxx index 52e02446608b..b7a64f43f4d1 100644 --- a/unotools/source/config/compatibilityviewoptions.cxx +++ b/unotools/source/config/compatibilityviewoptions.cxx @@ -8,7 +8,6 @@ */ #include <unotools/compatibilityviewoptions.hxx> -#include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> #include "itemholder1.hxx" diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx index fd4fd3dc0fcb..803413259d11 100644 --- a/unotools/source/config/configitem.cxx +++ b/unotools/source/config/configitem.cxx @@ -23,25 +23,20 @@ #include <unotools/configitem.hxx> #include <unotools/configmgr.hxx> #include <unotools/configpaths.hxx> -#include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/util/XChangesListener.hpp> #include <com/sun/star/util/XChangesNotifier.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> -#include <com/sun/star/container/XHierarchicalName.hpp> #include <com/sun/star/configuration/XTemplateContainer.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/awt/XRequestCallback.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/util/XStringEscape.hpp> #include <com/sun/star/util/XChangesBatch.hpp> #include <osl/diagnose.h> #include <comphelper/solarmutex.hxx> #include <rtl/ref.hxx> -#include <rtl/ustrbuf.hxx> #include <tools/diagnose_ex.h> using namespace utl; diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index 1c7a7f29ff9e..05b1e5874643 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -19,8 +19,6 @@ #include <sal/config.h> -#include <list> - #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> @@ -30,7 +28,6 @@ #include <com/sun/star/uno/Sequence.hxx> #include <i18nlangtag/languagetag.hxx> #include <rtl/instance.hxx> -#include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <sal/log.hxx> #include <unotools/configitem.hxx> diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx index db0861b4bc2f..64ea55ced8c5 100644 --- a/unotools/source/config/confignode.cxx +++ b/unotools/source/config/confignode.cxx @@ -22,8 +22,6 @@ #include <tools/diagnose_ex.h> #include <osl/diagnose.h> #include <sal/log.hxx> -#include <com/sun/star/container/XHierarchicalName.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XComponent.hpp> @@ -34,10 +32,6 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <comphelper/namedvaluecollection.hxx> -#include <rtl/string.hxx> -#if OSL_DEBUG_LEVEL > 0 -#include <rtl/strbuf.hxx> -#endif namespace utl { diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx index 7c9b4a38c0e4..dddbd22d3b13 100644 --- a/unotools/source/config/defaultoptions.cxx +++ b/unotools/source/config/defaultoptions.cxx @@ -24,9 +24,7 @@ #include <unotools/defaultoptions.hxx> #include <unotools/pathoptions.hxx> #include <unotools/configitem.hxx> -#include <unotools/configmgr.hxx> #include <tools/debug.hxx> -#include <tools/solar.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <osl/mutex.hxx> diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx index 1d2d751314b4..6109fb4666d5 100644 --- a/unotools/source/config/dynamicmenuoptions.cxx +++ b/unotools/source/config/dynamicmenuoptions.cxx @@ -21,8 +21,6 @@ #include <sal/log.hxx> #include <unotools/dynamicmenuoptions.hxx> -#include <unotools/moduleoptions.hxx> -#include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> #include <tools/debug.hxx> #include <com/sun/star/uno/Any.hxx> diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index 5445320c8150..e8cd76bd9d32 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -23,8 +23,6 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <cppuhelper/weakref.hxx> #include <o3tl/enumarray.hxx> #include <o3tl/enumrange.hxx> #include <rtl/ref.hxx> diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx index cd6cc83ebb56..2d57ab4230a2 100644 --- a/unotools/source/config/extendedsecurityoptions.cxx +++ b/unotools/source/config/extendedsecurityoptions.cxx @@ -19,18 +19,13 @@ #include <sal/config.h> -#include <sal/log.hxx> #include <unotools/extendedsecurityoptions.hxx> -#include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> #include <tools/debug.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> -#include <unotools/pathoptions.hxx> - #include "itemholder1.hxx" #include <unordered_map> diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx index 387f691a6a0b..e6a4fa1faf6c 100644 --- a/unotools/source/config/fltrcfg.cxx +++ b/unotools/source/config/fltrcfg.cxx @@ -17,15 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <config_features.h> - #include <o3tl/any.hxx> #include <o3tl/typed_flags_set.hxx> #include <unotools/fltrcfg.hxx> #include <tools/debug.hxx> -#include <tools/solar.h> #include <osl/diagnose.h> -#include <sal/log.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index ecb47f59dae8..bddb6049911f 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -26,11 +26,9 @@ #include <comphelper/processfactory.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <comphelper/propertysequence.hxx> -#include <unotools/configpaths.hxx> #include <unotools/syslocale.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/instance.hxx> @@ -39,7 +37,6 @@ #include <sal/log.hxx> #include <string.h> -#include <list> #include <algorithm> using namespace utl; diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx index ec4d4d846bee..c9fa6ec48f94 100644 --- a/unotools/source/config/fontoptions.cxx +++ b/unotools/source/config/fontoptions.cxx @@ -18,7 +18,6 @@ */ #include <unotools/fontoptions.hxx> -#include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> #include <tools/debug.hxx> #include <com/sun/star/uno/Any.hxx> diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx index 6227fb2ac095..5fad79cfbb96 100644 --- a/unotools/source/config/historyoptions.cxx +++ b/unotools/source/config/historyoptions.cxx @@ -17,15 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sal/log.hxx> #include <unotools/historyoptions.hxx> -#include <unotools/configmgr.hxx> -#include <unotools/configitem.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <cassert> -#include <deque> #include <algorithm> #include "itemholder1.hxx" diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx index 3af5dbf1b302..81c0137cd8dc 100644 --- a/unotools/source/config/itemholder1.cxx +++ b/unotools/source/config/itemholder1.cxx @@ -30,9 +30,7 @@ #include <unotools/compatibilityviewoptions.hxx> #include <unotools/defaultoptions.hxx> #include <unotools/dynamicmenuoptions.hxx> -#include <unotools/eventcfg.hxx> #include <unotools/extendedsecurityoptions.hxx> -#include <unotools/fltrcfg.hxx> #include <unotools/fontoptions.hxx> #include <unotools/historyoptions.hxx> #include <unotools/lingucfg.hxx> @@ -40,7 +38,6 @@ #include <unotools/pathoptions.hxx> #include <unotools/printwarningoptions.hxx> #include <unotools/optionsdlg.hxx> -#include <unotools/searchopt.hxx> #include <unotools/securityoptions.hxx> #include <unotools/viewoptions.hxx> #include <unotools/options.hxx> diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 11fb0816c3bf..a1c07d61489c 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -21,12 +21,9 @@ #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/container/XNameReplace.hpp> #include <com/sun/star/util/XChangesBatch.hpp> #include <rtl/instance.hxx> #include <sal/log.hxx> diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx index b11b9c499d31..e8bf4023479f 100644 --- a/unotools/source/config/misccfg.cxx +++ b/unotools/source/config/misccfg.cxx @@ -22,10 +22,8 @@ #include <o3tl/any.hxx> #include <unotools/misccfg.hxx> #include <rtl/instance.hxx> -#include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> #include <tools/debug.hxx> -#include <tools/solar.h> #include <com/sun/star/uno/Sequence.hxx> #include <osl/mutex.hxx> #include "itemholder1.hxx" diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index 85cea00c93aa..7d6fa71fe4ec 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -19,7 +19,6 @@ #include <unotools/moduleoptions.hxx> #include <comphelper/sequenceashashmap.hxx> -#include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> @@ -31,7 +30,6 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/document/XTypeDetection.hpp> #include <com/sun/star/util/PathSubstitution.hpp> diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx index d63af0441701..8efc6e2dc56e 100644 --- a/unotools/source/config/optionsdlg.cxx +++ b/unotools/source/config/optionsdlg.cxx @@ -18,7 +18,6 @@ */ #include <unotools/optionsdlg.hxx> -#include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx index 1c8fdcadc96f..29a143f2bb35 100644 --- a/unotools/source/config/pathoptions.cxx +++ b/unotools/source/config/pathoptions.cxx @@ -21,24 +21,17 @@ #include <sal/log.hxx> #include <unotools/pathoptions.hxx> -#include <unotools/configitem.hxx> -#include <unotools/configmgr.hxx> #include <tools/urlobj.hxx> -#include <tools/solar.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <osl/mutex.hxx> #include <osl/file.hxx> -#include <unotools/bootstrap.hxx> #include <unotools/ucbhelper.hxx> #include <comphelper/getexpandeduri.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/beans/XFastPropertySet.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/thePathSettings.hpp> #include <com/sun/star/util/PathSubstitution.hpp> #include <com/sun/star/util/XStringSubstitution.hpp> diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx index 885e588e0bb8..c2409dab3027 100644 --- a/unotools/source/config/printwarningoptions.cxx +++ b/unotools/source/config/printwarningoptions.cxx @@ -18,7 +18,6 @@ */ #include <unotools/printwarningoptions.hxx> -#include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> #include <tools/debug.hxx> #include <com/sun/star/uno/Any.hxx> diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index 6ef1403d020f..6c8922edf706 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -25,7 +25,6 @@ #include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> #include <tools/debug.hxx> -#include <tools/solar.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx index f0489fdaf07a..f6a06747e78c 100644 --- a/unotools/source/config/useroptions.cxx +++ b/unotools/source/config/useroptions.cxx @@ -19,10 +19,8 @@ #include <sal/config.h> -#include <sal/log.hxx> #include <unotools/useroptions.hxx> #include <unotools/syslocale.hxx> -#include <unotools/configmgr.hxx> #include <com/sun/star/uno/Any.hxx> #include <osl/mutex.hxx> #include <rtl/instance.hxx> @@ -33,8 +31,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/util/XChangesListener.hpp> #include <com/sun/star/util/XChangesNotifier.hpp> #include <com/sun/star/util/ChangesEvent.hpp> diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index ae5eb752bbff..85708df745a9 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.cxx @@ -21,14 +21,11 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/beans/NamedValue.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> #include <sal/log.hxx> -#include <unotools/configpaths.hxx> #include <unotools/configmgr.hxx> #include <comphelper/configurationhelper.hxx> #include <comphelper/processfactory.hxx> diff --git a/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx index 98e765104a3a..dd58a9d1196d 100644 --- a/unotools/source/i18n/calendarwrapper.cxx +++ b/unotools/source/i18n/calendarwrapper.cxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <rtl/strbuf.hxx> #include <sal/log.hxx> #include <unotools/calendarwrapper.hxx> -#include <com/sun/star/i18n/CalendarFieldIndex.hpp> #include <com/sun/star/i18n/LocaleCalendar2.hpp> using namespace ::com::sun::star; diff --git a/unotools/source/i18n/intlwrapper.cxx b/unotools/source/i18n/intlwrapper.cxx index bded270a5d81..f15869fb6255 100644 --- a/unotools/source/i18n/intlwrapper.cxx +++ b/unotools/source/i18n/intlwrapper.cxx @@ -21,7 +21,6 @@ #include <unotools/collatorwrapper.hxx> #include <unotools/localedatawrapper.hxx> #include <com/sun/star/i18n/CollatorOptions.hpp> -#include <i18nlangtag/mslangid.hxx> #include <comphelper/processfactory.hxx> IntlWrapper::IntlWrapper( diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index cde0ad16aaee..aa9ce284dfef 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <string.h> #include <stdio.h> #include <string> @@ -26,7 +25,6 @@ #include <unotools/calendarwrapper.hxx> #include <unotools/digitgroupingiterator.hxx> #include <tools/debug.hxx> -#include <tools/solar.h> #include <i18nlangtag/languagetag.hxx> #include <com/sun/star/i18n/KNumberFormatUsage.hpp> @@ -40,8 +38,6 @@ #include <comphelper/processfactory.hxx> #include <rtl/instance.hxx> #include <rtl/ustrbuf.hxx> -#include <osl/diagnose.h> -#include <sal/macros.h> #include <rtl/math.hxx> static const sal_uInt16 nCurrFormatInvalid = 0xffff; diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx index 654d3c2fae19..32fb86bdcf02 100644 --- a/unotools/source/i18n/resmgr.cxx +++ b/unotools/source/i18n/resmgr.cxx @@ -27,45 +27,27 @@ #define _HAS_AUTO_PTR_ETC 1 #endif -#include <config_folders.h> - #include <sal/config.h> #include <cassert> #include <string.h> #include <stdio.h> -#include <stdlib.h> #if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID # include <libintl.h> #endif #include <comphelper/lok.hxx> -#include <tools/debug.hxx> -#include <tools/stream.hxx> #include <unotools/resmgr.hxx> -#include <osl/endian.h> -#include <osl/process.h> #include <osl/thread.h> #include <osl/file.hxx> -#include <osl/mutex.hxx> -#include <osl/signal.h> #include <rtl/crc.h> -#include <rtl/ustrbuf.hxx> -#include <rtl/strbuf.hxx> -#include <sal/log.hxx> -#include <rtl/instance.hxx> #include <rtl/bootstrap.hxx> #include <i18nlangtag/languagetag.hxx> -#include <i18nlangtag/mslangid.hxx> #include <boost/locale.hpp> #include <boost/locale/gnu_gettext.hpp> -#include <algorithm> -#include <list> -#include <set> -#include <unordered_set> #include <unordered_map> #include <memory> diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx index bd0f3f9bcb2e..1e27796694f9 100644 --- a/unotools/source/i18n/textsearch.cxx +++ b/unotools/source/i18n/textsearch.cxx @@ -25,7 +25,6 @@ #include <i18nlangtag/languagetag.hxx> #include <i18nutil/searchopt.hxx> #include <i18nutil/transliteration.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/TextSearch2.hpp> #include <com/sun/star/util/SearchAlgorithms2.hpp> #include <com/sun/star/util/SearchFlags.hpp> diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx index aa5bb14310d0..f9e70cff0724 100644 --- a/unotools/source/i18n/transliterationwrapper.cxx +++ b/unotools/source/i18n/transliterationwrapper.cxx @@ -24,7 +24,6 @@ #include <i18nlangtag/languagetag.hxx> #include <i18nutil/transliteration.hxx> -#include <com/sun/star/i18n/TransliterationModulesExtra.hpp> #include <com/sun/star/i18n/Transliteration.hpp> using namespace ::com::sun::star::lang; diff --git a/unotools/source/misc/ServiceDocumenter.hxx b/unotools/source/misc/ServiceDocumenter.hxx index acb64e78614c..874e3313c5c6 100644 --- a/unotools/source/misc/ServiceDocumenter.hxx +++ b/unotools/source/misc/ServiceDocumenter.hxx @@ -9,10 +9,11 @@ #ifndef INCLUDED_UNOTOOLS_INC_SERVICEDOCUMENTER_HXX #define INCLUDED_UNOTOOLS_INC_SERVICEDOCUMENTER_HXX -#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> #include <com/sun/star/script/XServiceDocumenter.hpp> +namespace com::sun::star::uno { class XComponentContext; } + namespace unotools { namespace misc { class ServiceDocumenter : public ::cppu::WeakImplHelper< diff --git a/unotools/source/misc/ZipPackageHelper.cxx b/unotools/source/misc/ZipPackageHelper.cxx index f0d6a2156705..d690e301540c 100644 --- a/unotools/source/misc/ZipPackageHelper.cxx +++ b/unotools/source/misc/ZipPackageHelper.cxx @@ -17,11 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <com/sun/star/io/XActiveDataControl.hpp> -#include <com/sun/star/io/XActiveDataSource.hpp> -#include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XActiveDataSink.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/container/XChild.hpp> @@ -35,15 +31,14 @@ #include <unotools/ZipPackageHelper.hxx> #include <comphelper/storagehelper.hxx> #include <osl/file.hxx> -#include <unotools/pathoptions.hxx> #include <unotools/streamwrap.hxx> -#include <unotools/tempfile.hxx> -#include <svl/urihelper.hxx> #include <tools/stream.hxx> #include <tools/urlobj.hxx> #include <rtl/uri.hxx> +namespace com::sun::star::io { class XInputStream; } + using namespace utl; using namespace osl; using namespace comphelper; diff --git a/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx index 7ebfd543c681..667a5898f825 100644 --- a/unotools/source/misc/datetime.cxx +++ b/unotools/source/misc/datetime.cxx @@ -26,7 +26,6 @@ #include <rtl/ustrbuf.hxx> #include <rtl/math.hxx> #include <osl/diagnose.h> -#include <vcl/svapp.hxx> #include <comphelper/string.hxx> #include <sstream> diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx index 663954c1bfc1..c4ed3f67096b 100644 --- a/unotools/source/misc/fontcvt.cxx +++ b/unotools/source/misc/fontcvt.cxx @@ -27,8 +27,6 @@ #include <map> #include <vector> -#include <algorithm> -#include <functional> //These conversion tables were designed for StarSymbol. OpenSymbol //originally didn't have the same code points as StarSymbol, and diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx index 4d90303df0d3..1c9aead6bab5 100644 --- a/unotools/source/misc/mediadescriptor.cxx +++ b/unotools/source/misc/mediadescriptor.cxx @@ -33,19 +33,11 @@ #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/io/XActiveDataSink.hpp> #include <com/sun/star/io/XSeekable.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/ucb/InteractiveIOException.hpp> -#include <com/sun/star/ucb/UnsupportedDataSinkException.hpp> -#include <com/sun/star/ucb/CommandFailedException.hpp> -#include <com/sun/star/task/XInteractionAbort.hpp> #include <com/sun/star/uri/UriReferenceFactory.hpp> #include <com/sun/star/uri/XUriReference.hpp> #include <com/sun/star/ucb/PostCommandArgument2.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <officecfg/Office/Common.hxx> -#include <ucbhelper/interceptedinteraction.hxx> #include <ucbhelper/content.hxx> #include <ucbhelper/commandenvironment.hxx> #include <ucbhelper/activedatasink.hxx> diff --git a/unotools/source/misc/syslocale.cxx b/unotools/source/misc/syslocale.cxx index c9a11e7d817d..9b5d9b3cd782 100644 --- a/unotools/source/misc/syslocale.cxx +++ b/unotools/source/misc/syslocale.cxx @@ -22,7 +22,6 @@ #include <sal/log.hxx> #include <unotools/localedatawrapper.hxx> #include <unotools/charclass.hxx> -#include <unotools/configmgr.hxx> #include <unotools/syslocale.hxx> #include <unotools/syslocaleoptions.hxx> #include <comphelper/lok.hxx> diff --git a/unotools/source/misc/unotoolsservices.cxx b/unotools/source/misc/unotoolsservices.cxx index 10cc549f2b01..4804e9ab5042 100644 --- a/unotools/source/misc/unotoolsservices.cxx +++ b/unotools/source/misc/unotoolsservices.cxx @@ -8,8 +8,6 @@ */ #include <comphelper/servicedecl.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <uno/environment.h> #include <unotoolsservices.hxx> diff --git a/unotools/source/ucbhelper/XTempFile.hxx b/unotools/source/ucbhelper/XTempFile.hxx index 8a3d9fd0be41..f96bbb8f5786 100644 --- a/unotools/source/ucbhelper/XTempFile.hxx +++ b/unotools/source/ucbhelper/XTempFile.hxx @@ -22,16 +22,16 @@ #include <memory> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/io/XSeekable.hpp> -#include <com/sun/star/io/XStream.hpp> #include <com/sun/star/io/XTempFile.hpp> #include <com/sun/star/io/XTruncate.hpp> -#include <com/sun/star/lang/XSingleComponentFactory.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/beans/XPropertyAccess.hpp> +#include <com/sun/star/beans/XFastPropertySet.hpp> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/propertysetmixin.hxx> #include <osl/mutex.hxx> +namespace com::sun::star::uno { class XComponentContext; } + class SvStream; namespace utl { class TempFile; } diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx index 4b0a69336a33..19de32703b37 100644 --- a/unotools/source/ucbhelper/localfilehelper.cxx +++ b/unotools/source/ucbhelper/localfilehelper.cxx @@ -26,7 +26,6 @@ #include <unotools/localfilehelper.hxx> #include <rtl/ustring.hxx> #include <osl/file.hxx> -#include <tools/urlobj.hxx> #include <ucbhelper/content.hxx> #include <vector> diff --git a/unotools/source/ucbhelper/progresshandlerwrap.cxx b/unotools/source/ucbhelper/progresshandlerwrap.cxx index 04719393267d..9c50cf834ffc 100644 --- a/unotools/source/ucbhelper/progresshandlerwrap.cxx +++ b/unotools/source/ucbhelper/progresshandlerwrap.cxx @@ -18,6 +18,7 @@ */ #include <unotools/progresshandlerwrap.hxx> +#include <com/sun/star/task/XStatusIndicator.hpp> namespace utl { diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx index a659428f8623..9e582658bd89 100644 --- a/unotools/source/ucbhelper/tempfile.cxx +++ b/unotools/source/ucbhelper/tempfile.cxx @@ -22,20 +22,15 @@ #include <cassert> #include <utility> -#include <com/sun/star/ucb/UniversalContentBroker.hpp> #include <unotools/tempfile.hxx> -#include <unotools/localfilehelper.hxx> #include <rtl/ustring.hxx> #include <rtl/instance.hxx> #include <osl/detail/file.h> #include <osl/file.hxx> #include <tools/time.hxx> #include <tools/debug.hxx> -#include <stdio.h> #ifdef UNX -#include <sys/stat.h> -#include <sys/types.h> #include <unistd.h> #elif defined( WNT ) #include <process.h> diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx index 10cc0e1a65f0..90aead427e39 100644 --- a/unotools/source/ucbhelper/ucbhelper.cxx +++ b/unotools/source/ucbhelper/ucbhelper.cxx @@ -22,7 +22,6 @@ #include <cassert> #include <vector> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/task/InteractionHandler.hpp> @@ -35,22 +34,16 @@ #include <com/sun/star/ucb/UniversalContentBroker.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> -#include <com/sun/star/ucb/XContentIdentifier.hpp> -#include <com/sun/star/ucb/XProgressHandler.hpp> #include <com/sun/star/ucb/XUniversalContentBroker.hpp> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/util/DateTime.hpp> #include <comphelper/processfactory.hxx> #include <cppuhelper/exc_hlp.hxx> #include <comphelper/simplefileaccessinteraction.hxx> #include <osl/file.hxx> -#include <rtl/string.h> -#include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <sal/log.hxx> #include <sal/types.h> @@ -61,6 +54,10 @@ #include <ucbhelper/content.hxx> #include <unotools/ucbhelper.hxx> +namespace com::sun::star::ucb { class XProgressHandler; } +namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::util { struct DateTime; } + namespace { OUString canonic(OUString const & url) { diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index b9d79c0e4425..bff6ad67a390 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -19,7 +19,6 @@ #include "ucblockbytes.hxx" -#include <sal/macros.h> #include <sal/log.hxx> #include <comphelper/processfactory.hxx> #include <salhelper/condition.hxx> @@ -35,26 +34,24 @@ #include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/ucb/UnsupportedDataSinkException.hpp> #include <com/sun/star/ucb/InteractiveIOException.hpp> +#include <com/sun/star/ucb/XContentIdentifier.hpp> +#include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/io/XActiveDataStreamer.hpp> #include <com/sun/star/io/TempFile.hpp> -#include <com/sun/star/ucb/DocumentHeaderField.hpp> -#include <com/sun/star/ucb/XCommandInfo.hpp> #include <com/sun/star/ucb/XCommandProcessor.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/ucb/OpenCommandArgument2.hpp> #include <com/sun/star/ucb/PostCommandArgument2.hpp> #include <com/sun/star/ucb/OpenMode.hpp> -#include <com/sun/star/beans/Property.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertiesChangeNotifier.hpp> #include <com/sun/star/beans/XPropertiesChangeListener.hpp> -#include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/io/XActiveDataSink.hpp> #include <com/sun/star/io/XActiveDataControl.hpp> #include <com/sun/star/io/XSeekable.hpp> #include <cppuhelper/implbase.hxx> -#include <tools/inetmsg.hxx> +#include <tools/debug.hxx> #include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> diff --git a/unotools/source/ucbhelper/ucblockbytes.hxx b/unotools/source/ucbhelper/ucblockbytes.hxx index 5c97db80c980..df1e237e9415 100644 --- a/unotools/source/ucbhelper/ucblockbytes.hxx +++ b/unotools/source/ucbhelper/ucblockbytes.hxx @@ -20,18 +20,11 @@ #define INCLUDED_UNOTOOLS_UCBLOCKBYTES_HXX #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/ucb/XContent.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <osl/thread.hxx> #include <osl/conditn.hxx> #include <osl/mutex.hxx> -#include <rtl/ustring.hxx> #include <tools/stream.hxx> -#include <tools/link.hxx> #include <vcl/errcode.hxx> -#include <tools/datetime.hxx> namespace com { diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx index 33c6529b6a56..6f72c00bc985 100644 --- a/unotools/source/ucbhelper/ucbstreamhelper.cxx +++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx @@ -23,16 +23,16 @@ #include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/CommandAbortedException.hpp> -#include <com/sun/star/ucb/UniversalContentBroker.hpp> -#include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/ucb/InsertCommandArgument.hpp> -#include <com/sun/star/io/XActiveDataStreamer.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> #include <comphelper/simplefileaccessinteraction.hxx> #include <ucbhelper/content.hxx> #include <unotools/streamwrap.hxx> #include "ucblockbytes.hxx" +namespace com::sun::star::ucb { class XCommandEnvironment; } + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; using namespace ::com::sun::star::ucb; diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx index dc05e4194237..24213db368a8 100644 --- a/unotools/source/ucbhelper/xtempfile.cxx +++ b/unotools/source/ucbhelper/xtempfile.cxx @@ -22,12 +22,8 @@ #include <com/sun/star/io/BufferSizeExceededException.hpp> #include <com/sun/star/io/NotConnectedException.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <cppuhelper/factory.hxx> -#include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> #include <comphelper/servicedecl.hxx> -#include <osl/file.hxx> -#include <unotools/configmgr.hxx> #include <unotools/tempfile.hxx> #include <cppuhelper/propshlp.hxx> |