diff options
167 files changed, 281 insertions, 43 deletions
diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx index abd01f5cfb62..655f076e2cc5 100644 --- a/avmedia/source/gstreamer/gstuno.cxx +++ b/avmedia/source/gstreamer/gstuno.cxx @@ -18,6 +18,7 @@ */ #include <mediamisc.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include "gstmanager.hxx" using namespace ::com::sun::star; diff --git a/avmedia/source/macavf/macavfuno.mm b/avmedia/source/macavf/macavfuno.mm index 73020618ec70..5d4b36da20ab 100644 --- a/avmedia/source/macavf/macavfuno.mm +++ b/avmedia/source/macavf/macavfuno.mm @@ -19,6 +19,7 @@ #include "macavfcommon.hxx" #include "manager.hxx" +#include "com/sun/star/lang/XSingleServiceFactory.hpp" using namespace ::com::sun::star; diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx index d431fbf67830..16d771838fca 100644 --- a/avmedia/source/win/winuno.cxx +++ b/avmedia/source/win/winuno.cxx @@ -19,6 +19,7 @@ #include "wincommon.hxx" #include "manager.hxx" +#include <com/sun/star/lang/XSingleServiceFactory.hpp> using namespace ::com::sun::star; diff --git a/basctl/source/basicide/register.cxx b/basctl/source/basicide/register.cxx index 8219af8858a0..f74ff4075337 100644 --- a/basctl/source/basicide/register.cxx +++ b/basctl/source/basicide/register.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <cppuhelper/factory.hxx> diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index a2aebb7cd018..a83bcd3c3961 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -32,6 +32,7 @@ #include <comphelper/interfacecontainer2.hxx> #include <comphelper/extract.hxx> #include <comphelper/processfactory.hxx> +#include <cppuhelper/weakref.hxx> #include <rtl/instance.hxx> #include <rtl/strbuf.hxx> diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx index 61bd3f2519d3..29d9a83cf89b 100644 --- a/basic/source/inc/scriptcont.hxx +++ b/basic/source/inc/scriptcont.hxx @@ -24,6 +24,7 @@ #include <basic/basmgr.hxx> #include <com/sun/star/script/vba/XVBAModuleInfo.hpp> #include <comphelper/uno3.hxx> +#include <cppuhelper/implbase1.hxx> namespace basic { diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index dda0c4824afa..f72ad68c518e 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/task/ErrorCodeIOException.hpp> #include <com/sun/star/script/ModuleType.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/storagehelper.hxx> #include <unotools/streamwrap.hxx> #include <unotools/ucbstreamhelper.hxx> diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index dcf21fc02130..f7026b3d0c0f 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -53,6 +53,7 @@ #include <osl/mutex.hxx> #include <rtl/ref.hxx> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakagg.hxx> #include <comphelper/interfacecontainer2.hxx> #include <vcl/GraphicObject.hxx> diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx index 1d7608f9a0ef..48365c9ecb67 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -29,6 +29,7 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakref.hxx> #include <map> diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index 44684adb2c6c..641ddfe91646 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -38,6 +38,7 @@ #include <com/sun/star/lang/XServiceName.hpp> #include <com/sun/star/chart/ChartSolidType.hpp> #include <com/sun/star/chart2/CurveStyle.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <tools/diagnose_ex.h> #include <sal/log.hxx> diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index c47087dee0fe..5577176821c5 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -32,6 +32,7 @@ #include <unonames.hxx> #include <cppuhelper/component_context.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/chart/ChartSolidType.hpp> #include <com/sun/star/chart2/AxisType.hpp> #include <com/sun/star/chart2/StackingDirection.hpp> diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx index 3f4a99369a2e..ac675200f733 100644 --- a/connectivity/source/cpool/ZPoolCollection.hxx +++ b/connectivity/source/cpool/ZPoolCollection.hxx @@ -24,6 +24,7 @@ #include <map> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakref.hxx> #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/sdbc/XDriver.hpp> #include <com/sun/star/sdbc/XDriverManager2.hpp> diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx index 81138a32fb54..cd834ad6c264 100644 --- a/connectivity/source/cpool/Zregistration.cxx +++ b/connectivity/source/cpool/Zregistration.cxx @@ -19,6 +19,7 @@ #include <cppuhelper/factory.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include "ZPoolCollection.hxx" diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx index f31d14e326ae..8b5ce37d5a89 100644 --- a/connectivity/source/drivers/ado/Aservices.cxx +++ b/connectivity/source/drivers/ado/Aservices.cxx @@ -19,6 +19,7 @@ #include <ado/ADriver.hxx> #include <cppuhelper/factory.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> using namespace connectivity::ado; using ::com::sun::star::uno::Reference; diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx index c1d840965f30..343c9fcb6305 100644 --- a/connectivity/source/drivers/calc/Cservices.cxx +++ b/connectivity/source/drivers/calc/Cservices.cxx @@ -19,6 +19,7 @@ #include <calc/CDriver.hxx> #include <cppuhelper/factory.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> using namespace connectivity::calc; using ::com::sun::star::uno::Reference; diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx index a45443680f42..c269ddf997f0 100644 --- a/connectivity/source/drivers/dbase/Dservices.cxx +++ b/connectivity/source/drivers/dbase/Dservices.cxx @@ -19,6 +19,7 @@ #include <dbase/DDriver.hxx> #include <cppuhelper/factory.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> using namespace connectivity::dbase; using ::com::sun::star::uno::Reference; diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx index 3fa7a83a36e7..94b6f7867438 100644 --- a/connectivity/source/drivers/evoab2/NServices.cxx +++ b/connectivity/source/drivers/evoab2/NServices.cxx @@ -19,6 +19,7 @@ #include "NDriver.hxx" #include <cppuhelper/factory.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <osl/diagnose.h> using namespace connectivity::evoab; diff --git a/connectivity/source/drivers/firebird/Services.cxx b/connectivity/source/drivers/firebird/Services.cxx index 75b247c32fe5..023a41dff18b 100644 --- a/connectivity/source/drivers/firebird/Services.cxx +++ b/connectivity/source/drivers/firebird/Services.cxx @@ -20,6 +20,7 @@ #include "Driver.hxx" #include <cppuhelper/factory.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <sal/types.h> using namespace connectivity::firebird; diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx index 2771617c82b7..62884acef137 100644 --- a/connectivity/source/drivers/flat/Eservices.cxx +++ b/connectivity/source/drivers/flat/Eservices.cxx @@ -19,6 +19,7 @@ #include <flat/EDriver.hxx> #include <cppuhelper/factory.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> using namespace connectivity::flat; using ::com::sun::star::uno::Reference; diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx index 6d1294b9b072..a7ce2346374a 100644 --- a/connectivity/source/drivers/hsqldb/Hservices.cxx +++ b/connectivity/source/drivers/hsqldb/Hservices.cxx @@ -20,6 +20,7 @@ #include <hsqldb/HDriver.hxx> #include <cppuhelper/factory.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> using namespace connectivity::hsqldb; using css::uno::Reference; diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx index c5977439638b..281d8936d488 100644 --- a/connectivity/source/drivers/jdbc/jservices.cxx +++ b/connectivity/source/drivers/jdbc/jservices.cxx @@ -19,6 +19,7 @@ #include <java/sql/Driver.hxx> #include <cppuhelper/factory.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> using namespace connectivity; using ::com::sun::star::uno::Reference; diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx index ed64a21f9181..8642c03e61e3 100644 --- a/connectivity/source/drivers/macab/MacabServices.cxx +++ b/connectivity/source/drivers/macab/MacabServices.cxx @@ -20,6 +20,7 @@ #include "MacabDriver.hxx" #include <cppuhelper/factory.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> using namespace connectivity::macab; using ::com::sun::star::uno::Reference; diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index 1eb3b91b66bc..460d6d1c6ab4 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/factory.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <cppuhelper/supportsservice.hxx> #include "MMozillaBootstrap.hxx" #include "MNSFolders.hxx" diff --git a/connectivity/source/drivers/mysqlc/mysqlc_services.cxx b/connectivity/source/drivers/mysqlc/mysqlc_services.cxx index 3ddf55e298a0..002f4df40272 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_services.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_services.cxx @@ -22,6 +22,7 @@ #include <cppuhelper/factory.hxx> #include <rtl/ustrbuf.hxx> #include <uno/lbnames.h> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> using namespace connectivity::mysqlc; using ::com::sun::star::lang::XMultiServiceFactory; diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx index a4a5cd4e6aa1..71fd857ec19e 100644 --- a/connectivity/source/drivers/odbc/oservices.cxx +++ b/connectivity/source/drivers/odbc/oservices.cxx @@ -20,6 +20,7 @@ #include "ORealDriver.hxx" #include <odbc/ODriver.hxx> #include <cppuhelper/factory.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> using namespace connectivity::odbc; using ::com::sun::star::uno::Reference; diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index e877776b3a3a..a51f69c848e9 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -39,6 +39,8 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/implementationentry.hxx> #include <cppuhelper/supportsservice.hxx> +#include <com/sun/star/lang/XSingleComponentFactory.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include "pq_driver.hxx" diff --git a/connectivity/source/drivers/writer/Wservices.cxx b/connectivity/source/drivers/writer/Wservices.cxx index 029f71491894..1566b4eacc45 100644 --- a/connectivity/source/drivers/writer/Wservices.cxx +++ b/connectivity/source/drivers/writer/Wservices.cxx @@ -19,6 +19,7 @@ #include <writer/WDriver.hxx> #include <cppuhelper/factory.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> using namespace com::sun::star; diff --git a/connectivity/source/inc/ParameterSubstitution.hxx b/connectivity/source/inc/ParameterSubstitution.hxx index 1dd52e94aa71..59d9b1a91ece 100644 --- a/connectivity/source/inc/ParameterSubstitution.hxx +++ b/connectivity/source/inc/ParameterSubstitution.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakref.hxx> namespace connectivity { diff --git a/connectivity/source/manager/mregistration.cxx b/connectivity/source/manager/mregistration.cxx index 40cd37698f70..99c3fb1ad58b 100644 --- a/connectivity/source/manager/mregistration.cxx +++ b/connectivity/source/manager/mregistration.cxx @@ -21,6 +21,7 @@ #include "mdrivermanager.hxx" #include <cppuhelper/factory.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/cppuhelper/source/access_control.cxx b/cppuhelper/source/access_control.cxx index 8bce8a23887b..a63dcdacf3b1 100644 --- a/cppuhelper/source/access_control.cxx +++ b/cppuhelper/source/access_control.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/security/RuntimePermission.hpp> #include <com/sun/star/io/FilePermission.hpp> #include <com/sun/star/connection/SocketPermission.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> using namespace ::osl; using namespace ::com::sun::star; diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index 12efac1fb061..361cbb2c6750 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/loader/XImplementationLoader.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx index a3ee6708ca17..0472cc5dd051 100644 --- a/cppuhelper/source/implbase_ex.cxx +++ b/cppuhelper/source/implbase_ex.cxx @@ -26,6 +26,7 @@ #include <rtl/uuid.h> #include <sal/log.hxx> #include <cppuhelper/compbase_ex.hxx> +#include <cppuhelper/implbase_ex.hxx> #include <com/sun/star/uno/RuntimeException.hpp> diff --git a/cppuhelper/source/implementationentry.cxx b/cppuhelper/source/implementationentry.cxx index 0aeae8b68b54..bd4ce00ffcc7 100644 --- a/cppuhelper/source/implementationentry.cxx +++ b/cppuhelper/source/implementationentry.cxx @@ -18,6 +18,8 @@ */ #include <cppuhelper/implementationentry.hxx> +#include <com/sun/star/lang/XSingleComponentFactory.hpp> +#include <com/sun/star/registry/XRegistryKey.hpp> #include <osl/diagnose.h> diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx index 01971f695c03..954258fbfbf5 100644 --- a/cppuhelper/source/macro_expander.cxx +++ b/cppuhelper/source/macro_expander.cxx @@ -29,6 +29,7 @@ #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/util/XMacroExpander.hpp> #include <com/sun/star/uno/RuntimeException.hpp> diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index 52d8af821474..b54d45ed0773 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/loader/CannotActivateFactoryException.hpp> #include <com/sun/star/registry/CannotRegisterImplementationException.hpp> +#include <com/sun/star/registry/XRegistryKey.hpp> #include <cppuhelper/factory.hxx> #include <cppuhelper/shlib.hxx> #include <osl/module.hxx> diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx index 40287169ae97..11cbe497290b 100644 --- a/desktop/source/offacc/acceptor.cxx +++ b/desktop/source/offacc/acceptor.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/bridge/BridgeFactory.hpp> #include <com/sun/star/connection/Acceptor.hpp> #include <com/sun/star/uno/XNamingService.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <comphelper/processfactory.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/dtrans/source/cnttype/mctfentry.cxx b/dtrans/source/cnttype/mctfentry.cxx index 7c9e39b93a67..878b1fbe942c 100644 --- a/dtrans/source/cnttype/mctfentry.cxx +++ b/dtrans/source/cnttype/mctfentry.cxx @@ -18,6 +18,7 @@ */ #include <cppuhelper/factory.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/container/XSet.hpp> #include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp> #include "mcnttfactory.hxx" diff --git a/dtrans/source/generic/dtrans.cxx b/dtrans/source/generic/dtrans.cxx index edc78bc355a0..14cdecd817f4 100644 --- a/dtrans/source/generic/dtrans.cxx +++ b/dtrans/source/generic/dtrans.cxx @@ -18,6 +18,7 @@ */ #include <cppuhelper/factory.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include "clipboardmanager.hxx" #include "generic_clipboard.hxx" diff --git a/dtrans/source/win32/clipb/wcbentry.cxx b/dtrans/source/win32/clipb/wcbentry.cxx index df60bba1eaaa..d295bf00447c 100644 --- a/dtrans/source/win32/clipb/wcbentry.cxx +++ b/dtrans/source/win32/clipb/wcbentry.cxx @@ -20,6 +20,7 @@ #include <cppuhelper/factory.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/container/XSet.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include "WinClipboard.hxx" #define WINCLIPBOARD_SERVICE_NAME "com.sun.star.datatransfer.clipboard.SystemClipboard" diff --git a/dtrans/source/win32/dnd/dndentry.cxx b/dtrans/source/win32/dnd/dndentry.cxx index 8bce76cfbb1d..9a06cbc6f3b9 100644 --- a/dtrans/source/win32/dnd/dndentry.cxx +++ b/dtrans/source/win32/dnd/dndentry.cxx @@ -20,6 +20,7 @@ #include <cppuhelper/factory.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/container/XSet.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include "source.hxx" #include "target.hxx" diff --git a/dtrans/source/win32/ftransl/ftranslentry.cxx b/dtrans/source/win32/ftransl/ftranslentry.cxx index 4d8789f4686c..67e90161a207 100644 --- a/dtrans/source/win32/ftransl/ftranslentry.cxx +++ b/dtrans/source/win32/ftransl/ftranslentry.cxx @@ -20,6 +20,7 @@ #include <cppuhelper/factory.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/container/XSet.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/datatransfer/XDataFormatTranslator.hpp> #include "ftransl.hxx" diff --git a/embeddedobj/source/commonembedding/register.cxx b/embeddedobj/source/commonembedding/register.cxx index ec29cad223d7..0ca1676b2de1 100644 --- a/embeddedobj/source/commonembedding/register.cxx +++ b/embeddedobj/source/commonembedding/register.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/registry/InvalidRegistryException.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <cppuhelper/factory.hxx> #include "xfactory.hxx" diff --git a/embeddedobj/source/msole/mtnotification.hxx b/embeddedobj/source/msole/mtnotification.hxx index f8746ad36329..710481460485 100644 --- a/embeddedobj/source/msole/mtnotification.hxx +++ b/embeddedobj/source/msole/mtnotification.hxx @@ -24,6 +24,7 @@ #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/awt/XCallback.hpp> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakref.hxx> #include <rtl/ref.hxx> diff --git a/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx index 0c655496a1b9..ca1e4437b309 100644 --- a/embeddedobj/source/msole/oleregister.cxx +++ b/embeddedobj/source/msole/oleregister.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/registry/InvalidRegistryException.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <cppuhelper/factory.hxx> #include "xolefactory.hxx" diff --git a/embedserv/source/inc/docholder.hxx b/embedserv/source/inc/docholder.hxx index 6a9f9b1a8541..1bd9a8746323 100644 --- a/embedserv/source/inc/docholder.hxx +++ b/embedserv/source/inc/docholder.hxx @@ -28,6 +28,7 @@ #include <com/sun/star/frame/XFrame2.hpp> #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakref.hxx> #include <rtl/ref.hxx> diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 2b79af21cb24..b9aa15092714 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/frame/XFrameLoader.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 4cfbfe1e12ca..29a12cf9a249 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -35,6 +35,7 @@ #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/inspection/PropertyControlType.hpp> #include <com/sun/star/ucb/AlreadyInitializedException.hpp> +#include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <comphelper/types.hxx> diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index 0a45bb54e831..208a0d27b183 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/Time.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <connectivity/dbconversion.hxx> #include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> diff --git a/extensions/source/scanner/scnserv.cxx b/extensions/source/scanner/scnserv.cxx index d790bb9522fe..91443b4444e5 100644 --- a/extensions/source/scanner/scnserv.cxx +++ b/extensions/source/scanner/scnserv.cxx @@ -22,6 +22,7 @@ #include "scanner.hxx" #include <com/sun/star/registry/XRegistryKey.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> using namespace com::sun::star::registry; diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index b1f6ccde72a4..5e9b78e3516b 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx index 0df04004a94d..1f727e363558 100644 --- a/filter/source/xsltfilter/OleHandler.cxx +++ b/filter/source/xsltfilter/OleHandler.cxx @@ -39,6 +39,7 @@ #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include "OleHandler.hxx" #include <memory> diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index df8ef610c0af..a82b6db15f54 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -35,6 +35,7 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/EventObject.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/uno/Any.hxx> diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx index 3939b77306ea..4266d74bdb4c 100644 --- a/forms/source/inc/InterfaceContainer.hxx +++ b/forms/source/inc/InterfaceContainer.hxx @@ -42,6 +42,7 @@ #include <osl/mutex.hxx> #include <comphelper/interfacecontainer2.hxx> #include <cppuhelper/component.hxx> +#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase8.hxx> #include <unordered_map> diff --git a/fpicker/source/aqua/FPentry.mm b/fpicker/source/aqua/FPentry.mm index f56c7819fb86..4fe6b9839aac 100644 --- a/fpicker/source/aqua/FPentry.mm +++ b/fpicker/source/aqua/FPentry.mm @@ -19,6 +19,7 @@ #include <cppuhelper/factory.hxx> #include <com/sun/star/container/XSet.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include "SalAquaFilePicker.hxx" #include "SalAquaFolderPicker.hxx" diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx index d62dda491128..885104529f48 100644 --- a/fpicker/source/win32/filepicker/FPentry.cxx +++ b/fpicker/source/win32/filepicker/FPentry.cxx @@ -19,6 +19,7 @@ #include <cppuhelper/factory.hxx> #include <com/sun/star/container/XSet.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include "FPServiceInfo.hxx" #include "VistaFilePicker.hxx" diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx index d82745f7384f..9aed7b5ae2cc 100644 --- a/framework/inc/dispatch/closedispatcher.hxx +++ b/framework/inc/dispatch/closedispatcher.hxx @@ -35,6 +35,7 @@ #include <memory> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakref.hxx> #include <vcl/evntpost.hxx> #include <vcl/vclptr.hxx> diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx index 73a9b18e5a79..ab08bbf31f9d 100644 --- a/framework/inc/helper/mischelper.hxx +++ b/framework/inc/helper/mischelper.hxx @@ -31,6 +31,7 @@ #include <com/sun/star/ui/XContextChangeEventListener.hpp> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakref.hxx> #include <i18nlangtag/lang.h> #include <svl/languageoptions.hxx> diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx index e6b5c47d8c72..0699f59beb2c 100644 --- a/framework/inc/helper/persistentwindowstate.hxx +++ b/framework/inc/helper/persistentwindowstate.hxx @@ -31,6 +31,7 @@ #include <unotools/moduleoptions.hxx> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakref.hxx> namespace framework{ diff --git a/framework/inc/helper/tagwindowasmodified.hxx b/framework/inc/helper/tagwindowasmodified.hxx index 1832bada8497..13e46851727d 100644 --- a/framework/inc/helper/tagwindowasmodified.hxx +++ b/framework/inc/helper/tagwindowasmodified.hxx @@ -30,6 +30,7 @@ #include <com/sun/star/frame/XFrameActionListener.hpp> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakref.hxx> namespace framework{ diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx index cbab719bb9a6..ab93896ec273 100644 --- a/framework/inc/helper/titlebarupdate.hxx +++ b/framework/inc/helper/titlebarupdate.hxx @@ -29,6 +29,7 @@ #include <com/sun/star/lang/XEventListener.hpp> #include <unotools/moduleoptions.hxx> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakref.hxx> #include <rtl/ustrbuf.hxx> namespace framework{ diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx index 2cb87931848e..4ba468197986 100644 --- a/framework/inc/helper/uiconfigelementwrapperbase.hxx +++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx @@ -34,6 +34,7 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/propshlp.hxx> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakref.hxx> namespace framework { diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx index 9d2f805e3a7f..7119c08e1f46 100644 --- a/framework/inc/helper/uielementwrapperbase.hxx +++ b/framework/inc/helper/uielementwrapperbase.hxx @@ -30,6 +30,7 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/propshlp.hxx> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakref.hxx> namespace framework { diff --git a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx index 385062bdb2b9..1037ecb905f4 100644 --- a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx +++ b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx @@ -26,6 +26,7 @@ #include <rtl/ustring.hxx> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakref.hxx> #include <vector> diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx index fef8302f8fb6..cc4653dce95c 100644 --- a/framework/source/dispatch/servicehandler.cxx +++ b/framework/source/dispatch/servicehandler.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/frame/DispatchResultState.hpp> #include <com/sun/star/task/XJobExecutor.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <vcl/svapp.hxx> #include <sal/log.hxx> diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx index 377e1d01d284..e473dd53275b 100644 --- a/framework/source/inc/dispatch/loaddispatcher.hxx +++ b/framework/source/inc/dispatch/loaddispatcher.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/frame/XSynchronousDispatch.hpp> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakref.hxx> namespace framework{ diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx index bf823d5e12e3..3c2997590ed3 100644 --- a/hwpfilter/source/hwpreader.hxx +++ b/hwpfilter/source/hwpreader.hxx @@ -27,6 +27,8 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/document/XImporter.hpp> diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx index dc2f6a40529c..25d2e3196864 100644 --- a/i18npool/source/search/textsearch.cxx +++ b/i18npool/source/search/textsearch.cxx @@ -21,6 +21,7 @@ #include "levdis.hxx" #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <comphelper/processfactory.hxx> #include <com/sun/star/i18n/BreakIterator.hpp> #include <com/sun/star/i18n/UnicodeType.hpp> diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index 9ad89d5d1344..9717b10d9754 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -49,3 +49,48 @@ blacklist: include/sfx2/toolbarids.hxx: # needed for enum definition - sal/types.h + include/cppuhelper/compbase1.hxx: + # Needed for template functions + - cppuhelper/implbase1.hxx + include/cppuhelper/compbase2.hxx: + # Needed for template functions + - cppuhelper/implbase2.hxx + include/cppuhelper/compbase3.hxx: + # Needed for template functions + - cppuhelper/implbase3.hxx + include/cppuhelper/compbase4.hxx: + # Needed for template functions + - cppuhelper/implbase4.hxx + include/cppuhelper/compbase5.hxx: + # Needed for template functions + - cppuhelper/implbase5.hxx + include/cppuhelper/compbase6.hxx: + # Needed for template functions + - cppuhelper/implbase6.hxx + include/cppuhelper/compbase7.hxx: + # Needed for template functions + - cppuhelper/implbase7.hxx + include/cppuhelper/compbase8.hxx: + # Needed for template functions + - cppuhelper/implbase8.hxx + include/cppuhelper/compbase9.hxx: + # Needed for template functions + - cppuhelper/implbase9.hxx + include/cppuhelper/compbase10.hxx: + # Needed for template functions + - cppuhelper/implbase10.hxx + include/cppuhelper/compbase11.hxx: + # Needed for template functions + - cppuhelper/implbase11.hxx + include/cppuhelper/compbase12.hxx: + # Needed for template functions + - cppuhelper/implbase12.hxx + include/cppuhelper/exc_hlp.hxx: + #Needed for implicit destructor + - com/sun/star/uno/Any.hxx + include/cppuhelper/propertysetmixin.hxx: + #Needed for implicit destructor + - com/sun/star/uno/Sequence.hxx + include/cppuhelper/interfacecontainer.h: + #Needed for implicit destructor + - com/sun/star/uno/Sequence.hxx diff --git a/include/cppuhelper/access_control.hxx b/include/cppuhelper/access_control.hxx index 816eb07829e0..35b6282522b0 100644 --- a/include/cppuhelper/access_control.hxx +++ b/include/cppuhelper/access_control.hxx @@ -19,10 +19,11 @@ #ifndef INCLUDED_CPPUHELPER_ACCESS_CONTROL_HXX #define INCLUDED_CPPUHELPER_ACCESS_CONTROL_HXX -#include "com/sun/star/uno/XComponentContext.hpp" -#include "com/sun/star/security/XAccessController.hpp" #include "cppuhelper/cppuhelperdllapi.h" +#include "com/sun/star/uno/Reference.hxx" +namespace com { namespace sun { namespace star { namespace security { class XAccessController; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } namespace cppu { diff --git a/include/cppuhelper/bootstrap.hxx b/include/cppuhelper/bootstrap.hxx index bdb4d90584dd..a7f92bbb7cd1 100644 --- a/include/cppuhelper/bootstrap.hxx +++ b/include/cppuhelper/bootstrap.hxx @@ -20,7 +20,7 @@ #define INCLUDED_CPPUHELPER_BOOTSTRAP_HXX #include "sal/config.h" -#include "com/sun/star/uno/Reference.hxx" +#include "com/sun/star/uno/Reference.h" #include "rtl/ustring.hxx" #include "sal/types.h" #include "cppuhelper/cppuhelperdllapi.h" diff --git a/include/cppuhelper/compbase.hxx b/include/cppuhelper/compbase.hxx index d9230482753d..8e00da57bfdc 100644 --- a/include/cppuhelper/compbase.hxx +++ b/include/cppuhelper/compbase.hxx @@ -22,14 +22,11 @@ #include "sal/config.h" -#include <exception> - #include "com/sun/star/lang/XTypeProvider.hpp" -#include "com/sun/star/uno/Any.hxx" -#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/Type.hxx" +#include "com/sun/star/uno/Any.h" +#include "com/sun/star/uno/Reference.h" +#include "com/sun/star/uno/Sequence.h" +#include "com/sun/star/uno/Type.h" #include "cppuhelper/compbase_ex.hxx" #include "cppuhelper/implbase.hxx" #include "rtl/instance.hxx" diff --git a/include/cppuhelper/compbase_ex.hxx b/include/cppuhelper/compbase_ex.hxx index 6a3f0000c992..db216e8655f9 100644 --- a/include/cppuhelper/compbase_ex.hxx +++ b/include/cppuhelper/compbase_ex.hxx @@ -19,14 +19,16 @@ #ifndef INCLUDED_CPPUHELPER_COMPBASE_EX_HXX #define INCLUDED_CPPUHELPER_COMPBASE_EX_HXX -#include "cppuhelper/implbase_ex.hxx" #include "cppuhelper/interfacecontainer.h" #include "com/sun/star/lang/XComponent.hpp" #include "cppuhelper/cppuhelperdllapi.h" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" /// @cond INTERNAL namespace osl { class Mutex; } +namespace cppu { struct class_data; } namespace cppu { diff --git a/include/cppuhelper/component.hxx b/include/cppuhelper/component.hxx index e9f50a8f8bd7..d99e7b82fdad 100644 --- a/include/cppuhelper/component.hxx +++ b/include/cppuhelper/component.hxx @@ -22,9 +22,8 @@ #include "cppuhelper/weakagg.hxx" #include "cppuhelper/interfacecontainer.h" -#include "cppuhelper/implbase1.hxx" - #include "com/sun/star/lang/XComponent.hpp" +#include "com/sun/star/lang/XTypeProvider.hpp" #include "cppuhelper/cppuhelperdllapi.h" diff --git a/include/cppuhelper/component_context.hxx b/include/cppuhelper/component_context.hxx index e0a67845b770..a2592f89c039 100644 --- a/include/cppuhelper/component_context.hxx +++ b/include/cppuhelper/component_context.hxx @@ -19,13 +19,13 @@ #ifndef INCLUDED_CPPUHELPER_COMPONENT_CONTEXT_HXX #define INCLUDED_CPPUHELPER_COMPONENT_CONTEXT_HXX -#include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/uno/Any.hxx" #include "com/sun/star/uno/Reference.hxx" #include "cppuhelper/cppuhelperdllapi.h" #include "rtl/ustring.hxx" #include "sal/types.h" +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } namespace cppu { diff --git a/include/cppuhelper/factory.hxx b/include/cppuhelper/factory.hxx index aa5fdf6dad7c..edcbc9d6e375 100644 --- a/include/cppuhelper/factory.hxx +++ b/include/cppuhelper/factory.hxx @@ -26,13 +26,16 @@ #include "rtl/ustring.hxx" #include "rtl/unload.h" -#include "com/sun/star/uno/XComponentContext.hpp" -#include "com/sun/star/lang/XSingleComponentFactory.hpp" -#include "com/sun/star/lang/XSingleServiceFactory.hpp" -#include "com/sun/star/lang/XMultiServiceFactory.hpp" -#include "com/sun/star/registry/XRegistryKey.hpp" +#include "com/sun/star/uno/Reference.h" #include "cppuhelper/cppuhelperdllapi.h" +namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com { namespace sun { namespace star { namespace lang { class XSingleComponentFactory; } } } } +namespace com { namespace sun { namespace star { namespace lang { class XSingleServiceFactory; } } } } +namespace com { namespace sun { namespace star { namespace registry { class XRegistryKey; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } } +namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } } #define COMPONENT_GETENV "component_getImplementationEnvironment" #define COMPONENT_GETENVEXT "component_getImplementationEnvironmentExt" diff --git a/include/cppuhelper/implbase.hxx b/include/cppuhelper/implbase.hxx index c946fb9cb052..b5d67edac990 100644 --- a/include/cppuhelper/implbase.hxx +++ b/include/cppuhelper/implbase.hxx @@ -23,14 +23,12 @@ #include "sal/config.h" #include <cstddef> -#include <exception> #include <utility> #include "com/sun/star/lang/XTypeProvider.hpp" -#include "com/sun/star/uno/Any.hxx" -#include "com/sun/star/uno/RuntimeException.hpp" +#include "com/sun/star/uno/Any.h" #include "com/sun/star/uno/Sequence.hxx" -#include "com/sun/star/uno/Type.hxx" +#include "com/sun/star/uno/Type.h" #include "cppuhelper/implbase_ex.hxx" #include "cppuhelper/weak.hxx" #include "rtl/instance.hxx" diff --git a/include/cppuhelper/implbase1.hxx b/include/cppuhelper/implbase1.hxx index d274d661b4f7..61f7c0780df8 100644 --- a/include/cppuhelper/implbase1.hxx +++ b/include/cppuhelper/implbase1.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase10.hxx b/include/cppuhelper/implbase10.hxx index d4278d551c2a..ea978e115162 100644 --- a/include/cppuhelper/implbase10.hxx +++ b/include/cppuhelper/implbase10.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase11.hxx b/include/cppuhelper/implbase11.hxx index 937705b3c2a5..2ce61f8f8a4b 100644 --- a/include/cppuhelper/implbase11.hxx +++ b/include/cppuhelper/implbase11.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase12.hxx b/include/cppuhelper/implbase12.hxx index 57c01184cb08..afc5b4e34f0e 100644 --- a/include/cppuhelper/implbase12.hxx +++ b/include/cppuhelper/implbase12.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase13.hxx b/include/cppuhelper/implbase13.hxx index 21ab3d4017f1..7ebb695d2ce6 100644 --- a/include/cppuhelper/implbase13.hxx +++ b/include/cppuhelper/implbase13.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase2.hxx b/include/cppuhelper/implbase2.hxx index ff1daf927375..bdf8568db51a 100644 --- a/include/cppuhelper/implbase2.hxx +++ b/include/cppuhelper/implbase2.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase3.hxx b/include/cppuhelper/implbase3.hxx index 4238739f78a1..590471118f8b 100644 --- a/include/cppuhelper/implbase3.hxx +++ b/include/cppuhelper/implbase3.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase4.hxx b/include/cppuhelper/implbase4.hxx index 827f56eece37..36279a0f74b5 100644 --- a/include/cppuhelper/implbase4.hxx +++ b/include/cppuhelper/implbase4.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase5.hxx b/include/cppuhelper/implbase5.hxx index 26cac953bfa9..1b300dcf6c04 100644 --- a/include/cppuhelper/implbase5.hxx +++ b/include/cppuhelper/implbase5.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase6.hxx b/include/cppuhelper/implbase6.hxx index 0b1db8d75bfc..62652c9819e2 100644 --- a/include/cppuhelper/implbase6.hxx +++ b/include/cppuhelper/implbase6.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase7.hxx b/include/cppuhelper/implbase7.hxx index 157e1c945418..0d1e12a91117 100644 --- a/include/cppuhelper/implbase7.hxx +++ b/include/cppuhelper/implbase7.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase8.hxx b/include/cppuhelper/implbase8.hxx index c55198888bdf..08dec44e4215 100644 --- a/include/cppuhelper/implbase8.hxx +++ b/include/cppuhelper/implbase8.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase9.hxx b/include/cppuhelper/implbase9.hxx index a71fd7c7eba2..2c3fe2bd1a74 100644 --- a/include/cppuhelper/implbase9.hxx +++ b/include/cppuhelper/implbase9.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase_ex.hxx b/include/cppuhelper/implbase_ex.hxx index 922f5ac68475..75f758d46094 100644 --- a/include/cppuhelper/implbase_ex.hxx +++ b/include/cppuhelper/implbase_ex.hxx @@ -19,9 +19,15 @@ #ifndef INCLUDED_CPPUHELPER_IMPLBASE_EX_HXX #define INCLUDED_CPPUHELPER_IMPLBASE_EX_HXX -#include "cppuhelper/weak.hxx" -#include "cppuhelper/weakagg.hxx" -#include "com/sun/star/lang/XTypeProvider.hpp" +#include "com/sun/star/uno/Any.h" +#include "com/sun/star/uno/Sequence.h" +#include "com/sun/star/uno/Type.h" +#include "com/sun/star/uno/genfunc.h" +#include "cppuhelper/cppuhelperdllapi.h" +#include "sal/types.h" + +namespace cppu { class OWeakAggObject; } +namespace cppu { class OWeakObject; } /* If you need to define implementation helper classes that deal with more than diff --git a/include/cppuhelper/interfacecontainer.h b/include/cppuhelper/interfacecontainer.h index 67e6353f4a2d..66522576fe03 100644 --- a/include/cppuhelper/interfacecontainer.h +++ b/include/cppuhelper/interfacecontainer.h @@ -30,12 +30,13 @@ #include "osl/mutex.hxx" #include "rtl/alloc.h" #include "com/sun/star/uno/Sequence.hxx" -#include "com/sun/star/uno/XInterface.hpp" #include "com/sun/star/lang/EventObject.hpp" #include "com/sun/star/lang/DisposedException.hpp" #include "cppuhelper/cppuhelperdllapi.h" +namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } } + /** */ //for docpp namespace cppu { diff --git a/include/cppuhelper/propertysetmixin.hxx b/include/cppuhelper/propertysetmixin.hxx index 287ef7dd1fc7..56887d9b7cf1 100644 --- a/include/cppuhelper/propertysetmixin.hxx +++ b/include/cppuhelper/propertysetmixin.hxx @@ -22,17 +22,10 @@ #include "sal/config.h" -#include <exception> - -#include "com/sun/star/beans/PropertyVetoException.hpp" -#include "com/sun/star/beans/UnknownPropertyException.hpp" #include "com/sun/star/beans/XFastPropertySet.hpp" #include "com/sun/star/beans/XPropertyAccess.hpp" #include "com/sun/star/beans/XPropertySet.hpp" -#include "com/sun/star/lang/IllegalArgumentException.hpp" -#include "com/sun/star/lang/WrappedTargetException.hpp" -#include "com/sun/star/uno/Reference.hxx" -#include "com/sun/star/uno/RuntimeException.hpp" +#include "com/sun/star/uno/Reference.h" #include "com/sun/star/uno/Sequence.hxx" #include "sal/types.h" #include "cppuhelper/cppuhelperdllapi.h" @@ -45,17 +38,13 @@ namespace com { namespace sun { namespace star { struct PropertyValue; } namespace uno { - class Any; class Type; class XComponentContext; } } } } -namespace rtl { class OUString; } namespace cppu { -template< typename T > class PropertySetMixin; - /** @short A helper base class for <code>cppu::PropertySetMixin</code>. diff --git a/include/cppuhelper/proptypehlp.h b/include/cppuhelper/proptypehlp.h index dcd2cd16c6bc..e1e6684f1d40 100644 --- a/include/cppuhelper/proptypehlp.h +++ b/include/cppuhelper/proptypehlp.h @@ -19,8 +19,9 @@ #ifndef INCLUDED_CPPUHELPER_PROPTYPEHLP_H #define INCLUDED_CPPUHELPER_PROPTYPEHLP_H -#include "com/sun/star/uno/Any.h" +#include "sal/types.h" +namespace com { namespace sun { namespace star { namespace uno { class Any; } } } } namespace cppu { diff --git a/include/cppuhelper/queryinterface.hxx b/include/cppuhelper/queryinterface.hxx index 0d662943695c..d54994ac1cd8 100644 --- a/include/cppuhelper/queryinterface.hxx +++ b/include/cppuhelper/queryinterface.hxx @@ -22,7 +22,7 @@ #include "sal/config.h" #include "com/sun/star/uno/Any.hxx" -#include "com/sun/star/uno/Type.hxx" +#include "com/sun/star/uno/Type.h" #include "sal/types.h" namespace cppu diff --git a/include/cppuhelper/shlib.hxx b/include/cppuhelper/shlib.hxx index 83e77daa3145..fa5efa424486 100644 --- a/include/cppuhelper/shlib.hxx +++ b/include/cppuhelper/shlib.hxx @@ -19,10 +19,13 @@ #ifndef INCLUDED_CPPUHELPER_SHLIB_HXX #define INCLUDED_CPPUHELPER_SHLIB_HXX -#include "com/sun/star/lang/XMultiServiceFactory.hpp" -#include "com/sun/star/registry/XRegistryKey.hpp" #include "cppuhelper/cppuhelperdllapi.h" +#include "com/sun/star/uno/Reference.h" +#include "rtl/ustring.hxx" +namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com { namespace sun { namespace star { namespace registry { class XRegistryKey; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } } namespace cppu { diff --git a/include/svtools/openfiledroptargetlistener.hxx b/include/svtools/openfiledroptargetlistener.hxx index 88e7dbe4da71..695f14df7135 100644 --- a/include/svtools/openfiledroptargetlistener.hxx +++ b/include/svtools/openfiledroptargetlistener.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/frame/XFrame.hpp> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakref.hxx> #include <sot/exchange.hxx> diff --git a/include/svx/unomodel.hxx b/include/svx/unomodel.hxx index 5d5e15a5bee8..3b82b337c6cc 100644 --- a/include/svx/unomodel.hxx +++ b/include/svx/unomodel.hxx @@ -28,6 +28,7 @@ #include <sfx2/sfxbasemodel.hxx> #include <svx/fmdmod.hxx> #include <svx/svxdllapi.h> +#include <cppuhelper/weakref.hxx> class SdrModel; diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx index eb8068e40f8e..9d92b8d4e8dc 100644 --- a/include/toolkit/controls/controlmodelcontainerbase.hxx +++ b/include/toolkit/controls/controlmodelcontainerbase.hxx @@ -31,6 +31,7 @@ #include <com/sun/star/resource/XStringResourceResolver.hpp> #include <cppuhelper/implbase8.hxx> #include <cppuhelper/implbase3.hxx> +#include <cppuhelper/weak.hxx> #include <toolkit/helper/listenermultiplexer.hxx> #include <toolkit/controls/unocontrolmodel.hxx> #include <toolkit/controls/unocontrolcontainer.hxx> diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx index 2f518a248053..d0bbc49f1856 100644 --- a/io/source/acceptor/acceptor.cxx +++ b/io/source/acceptor/acceptor.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/connection/XAcceptor.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <services.hxx> #include "acceptor.hxx" diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx index 3efcdbea8745..1de3ee92ec2d 100644 --- a/io/source/connector/connector.cxx +++ b/io/source/connector/connector.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/connection/ConnectionSetupException.hpp> #include <com/sun/star/connection/NoConnectException.hpp> #include <com/sun/star/connection/XConnector.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <services.hxx> #include "connector.hxx" diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx index aaa4178d3b0f..6a62c75d5a63 100644 --- a/io/source/stm/odata.cxx +++ b/io/source/stm/odata.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/io/UnexpectedEOFException.hpp> #include <com/sun/star/io/WrongFormatException.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> using namespace ::cppu; using namespace ::osl; diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx index 957ab25e2334..422e219a59c9 100644 --- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx @@ -22,6 +22,7 @@ #include <cppuhelper/factory.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/registry/XRegistryKey.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <i18nlangtag/languagetag.hxx> #include <tools/debug.hxx> #include <osl/mutex.hxx> diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm index d9f0d017ba84..96cb56529db5 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm +++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm @@ -23,6 +23,7 @@ #include <cppuhelper/factory.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/registry/XRegistryKey.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <tools/debug.hxx> #include <osl/mutex.hxx> diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx index 7e9457ff4fa1..72019218ccbe 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx @@ -24,6 +24,8 @@ #include <comphelper/processfactory.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/supportsservice.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> #include <tools/debug.hxx> #include <osl/mutex.hxx> diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx index 7f9dca4f9ce2..6ea501e327df 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/uno/Reference.h> #include <cppuhelper/factory.hxx> #include <cppuhelper/supportsservice.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/linguistic2/LinguServiceManager.hpp> diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 5e7ab7abb35d..5351e795b2e6 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/NoSupportException.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/linguistic2/ConversionDictionaryType.hpp> #include <com/sun/star/linguistic2/XConversionDictionary.hpp> #include <com/sun/star/linguistic2/XConversionDictionaryList.hpp> diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 4db66d632b22..651cb6ed2731 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -32,6 +32,7 @@ #include <unotools/ucbstreamhelper.hxx> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/lang/Locale.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/linguistic2/DictionaryEventFlags.hpp> #include <com/sun/star/linguistic2/DictionaryListEventFlags.hpp> diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index be3fa38243a3..c104ee9a4f95 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -44,6 +44,7 @@ #include <com/sun/star/text/XFlatParagraphIterator.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <sal/config.h> #include <sal/log.hxx> diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index d18ebec6a8d5..ec7816cf445c 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/registry/XSimpleRegistry.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/lang/Locale.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/i18n/ScriptType.hpp> #include <i18nlangtag/mslangid.hxx> diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index d106bf586934..b06ac83dfdf5 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -26,6 +26,8 @@ #include <com/sun/star/container/XContentEnumerationAccess.hpp> #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/lang/XSingleComponentFactory.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/linguistic2/XSupportedLocales.hpp> #include <com/sun/star/linguistic2/DictionaryListEventFlags.hpp> #include <com/sun/star/linguistic2/LinguServiceEventFlags.hpp> diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx index 3579989c5835..2915b2055102 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx @@ -38,6 +38,8 @@ #include <cppuhelper/factory.hxx> #include <osl/diagnose.h> #include <uno/lbnames.h> +#include <com/sun/star/registry/XRegistryKey.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> using namespace connectivity::skeleton; using ::rtl::OUString; diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx index 8c3e7a622816..e07d5cb26d24 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx @@ -41,6 +41,8 @@ #include <uno/lbnames.h> #include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/odk/examples/cpp/remoteclient/remoteclient.cxx b/odk/examples/cpp/remoteclient/remoteclient.cxx index 373efaee8a24..90f6280c15f4 100644 --- a/odk/examples/cpp/remoteclient/remoteclient.cxx +++ b/odk/examples/cpp/remoteclient/remoteclient.cxx @@ -46,6 +46,8 @@ #include <com/sun/star/lang/XMain.hpp> #include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/io/XInputStream.hpp> diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 33266663d794..6fd56390233c 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -77,6 +77,7 @@ #include <com/sun/star/table/XMergeableCell.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/frame/XModel.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <tools/stream.hxx> #include <tools/globname.hxx> #include <comphelper/classids.hxx> diff --git a/package/source/xstor/ohierarchyholder.hxx b/package/source/xstor/ohierarchyholder.hxx index c50a00358b1b..2c2db2662e13 100644 --- a/package/source/xstor/ohierarchyholder.hxx +++ b/package/source/xstor/ohierarchyholder.hxx @@ -24,6 +24,7 @@ #include <com/sun/star/embed/XTransactionListener.hpp> #include <com/sun/star/embed/XExtendedStorageStream.hpp> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakref.hxx> #include <comphelper/sequenceashashmap.hxx> diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index 3bdb5e357fc4..d36e7442bbb7 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -85,6 +85,7 @@ #include <com/sun/star/sheet/XExternalSheetName.hpp> #include <com/sun/star/document/XEventsSupplier.hpp> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakref.hxx> #include <memory> #include <vector> diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index b446ffc7995c..5d2c650d062c 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -71,6 +71,7 @@ #include <com/sun/star/document/XEmbeddedObjectSupplier.hpp> #include <com/sun/star/frame/XStorable2.hpp> #include <com/sun/star/frame/Desktop.hpp> +#include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <config_folders.h> diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx index cb2a8b3dd04f..0576fc38158c 100644 --- a/scaddins/source/analysis/analysis.cxx +++ b/scaddins/source/analysis/analysis.cxx @@ -24,6 +24,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/random.hxx> #include <cppuhelper/supportsservice.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <o3tl/any.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/math.hxx> diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx index 3585cd6487cd..bcf5102faf9f 100644 --- a/scaddins/source/datefunc/datefunc.cxx +++ b/scaddins/source/datefunc/datefunc.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/util/Date.hpp> #include <cppuhelper/factory.hxx> #include <cppuhelper/supportsservice.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <rtl/ustrbuf.hxx> #include <unotools/resmgr.hxx> #include <algorithm> diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx index 271e18ac80b0..ced28ba974a8 100644 --- a/scaddins/source/pricing/pricing.cxx +++ b/scaddins/source/pricing/pricing.cxx @@ -29,6 +29,7 @@ #include <cppuhelper/factory.hxx> #include <cppuhelper/supportsservice.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <iostream> #include <algorithm> #include <rtl/math.hxx> diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 6cb4c8c41a73..e99759b61ab8 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -55,6 +55,7 @@ #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/frame/XModel.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <oox/export/utils.hxx> #include <oox/ppt/pptfilterhelpers.hxx> diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx index aa11447df77b..a31a7568d675 100644 --- a/sd/source/ui/inc/framework/ResourceId.hxx +++ b/sd/source/ui/inc/framework/ResourceId.hxx @@ -29,6 +29,8 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakref.hxx> + #include <memory> namespace sd { namespace framework { diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index 5ec60462575b..f506830f48ae 100644 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/sd/source/ui/unoidl/facreg.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/registry/XRegistryKey.hpp> +#include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <facreg.hxx> #include <sddll.hxx> diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx b/sdext/source/minimizer/pppoptimizeruno.cxx index 08a97a7f52d7..361291d8e85d 100644 --- a/sdext/source/minimizer/pppoptimizeruno.cxx +++ b/sdext/source/minimizer/pppoptimizeruno.cxx @@ -20,6 +20,7 @@ #include <osl/thread.h> #include <cppuhelper/factory.hxx> +#include <com/sun/star/lang/XSingleComponentFactory.hpp> #include "pppoptimizerdialog.hxx" using namespace ::cppu; diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx index 405f0ef5b269..0fb5b62b16a6 100644 --- a/sdext/source/pdfimport/services.cxx +++ b/sdext/source/pdfimport/services.cxx @@ -24,6 +24,7 @@ #include <cppuhelper/factory.hxx> #include <cppuhelper/implementationentry.hxx> +#include <com/sun/star/lang/XSingleComponentFactory.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx index 0e5bb44445a9..c49107ba87ce 100644 --- a/sfx2/source/appl/imestatuswindow.cxx +++ b/sfx2/source/appl/imestatuswindow.cxx @@ -42,6 +42,7 @@ #include <sal/types.h> #include <vcl/svapp.hxx> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakref.hxx> //TO-Do, merge into framework/inc/helpers/mischelpers.hxx and deliver class WeakPropertyChangeListener : public ::cppu::WeakImplHelper<css::beans::XPropertyChangeListener> diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx index a910138908fd..1c32be75cd90 100644 --- a/sfx2/source/appl/macroloader.cxx +++ b/sfx2/source/appl/macroloader.cxx @@ -27,6 +27,8 @@ #include <basic/basmgr.hxx> #include <basic/sbuno.hxx> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/weak.hxx> +#include <cppuhelper/weakref.hxx> #include <framework/documentundoguard.hxx> #include <rtl/ref.hxx> #include <sfx2/app.hxx> diff --git a/sfx2/source/inc/macroloader.hxx b/sfx2/source/inc/macroloader.hxx index 94fa5165fdd9..54decff36a37 100644 --- a/sfx2/source/inc/macroloader.hxx +++ b/sfx2/source/inc/macroloader.hxx @@ -36,6 +36,7 @@ #include <com/sun/star/util/URL.hpp> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakref.hxx> #include <sfx2/sfxuno.hxx> #include <vcl/errcode.hxx> diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx index 217343612fe8..80c6ca85b752 100644 --- a/shell/source/cmdmail/cmdmailentry.cxx +++ b/shell/source/cmdmail/cmdmailentry.cxx @@ -19,6 +19,7 @@ #include <cppuhelper/factory.hxx> #include <com/sun/star/container/XSet.hpp> +#include <com/sun/star/lang/XSingleComponentFactory.hpp> #include "cmdmailsuppl.hxx" using namespace ::com::sun::star::uno; diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx index 3b1792ef58db..baa304476a3d 100644 --- a/shell/source/unix/exec/shellexecentry.cxx +++ b/shell/source/unix/exec/shellexecentry.cxx @@ -18,6 +18,7 @@ */ #include <cppuhelper/factory.hxx> +#include <com/sun/star/lang/XSingleComponentFactory.hpp> #include "shellexec.hxx" using namespace ::com::sun::star::uno; diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx index a363edafdccf..7306ea5e7a5a 100644 --- a/shell/source/win32/SysShentry.cxx +++ b/shell/source/win32/SysShentry.cxx @@ -19,6 +19,7 @@ #include <cppuhelper/factory.hxx> #include <com/sun/star/container/XSet.hpp> +#include <com/sun/star/lang/XSingleComponentFactory.hpp> #include "SysShExec.hxx" using namespace ::com::sun::star::uno; diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx index 685f29983b72..d34aa12f0fb3 100644 --- a/shell/source/win32/simplemail/smplmailentry.cxx +++ b/shell/source/win32/simplemail/smplmailentry.cxx @@ -19,6 +19,8 @@ #include <cppuhelper/factory.hxx> #include <com/sun/star/container/XSet.hpp> +#include <com/sun/star/lang/XSingleComponentFactory.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include "smplmailsuppl.hxx" using namespace ::com::sun::star::uno; diff --git a/starmath/source/detreg.cxx b/starmath/source/detreg.cxx index 12a2428ba28c..74d25aa3d762 100644 --- a/starmath/source/detreg.cxx +++ b/starmath/source/detreg.cxx @@ -19,6 +19,7 @@ #include <cppuhelper/factory.hxx> #include <rtl/ustring.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include "smdetect.hxx" diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index b929972ba441..dd8997e5673b 100644 --- a/stoc/source/implementationregistration/implreg.cxx +++ b/stoc/source/implementationregistration/implreg.cxx @@ -46,6 +46,7 @@ #include <com/sun/star/reflection/XServiceTypeDescription.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/uno/RuntimeException.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include "mergekeys.hxx" diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index fea4816ac99e..c353729f3e6c 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -45,6 +45,7 @@ #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/reflection/InvocationTargetException.hpp> #include <com/sun/star/uno/RuntimeException.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <unordered_map> #include <unordered_set> diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 86d546462f7a..968e776be2a0 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/registry/XSimpleRegistry.hpp> diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx index db48d2d2ad28..a5c96a957452 100644 --- a/stoc/source/loader/dllcomponentloader.cxx +++ b/stoc/source/loader/dllcomponentloader.cxx @@ -40,6 +40,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> using namespace com::sun::star; using namespace css::uno; diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx index 99915cde3e3a..122497928295 100644 --- a/stoc/source/proxy_factory/proxyfac.cxx +++ b/stoc/source/proxy_factory/proxyfac.cxx @@ -34,6 +34,7 @@ #include <cppuhelper/implementationentry.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/weakagg.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/reflection/XProxyFactory.hpp> diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx index 1f046695e953..c169444d731c 100644 --- a/stoc/source/security/access_controller.cxx +++ b/stoc/source/security/access_controller.cxx @@ -38,6 +38,7 @@ #include <com/sun/star/uno/XCurrentContext.hpp> #include <com/sun/star/uno/DeploymentException.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx index 305d89585ea5..e720cafbf85f 100644 --- a/stoc/source/security/file_policy.cxx +++ b/stoc/source/security/file_policy.cxx @@ -36,6 +36,7 @@ #include <com/sun/star/security/RuntimePermission.hpp> #include <com/sun/star/io/FilePermission.hpp> #include <com/sun/star/connection/SocketPermission.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <unordered_map> diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index b295aa6f112b..a20fa8de7ed5 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -43,6 +43,7 @@ #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> +#include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/DisposedException.hpp> @@ -55,6 +56,7 @@ #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/container/XContentEnumerationAccess.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XUnloadingPreference.hpp> #include <unordered_map> diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index c799db2c6f04..6c276598f4e7 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/task/MasterPasswordRequest.hpp> #include <com/sun/star/task/NoMasterException.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <osl/diagnose.h> #include <rtl/character.hxx> diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx index 10e602ca7e5d..5d00257768e6 100644 --- a/svtools/source/graphic/renderer.cxx +++ b/svtools/source/graphic/renderer.cxx @@ -32,6 +32,7 @@ #include <comphelper/propertysethelper.hxx> #include <comphelper/propertysetinfo.hxx> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/weakagg.hxx> #include <rtl/ref.hxx> #include <svl/itemprop.hxx> #include <vcl/GraphicObject.hxx> diff --git a/svx/source/form/fmservs.cxx b/svx/source/form/fmservs.cxx index 981bc1bb6e00..5cd0b79991b6 100644 --- a/svx/source/form/fmservs.cxx +++ b/svx/source/form/fmservs.cxx @@ -20,6 +20,8 @@ #include <com/sun/star/container/XSet.hpp> #include <cppuhelper/factory.hxx> #include <comphelper/processfactory.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <fmservs.hxx> using namespace com::sun::star; diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 42cc075d98c4..c7b7f2860476 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -44,6 +44,7 @@ #include <comphelper/interfacecontainer2.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/component.hxx> +#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx> #include <tools/diagnose_ex.h> diff --git a/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx index 7bafe95a6375..2b27c18435a4 100644 --- a/svx/source/unogallery/unogalitem.hxx +++ b/svx/source/unogallery/unogalitem.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/gallery/XGalleryItem.hpp> #include <comphelper/propertysethelper.hxx> #include <comphelper/propertysetinfo.hxx> +#include <cppuhelper/weakagg.hxx> class GalleryTheme; struct GalleryObject; diff --git a/sw/source/core/docnode/threadmanager.hxx b/sw/source/core/docnode/threadmanager.hxx index fa648292de8f..78af453fabef 100644 --- a/sw/source/core/docnode/threadmanager.hxx +++ b/sw/source/core/docnode/threadmanager.hxx @@ -27,6 +27,7 @@ #include <deque> #include <cppuhelper/weak.hxx> +#include <cppuhelper/weakref.hxx> #include <com/sun/star/util/XJobManager.hpp> #include <observablethread.hxx> #include "cancellablejob.hxx" diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx index b9137f7a9559..2e646bfb5a18 100644 --- a/testtools/source/bridgetest/cppobj.cxx +++ b/testtools/source/bridgetest/cppobj.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/uno/Sequence.hxx> diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index c03a37902a39..69bc6b94fb48 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -38,6 +38,8 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> +#include <cppuhelper/weak.hxx> +#include <cppuhelper/weakagg.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <vcl/outdev.hxx> diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 2cac7986a506..277cd80ded29 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -33,6 +33,8 @@ #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> +#include <cppuhelper/weak.hxx> +#include <cppuhelper/weakagg.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <comphelper/sequence.hxx> diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index 7eceac10dc50..56bcbc39593b 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -44,6 +44,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XNameReplace.hpp> #include <com/sun/star/util/XChangesBatch.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <comphelper/processfactory.hxx> #include <cppuhelper/implbase.hxx> #include "ucbstore.hxx" diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx index 10abce763b23..24810bf949cc 100644 --- a/ucb/source/ucp/cmis/cmis_provider.cxx +++ b/ucb/source/ucp/cmis/cmis_provider.cxx @@ -10,6 +10,7 @@ #include <comphelper/processfactory.hxx> #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/contenthelper.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/IllegalIdentifierException.hpp> diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index 66bb77f67b77..17184ddb51bd 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -22,6 +22,7 @@ #include <ucbhelper/contenthelper.hxx> #include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/IllegalIdentifierException.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include "gio_provider.hxx" #include "gio_content.hxx" diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx index bef1f9bd3883..55e1af3b31c5 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/container/XNameReplace.hpp> #include <com/sun/star/util/XChangesBatch.hpp> #include <com/sun/star/util/XOfficeInstallationDirectories.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <comphelper/propertysequence.hxx> #include "hierarchyprovider.hxx" #include "hierarchyuri.hxx" diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index 642df28c2d4c..930879624d12 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/util/XChangesBatch.hpp> #include <com/sun/star/util/XChangesNotifier.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> using namespace com::sun::star; using namespace hierarchy_ucp; diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index 9f0e0048bc65..c16927966c91 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -60,6 +60,7 @@ #include <com/sun/star/ucb/XCommandInfo.hpp> #include <com/sun/star/ucb/XPersistentPropertySet.hpp> #include <com/sun/star/util/XChangesBatch.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <comphelper/propertysequence.hxx> diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx index 9a33a88bcc66..4fc417010a0f 100644 --- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx +++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx @@ -26,6 +26,7 @@ #include <cppuhelper/factory.hxx> #include <cppuhelper/supportsservice.hxx> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include "tdoc_documentcontentfactory.hxx" diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx index 95a64428f57c..28d86a7c8e94 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.cxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/embed/StorageWrappedTargetException.hpp> #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/packages/NoEncryptionException.hpp> +#include <com/sun/star/uno/XAggregation.hpp> #include <cppuhelper/exc_hlp.hxx> #include <osl/diagnose.h> diff --git a/unoxml/source/dom/document.hxx b/unoxml/source/dom/document.hxx index a7f36c7997de..1211e5978ea9 100644 --- a/unoxml/source/dom/document.hxx +++ b/unoxml/source/dom/document.hxx @@ -28,6 +28,7 @@ #include <sal/types.h> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakref.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/beans/StringPair.hpp> diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx index cb85f43ec47b..3352eba9acba 100644 --- a/unoxml/source/rdf/librdf_repository.cxx +++ b/unoxml/source/rdf/librdf_repository.cxx @@ -59,6 +59,7 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/weakref.hxx> #include <comphelper/sequence.hxx> #include <comphelper/xmltools.hxx> diff --git a/vbahelper/source/vbahelper/vbaglobalbase.cxx b/vbahelper/source/vbahelper/vbaglobalbase.cxx index 6e56cc19fea1..4c65e9d4d398 100644 --- a/vbahelper/source/vbahelper/vbaglobalbase.cxx +++ b/vbahelper/source/vbahelper/vbaglobalbase.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> using namespace com::sun::star; using namespace ooo::vba; diff --git a/vcl/inc/graphic/UnoGraphicDescriptor.hxx b/vcl/inc/graphic/UnoGraphicDescriptor.hxx index f163a5023c2a..4186cfc43c4b 100644 --- a/vcl/inc/graphic/UnoGraphicDescriptor.hxx +++ b/vcl/inc/graphic/UnoGraphicDescriptor.hxx @@ -23,6 +23,7 @@ #include <comphelper/propertysethelper.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <cppuhelper/weakagg.hxx> #include <comphelper/propertysetinfo.hxx> #include <vcl/graph.hxx> diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx index 51b256d0cc1a..55dd003d1a21 100644 --- a/vcl/source/components/factory.cxx +++ b/vcl/source/components/factory.cxx @@ -22,6 +22,7 @@ #include <uno/mapping.hxx> #include <cppuhelper/factory.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <vcl/dllapi.h> #include <factory.hxx> diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index a1a5e909fa9d..07646937183e 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -25,6 +25,7 @@ #include <string.h> #include <com/sun/star/container/XSet.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <cppuhelper/factory.hxx> diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index e86521ca7f4a..14f4ff68e1f3 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/beans/XTolerantMultiPropertySet.hpp> #include <com/sun/star/beans/TolerantPropertySetResultType.hpp> #include <rtl/ustrbuf.hxx> +#include <cppuhelper/weakref.hxx> #include <list> #include <map> diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx index bd94183ad82a..7bef41fc0c11 100644 --- a/xmloff/source/transform/XMLFilterRegistration.cxx +++ b/xmloff/source/transform/XMLFilterRegistration.cxx @@ -20,6 +20,7 @@ #include <string.h> #include <com/sun/star/registry/XRegistryKey.hpp> #include <cppuhelper/factory.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <osl/diagnose.h> #include "XMLFilterRegistration.hxx" diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx index b03a4945f42d..81617fc845c7 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx @@ -33,6 +33,7 @@ #include "x509certificate_mscryptimpl.hxx" #include <comphelper/servicehelper.hxx> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <xmlsec-wrapper.h> #include "akmngr.hxx" |