diff options
145 files changed, 254 insertions, 95 deletions
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx index c9258d402be8..e1fc533d1201 100644 --- a/accessibility/source/standard/vclxaccessibletoolbox.cxx +++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx @@ -30,6 +30,8 @@ #include <vcl/toolbox.hxx> #include <comphelper/accessiblewrapper.hxx> #include <comphelper/processfactory.hxx> +#include <comphelper/types.hxx> +#include <cppuhelper/typeprovider.hxx> using namespace ::comphelper; using namespace ::com::sun::star; diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx index be8e592fbd1f..513fdc707b1f 100644 --- a/basctl/source/dlged/dlgedfac.cxx +++ b/basctl/source/dlged/dlgedfac.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/ScrollBarOrientation.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/processfactory.hxx> namespace basctl diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx index 957e9c4822f2..f7b8c097113f 100644 --- a/canvas/source/vcl/canvas.hxx +++ b/canvas/source/vcl/canvas.hxx @@ -33,6 +33,8 @@ #include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> +#include <comphelper/types.hxx> +#include <cppu/unotype.hxx> #include <canvas/base/basemutexhelper.hxx> #include <canvas/base/integerbitmapbase.hxx> diff --git a/canvas/source/vcl/canvascustomsprite.cxx b/canvas/source/vcl/canvascustomsprite.cxx index f999c26a016e..364d29e8f586 100644 --- a/canvas/source/vcl/canvascustomsprite.cxx +++ b/canvas/source/vcl/canvascustomsprite.cxx @@ -28,6 +28,7 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/utils/canvastools.hxx> #include <cppuhelper/supportsservice.hxx> +#include <comphelper/types.hxx> #include <rtl/math.hxx> #include <tools/diagnose_ex.h> #include <vcl/alpha.hxx> diff --git a/canvas/source/vcl/canvascustomsprite.hxx b/canvas/source/vcl/canvascustomsprite.hxx index 4075200328bf..b3f6d3202b91 100644 --- a/canvas/source/vcl/canvascustomsprite.hxx +++ b/canvas/source/vcl/canvascustomsprite.hxx @@ -22,6 +22,7 @@ #include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> +#include <comphelper/types.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XComponent.hpp> diff --git a/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx index 954d49d662d8..194c3c5537b2 100644 --- a/canvas/source/vcl/spritecanvas.hxx +++ b/canvas/source/vcl/spritecanvas.hxx @@ -34,6 +34,7 @@ #include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> +#include <comphelper/types.hxx> #include <canvas/base/spritecanvasbase.hxx> #include <canvas/base/disambiguationhelper.hxx> diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx index 8e4910cc6085..47f001addcdf 100644 --- a/comphelper/qa/string/test_string.cxx +++ b/comphelper/qa/string/test_string.cxx @@ -20,6 +20,8 @@ #include <comphelper/string.hxx> #include <cppuhelper/implbase.hxx> #include <com/sun/star/i18n/CharType.hpp> +#include <com/sun/star/i18n/XBreakIterator.hpp> +#include <com/sun/star/i18n/XCollator.hpp> #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx index 2d7c57ae152e..fa8343c60d49 100644 --- a/comphelper/source/container/namecontainer.cxx +++ b/comphelper/source/container/namecontainer.cxx @@ -25,6 +25,7 @@ #include <comphelper/sequence.hxx> #include <cppuhelper/implbase.hxx> #include <osl/mutex.hxx> +#include <com/sun/star/container/XNameContainer.hpp> typedef std::map<OUString, css::uno::Any> SvGenericNameContainerMapImpl; diff --git a/comphelper/source/misc/SelectionMultiplex.cxx b/comphelper/source/misc/SelectionMultiplex.cxx index a0495a69d0cf..f9760a647c42 100644 --- a/comphelper/source/misc/SelectionMultiplex.cxx +++ b/comphelper/source/misc/SelectionMultiplex.cxx @@ -19,7 +19,7 @@ #include <comphelper/SelectionMultiplex.hxx> - +#include <com/sun/star/view/XSelectionSupplier.hpp> namespace comphelper { diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx index 8a4b002f7d77..fc55f2c73ed2 100644 --- a/comphelper/source/misc/mimeconfighelper.cxx +++ b/comphelper/source/misc/mimeconfighelper.cxx @@ -20,6 +20,8 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/container/XContainerQuery.hpp> +#include <com/sun/star/container/XNameAccess.hpp> +#include <com/sun/star/embed/VerbDescriptor.hpp> #include <com/sun/star/document/XTypeDetection.hpp> #include <osl/diagnose.h> diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx index 8882ccc2bdad..42ef768d9297 100644 --- a/comphelper/source/misc/namedvaluecollection.cxx +++ b/comphelper/source/misc/namedvaluecollection.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/beans/PropertyState.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> #include <rtl/ustrbuf.hxx> #include <rtl/instance.hxx> diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx index 82225761b189..8b742d295cf9 100644 --- a/comphelper/source/misc/numberedcollection.cxx +++ b/comphelper/source/misc/numberedcollection.cxx @@ -20,6 +20,7 @@ #include <algorithm> #include <comphelper/numberedcollection.hxx> #include <com/sun/star/frame/UntitledNumbersConst.hpp> +#include <com/sun/star/lang/IllegalArgumentException.hpp> namespace comphelper{ diff --git a/comphelper/source/misc/numbers.cxx b/comphelper/source/misc/numbers.cxx index 2068223d3a71..70eb3f4e8df0 100644 --- a/comphelper/source/misc/numbers.cxx +++ b/comphelper/source/misc/numbers.cxx @@ -21,6 +21,7 @@ #include <osl/diagnose.h> #include <sal/log.hxx> #include <com/sun/star/util/NumberFormat.hpp> +#include <com/sun/star/util/XNumberFormatter.hpp> #include <com/sun/star/util/XNumberFormatTypes.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/Locale.hpp> diff --git a/comphelper/source/misc/sequenceashashmap.cxx b/comphelper/source/misc/sequenceashashmap.cxx index 93e84139352c..08301f5a8021 100644 --- a/comphelper/source/misc/sequenceashashmap.cxx +++ b/comphelper/source/misc/sequenceashashmap.cxx @@ -19,6 +19,8 @@ #include <sal/config.h> +#include <com/sun/star/beans/NamedValue.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <comphelper/sequenceashashmap.hxx> diff --git a/comphelper/source/misc/serviceinfohelper.cxx b/comphelper/source/misc/serviceinfohelper.cxx index 8e70ebcc142d..59cb0ea60b2d 100644 --- a/comphelper/source/misc/serviceinfohelper.cxx +++ b/comphelper/source/misc/serviceinfohelper.cxx @@ -19,8 +19,7 @@ #include <comphelper/serviceinfohelper.hxx> - -// ##################################################################### +#include <com/sun/star/uno/Sequence.hxx> namespace comphelper { diff --git a/comphelper/source/misc/solarmutex.cxx b/comphelper/source/misc/solarmutex.cxx index 3af24dadb4c7..3a6b34af1947 100644 --- a/comphelper/source/misc/solarmutex.cxx +++ b/comphelper/source/misc/solarmutex.cxx @@ -20,6 +20,7 @@ #include <sal/config.h> #include <comphelper/solarmutex.hxx> +#include <osl/thread.hxx> #include <assert.h> #include <cstdlib> diff --git a/comphelper/source/processfactory/processfactory.cxx b/comphelper/source/processfactory/processfactory.cxx index f3654a243ca9..1f51fe619016 100644 --- a/comphelper/source/processfactory/processfactory.cxx +++ b/comphelper/source/processfactory/processfactory.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/uno/DeploymentException.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> using namespace ::com::sun::star; using namespace com::sun::star::uno; diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx index 2bb428e9c8c6..aaf94149ce40 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.cxx @@ -28,6 +28,7 @@ #include <cppuhelper/supportsservice.hxx> #include <comphelper/propertysethelper.hxx> #include <osl/mutex.hxx> +#include <rtl/ref.hxx> #include <comphelper/genericpropertyset.hxx> #include <comphelper/propertysetinfo.hxx> diff --git a/comphelper/source/property/property.cxx b/comphelper/source/property/property.cxx index b69ca62c4ac5..54f31dcd83d0 100644 --- a/comphelper/source/property/property.cxx +++ b/comphelper/source/property/property.cxx @@ -31,6 +31,7 @@ #include <typeinfo> #endif #include <com/sun/star/beans/PropertyAttribute.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/uno/genfunc.h> #include <rtl/ustrbuf.hxx> diff --git a/comphelper/source/property/propertybag.cxx b/comphelper/source/property/propertybag.cxx index 027301a4d318..43aeee4276d4 100644 --- a/comphelper/source/property/propertybag.cxx +++ b/comphelper/source/property/propertybag.cxx @@ -18,6 +18,7 @@ */ #include <comphelper/propertybag.hxx> +#include <osl/diagnose.h> #include <com/sun/star/beans/IllegalTypeException.hpp> #include <com/sun/star/beans/PropertyExistException.hpp> @@ -25,6 +26,7 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/NotRemoveableException.hpp> +#include <com/sun/star/beans/UnknownPropertyException.hpp> #include <map> diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx index d2e5ad30afd2..11e3640f9485 100644 --- a/comphelper/source/property/propertycontainerhelper.cxx +++ b/comphelper/source/property/propertycontainerhelper.cxx @@ -22,6 +22,7 @@ #include <osl/diagnose.h> #include <uno/data.h> #include <com/sun/star/uno/genfunc.h> +#include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/UnknownPropertyException.hpp> #include <rtl/ustrbuf.hxx> diff --git a/comphelper/source/property/propertysethelper.cxx b/comphelper/source/property/propertysethelper.cxx index b9405ab555bf..1f456c2c00b3 100644 --- a/comphelper/source/property/propertysethelper.cxx +++ b/comphelper/source/property/propertysethelper.cxx @@ -20,6 +20,7 @@ #include <comphelper/propertysetinfo.hxx> #include <comphelper/propertysethelper.hxx> #include <osl/diagnose.h> +#include <rtl/ref.hxx> #include <memory> diff --git a/comphelper/source/streaming/oslfile2streamwrap.cxx b/comphelper/source/streaming/oslfile2streamwrap.cxx index 198ff1ecea12..c69473a60943 100644 --- a/comphelper/source/streaming/oslfile2streamwrap.cxx +++ b/comphelper/source/streaming/oslfile2streamwrap.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/io/BufferSizeExceededException.hpp> #include <com/sun/star/io/NotConnectedException.hpp> #include <comphelper/oslfile2streamwrap.hxx> +#include <osl/file.hxx> #include <algorithm> diff --git a/comphelper/source/streaming/streamsection.cxx b/comphelper/source/streaming/streamsection.cxx index f6165c7b059d..b03df8ab785a 100644 --- a/comphelper/source/streaming/streamsection.cxx +++ b/comphelper/source/streaming/streamsection.cxx @@ -18,6 +18,9 @@ */ #include <comphelper/streamsection.hxx> +#include <com/sun/star/io/XMarkableStream.hpp> +#include <com/sun/star/io/XDataInputStream.hpp> +#include <com/sun/star/io/XDataOutputStream.hpp> #include <osl/diagnose.h> namespace comphelper diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx index 025751399403..95c3c0b2212d 100644 --- a/connectivity/source/commontools/DateConversion.cxx +++ b/connectivity/source/commontools/DateConversion.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/script/XTypeConverter.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/util/NumberFormat.hpp> +#include <com/sun/star/util/XNumberFormatter.hpp> #include <com/sun/star/util/XNumberFormatTypes.hpp> #include <com/sun/star/sdb/XColumnUpdate.hpp> #include <com/sun/star/sdb/XColumn.hpp> diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx index d66e6c918db4..e5823278095e 100644 --- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx +++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx @@ -22,6 +22,7 @@ #include <comphelper/sequenceashashmap.hxx> #include <comphelper/evtlistenerhlp.hxx> +#include <comphelper/types.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <resource/sharedresources.hxx> #include <strings.hrc> diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 2457d52be051..d99e3808f37b 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -32,6 +32,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> #include <cppuhelper/typeprovider.hxx> +#include <comphelper/types.hxx> #include <connectivity/dbexception.hxx> #include <strings.hrc> #include <algorithm> diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index dffbeb996add..9f3ae07c3910 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -48,6 +48,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/propertysequence.hxx> #include <cppuhelper/supportsservice.hxx> +#include <comphelper/types.hxx> #include <unotools/confignode.hxx> #include <unotools/ucbstreamhelper.hxx> #include <strings.hrc> diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx index 5fd38f739a51..0c413d117b0b 100644 --- a/connectivity/source/drivers/hsqldb/HUser.cxx +++ b/connectivity/source/drivers/hsqldb/HUser.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/sdbc/XResultSet.hpp> #include <connectivity/dbtools.hxx> #include <connectivity/dbexception.hxx> +#include <comphelper/types.hxx> #include <com/sun/star/sdbcx/Privilege.hpp> #include <com/sun/star/sdbcx/PrivilegeObject.hpp> #include <TConnection.hxx> diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx index 85ef0adb621d..a01df751c4a0 100644 --- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx +++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx @@ -27,6 +27,7 @@ #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> #include <comphelper/sequence.hxx> +#include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/FValue.hxx> #include <connectivity/dbexception.hxx> diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx index 72920f138c10..fd129a1b798a 100644 --- a/connectivity/source/drivers/macab/MacabResultSet.cxx +++ b/connectivity/source/drivers/macab/MacabResultSet.cxx @@ -29,6 +29,8 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/sdbcx/CompareBookmark.hpp> #include <TConnection.hxx> +#include <cppuhelper/typeprovider.hxx> +#include <comphelper/types.hxx> #include <connectivity/dbexception.hxx> #include <resource/sharedresources.hxx> #include <strings.hrc> diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx index c8a7e8307356..55d91567330e 100644 --- a/connectivity/source/drivers/macab/MacabStatement.cxx +++ b/connectivity/source/drivers/macab/MacabStatement.cxx @@ -28,6 +28,7 @@ #include "macabcondition.hxx" #include "macaborder.hxx" #include <TConnection.hxx> +#include <cppuhelper/typeprovider.hxx> #include <connectivity/dbexception.hxx> #include <resource/sharedresources.hxx> #include <strings.hrc> diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx index 4945b26dd9c3..442dc9060822 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx @@ -11,6 +11,7 @@ #include "MPreparedStatement.hxx" #include "MResultSetMetaData.hxx" #include <connectivity/dbtools.hxx> +#include <comphelper/types.hxx> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <sal/log.hxx> diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index d169e8259b0d..49600e8bda3e 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #include <com/sun/star/sdbcx/CompareBookmark.hpp> #include <connectivity/dbtools.hxx> +#include <comphelper/types.hxx> #include <sal/log.hxx> #include <vector> diff --git a/connectivity/source/inc/TConnection.hxx b/connectivity/source/inc/TConnection.hxx index 2a18da132d04..8737da6dddbc 100644 --- a/connectivity/source/inc/TConnection.hxx +++ b/connectivity/source/inc/TConnection.hxx @@ -20,6 +20,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_INC_TCONNECTION_HXX #include <rtl/textenc.h> +#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index 8a05dd9b147a..ab47a8722846 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -44,6 +44,7 @@ #include <comphelper/extract.hxx> #include <comphelper/property.hxx> +#include <comphelper/types.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/sqliterator.hxx> diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx index 26bbec26c13d..edf1237070c7 100644 --- a/dbaccess/source/core/api/querycontainer.cxx +++ b/dbaccess/source/core/api/querycontainer.cxx @@ -36,6 +36,7 @@ #include <osl/diagnose.h> #include <comphelper/uno3.hxx> #include <comphelper/property.hxx> +#include <comphelper/types.hxx> #include <cppuhelper/exc_hlp.hxx> using namespace dbtools; diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 0e1df6750176..abdd5242d27a 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -45,6 +45,7 @@ #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/typeprovider.hxx> +#include <comphelper/types.hxx> #include <rtl/digest.h> #include <sfx2/signaturestate.hxx> #include <tools/debug.hxx> diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index 1793af9e5253..5bed9986d13a 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -48,6 +48,7 @@ #include <tools/diagnose_ex.h> #include <osl/diagnose.h> #include <comphelper/sequence.hxx> +#include <comphelper/types.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index b495e1afb5ef..e84af4dfe653 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -69,6 +69,7 @@ #include <comphelper/numberedcollection.hxx> #include <comphelper/storagehelper.hxx> #include <comphelper/propertysetinfo.hxx> +#include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 8ecba91846d4..fd707eb1cb66 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -54,6 +54,7 @@ #include <comphelper/interaction.hxx> #include <comphelper/property.hxx> #include <comphelper/sequence.hxx> +#include <comphelper/types.hxx> #include <cppuhelper/supportsservice.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index cf72ef2d2520..2bca0c619984 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -27,6 +27,7 @@ #include <comphelper/namedvaluecollection.hxx> #include <comphelper/classids.hxx> #include <comphelper/propertysequence.hxx> +#include <comphelper/types.hxx> #include <com/sun/star/frame/XUntitledNumbers.hpp> #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/awt/Size.hpp> diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index ef04d8c05932..1512c77233c5 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -51,6 +51,7 @@ #include <com/sun/star/util/XRefreshable.hpp> #include <cppuhelper/exc_hlp.hxx> +#include <comphelper/types.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/sqlerror.hxx> diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 4108eb78db34..73b9997c79d2 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -71,6 +71,7 @@ #include <comphelper/interaction.hxx> #include <comphelper/sequence.hxx> #include <comphelper/string.hxx> +#include <comphelper/types.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/sqlerror.hxx> diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index e1680295683d..9f5709f34782 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -70,6 +70,7 @@ #include <connectivity/dbconversion.hxx> #include <cppuhelper/typeprovider.hxx> #include <comphelper/servicehelper.hxx> +#include <comphelper/types.hxx> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <browserids.hxx> diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 580bb79b89bc..9bbf1b2af5a9 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp> #include <com/sun/star/ui/XContextMenuInterceptor.hpp> #include <com/sun/star/util/URL.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> #include <comphelper/interfacecontainer2.hxx> #include <comphelper/processfactory.hxx> diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index cba04bb093e9..7b5be605292b 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -37,6 +37,7 @@ #include "TableFieldInfo.hxx" #include <UITools.hxx> #include <svtools/treelistentry.hxx> +#include <comphelper/types.hxx> using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx b/drawinglayer/source/primitive2d/controlprimitive2d.cxx index a6295406d967..4de6279cb60d 100644 --- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <comphelper/processfactory.hxx> #include <com/sun/star/awt/XWindow2.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index ccef3e685cbb..132b98f0921f 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx @@ -32,6 +32,7 @@ #include <i18nlangtag/languagetag.hxx> #include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <vcl/svapp.hxx> +#include <o3tl/deleter.hxx> // VDev RevDevice provider diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx index 6fdb9e925144..2bac339a7651 100644 --- a/embeddedobj/source/commonembedding/xfactory.cxx +++ b/embeddedobj/source/commonembedding/xfactory.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/document/XTypeDetection.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/io/IOException.hpp> #include <comphelper/processfactory.hxx> diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index f5b565884e1f..24c2531a2953 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -75,6 +75,7 @@ #include <com/sun/star/text/WritingMode2.hpp> #include <comphelper/extract.hxx> +#include <comphelper/types.hxx> #include <connectivity/dbconversion.hxx> #include <connectivity/dbexception.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx index 21bddf5fc736..a220b164493d 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.cxx +++ b/extensions/source/propctrlr/genericpropertyhandler.cxx @@ -37,6 +37,7 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <comphelper/extract.hxx> +#include <comphelper/types.hxx> #include <tools/debug.hxx> #include <algorithm> diff --git a/filter/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx index 975c9078dd1d..9200cce2ca8d 100644 --- a/filter/source/msfilter/mscodec.cxx +++ b/filter/source/msfilter/mscodec.cxx @@ -27,6 +27,7 @@ #include <comphelper/hash.hxx> #include <comphelper/sequenceashashmap.hxx> #include <comphelper/docpasswordhelper.hxx> +#include <com/sun/star/beans/NamedValue.hpp> #define DEBUG_MSO_ENCRYPTION_STD97 0 diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 667ad43c0734..24a431aca5d5 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -35,6 +35,7 @@ #include <comphelper/property.hxx> #include <comphelper/basicio.hxx> #include <comphelper/servicehelper.hxx> +#include <comphelper/types.hxx> #include <services.hxx> #include <strings.hrc> #include <tools/debug.hxx> diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index dac29657ab5c..a64cd35287cb 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -22,6 +22,7 @@ #include <unotools/localedatawrapper.hxx> #include <vcl/svapp.hxx> #include <unotools/syslocale.hxx> +#include <comphelper/types.hxx> namespace frm diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index ea9ce31a0591..1ae254402117 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -61,6 +61,7 @@ #include <connectivity/dbtools.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/supportsservice.hxx> +#include <comphelper/types.hxx> #include <rtl/math.hxx> #include <rtl/tencinfo.h> #include <svl/inettype.hxx> diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index b7cc5dc73f8e..600010321d7b 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -37,6 +37,7 @@ #include <connectivity/dbconversion.hxx> #include <comphelper/property.hxx> +#include <comphelper/types.hxx> #include <tools/diagnose_ex.h> #include <sal/log.hxx> diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx index 52f368f54051..58b769d40522 100644 --- a/forms/source/component/EditBase.cxx +++ b/forms/source/component/EditBase.cxx @@ -23,6 +23,7 @@ #include <tools/debug.hxx> #include <comphelper/basicio.hxx> #include <comphelper/property.hxx> +#include <comphelper/types.hxx> #include <cppuhelper/queryinterface.hxx> #include <frm_resource.hxx> #include <strings.hrc> diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index 9b956a19b6d1..dd3c4f989e6f 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -48,6 +48,7 @@ #include <com/sun/star/awt/XItemList.hpp> #include <comphelper/property.hxx> +#include <comphelper/types.hxx> #include <cppuhelper/supportsservice.hxx> #include <connectivity/dbconversion.hxx> #include <connectivity/dbtools.hxx> diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 2279b49dfcff..1e2e742eaba9 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -25,6 +25,7 @@ #include <comphelper/property.hxx> #include <comphelper/sequence.hxx> #include <comphelper/numbers.hxx> +#include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/dbconversion.hxx> #include <o3tl/any.hxx> diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index 652926936842..ba3bfd222bf8 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/text/WritingMode2.hpp> #include <comphelper/basicio.hxx> #include <comphelper/property.hxx> +#include <comphelper/types.hxx> #include <cppuhelper/queryinterface.hxx> #include <vcl/unohelp.hxx> #include <vcl/svapp.hxx> diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index b5b85d77b1fa..2f8feff4a38a 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -51,6 +51,7 @@ #include <unotools/streamhelper.hxx> #include <comphelper/guarding.hxx> #include <comphelper/property.hxx> +#include <comphelper/types.hxx> #include <unotools/ucbstreamhelper.hxx> #include <svl/urihelper.hxx> diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index f294615cdd97..b41e06ce1c4f 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -41,6 +41,7 @@ #include <comphelper/basicio.hxx> #include <comphelper/property.hxx> #include <comphelper/sequence.hxx> +#include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/formattedcolumnvalue.hxx> #include <connectivity/dbconversion.hxx> diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx index b4c2537c2152..73a8e2980df4 100644 --- a/forms/source/component/Numeric.cxx +++ b/forms/source/component/Numeric.cxx @@ -18,6 +18,7 @@ */ #include "Numeric.hxx" +#include <comphelper/types.hxx> namespace frm { diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index c328e4241958..bae745377e41 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -44,6 +44,7 @@ #include <services.hxx> #include <comphelper/interfacecontainer2.hxx> #include <comphelper/property.hxx> +#include <comphelper/types.hxx> #include <cppuhelper/exc_hlp.hxx> #include <svtools/imageresourceaccess.hxx> #define LOCAL_URL_PREFIX '#' diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index 03de92cdc02a..ac7049c08d62 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -40,6 +40,7 @@ #include <comphelper/eventattachermgr.hxx> #include <comphelper/property.hxx> #include <comphelper/sequence.hxx> +#include <comphelper/types.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/queryinterface.hxx> #include <tools/debug.hxx> diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx b/framework/source/uielement/toolbarmodemenucontroller.cxx index 12d813e9c596..b61b3cd5e281 100644 --- a/framework/source/uielement/toolbarmodemenucontroller.cxx +++ b/framework/source/uielement/toolbarmodemenucontroller.cxx @@ -36,6 +36,7 @@ #include <vcl/settings.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> +#include <comphelper/types.hxx> #include <vcl/window.hxx> #include <svtools/menuoptions.hxx> #include <svtools/miscopt.hxx> diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index 1569881e4a48..81b3bc048b9e 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -155,3 +155,49 @@ blacklist: - com/sun/star/task/XInteractionDisapprove.hpp - com/sun/star/task/XInteractionRequest.hpp - com/sun/star/task/XInteractionRetry.hpp + include/comphelper/SelectionMultiplex.hxx: + # base class has to be a complete type + - com/sun/star/view/XSelectionChangeListener.hpp + include/comphelper/namedvaluecollection.hxx: + # Needed for template class + - com/sun/star/beans/PropertyValue.hpp + - com/sun/star/beans/NamedValue.hpp + include/comphelper/numberedcollection.hxx: + # base class has to be a complete type + - com/sun/star/frame/XUntitledNumbers.hpp + include/comphelper/oslfile2streamwrap.hxx: + # base class has to be a complete type + - com/sun/star/io/XInputStream.hpp + - com/sun/star/io/XOutputStream.hpp + include/comphelper/propmultiplex.hxx: + # base class has to be a complete type + - com/sun/star/beans/XPropertyChangeListener.hpp + include/comphelper/propertystatecontainer.hxx: + # base class has to be a complete type + - com/sun/star/beans/XPropertyState.hpp + include/comphelper/seqstream.hxx: + # base class has to be a complete type + - com/sun/star/io/XInputStream.hpp + - com/sun/star/io/XSeekable.hpp + include/comphelper/sequence.hxx: + # Needed for implicit dtor + - com/sun/star/uno/Sequence.hxx + include/comphelper/sequenceashashmap.hxx: + # Needed for implicit dtor + - com/sun/star/uno/Sequence.hxx + include/comphelper/servicedecl.hxx: + # base class has to be a complete type + - com/sun/star/lang/XServiceInfo.hpp + - com/sun/star/uno/XComponentContext.hpp + include/comphelper/servicehelper.hxx: + # Needed for macro + - rtl/instance.hxx + include/comphelper/simplefileaccessinteraction.hxx: + # base class has to be a complete type + - com/sun/star/task/XInteractionHandler.hpp + include/comphelper/unique_disposing_ptr.hxx: + # base class has to be a complete type + - com/sun/star/lang/XServiceInfo.hpp + include/comphelper/uno3.hxx: + # Needed for macro + - comphelper/sequence.hxx diff --git a/include/comphelper/MasterPropertySet.hxx b/include/comphelper/MasterPropertySet.hxx index 4a78c5ee7638..73f376a601a4 100644 --- a/include/comphelper/MasterPropertySet.hxx +++ b/include/comphelper/MasterPropertySet.hxx @@ -22,12 +22,13 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> -#include <comphelper/PropertyInfoHash.hxx> #include <comphelper/comphelperdllapi.h> -#include <comphelper/solarmutex.hxx> #include <rtl/ref.hxx> #include <map> +namespace comphelper { class SolarMutex; } +namespace comphelper { struct PropertyInfo; } + namespace comphelper { class MasterPropertySetInfo; diff --git a/include/comphelper/PropertyInfoHash.hxx b/include/comphelper/PropertyInfoHash.hxx index 3f1e4e084c97..03c4373001d2 100644 --- a/include/comphelper/PropertyInfoHash.hxx +++ b/include/comphelper/PropertyInfoHash.hxx @@ -21,7 +21,7 @@ #define INCLUDED_COMPHELPER_PROPERTYINFOHASH_HXX #include <rtl/ustring.hxx> -#include <com/sun/star/uno/Type.hxx> +#include <com/sun/star/uno/Type.h> #include <unordered_map> namespace comphelper diff --git a/include/comphelper/SelectionMultiplex.hxx b/include/comphelper/SelectionMultiplex.hxx index 8479ad7c4938..77ed7a363636 100644 --- a/include/comphelper/SelectionMultiplex.hxx +++ b/include/comphelper/SelectionMultiplex.hxx @@ -21,11 +21,12 @@ #define INCLUDED_COMPHELPER_SELECTIONMULTIPLEX_HXX #include <com/sun/star/view/XSelectionChangeListener.hpp> -#include <com/sun/star/view/XSelectionSupplier.hpp> +#include <com/sun/star/lang/EventObject.hpp> #include <cppuhelper/implbase.hxx> #include <comphelper/comphelperdllapi.h> #include <rtl/ref.hxx> +namespace com { namespace sun { namespace star { namespace view { class XSelectionSupplier; } } } } //= selection helper classes diff --git a/include/comphelper/mimeconfighelper.hxx b/include/comphelper/mimeconfighelper.hxx index 88ac1fc8d02d..c9b38452ad81 100644 --- a/include/comphelper/mimeconfighelper.hxx +++ b/include/comphelper/mimeconfighelper.hxx @@ -21,16 +21,15 @@ #define INCLUDED_COMPHELPER_MIMECONFIGHELPER_HXX #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/container/XContainerQuery.hpp> -#include <com/sun/star/beans/NamedValue.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/embed/VerbDescriptor.hpp> #include <comphelper/comphelperdllapi.h> +namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; } } } } +namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } +namespace com { namespace sun { namespace star { namespace container { class XContainerQuery; } } } } +namespace com { namespace sun { namespace star { namespace container { class XNameAccess; } } } } +namespace com { namespace sun { namespace star { namespace embed { struct VerbDescriptor; } } } } +namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } enum class SfxFilterFlags; diff --git a/include/comphelper/namecontainer.hxx b/include/comphelper/namecontainer.hxx index fd078c6e8630..3df8e1fc3e0b 100644 --- a/include/comphelper/namecontainer.hxx +++ b/include/comphelper/namecontainer.hxx @@ -20,10 +20,12 @@ #ifndef INCLUDED_COMPHELPER_NAMECONTAINER_HXX #define INCLUDED_COMPHELPER_NAMECONTAINER_HXX -#include <com/sun/star/uno/Type.hxx> -#include <com/sun/star/container/XNameContainer.hpp> +#include <com/sun/star/uno/Type.h> +#include <com/sun/star/uno/Reference.h> #include <comphelper/comphelperdllapi.h> +namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } } } } + namespace comphelper { COMPHELPER_DLLPUBLIC css::uno::Reference< css::container::XNameContainer > diff --git a/include/comphelper/namedvaluecollection.hxx b/include/comphelper/namedvaluecollection.hxx index 80a20f1348ed..3f3e405f5d0f 100644 --- a/include/comphelper/namedvaluecollection.hxx +++ b/include/comphelper/namedvaluecollection.hxx @@ -28,10 +28,8 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <memory> -#include <algorithm> #include <vector> - namespace comphelper { diff --git a/include/comphelper/numberedcollection.hxx b/include/comphelper/numberedcollection.hxx index f004e0a31dcf..e2d9a24d4db7 100644 --- a/include/comphelper/numberedcollection.hxx +++ b/include/comphelper/numberedcollection.hxx @@ -22,19 +22,17 @@ #include <comphelper/comphelperdllapi.h> -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/uno/XInterface.hpp> +#include <com/sun/star/uno/Reference.h> #include <com/sun/star/frame/XUntitledNumbers.hpp> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/weakref.hxx> #include <cppuhelper/implbase.hxx> -#include <functional> #include <unordered_map> #include <vector> +namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } } namespace comphelper{ diff --git a/include/comphelper/numbers.hxx b/include/comphelper/numbers.hxx index 5b3684767215..9699a8b1d515 100644 --- a/include/comphelper/numbers.hxx +++ b/include/comphelper/numbers.hxx @@ -20,11 +20,12 @@ #ifndef INCLUDED_COMPHELPER_NUMBERS_HXX #define INCLUDED_COMPHELPER_NUMBERS_HXX -#include <com/sun/star/util/XNumberFormats.hpp> -#include <com/sun/star/util/XNumberFormatter.hpp> -#include <com/sun/star/lang/Locale.hpp> +#include <rtl/ustring.hxx> +#include <com/sun/star/uno/Reference.h> #include <comphelper/comphelperdllapi.h> +namespace com { namespace sun { namespace star { namespace util { class XNumberFormats; } } } } +namespace com { namespace sun { namespace star { namespace util { class XNumberFormatter; } } } } namespace comphelper { diff --git a/include/comphelper/ofopxmlhelper.hxx b/include/comphelper/ofopxmlhelper.hxx index 8c3b62be3956..4679d3fd381c 100644 --- a/include/comphelper/ofopxmlhelper.hxx +++ b/include/comphelper/ofopxmlhelper.hxx @@ -20,13 +20,15 @@ #ifndef INCLUDED_COMPHELPER_OFOPXMLHELPER_HXX #define INCLUDED_COMPHELPER_OFOPXMLHELPER_HXX -#include <com/sun/star/beans/StringPair.hpp> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/uno/Sequence.h> #include <comphelper/comphelperdllapi.h> +namespace com { namespace sun { namespace star { namespace beans { struct StringPair; } } } } +namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } } +namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } } namespace comphelper { diff --git a/include/comphelper/oslfile2streamwrap.hxx b/include/comphelper/oslfile2streamwrap.hxx index 7a5197a0d09b..d365df6ccb12 100644 --- a/include/comphelper/oslfile2streamwrap.hxx +++ b/include/comphelper/oslfile2streamwrap.hxx @@ -21,11 +21,12 @@ #include <osl/mutex.hxx> #include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/io/XInputStream.hpp> + #include <com/sun/star/io/XInputStream.hpp> #include <cppuhelper/implbase.hxx> -#include <osl/file.hxx> #include <comphelper/comphelperdllapi.h> +namespace osl { class File; } + namespace comphelper { diff --git a/include/comphelper/processfactory.hxx b/include/comphelper/processfactory.hxx index 51ba33754a98..7531ee4fbebe 100644 --- a/include/comphelper/processfactory.hxx +++ b/include/comphelper/processfactory.hxx @@ -20,13 +20,15 @@ #ifndef INCLUDED_COMPHELPER_PROCESSFACTORY_HXX #define INCLUDED_COMPHELPER_PROCESSFACTORY_HXX -#include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/uno/Reference.h> #include <comphelper/comphelperdllapi.h> namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } + namespace comphelper { diff --git a/include/comphelper/profilezone.hxx b/include/comphelper/profilezone.hxx index 09b140748c33..3b3b5ee5041c 100644 --- a/include/comphelper/profilezone.hxx +++ b/include/comphelper/profilezone.hxx @@ -10,12 +10,10 @@ #ifndef INCLUDED_COMPHELPER_PROFILEZONE_HXX #define INCLUDED_COMPHELPER_PROFILEZONE_HXX -#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/Sequence.h> #include <comphelper/comphelperdllapi.h> #include <rtl/ustring.hxx> -#include <vector> - // implementation of XToolkitExperimental profiling API namespace comphelper diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx index 67cabd5c6402..cb0b1749b36e 100644 --- a/include/comphelper/propagg.hxx +++ b/include/comphelper/propagg.hxx @@ -20,7 +20,11 @@ #ifndef INCLUDED_COMPHELPER_PROPAGG_HXX #define INCLUDED_COMPHELPER_PROPAGG_HXX -#include <com/sun/star/uno/XAggregation.hpp> +#include <com/sun/star/beans/Property.hpp> +#include <com/sun/star/beans/PropertyState.hpp> +#include <com/sun/star/beans/XPropertiesChangeListener.hpp> +#include <com/sun/star/beans/XVetoableChangeListener.hpp> +#include <com/sun/star/lang/EventObject.hpp> #include <comphelper/propstate.hxx> #include <comphelper/comphelperdllapi.h> diff --git a/include/comphelper/property.hxx b/include/comphelper/property.hxx index c8b583db7f9a..1a7f86591fe4 100644 --- a/include/comphelper/property.hxx +++ b/include/comphelper/property.hxx @@ -23,10 +23,10 @@ #include <cppuhelper/proptypehlp.hxx> #include <comphelper/extract.hxx> #include <com/sun/star/beans/Property.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <type_traits> #include <comphelper/comphelperdllapi.h> -#include <cppu/unotype.hxx> + +namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } namespace comphelper { diff --git a/include/comphelper/propertycontainer.hxx b/include/comphelper/propertycontainer.hxx index 78d4eda7c403..37e355222a51 100644 --- a/include/comphelper/propertycontainer.hxx +++ b/include/comphelper/propertycontainer.hxx @@ -22,10 +22,12 @@ #include <comphelper/propertycontainerhelper.hxx> #include <cppuhelper/propshlp.hxx> -#include <com/sun/star/uno/Type.hxx> #include <comphelper/comphelperdllapi.h> +namespace com { namespace sun { namespace star { namespace uno { class Any; } } } } +namespace com { namespace sun { namespace star { namespace uno { class Type; } } } } + namespace comphelper { diff --git a/include/comphelper/propertycontainerhelper.hxx b/include/comphelper/propertycontainerhelper.hxx index 4f37a1018e66..0b5a178f6e4a 100644 --- a/include/comphelper/propertycontainerhelper.hxx +++ b/include/comphelper/propertycontainerhelper.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_COMPHELPER_PROPERTYCONTAINERHELPER_HXX #define INCLUDED_COMPHELPER_PROPERTYCONTAINERHELPER_HXX -#include <cppuhelper/propshlp.hxx> #include <com/sun/star/uno/Type.hxx> #include <com/sun/star/beans/Property.hpp> #include <vector> diff --git a/include/comphelper/propertysethelper.hxx b/include/comphelper/propertysethelper.hxx index a7ce8870bdab..763a0b91b0a7 100644 --- a/include/comphelper/propertysethelper.hxx +++ b/include/comphelper/propertysethelper.hxx @@ -24,9 +24,10 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <comphelper/comphelperdllapi.h> -#include <rtl/ref.hxx> #include <memory> +namespace rtl { template <class reference_type> class Reference; } + namespace comphelper { class PropertySetInfo; diff --git a/include/comphelper/propertystatecontainer.hxx b/include/comphelper/propertystatecontainer.hxx index f2f04410d732..966e2cb9939b 100644 --- a/include/comphelper/propertystatecontainer.hxx +++ b/include/comphelper/propertystatecontainer.hxx @@ -24,11 +24,8 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include <cppuhelper/implbase1.hxx> #include <comphelper/uno3.hxx> -#include <osl/diagnose.h> #include <comphelper/comphelperdllapi.h> -#include <map> - namespace comphelper { diff --git a/include/comphelper/propstate.hxx b/include/comphelper/propstate.hxx index 697bb3560b8d..3e3cea79e082 100644 --- a/include/comphelper/propstate.hxx +++ b/include/comphelper/propstate.hxx @@ -21,7 +21,7 @@ #define INCLUDED_COMPHELPER_PROPSTATE_HXX #include <com/sun/star/beans/XPropertyState.hpp> -#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/Sequence.h> #include <cppuhelper/propshlp.hxx> diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx index 585d81010931..f32fa5ecc3d8 100644 --- a/include/comphelper/proxyaggregation.hxx +++ b/include/comphelper/proxyaggregation.hxx @@ -20,11 +20,8 @@ #ifndef INCLUDED_COMPHELPER_PROXYAGGREGATION_HXX #define INCLUDED_COMPHELPER_PROXYAGGREGATION_HXX -#include <com/sun/star/uno/XAggregation.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XComponent.hpp> #include <cppuhelper/implbase1.hxx> -#include <cppuhelper/interfacecontainer.hxx> +#include <cppuhelper/interfacecontainer.h> #include <cppuhelper/basemutex.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/compbase_ex.hxx> @@ -33,6 +30,8 @@ namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XAggregation; } } } } +namespace com { namespace sun { namespace star { namespace lang { class XComponent; } } } } /* class hierarchy herein: diff --git a/include/comphelper/sequence.hxx b/include/comphelper/sequence.hxx index 903b0b5ae25b..d80534f4a8c7 100644 --- a/include/comphelper/sequence.hxx +++ b/include/comphelper/sequence.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_COMPHELPER_SEQUENCE_HXX #define INCLUDED_COMPHELPER_SEQUENCE_HXX -#include <algorithm> #include <com/sun/star/uno/Sequence.hxx> #include <osl/diagnose.h> #include <comphelper/comphelperdllapi.h> diff --git a/include/comphelper/sequenceashashmap.hxx b/include/comphelper/sequenceashashmap.hxx index 35cdabc9aa76..ba956f8401e6 100644 --- a/include/comphelper/sequenceashashmap.hxx +++ b/include/comphelper/sequenceashashmap.hxx @@ -20,14 +20,13 @@ #ifndef INCLUDED_COMPHELPER_SEQUENCEASHASHMAP_HXX #define INCLUDED_COMPHELPER_SEQUENCEASHASHMAP_HXX -#include <algorithm> #include <unordered_map> #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/NamedValue.hpp> #include <comphelper/comphelperdllapi.h> +namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; } } } } +namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } namespace comphelper{ diff --git a/include/comphelper/servicedecl.hxx b/include/comphelper/servicedecl.hxx index 40cb81c0dbeb..8594d36f1658 100644 --- a/include/comphelper/servicedecl.hxx +++ b/include/comphelper/servicedecl.hxx @@ -23,7 +23,6 @@ #include <cppuhelper/implbase.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <uno/environment.h> #include <functional> #include <initializer_list> diff --git a/include/comphelper/serviceinfohelper.hxx b/include/comphelper/serviceinfohelper.hxx index 0e0e619e6440..8b3bb70750f5 100644 --- a/include/comphelper/serviceinfohelper.hxx +++ b/include/comphelper/serviceinfohelper.hxx @@ -23,10 +23,12 @@ #include <sal/config.h> #include <initializer_list> +#include <rtl/ustring.hxx> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <comphelper/comphelperdllapi.h> +namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } } + namespace comphelper { /** This class provides a basic helper for classes supporting the XServiceInfo Interface. diff --git a/include/comphelper/sharedmutex.hxx b/include/comphelper/sharedmutex.hxx index 82ed7f9bef77..a92c7ccb33e6 100644 --- a/include/comphelper/sharedmutex.hxx +++ b/include/comphelper/sharedmutex.hxx @@ -21,9 +21,10 @@ #define INCLUDED_COMPHELPER_SHAREDMUTEX_HXX #include <comphelper/comphelperdllapi.h> -#include <osl/mutex.hxx> #include <memory> +namespace osl { class Mutex; } + namespace comphelper { diff --git a/include/comphelper/simplefileaccessinteraction.hxx b/include/comphelper/simplefileaccessinteraction.hxx index 69cec86d1712..78705d8724b3 100644 --- a/include/comphelper/simplefileaccessinteraction.hxx +++ b/include/comphelper/simplefileaccessinteraction.hxx @@ -12,9 +12,11 @@ #include <sal/config.h> #include <ucbhelper/interceptedinteraction.hxx> -#include <com/sun/star/task/XInteractionHandler.hpp> #include <comphelper/comphelperdllapi.h> +namespace com { namespace sun { namespace star { namespace task { class XInteractionHandler; } } } } +namespace com { namespace sun { namespace star { namespace task { class XInteractionRequest; } } } } + namespace comphelper { /** An interaction handler wrapper for simple file access. diff --git a/include/comphelper/solarmutex.hxx b/include/comphelper/solarmutex.hxx index fdecd0d09b9c..0c147f405560 100644 --- a/include/comphelper/solarmutex.hxx +++ b/include/comphelper/solarmutex.hxx @@ -22,7 +22,8 @@ #include <sal/config.h> -#include <osl/thread.hxx> +#include <assert.h> +#include <osl/thread.h> #include <osl/mutex.hxx> #include <comphelper/comphelperdllapi.h> diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx index bf8cc2b70494..c166b5a7040e 100644 --- a/include/comphelper/stl_types.hxx +++ b/include/comphelper/stl_types.hxx @@ -21,13 +21,12 @@ #include <sal/config.h> -#include <math.h> #include <memory> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> + +namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } } namespace comphelper { diff --git a/include/comphelper/storagehelper.hxx b/include/comphelper/storagehelper.hxx index ef82b83effae..2ebec23e1eb7 100644 --- a/include/comphelper/storagehelper.hxx +++ b/include/comphelper/storagehelper.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_COMPHELPER_STORAGEHELPER_HXX #define INCLUDED_COMPHELPER_STORAGEHELPER_HXX -#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/Sequence.h> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/embed/ElementModes.hpp> #include <comphelper/comphelperdllapi.h> diff --git a/include/comphelper/streamsection.hxx b/include/comphelper/streamsection.hxx index 6c52892fde6b..d24783c93704 100644 --- a/include/comphelper/streamsection.hxx +++ b/include/comphelper/streamsection.hxx @@ -20,11 +20,13 @@ #ifndef INCLUDED_COMPHELPER_STREAMSECTION_HXX #define INCLUDED_COMPHELPER_STREAMSECTION_HXX -#include <com/sun/star/io/XMarkableStream.hpp> -#include <com/sun/star/io/XDataInputStream.hpp> -#include <com/sun/star/io/XDataOutputStream.hpp> +#include <com/sun/star/uno/Reference.h> #include <comphelper/comphelperdllapi.h> +namespace com { namespace sun { namespace star { namespace io { class XDataInputStream; } } } } +namespace com { namespace sun { namespace star { namespace io { class XDataOutputStream; } } } } +namespace com { namespace sun { namespace star { namespace io { class XMarkableStream; } } } } + namespace comphelper { diff --git a/include/comphelper/string.hxx b/include/comphelper/string.hxx index c3d4ec178e92..9f5738e5ba48 100644 --- a/include/comphelper/string.hxx +++ b/include/comphelper/string.hxx @@ -22,17 +22,19 @@ #include <sal/config.h> -#include <cstddef> #include <vector> #include <comphelper/comphelperdllapi.h> #include <sal/types.h> #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> -#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/Sequence.h> +#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/i18n/XCollator.hpp> -#include <com/sun/star/i18n/XBreakIterator.hpp> +#include <com/sun/star/lang/Locale.hpp> + +namespace com { namespace sun { namespace star { namespace i18n { class XBreakIterator; } } } } +namespace com { namespace sun { namespace star { namespace i18n { class XCollator; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } // OUString helper functions that are not widespread or mature enough to // go into the stable URE API: diff --git a/include/comphelper/synchronousdispatch.hxx b/include/comphelper/synchronousdispatch.hxx index a547703376e7..3c2b89b9fbfd 100644 --- a/include/comphelper/synchronousdispatch.hxx +++ b/include/comphelper/synchronousdispatch.hxx @@ -22,10 +22,8 @@ #include <comphelper/comphelperdllapi.h> -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/Sequence.hxx> - -#include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/uno/Reference.h> +#include <rtl/ustring.hxx> namespace com { namespace sun { namespace star { namespace uno { @@ -34,6 +32,9 @@ namespace com { namespace sun { namespace star { class XComponent; } } } } +namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } +namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } } + namespace comphelper { diff --git a/include/comphelper/syntaxhighlight.hxx b/include/comphelper/syntaxhighlight.hxx index 22f1338ea12f..26cfd9baad62 100644 --- a/include/comphelper/syntaxhighlight.hxx +++ b/include/comphelper/syntaxhighlight.hxx @@ -23,10 +23,6 @@ #include <comphelper/comphelperdllapi.h> -#ifdef UNX -#include <sys/resource.h> -#endif - #include <vector> #include <memory> diff --git a/include/comphelper/threadpool.hxx b/include/comphelper/threadpool.hxx index fd5905edc821..092078199981 100644 --- a/include/comphelper/threadpool.hxx +++ b/include/comphelper/threadpool.hxx @@ -14,7 +14,6 @@ #include <rtl/ref.hxx> #include <comphelper/comphelperdllapi.h> #include <mutex> -#include <thread> #include <condition_variable> #include <vector> #include <memory> @@ -22,7 +21,6 @@ namespace comphelper { class ThreadTaskTag; -class ThreadPool; class COMPHELPER_DLLPUBLIC ThreadTask { diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx index a5b56219c295..1e5b2f9f0a90 100644 --- a/include/comphelper/types.hxx +++ b/include/comphelper/types.hxx @@ -20,19 +20,18 @@ #ifndef INCLUDED_COMPHELPER_TYPES_HXX #define INCLUDED_COMPHELPER_TYPES_HXX -#include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <comphelper/comphelperdllapi.h> -#include <cppu/unotype.hxx> namespace com { namespace sun { namespace star { namespace awt { struct FontDescriptor; } } } } +namespace com { namespace sun { namespace star { namespace uno { class Any; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } } + namespace comphelper { diff --git a/include/comphelper/unique_disposing_ptr.hxx b/include/comphelper/unique_disposing_ptr.hxx index 51a9710f606d..e72b039e6606 100644 --- a/include/comphelper/unique_disposing_ptr.hxx +++ b/include/comphelper/unique_disposing_ptr.hxx @@ -17,9 +17,10 @@ #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <o3tl/deleter.hxx> #include <vcl/svapp.hxx> +namespace o3tl { template <typename T> struct default_delete; } + namespace comphelper { //Similar to std::unique_ptr, except additionally releases the ptr on XComponent::disposing and/or XTerminateListener::notifyTermination if supported diff --git a/include/comphelper/uno3.hxx b/include/comphelper/uno3.hxx index b21fe75765bf..1312d0c6e240 100644 --- a/include/comphelper/uno3.hxx +++ b/include/comphelper/uno3.hxx @@ -20,11 +20,8 @@ #ifndef INCLUDED_COMPHELPER_UNO3_HXX #define INCLUDED_COMPHELPER_UNO3_HXX -#include <rtl/instance.hxx> -#include <comphelper/types.hxx> #include <com/sun/star/uno/XAggregation.hpp> #include <comphelper/sequence.hxx> -#include <cppuhelper/typeprovider.hxx> namespace comphelper diff --git a/include/comphelper/weakbag.hxx b/include/comphelper/weakbag.hxx index 981a6c834e36..c52defab23eb 100644 --- a/include/comphelper/weakbag.hxx +++ b/include/comphelper/weakbag.hxx @@ -23,7 +23,7 @@ #include <sal/config.h> #include <vector> -#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/Reference.h> #include <cppuhelper/weakref.hxx> #include <osl/diagnose.h> diff --git a/include/comphelper/weakeventlistener.hxx b/include/comphelper/weakeventlistener.hxx index 273153cfaeb9..b77ab2a30231 100644 --- a/include/comphelper/weakeventlistener.hxx +++ b/include/comphelper/weakeventlistener.hxx @@ -22,12 +22,14 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> -#include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/uno/XWeak.hpp> #include <cppuhelper/weakref.hxx> #include <comphelper/comphelperdllapi.h> +namespace com { namespace sun { namespace star { namespace lang { class XComponent; } } } } +namespace com { namespace sun { namespace star { namespace lang { class XEventListener; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XWeak; } } } } + namespace comphelper { diff --git a/include/comphelper/xmltools.hxx b/include/comphelper/xmltools.hxx index 85915ec47f9a..e40ea4e24a26 100644 --- a/include/comphelper/xmltools.hxx +++ b/include/comphelper/xmltools.hxx @@ -10,9 +10,7 @@ #ifndef INCLUDED_COMPHELPER_XMLTOOLS_HXX #define INCLUDED_COMPHELPER_XMLTOOLS_HXX -#include <rtl/strbuf.hxx> -#include <rtl/ustrbuf.hxx> -#include <com/sun/star/uno/Sequence.hxx> +#include <rtl/string.hxx> #include <comphelper/comphelperdllapi.h> namespace comphelper diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx index e7d35007cfaf..22643b3b9c04 100644 --- a/linguistic/source/hyphdsp.cxx +++ b/linguistic/source/hyphdsp.cxx @@ -23,6 +23,7 @@ #include <algorithm> #include <cppuhelper/factory.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/linguistic2/XLinguServiceEventBroadcaster.hpp> #include <com/sun/star/linguistic2/XHyphenatedWord.hpp> diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx index 0251635c3d9f..e557207ffdcc 100644 --- a/linguistic/source/spelldsp.cxx +++ b/linguistic/source/spelldsp.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp> #include <com/sun/star/linguistic2/SpellFailure.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/factory.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx index 0e35a0ba5b80..cdb5a77af8e4 100644 --- a/linguistic/source/thesdsp.cxx +++ b/linguistic/source/thesdsp.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <comphelper/processfactory.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> #include <osl/mutex.hxx> #include <sal/log.hxx> diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx index a2e34ecd7168..b68f05160a62 100644 --- a/oox/source/core/filterdetect.cxx +++ b/oox/source/core/filterdetect.cxx @@ -35,6 +35,7 @@ #include <oox/crypto/DocumentDecryption.hxx> #include <com/sun/star/uri/UriReferenceFactory.hpp> +#include <com/sun/star/beans/NamedValue.hpp> using namespace ::com::sun::star; diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx index a8462b657329..88f2a7287d71 100644 --- a/oox/source/crypto/DocumentDecryption.cxx +++ b/oox/source/crypto/DocumentDecryption.cxx @@ -13,6 +13,7 @@ #include <comphelper/sequenceashashmap.hxx> #include <cppuhelper/implbase.hxx> +#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <oox/crypto/AgileEngine.hxx> diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx index 3d0b8c413bab..c5268af73a91 100644 --- a/oox/source/drawingml/chart/converterbase.cxx +++ b/oox/source/drawingml/chart/converterbase.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <osl/diagnose.h> #include <basegfx/numeric/ftools.hxx> #include <oox/core/xmlfilterbase.hxx> diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index 5dd58e5c7de6..a8cc9a02ba77 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -40,6 +40,7 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/awt/Size.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <tools/globname.hxx> #include <unotools/streamwrap.hxx> diff --git a/oox/source/ole/oleobjecthelper.cxx b/oox/source/ole/oleobjecthelper.cxx index 47ba8bc918f0..cb909592f9b2 100644 --- a/oox/source/ole/oleobjecthelper.cxx +++ b/oox/source/ole/oleobjecthelper.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/awt/Size.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/document/XEmbeddedObjectResolver.hpp> diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 45dc3857c01c..6b273ea26fc4 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -105,6 +105,7 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/typeprovider.hxx> #include <dbaccess/dbaundomanager.hxx> #include <editeng/paperinf.hxx> #include <framework/titlehelper.hxx> diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 4340b77405b2..69be4b7fc3c8 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -20,6 +20,7 @@ #include <comphelper/enumhelper.hxx> #include <connectivity/dbtools.hxx> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/typeprovider.hxx> #include <com/sun/star/report/XReportComponent.hpp> #include <com/sun/star/report/ForceNewPage.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index cb244049b9fe..41c969996839 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/util/URL.hpp> #include <com/sun/star/sdb/XDocumentDataSource.hpp> #include <com/sun/star/i18n/XCollator.hpp> +#include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <vcl/waitobj.hxx> #include <vcl/svapp.hxx> diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index af9b9333a527..08461d90b51d 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -20,6 +20,7 @@ #include <statusbarcontroller.hxx> #include <cppuhelper/supportsservice.hxx> +#include <comphelper/types.hxx> #include <svx/zoomsliderctrl.hxx> #include <svx/zoomctrl.hxx> #include <svx/svxids.hrc> diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 7bc4c6a4f4d1..085160518c63 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -35,6 +35,7 @@ #include <comphelper/property.hxx> #include <comphelper/propertysequence.hxx> #include <comphelper/sequenceashashmap.hxx> +#include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <com/sun/star/view/PaperFormat.hpp> diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index b7e8a01f42b1..c65f26e83ed2 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/util/XNumberFormatTypes.hpp> #include <com/sun/star/util/NumberFormat.hpp> #include <cppuhelper/supportsservice.hxx> +#include <comphelper/types.hxx> namespace calc { diff --git a/sd/qa/unit/uimpress.cxx b/sd/qa/unit/uimpress.cxx index 9567df577c45..d0dbd223887b 100644 --- a/sd/qa/unit/uimpress.cxx +++ b/sd/qa/unit/uimpress.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/lang/XMultiComponentFactory.hpp> using namespace ::com::sun::star; diff --git a/svtools/langsupport/langsupport.cxx b/svtools/langsupport/langsupport.cxx index 263e04845310..1aae3df70277 100644 --- a/svtools/langsupport/langsupport.cxx +++ b/svtools/langsupport/langsupport.cxx @@ -9,6 +9,7 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/processfactory.hxx> #include <cppuhelper/bootstrap.hxx> #include <i18nlangtag/languagetag.hxx> diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index a62587ddfc47..74a956befb7e 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/container/XChild.hpp> +#include <comphelper/types.hxx> #include <rtl/ustring.hxx> #include <tools/debug.hxx> diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 7aa1a207bede..2a344282a2cb 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -56,6 +56,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/property.hxx> #include <comphelper/string.hxx> +#include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 9b2a774ae918..ee8df28c5ec2 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -51,6 +51,7 @@ #include <comphelper/property.hxx> #include <comphelper/servicehelper.hxx> #include <comphelper/string.hxx> +#include <comphelper/types.hxx> #include <connectivity/formattedcolumnvalue.hxx> #include <cppuhelper/typeprovider.hxx> #include <i18nlangtag/lang.h> diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 06dfb8496c3c..eedf197d0c8f 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -55,6 +55,7 @@ #include <sdbdatacolumn.hxx> #include <comphelper/property.hxx> +#include <comphelper/types.hxx> #include <cppuhelper/implbase.hxx> #include <algorithm> diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx index 509d4c4ed5dc..849d21b25871 100644 --- a/svx/source/form/fmdmod.cxx +++ b/svx/source/form/fmdmod.cxx @@ -23,6 +23,7 @@ #include <fmobj.hxx> #include <svx/unoshape.hxx> #include <comphelper/processfactory.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> #include <svx/fmglob.hxx> using namespace ::svxform; diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index ea762b98d52a..a5e6fae5fe75 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -71,6 +71,7 @@ #include <comphelper/property.hxx> #include <comphelper/sequence.hxx> #include <comphelper/flagguard.hxx> +#include <comphelper/types.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 57b0bfaff55e..c785a6cdad13 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -41,6 +41,7 @@ #include <com/sun/star/awt/InvalidateStyle.hpp> #include <com/sun/star/util/XModeChangeListener.hpp> #include <com/sun/star/util/XModeChangeBroadcaster.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/container/XContainer.hpp> diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index b87dc21c6a2e..f1ac0921dac3 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/awt/Rectangle.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/processfactory.hxx> #include <svl/urihelper.hxx> #include <com/sun/star/uno/Sequence.h> diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index 68b13f3d2e4f..38ea6471ebe4 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/io/XObjectOutputStream.hpp> #include <com/sun/star/io/XObjectInputStream.hpp> #include <com/sun/star/util/XCloneable.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/processfactory.hxx> #include <vcl/pdfextoutdevdata.hxx> #include <svx/svdouno.hxx> diff --git a/sw/source/core/docnode/retrieveinputstream.cxx b/sw/source/core/docnode/retrieveinputstream.cxx index 030dcfbbbf16..c53ab66715e6 100644 --- a/sw/source/core/docnode/retrieveinputstream.cxx +++ b/sw/source/core/docnode/retrieveinputstream.cxx @@ -20,6 +20,7 @@ #include <retrieveinputstream.hxx> #include <unotools/mediadescriptor.hxx> #include <com/sun/star/io/XStream.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> /* class for a thread to retrieve an input stream given by an URL diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 5abf7f41cc20..3cc9826e2785 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -19,6 +19,7 @@ #include <hintids.hxx> #include <com/sun/star/i18n/ScriptType.hpp> +#include <com/sun/star/i18n/XBreakIterator.hpp> #include <comphelper/string.hxx> #include <utility> #include <vcl/svapp.hxx> diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index e9ee2209e15d..333b5731f249 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/i18n/ScriptType.hpp> +#include <com/sun/star/i18n/XBreakIterator.hpp> #include <comphelper/string.hxx> #include <svtools/htmlkywd.hxx> #include <svtools/htmlout.hxx> diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 42bdd7be095b..a4f6966ab268 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/i18n/ScriptType.hpp> +#include <com/sun/star/i18n/XBreakIterator.hpp> #include <comphelper/string.hxx> #include <o3tl/safeint.hxx> #include <rtl/ustrbuf.hxx> diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 6e2987cc67fe..65a1ca26e45c 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -137,6 +137,7 @@ #include <svtools/miscopt.hxx> #include <com/sun/star/i18n/ScriptType.hpp> +#include <com/sun/star/i18n/XBreakIterator.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/drawing/ShadingPattern.hpp> #include <com/sun/star/text/GraphicCrop.hpp> diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index c72bc4811ec3..5595a31f35cc 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -40,6 +40,7 @@ #include <ucbhelper/commandenvironment.hxx> #include <com/sun/star/i18n/ScriptType.hpp> +#include <com/sun/star/i18n/XBreakIterator.hpp> #include <hintids.hxx> #include <editeng/fontitem.hxx> #include <editeng/fhgtitem.hxx> diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index 4a550138dcba..f07c88f2410a 100644 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/ucb/IllegalIdentifierException.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include "pkgprovider.hxx" #include "pkgcontent.hxx" #include "pkguri.hxx" diff --git a/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx b/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx index 0d4d79321a99..56d6da9f3e4e 100644 --- a/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx +++ b/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/exc_hlp.hxx> #include <cppunit/Message.h> diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx index 2991df012235..fe5aaaa99d2a 100644 --- a/vbahelper/source/vbahelper/vbashape.cxx +++ b/vbahelper/source/vbahelper/vbashape.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/text/RelOrientation.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <ooo/vba/office/MsoShapeType.hpp> #include <ooo/vba/office/MsoAutoShapeType.hpp> #include <ooo/vba/word/WdRelativeHorizontalPosition.hpp> diff --git a/writerfilter/source/dmapper/TablePositionHandler.cxx b/writerfilter/source/dmapper/TablePositionHandler.cxx index 4b9a0091c7a0..151c7fd50071 100644 --- a/writerfilter/source/dmapper/TablePositionHandler.cxx +++ b/writerfilter/source/dmapper/TablePositionHandler.cxx @@ -9,6 +9,7 @@ #include "TablePositionHandler.hxx" #include "ConversionHelper.hxx" #include <ooxml/resourceids.hxx> +#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp> #include <com/sun/star/text/RelOrientation.hpp> diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 1f354a34dd5f..26482ab78e6e 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -20,6 +20,7 @@ #include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/base64.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/servicehelper.hxx> diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index e79e3db09e9a..5d33268f741d 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/mozilla/XMozillaBootstrap.hpp> #include <com/sun/star/xml/crypto/DigestID.hpp> #include <com/sun/star/xml/crypto/CipherID.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/supportsservice.hxx> #include <officecfg/Office/Common.hxx> #include <sal/types.h> |