diff options
230 files changed, 250 insertions, 34 deletions
diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx index 90e53ef67880..0c706479c052 100644 --- a/UnoControls/inc/multiplexer.hxx +++ b/UnoControls/inc/multiplexer.hxx @@ -44,6 +44,7 @@ #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/PosSize.hpp> #include <cppuhelper/weak.hxx> +#include <cppuhelper/weakref.hxx> #include <cppuhelper/interfacecontainer.hxx> // "namespaces" diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx index a286648a1bab..829ae6bb12ee 100644 --- a/UnoControls/source/base/basecontainercontrol.cxx +++ b/UnoControls/source/base/basecontainercontrol.cxx @@ -19,6 +19,7 @@ #include "basecontainercontrol.hxx" +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> // namespaces diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx index a2dbe42bb2af..5da9907b88ef 100644 --- a/UnoControls/source/base/basecontrol.cxx +++ b/UnoControls/source/base/basecontrol.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/awt/Toolkit.hpp> #include <comphelper/processfactory.hxx> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> // namespaces diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx index ad58593c83c5..8157e66e554a 100644 --- a/UnoControls/source/base/multiplexer.cxx +++ b/UnoControls/source/base/multiplexer.cxx @@ -20,6 +20,7 @@ #include "multiplexer.hxx" #include <osl/diagnose.h> +#include <cppuhelper/queryinterface.hxx> using namespace ::cppu; using namespace ::osl; diff --git a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx index a5329acb222b..f7125f9b8a12 100644 --- a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx +++ b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx @@ -21,6 +21,8 @@ #include "OConnectionPointHelper.hxx" +#include <cppuhelper/queryinterface.hxx> + // namespaces using namespace ::osl; diff --git a/UnoControls/source/controls/OConnectionPointHelper.cxx b/UnoControls/source/controls/OConnectionPointHelper.cxx index fe2305a4eeaa..c58001311166 100644 --- a/UnoControls/source/controls/OConnectionPointHelper.cxx +++ b/UnoControls/source/controls/OConnectionPointHelper.cxx @@ -21,6 +21,8 @@ #include "OConnectionPointContainerHelper.hxx" +#include <cppuhelper/queryinterface.hxx> + // namespaces using namespace ::osl; diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx index d0e22aa97f22..466fa299e817 100644 --- a/UnoControls/source/controls/framecontrol.cxx +++ b/UnoControls/source/controls/framecontrol.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <comphelper/processfactory.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include <osl/diagnose.h> diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx index 91475d2c84a1..9af003a1a1e0 100644 --- a/UnoControls/source/controls/progressbar.cxx +++ b/UnoControls/source/controls/progressbar.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/awt/Gradient.hpp> #include <com/sun/star/awt/XGraphics.hpp> #include <tools/debug.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include <math.h> diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx index aa13e3193b1c..035d5ed83cf1 100644 --- a/UnoControls/source/controls/progressmonitor.cxx +++ b/UnoControls/source/controls/progressmonitor.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <tools/debug.hxx> #include <algorithm> diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx index 50c6a0df8347..fa9ef0ba82a6 100644 --- a/UnoControls/source/controls/statusindicator.cxx +++ b/UnoControls/source/controls/statusindicator.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/awt/InvalidateStyle.hpp> #include <com/sun/star/awt/WindowAttribute.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include "progressbar.hxx" diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx index 3ac295a79859..638174eeb794 100644 --- a/UnoControls/source/inc/OConnectionPointHelper.hxx +++ b/UnoControls/source/inc/OConnectionPointHelper.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/lang/XConnectionPointContainer.hpp> #include <com/sun/star/lang/XConnectionPoint.hpp> #include <cppuhelper/weak.hxx> +#include <cppuhelper/weakref.hxx> #include <cppuhelper/propshlp.hxx> #include "OConnectionPointContainerHelper.hxx" diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx index 9aed80975efb..1c9596dbea8f 100644 --- a/animations/source/animcore/animcore.cxx +++ b/animations/source/animcore/animcore.cxx @@ -46,6 +46,7 @@ #include <com/sun/star/util/XChangesNotifier.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <comphelper/servicehelper.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weakref.hxx> diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index 5d0a18c91b75..a3527182cd8d 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -27,6 +27,7 @@ #include <comphelper/sequenceashashmap.hxx> #include <rtl/ustrbuf.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/avmedia/source/opengl/oglmanager.hxx b/avmedia/source/opengl/oglmanager.hxx index cb4ec2112634..5151588e9303 100644 --- a/avmedia/source/opengl/oglmanager.hxx +++ b/avmedia/source/opengl/oglmanager.hxx @@ -11,6 +11,7 @@ #define INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLMANAGER_HXX #include <cppuhelper/compbase2.hxx> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/media/XManager.hpp> diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 5c9126d6c3ef..da1ec5a6506a 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/container/XContainer.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/ucb/ContentCreationException.hpp> #include <vcl/svapp.hxx> @@ -62,6 +63,7 @@ #include <com/sun/star/deployment/ExtensionManager.hpp> #include <comphelper/storagehelper.hxx> #include <cppuhelper/exc_hlp.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <basic/sbmod.hxx> #include <boost/scoped_ptr.hpp> diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx index 4c2c8a1fcefd..9004264eab87 100644 --- a/chart2/source/model/inc/XMLFilter.hxx +++ b/chart2/source/model/inc/XMLFilter.hxx @@ -24,6 +24,7 @@ #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/document/XImporter.hpp> #include <com/sun/star/document/XExporter.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx index 4395c78a75b2..887f8ca96ae4 100644 --- a/chart2/source/view/inc/PlotterBase.hxx +++ b/chart2/source/view/inc/PlotterBase.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/drawing/HomogenMatrix.hpp> #include <com/sun/star/drawing/XShapes.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/drawing/Position3D.hpp> diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index 5f2b28f1eab0..1a84f0cb3483 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/sdbc/KeyRule.hpp> #include <cppuhelper/typeprovider.hxx> #include <com/sun/star/lang/DisposedException.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <comphelper/sequence.hxx> #include <comphelper/types.hxx> diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx index 8e0c51081725..b66718d75013 100644 --- a/connectivity/source/drivers/ado/ACallableStatement.cxx +++ b/connectivity/source/drivers/ado/ACallableStatement.cxx @@ -19,6 +19,7 @@ #include "ado/ACallableStatement.hxx" #include <connectivity/dbexception.hxx> +#include <cppuhelper/queryinterface.hxx> using namespace connectivity::ado; using namespace com::sun::star::uno; diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx index 691408e1a9f1..2e581fe873ad 100644 --- a/connectivity/source/drivers/ado/APreparedStatement.cxx +++ b/connectivity/source/drivers/ado/APreparedStatement.cxx @@ -25,6 +25,7 @@ #include "ado/ADriver.hxx" #include <com/sun/star/lang/DisposedException.hpp> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> #include <connectivity/dbexception.hxx> diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index ad4244e69272..82cfb93cdff1 100644 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.cxx @@ -24,6 +24,7 @@ #include <comphelper/uno3.hxx> #include <osl/thread.h> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <comphelper/sequence.hxx> #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index 3174f7809061..071df968a244 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -40,6 +40,7 @@ #include <connectivity/sdbcx/VColumn.hxx> #include <rtl/ustrbuf.hxx> #include <osl/thread.h> +#include <cppuhelper/queryinterface.hxx> #include <comphelper/sequence.hxx> #include <svl/zforlist.hxx> #include <rtl/math.hxx> diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index bd376cef1905..19fc244f4ecf 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -44,6 +44,7 @@ #include <unotools/ucbhelper.hxx> #include <comphelper/types.hxx> #include <cppuhelper/exc_hlp.hxx> +#include <cppuhelper/queryinterface.hxx> #include <connectivity/PColumn.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/FValue.hxx> diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx index d54540c394db..5939f0abe0d3 100644 --- a/connectivity/source/drivers/file/FPreparedStatement.cxx +++ b/connectivity/source/drivers/file/FPreparedStatement.cxx @@ -24,6 +24,7 @@ #include "file/FPreparedStatement.hxx" #include <com/sun/star/sdbc/DataType.hpp> #include "file/FResultSetMetaData.hxx" +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include <comphelper/sequence.hxx> #include <com/sun/star/lang/DisposedException.hpp> diff --git a/connectivity/source/drivers/firebird/Driver.hxx b/connectivity/source/drivers/firebird/Driver.hxx index 2ed77a0a9463..7725c69980f6 100644 --- a/connectivity/source/drivers/firebird/Driver.hxx +++ b/connectivity/source/drivers/firebird/Driver.hxx @@ -23,6 +23,7 @@ #include "Connection.hxx" #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/sdbc/XDriver.hpp> #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp> #include <cppuhelper/compbase3.hxx> diff --git a/connectivity/source/drivers/firebird/Statement.cxx b/connectivity/source/drivers/firebird/Statement.cxx index f8343449ac80..f30616e2ccc5 100644 --- a/connectivity/source/drivers/firebird/Statement.cxx +++ b/connectivity/source/drivers/firebird/Statement.cxx @@ -24,6 +24,7 @@ #include "Util.hxx" #include <comphelper/sequence.hxx> +#include <cppuhelper/queryinterface.hxx> #include <osl/diagnose.h> #include <osl/thread.h> #include <rtl/ustrbuf.hxx> diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index ce30f3b29d0d..3688e9122890 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -29,6 +29,7 @@ #include <svl/zforlist.hxx> #include <rtl/math.hxx> #include <stdio.h> +#include <cppuhelper/queryinterface.hxx> #include <comphelper/extract.hxx> #include <comphelper/numbers.hxx> #include <comphelper/processfactory.hxx> diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx index d7ee0291221d..86f479cf5200 100644 --- a/connectivity/source/drivers/jdbc/CallableStatement.cxx +++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx @@ -26,6 +26,7 @@ #include "java/sql/Ref.hxx" #include "java/sql/Timestamp.hxx" #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <comphelper/sequence.hxx> #include <string.h> diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx index bf3cb564afab..2c102c199a7d 100644 --- a/connectivity/source/drivers/jdbc/JStatement.cxx +++ b/connectivity/source/drivers/jdbc/JStatement.cxx @@ -27,6 +27,7 @@ #include <comphelper/property.hxx> #include <com/sun/star/lang/DisposedException.hpp> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <comphelper/sequence.hxx> #include "TConnection.hxx" #include <comphelper/types.hxx> diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx index 6b82ce07f77c..50cea162a297 100644 --- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx +++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx @@ -25,6 +25,7 @@ #include "java/math/BigDecimal.hxx" #include "java/tools.hxx" #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <comphelper/sequence.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/FValue.hxx> diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx index 1c850882184d..bbec3e4dd33c 100644 --- a/connectivity/source/drivers/macab/MacabDriver.hxx +++ b/connectivity/source/drivers/macab/MacabDriver.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/sdbc/XDriver.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/compbase3.hxx> diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx index a5ae705f0674..a56c8445afc0 100644 --- a/connectivity/source/drivers/mork/MStatement.cxx +++ b/connectivity/source/drivers/mork/MStatement.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/sdbc/FetchDirection.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <comphelper/sequence.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/extract.hxx> diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index 6d7a652438b6..0c981b048811 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/supportsservice.hxx> #include "MMozillaBootstrap.hxx" diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index de88682d596d..e6bdf6d20feb 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <comphelper/sequence.hxx> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <comphelper/extract.hxx> #include <comphelper/types.hxx> #include "diagnose_ex.h" diff --git a/connectivity/source/drivers/postgresql/pq_xbase.cxx b/connectivity/source/drivers/postgresql/pq_xbase.cxx index ee265cedb281..87e5477a05cf 100644 --- a/connectivity/source/drivers/postgresql/pq_xbase.cxx +++ b/connectivity/source/drivers/postgresql/pq_xbase.cxx @@ -37,6 +37,7 @@ #include <rtl/ustrbuf.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include "pq_tools.hxx" #include "pq_xbase.hxx" diff --git a/connectivity/source/inc/calc/CDriver.hxx b/connectivity/source/inc/calc/CDriver.hxx index 6e66f5bd17cb..707165ce7e1e 100644 --- a/connectivity/source/inc/calc/CDriver.hxx +++ b/connectivity/source/inc/calc/CDriver.hxx @@ -22,6 +22,8 @@ #include "file/FDriver.hxx" +#include <com/sun/star/lang/XMultiServiceFactory.hpp> + namespace connectivity { namespace calc diff --git a/connectivity/source/inc/dbase/DDriver.hxx b/connectivity/source/inc/dbase/DDriver.hxx index 05a372888cb5..9ad46bc09145 100644 --- a/connectivity/source/inc/dbase/DDriver.hxx +++ b/connectivity/source/inc/dbase/DDriver.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DDRIVER_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DDRIVER_HXX +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/compbase2.hxx> #include <connectivity/CommonTools.hxx> #include "file/FDriver.hxx" diff --git a/connectivity/source/inc/flat/EDriver.hxx b/connectivity/source/inc/flat/EDriver.hxx index cbc8e850ce77..b08b1c454758 100644 --- a/connectivity/source/inc/flat/EDriver.hxx +++ b/connectivity/source/inc/flat/EDriver.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FLAT_EDRIVER_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_FLAT_EDRIVER_HXX +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/compbase2.hxx> #include <connectivity/CommonTools.hxx> #include "file/FDriver.hxx" diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx index 66bb5d17a2fd..099182b940b7 100644 --- a/connectivity/source/inc/hsqldb/HDriver.hxx +++ b/connectivity/source/inc/hsqldb/HDriver.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp> #include <com/sun/star/sdbcx/XCreateCatalog.hpp> #include <com/sun/star/embed/XTransactionListener.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/compbase5.hxx> diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx index 549971673dd1..ac0600330153 100644 --- a/connectivity/source/inc/mysql/YDriver.hxx +++ b/connectivity/source/inc/mysql/YDriver.hxx @@ -25,6 +25,7 @@ #include <com/sun/star/sdbc/XDriver.hpp> #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/compbase3.hxx> diff --git a/connectivity/source/inc/odbc/ODriver.hxx b/connectivity/source/inc/odbc/ODriver.hxx index 210a543924c9..e50e951fed6d 100644 --- a/connectivity/source/inc/odbc/ODriver.hxx +++ b/connectivity/source/inc/odbc/ODriver.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/sdbc/XDriver.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/compbase2.hxx> #include <connectivity/odbc.hxx> #include "odbc/odbcbasedllapi.hxx" diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx index 8e877542e918..1fbbf8f541fc 100644 --- a/cppuhelper/source/defaultbootstrap.cxx +++ b/cppuhelper/source/defaultbootstrap.cxx @@ -16,6 +16,7 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <cppuhelper/bootstrap.hxx> #include <cppuhelper/component_context.hxx> #include <rtl/bootstrap.hxx> diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index a212e7dac5ca..29100b60e70d 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -24,6 +24,7 @@ #include <cppuhelper/component.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/implbase3.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> #include <rtl/instance.hxx> diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx index c57a61d897c5..d19e65674839 100644 --- a/cppuhelper/source/propshlp.cxx +++ b/cppuhelper/source/propshlp.cxx @@ -20,6 +20,7 @@ #include <osl/diagnose.h> #include <cppuhelper/implbase1.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/propshlp.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index c150364d5a0a..8868d591ee91 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -23,6 +23,7 @@ #include <cstdlib> #include <com/sun/star/loader/CannotActivateFactoryException.hpp> +#include <com/sun/star/registry/CannotRegisterImplementationException.hpp> #include <cppuhelper/factory.hxx> #include <cppuhelper/shlib.hxx> #include <osl/module.hxx> diff --git a/cppuhelper/source/typeprovider.cxx b/cppuhelper/source/typeprovider.cxx index b20ec1bd9072..e56ebead1cbe 100644 --- a/cppuhelper/source/typeprovider.cxx +++ b/cppuhelper/source/typeprovider.cxx @@ -17,8 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <cppuhelper/typeprovider.hxx> + +#include <rtl/uuid.h> #include <osl/mutex.hxx> using namespace osl; diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx index 212a9be34775..deb3a2b64743 100644 --- a/cppuhelper/source/weak.cxx +++ b/cppuhelper/source/weak.cxx @@ -24,6 +24,7 @@ #include <cppuhelper/weakagg.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/exc_hlp.hxx> +#include <cppuhelper/queryinterface.hxx> using namespace osl; using namespace com::sun::star::uno; diff --git a/dbaccess/source/core/api/View.cxx b/dbaccess/source/core/api/View.cxx index 4ec165dc3482..547eab3cd8bd 100644 --- a/dbaccess/source/core/api/View.cxx +++ b/dbaccess/source/core/api/View.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/lang/WrappedTargetException.hpp> #include <com/sun/star/lang/DisposedException.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <cppuhelper/exc_hlp.hxx> diff --git a/dbaccess/source/core/api/callablestatement.cxx b/dbaccess/source/core/api/callablestatement.cxx index d0940967cff6..23b733fa6c5d 100644 --- a/dbaccess/source/core/api/callablestatement.cxx +++ b/dbaccess/source/core/api/callablestatement.cxx @@ -20,6 +20,7 @@ #include <callablestatement.hxx> #include <com/sun/star/lang/DisposedException.hpp> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <comphelper/property.hxx> #include "dbastrings.hrc" diff --git a/dbaccess/source/core/api/datacolumn.cxx b/dbaccess/source/core/api/datacolumn.cxx index 9582a7e3177b..f8c36db9ebe0 100644 --- a/dbaccess/source/core/api/datacolumn.cxx +++ b/dbaccess/source/core/api/datacolumn.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include <tools/debug.hxx> #include "dbastrings.hrc" diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx index d3eb2fd217d6..353de68d72a4 100644 --- a/dbaccess/source/core/api/preparedstatement.cxx +++ b/dbaccess/source/core/api/preparedstatement.cxx @@ -27,6 +27,7 @@ #include <comphelper/property.hxx> #include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include <preparedstatement.hxx> #include <resultcolumn.hxx> diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx index 0a59d417cc10..e3a71325071f 100644 --- a/dbaccess/source/core/api/resultset.cxx +++ b/dbaccess/source/core/api/resultset.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include <comphelper/property.hxx> #include <comphelper/sequence.hxx> diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx index 09e0dd0e463c..20a45c710f09 100644 --- a/dbaccess/source/core/api/statement.cxx +++ b/dbaccess/source/core/api/statement.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <comphelper/sequence.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> #include <comphelper/property.hxx> diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx index 6d8d56517534..b57741836cd5 100644 --- a/dbaccess/source/inc/apitools.hxx +++ b/dbaccess/source/inc/apitools.hxx @@ -22,6 +22,7 @@ #include <sal/config.h> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/component.hxx> #include <osl/mutex.hxx> #include <cppuhelper/interfacecontainer.hxx> diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index b7010989267e..458599c21d50 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -21,6 +21,7 @@ #include "JoinController.hxx" #include "RelationDesignView.hxx" +#include <com/sun/star/lang/XMultiServiceFactory.hpp> class WaitObject; namespace dbaui diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index 999a7fe15aee..9c40b964ec9d 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -25,6 +25,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/io/XObjectOutputStream.hpp> #include <com/sun/star/io/XObjectInputStream.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include "TypeInfo.hxx" #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbcx/XKeysSupplier.hpp> diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index 45cfaf2ec921..438f455f324b 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -21,7 +21,9 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_UNOSQLMESSAGE_HXX #include <svtools/genericunodialog.hxx> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include "moduledbu.hxx" + namespace dbaui { diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx index ee8973331bf4..3f55ef279a78 100644 --- a/dbaccess/source/ui/misc/singledoccontroller.cxx +++ b/dbaccess/source/ui/misc/singledoccontroller.cxx @@ -25,6 +25,7 @@ #include "moduledbu.hxx" #include <svl/undo.hxx> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <osl/diagnose.h> #include <boost/scoped_ptr.hpp> diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index ed2768b958bc..dd3e1315b107 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -17,6 +17,7 @@ #include <vcl/window.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <osl/mutex.hxx> +#include <cppuhelper/queryinterface.hxx> #include <comphelper/processfactory.hxx> #include "LimitBox.hxx" diff --git a/desktop/source/offacc/acceptor.hxx b/desktop/source/offacc/acceptor.hxx index 812af206fa10..e19c7487b82f 100644 --- a/desktop/source/offacc/acceptor.hxx +++ b/desktop/source/offacc/acceptor.hxx @@ -22,6 +22,7 @@ #include <sal/config.h> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/Reference.h> diff --git a/dtrans/source/generic/clipboardmanager.hxx b/dtrans/source/generic/clipboardmanager.hxx index 89c8845e2b9b..a65e672f36a8 100644 --- a/dtrans/source/generic/clipboardmanager.hxx +++ b/dtrans/source/generic/clipboardmanager.hxx @@ -24,6 +24,7 @@ #include <com/sun/star/datatransfer/clipboard/XClipboardManager.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <map> diff --git a/dtrans/source/generic/generic_clipboard.hxx b/dtrans/source/generic/generic_clipboard.hxx index 0d937171cca0..cc412acaa5bc 100644 --- a/dtrans/source/generic/generic_clipboard.hxx +++ b/dtrans/source/generic/generic_clipboard.hxx @@ -25,6 +25,7 @@ #include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> diff --git a/dtrans/source/win32/clipb/wcbentry.cxx b/dtrans/source/win32/clipb/wcbentry.cxx index a9f6d638200c..5427dcde17c3 100644 --- a/dtrans/source/win32/clipb/wcbentry.cxx +++ b/dtrans/source/win32/clipb/wcbentry.cxx @@ -60,7 +60,7 @@ extern "C" // component_getFactory // returns a factory to create XFilePicker-Services -SAL_DLLPUBLIC_EXPORT void* SAL_CALL sysdtrans_component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL sysdtrans_component_getFactory( const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/dtrans/source/win32/dnd/dndentry.cxx b/dtrans/source/win32/dnd/dndentry.cxx index efac99d9305b..5e4c63ecf713 100644 --- a/dtrans/source/win32/dnd/dndentry.cxx +++ b/dtrans/source/win32/dnd/dndentry.cxx @@ -45,7 +45,8 @@ Reference< XInterface > SAL_CALL createDropTarget( const Reference< XMultiServic extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL dnd_component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL +dnd_component_getFactory( const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ ) { void* pRet = 0; Reference< XSingleServiceFactory > xFactory; diff --git a/dtrans/source/win32/ftransl/ftranslentry.cxx b/dtrans/source/win32/ftransl/ftranslentry.cxx index fa4bb1baf473..3ddc84a25f68 100644 --- a/dtrans/source/win32/ftransl/ftranslentry.cxx +++ b/dtrans/source/win32/ftransl/ftranslentry.cxx @@ -62,7 +62,7 @@ extern "C" // component_getFactory // returns a factory to create XFilePicker-Services -SAL_DLLPUBLIC_EXPORT void* SAL_CALL ftransl_component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL ftransl_component_getFactory( const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/editeng/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx index 401fb553dc26..2bf54c5e74bd 100644 --- a/editeng/source/editeng/eeobj.cxx +++ b/editeng/source/editeng/eeobj.cxx @@ -26,6 +26,7 @@ #include <sot/formats.hxx> #include <editeng/editeng.hxx> #include <svl/itempool.hxx> +#include <cppuhelper/queryinterface.hxx> #include <osl/mutex.hxx> using namespace ::com::sun::star; diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx index f97df5176d32..ae383fba144d 100644 --- a/embeddedobj/source/commonembedding/miscobj.cxx +++ b/embeddedobj/source/commonembedding/miscobj.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/interfacecontainer.h> #include <comphelper/mimeconfighelper.hxx> #include <comphelper/processfactory.hxx> diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx index 4ff96a131bb1..39fb7d20f49b 100644 --- a/embeddedobj/source/commonembedding/specialobject.cxx +++ b/embeddedobj/source/commonembedding/specialobject.cxx @@ -35,6 +35,7 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/embed/EmbedMapUnits.hpp> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include "specialobject.hxx" diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx index 4fa109e8d9c9..04ffae9a4667 100644 --- a/embeddedobj/source/inc/oleembobj.hxx +++ b/embeddedobj/source/inc/oleembobj.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/embed/XInplaceObject.hpp> #include <com/sun/star/embed/XVisualObject.hpp> diff --git a/embeddedobj/source/msole/xolefactory.hxx b/embeddedobj/source/msole/xolefactory.hxx index b4dac71a4bc4..6ea005e8a777 100644 --- a/embeddedobj/source/msole/xolefactory.hxx +++ b/embeddedobj/source/msole/xolefactory.hxx @@ -21,6 +21,7 @@ #define INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_XOLEFACTORY_HXX #include <com/sun/star/embed/XEmbeddedObjectCreator.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase2.hxx> diff --git a/embedserv/source/embed/servprov.cxx b/embedserv/source/embed/servprov.cxx index d68e6825093d..006b4ed9c101 100644 --- a/embedserv/source/embed/servprov.cxx +++ b/embedserv/source/embed/servprov.cxx @@ -25,6 +25,7 @@ #include "embeddoc.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <osl/diagnose.h> #include <osl/mutex.hxx> #include <osl/thread.h> diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 49fa9581a30a..cc2e1edabcff 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -42,6 +42,7 @@ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/form/XGridColumnFactory.hpp> #include <com/sun/star/io/XDataInputStream.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <comphelper/container.hxx> #include <svl/urihelper.hxx> diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx index 221e9de00f8a..39f4c647326a 100644 --- a/extensions/source/ole/servprov.cxx +++ b/extensions/source/ole/servprov.cxx @@ -29,6 +29,7 @@ #include "servprov.hxx" #include "unoobjw.hxx" #include "oleobjw.hxx" +#include <cppuhelper/queryinterface.hxx> using namespace cppu; using namespace osl; diff --git a/extensions/source/plugin/base/plmodel.cxx b/extensions/source/plugin/base/plmodel.cxx index befe3a9db952..f2c5cc3f650f 100644 --- a/extensions/source/plugin/base/plmodel.cxx +++ b/extensions/source/plugin/base/plmodel.cxx @@ -28,6 +28,7 @@ #include <plugin/model.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> +#include <cppuhelper/queryinterface.hxx> using namespace com::sun::star::uno; diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index 4386de4638f0..a151bc98f4b8 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -42,6 +42,7 @@ #include <com/sun/star/loader/XImplementationLoader.hpp> #include <com/sun/star/plugin/PluginManager.hpp> +#include <cppuhelper/queryinterface.hxx> #include <comphelper/processfactory.hxx> #include <plugin/impl.hxx> #include <ucbhelper/content.hxx> diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 4e5dda00b2e4..188bdefdf7e3 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -45,6 +45,7 @@ #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/component_context.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/extensions/source/scanner/scanner.cxx b/extensions/source/scanner/scanner.cxx index 45e88233dcdf..c6537db18968 100644 --- a/extensions/source/scanner/scanner.cxx +++ b/extensions/source/scanner/scanner.cxx @@ -19,6 +19,7 @@ #include <scanner.hxx> +#include <cppuhelper/queryinterface.hxx> // - ScannerManager - diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx index 125e8c83a9f3..a66d797587dc 100644 --- a/extensions/source/scanner/scanunx.cxx +++ b/extensions/source/scanner/scanunx.cxx @@ -20,6 +20,7 @@ #include <scanner.hxx> #include <sanedlg.hxx> #include <osl/thread.hxx> +#include <cppuhelper/queryinterface.hxx> #include <boost/shared_ptr.hpp> #if OSL_DEBUG_LEVEL > 1 diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx index de901b6bc4c7..a4583d01685b 100644 --- a/filter/source/config/cache/configflush.hxx +++ b/filter/source/config/cache/configflush.hxx @@ -21,6 +21,7 @@ #include "cacheitem.hxx" #include <com/sun/star/util/XRefreshable.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/implbase2.hxx> diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx index c5c99d6ca16c..6c91529b94d9 100644 --- a/filter/source/config/cache/typedetection.hxx +++ b/filter/source/config/cache/typedetection.hxx @@ -22,6 +22,7 @@ #include "basecontainer.hxx" #include <com/sun/star/document/XTypeDetection.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <unotools/mediadescriptor.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx index 2af211dc8728..3a77307fe223 100644 --- a/filter/source/flash/swfdialog.cxx +++ b/filter/source/flash/swfdialog.cxx @@ -25,6 +25,7 @@ #include <vcl/dialog.hxx> #include <svl/solar.hrc> #include <comphelper/processfactory.hxx> +#include <cppuhelper/queryinterface.hxx> #include <com/sun/star/view/XRenderable.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> diff --git a/filter/source/flash/swfuno.hxx b/filter/source/flash/swfuno.hxx index 1d5745340db6..ef0cc16e7e99 100644 --- a/filter/source/flash/swfuno.hxx +++ b/filter/source/flash/swfuno.hxx @@ -26,6 +26,7 @@ #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/lang/XMultiServiceFactory.hpp> #include <rtl/ustring.hxx> #include <sal/types.h> diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx index 3243eb5f8670..5f6cb4730eed 100644 --- a/filter/source/svg/svgdialog.cxx +++ b/filter/source/svg/svgdialog.cxx @@ -23,6 +23,7 @@ #include <vcl/svapp.hxx> #include <vcl/dialog.hxx> #include <comphelper/processfactory.hxx> +#include <cppuhelper/queryinterface.hxx> #include <com/sun/star/view/XRenderable.hpp> #include <com/sun/star/frame/XController.hpp> diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx index 68871a66b19f..064240ff49c7 100644 --- a/filter/source/svg/svgdialog.hxx +++ b/filter/source/svg/svgdialog.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/beans/XPropertyAccess.hpp> #include <com/sun/star/document/XExporter.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <svtools/genericunodialog.hxx> #include <memory> diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx index ced0df914a86..307d92f8b278 100644 --- a/filter/source/t602/t602filter.hxx +++ b/filter/source/t602/t602filter.hxx @@ -25,6 +25,7 @@ #include <com/sun/star/document/XExtendedFilterDetection.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XLocalizable.hpp> #include <com/sun/star/beans/XPropertyAccess.hpp> diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx index f628dfdfbb2a..8e358776fe13 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/document/XImporter.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase5.hxx> diff --git a/forms/source/component/EventThread.cxx b/forms/source/component/EventThread.cxx index 8e09f47d68a2..c99443a53624 100644 --- a/forms/source/component/EventThread.cxx +++ b/forms/source/component/EventThread.cxx @@ -20,6 +20,8 @@ #include "EventThread.hxx" #include <comphelper/guarding.hxx> #include <tools/debug.hxx> +#include <cppuhelper/queryinterface.hxx> + #include <boost/scoped_ptr.hpp> namespace frm diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx index 34e437e0c57c..0139720999ee 100644 --- a/forms/source/component/File.cxx +++ b/forms/source/component/File.cxx @@ -23,6 +23,7 @@ #include "property.hrc" #include "services.hxx" +#include <cppuhelper/queryinterface.hxx> #include <tools/debug.hxx> #include <comphelper/container.hxx> #include <comphelper/basicio.hxx> diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx index e3ae3ff9717f..32ba7bc2fc28 100644 --- a/forms/source/component/FormattedFieldWrapper.cxx +++ b/forms/source/component/FormattedFieldWrapper.cxx @@ -24,6 +24,7 @@ #include "services.hxx" #include <comphelper/processfactory.hxx> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/queryinterface.hxx> #include <connectivity/dbtools.hxx> #include <tools/debug.hxx> #include <vcl/svapp.hxx> diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index 948e8c8220d3..64ea9f041a7c 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -26,6 +26,7 @@ #include <vcl/svapp.hxx> #include <unotools/ucbstreamhelper.hxx> #include <vcl/graphicfilter.hxx> +#include <cppuhelper/queryinterface.hxx> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx index e81e5b9afe40..e16a42757b75 100644 --- a/forms/source/richtext/richtextcontrol.hxx +++ b/forms/source/richtext/richtextcontrol.hxx @@ -23,6 +23,7 @@ #include <toolkit/controls/unocontrols.hxx> #include <toolkit/awt/vclxwindow.hxx> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <comphelper/uno3.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx index 911a82959363..a884de9542b8 100644 --- a/forms/source/runtime/formoperations.hxx +++ b/forms/source/runtime/formoperations.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/form/runtime/XFormOperations.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/form/XForm.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/form/XLoadable.hpp> diff --git a/fpicker/source/aqua/FPentry.mm b/fpicker/source/aqua/FPentry.mm index 1af90ecd9bf5..9b97f1e53adf 100644 --- a/fpicker/source/aqua/FPentry.mm +++ b/fpicker/source/aqua/FPentry.mm @@ -50,7 +50,7 @@ extern "C" { SAL_DLLPUBLIC_EXPORT void* SAL_CALL fps_aqua_component_getFactory( - const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) + const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx index 18cff92f0f40..2461d58b2be2 100644 --- a/fpicker/source/win32/filepicker/FPentry.cxx +++ b/fpicker/source/win32/filepicker/FPentry.cxx @@ -88,7 +88,7 @@ extern "C" { SAL_DLLPUBLIC_EXPORT void* SAL_CALL fps_win32_component_getFactory( - const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* ) + const sal_Char* pImplName, void* pSrvManager, void* ) { void* pRet = 0; diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx index 2e7cda51745c..f5f1fe2ddaff 100644 --- a/fpicker/source/win32/filepicker/FilePicker.cxx +++ b/fpicker/source/win32/filepicker/FilePicker.cxx @@ -19,6 +19,7 @@ #include <tchar.h> #include <com/sun/star/lang/DisposedException.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/supportsservice.hxx> #include <osl/diagnose.h> diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx index 925d46614d8e..bd6fc8f758ec 100644 --- a/fpicker/source/win32/filepicker/FilePicker.hxx +++ b/fpicker/source/win32/filepicker/FilePicker.hxx @@ -24,6 +24,7 @@ #include <osl/mutex.hxx> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ui/dialogs/XFilePicker2.hpp> #include <com/sun/star/ui/dialogs/XFilePicker3.hpp> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> diff --git a/fpicker/source/win32/folderpicker/FolderPicker.hxx b/fpicker/source/win32/folderpicker/FolderPicker.hxx index 400ade088f74..191219a5499a 100644 --- a/fpicker/source/win32/folderpicker/FolderPicker.hxx +++ b/fpicker/source/win32/folderpicker/FolderPicker.hxx @@ -23,6 +23,7 @@ #include <cppuhelper/implbase2.hxx> #include <osl/mutex.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ui/dialogs/XFolderPicker2.hpp> diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index f3d167392cf5..4f069bbb9e7b 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -52,6 +52,7 @@ #include <vcl/timer.hxx> #include <toolkit/awt/vclxmenu.hxx> #include <cppuhelper/weak.hxx> +#include <cppuhelper/weakref.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <framework/addonsoptions.hxx> diff --git a/framework/inc/uifactory/configurationaccessfactorymanager.hxx b/framework/inc/uifactory/configurationaccessfactorymanager.hxx index b4f9afe7c98b..365a44359980 100644 --- a/framework/inc/uifactory/configurationaccessfactorymanager.hxx +++ b/framework/inc/uifactory/configurationaccessfactorymanager.hxx @@ -25,6 +25,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/container/XNameAccess.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase1.hxx> diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx index d1c71ed00f1d..27acc50a2af2 100644 --- a/framework/source/fwe/classes/actiontriggercontainer.cxx +++ b/framework/source/fwe/classes/actiontriggercontainer.cxx @@ -20,6 +20,7 @@ #include <classes/actiontriggercontainer.hxx> #include <classes/actiontriggerpropertyset.hxx> #include <classes/actiontriggerseparatorpropertyset.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx index 1c06d9bb4664..6cafe9375028 100644 --- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx @@ -20,6 +20,7 @@ #include <classes/actiontriggerpropertyset.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <cppuhelper/proptypehlp.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx index 127a365d99b8..e9198e54272c 100644 --- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <cppuhelper/proptypehlp.hxx> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx index 23819a879270..fe5196b20cc4 100644 --- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx +++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx @@ -22,6 +22,7 @@ #include <classes/actiontriggerpropertyset.hxx> #include <classes/actiontriggerseparatorpropertyset.hxx> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include <framework/actiontriggerhelper.hxx> #include <osl/mutex.hxx> diff --git a/framework/source/fwe/helper/propertysetcontainer.cxx b/framework/source/fwe/helper/propertysetcontainer.cxx index 8284460e1483..8365ab45a50d 100644 --- a/framework/source/fwe/helper/propertysetcontainer.cxx +++ b/framework/source/fwe/helper/propertysetcontainer.cxx @@ -19,6 +19,7 @@ #include <helper/propertysetcontainer.hxx> +#include <cppuhelper/queryinterface.hxx> #include <vcl/svapp.hxx> #define WRONG_TYPE_EXCEPTION "Only XPropertSet allowed!" diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx index 2dd1e74ec4ad..2219b5c6ff97 100644 --- a/framework/source/uielement/buttontoolbarcontroller.cxx +++ b/framework/source/uielement/buttontoolbarcontroller.cxx @@ -31,6 +31,7 @@ #include <rtl/uri.hxx> #include <osl/mutex.hxx> +#include <cppuhelper/queryinterface.hxx> #include <comphelper/processfactory.hxx> #include <unotools/ucbstreamhelper.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 64b179e12083..72c7ff0cc06b 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -72,6 +72,7 @@ #include <osl/mutex.hxx> #include <osl/file.hxx> #include <cppuhelper/implbase1.hxx> +#include <cppuhelper/queryinterface.hxx> #include <svtools/acceleratorexecute.hxx> #include <svtools/miscopt.hxx> #include <uielement/menubarmerger.hxx> diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index a7b534376c73..8c166e4532ce 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -38,6 +38,7 @@ #include <com/sun/star/ui/ItemStyle.hpp> #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/Command.hpp> #include <com/sun/star/ui/XStatusbarItem.hdl> diff --git a/include/comphelper/servicedecl.hxx b/include/comphelper/servicedecl.hxx index 499bcbc353a0..0b1eb22fcbfe 100644 --- a/include/comphelper/servicedecl.hxx +++ b/include/comphelper/servicedecl.hxx @@ -23,6 +23,7 @@ #include <cppuhelper/implbase1.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> #include <uno/environment.h> #include <boost/utility.hpp> diff --git a/include/cppuhelper/bootstrap.hxx b/include/cppuhelper/bootstrap.hxx index 4d942809e251..debddcf18df2 100644 --- a/include/cppuhelper/bootstrap.hxx +++ b/include/cppuhelper/bootstrap.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CPPUHELPER_BOOTSTRAP_HXX #include <sal/config.h> -#include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/Reference.hxx> #include <rtl/ustring.hxx> #include <sal/types.h> diff --git a/include/cppuhelper/compbase_ex.hxx b/include/cppuhelper/compbase_ex.hxx index a5ff85769571..f902e53786c1 100644 --- a/include/cppuhelper/compbase_ex.hxx +++ b/include/cppuhelper/compbase_ex.hxx @@ -19,14 +19,15 @@ #ifndef INCLUDED_CPPUHELPER_COMPBASE_EX_HXX #define INCLUDED_CPPUHELPER_COMPBASE_EX_HXX -#include <osl/mutex.hxx> #include <cppuhelper/implbase_ex.hxx> -#include <cppuhelper/interfacecontainer.hxx> +#include <cppuhelper/interfacecontainer.h> #include <com/sun/star/lang/XComponent.hpp> #include <cppuhelper/cppuhelperdllapi.h> /// @cond INTERNAL +namespace osl { class Mutex; } + namespace cppu { diff --git a/include/cppuhelper/component.hxx b/include/cppuhelper/component.hxx index e22bb45b5396..ffcd50fb51a6 100644 --- a/include/cppuhelper/component.hxx +++ b/include/cppuhelper/component.hxx @@ -19,17 +19,17 @@ #ifndef INCLUDED_CPPUHELPER_COMPONENT_HXX #define INCLUDED_CPPUHELPER_COMPONENT_HXX -#include <osl/mutex.hxx> #include <cppuhelper/weakagg.hxx> -#include <cppuhelper/interfacecontainer.hxx> +#include <cppuhelper/interfacecontainer.h> #include <cppuhelper/implbase1.hxx> #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/XEventListener.hpp> #include <cppuhelper/cppuhelperdllapi.h> +namespace osl { class Mutex; } + namespace cppu { diff --git a/include/cppuhelper/component_context.hxx b/include/cppuhelper/component_context.hxx index 95c518326e72..f22ff2c1df6d 100644 --- a/include/cppuhelper/component_context.hxx +++ b/include/cppuhelper/component_context.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CPPUHELPER_COMPONENT_CONTEXT_HXX #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <cppuhelper/cppuhelperdllapi.h> diff --git a/include/cppuhelper/factory.hxx b/include/cppuhelper/factory.hxx index b507674a8ff5..2d82e288cbd6 100644 --- a/include/cppuhelper/factory.hxx +++ b/include/cppuhelper/factory.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CPPUHELPER_FACTORY_HXX #include <rtl/ustring.hxx> -#include <uno/dispatcher.h> #include <rtl/unload.h> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/include/cppuhelper/implbase_ex.hxx b/include/cppuhelper/implbase_ex.hxx index efbe8dc2af7e..e2335fb6f326 100644 --- a/include/cppuhelper/implbase_ex.hxx +++ b/include/cppuhelper/implbase_ex.hxx @@ -23,10 +23,6 @@ #include <cppuhelper/weakagg.hxx> #include <com/sun/star/lang/XTypeProvider.hpp> -// Despite the fact that the following include is not used in this header, it has to remain, -// because it is expected by files including cppuhelper/implbaseN.hxx. -// So maybe we can omit it some time in the future... -#include <com/sun/star/lang/XMultiServiceFactory.hpp> /* If you need to define implementation helper classes that deal with more than 12 interfaces, then use macros as follows, e.g. for 3 interfaces: diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx index 8bb916c9afc6..fc1ded273699 100644 --- a/include/cppuhelper/propshlp.hxx +++ b/include/cppuhelper/propshlp.hxx @@ -22,7 +22,7 @@ #include <rtl/alloc.h> -#include <cppuhelper/interfacecontainer.hxx> +#include <cppuhelper/interfacecontainer.h> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetOption.hpp> diff --git a/include/cppuhelper/proptypehlp.h b/include/cppuhelper/proptypehlp.h index a0d863cadccd..ac1e075e6300 100644 --- a/include/cppuhelper/proptypehlp.h +++ b/include/cppuhelper/proptypehlp.h @@ -19,8 +19,7 @@ #ifndef INCLUDED_CPPUHELPER_PROPTYPEHLP_H #define INCLUDED_CPPUHELPER_PROPTYPEHLP_H -#include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/uno/TypeClass.hpp> +#include <com/sun/star/uno/Any.h> namespace cppu { diff --git a/include/cppuhelper/proptypehlp.hxx b/include/cppuhelper/proptypehlp.hxx index 9a3d26788c0c..c93a7961169f 100644 --- a/include/cppuhelper/proptypehlp.hxx +++ b/include/cppuhelper/proptypehlp.hxx @@ -20,6 +20,8 @@ #define INCLUDED_CPPUHELPER_PROPTYPEHLP_HXX #include <cppuhelper/proptypehlp.h> +#include <com/sun/star/lang/IllegalArgumentException.hpp> +#include <com/sun/star/uno/TypeClass.hpp> namespace cppu { diff --git a/include/cppuhelper/shlib.hxx b/include/cppuhelper/shlib.hxx index bc2c6c14b420..3a62ef5ff1d1 100644 --- a/include/cppuhelper/shlib.hxx +++ b/include/cppuhelper/shlib.hxx @@ -21,8 +21,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> -#include <com/sun/star/loader/CannotActivateFactoryException.hpp> -#include <com/sun/star/registry/CannotRegisterImplementationException.hpp> #include <cppuhelper/cppuhelperdllapi.h> diff --git a/include/cppuhelper/typeprovider.hxx b/include/cppuhelper/typeprovider.hxx index 6b77bf5b5042..50344096d772 100644 --- a/include/cppuhelper/typeprovider.hxx +++ b/include/cppuhelper/typeprovider.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CPPUHELPER_TYPEPROVIDER_HXX #include <rtl/alloc.h> -#include <rtl/uuid.h> #include <com/sun/star/uno/Sequence.hxx> #include <cppuhelper/cppuhelperdllapi.h> diff --git a/include/cppuhelper/weak.hxx b/include/cppuhelper/weak.hxx index 41a8073dac34..60ee36cc2275 100644 --- a/include/cppuhelper/weak.hxx +++ b/include/cppuhelper/weak.hxx @@ -21,8 +21,6 @@ #include <osl/interlck.h> #include <rtl/alloc.h> -#include <cppuhelper/weakref.hxx> -#include <cppuhelper/queryinterface.hxx> #include <com/sun/star/uno/XWeak.hpp> #include <cppuhelper/cppuhelperdllapi.h> diff --git a/include/cppuhelper/weakagg.hxx b/include/cppuhelper/weakagg.hxx index 8575fb3cce5b..abc0cade6149 100644 --- a/include/cppuhelper/weakagg.hxx +++ b/include/cppuhelper/weakagg.hxx @@ -20,6 +20,7 @@ #define INCLUDED_CPPUHELPER_WEAKAGG_HXX #include <cppuhelper/weak.hxx> +#include <cppuhelper/weakref.hxx> #include <com/sun/star/uno/XAggregation.hpp> #include <cppuhelper/cppuhelperdllapi.h> diff --git a/include/svl/numuno.hxx b/include/svl/numuno.hxx index 9a24568d4eb6..d1a3373b1fe4 100644 --- a/include/svl/numuno.hxx +++ b/include/svl/numuno.hxx @@ -22,6 +22,7 @@ #include <svl/svldllapi.h> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/implbase2.hxx> class SvNumberFormatter; diff --git a/include/svtools/contextmenuhelper.hxx b/include/svtools/contextmenuhelper.hxx index d49f38f3e95d..6b5d58ce6485 100644 --- a/include/svtools/contextmenuhelper.hxx +++ b/include/svtools/contextmenuhelper.hxx @@ -28,6 +28,7 @@ #include <rtl/ustring.hxx> #include <cppuhelper/weak.hxx> +#include <cppuhelper/weakref.hxx> #include <vcl/menu.hxx> #include <svtools/svtdllapi.h> diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx index 65dbe8e99510..0d44bc33188d 100644 --- a/include/toolkit/controls/controlmodelcontainerbase.hxx +++ b/include/toolkit/controls/controlmodelcontainerbase.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XContainer.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/awt/XTabControllerModel.hpp> #include <com/sun/star/util/XChangesNotifier.hpp> #include <com/sun/star/util/XChangesListener.hpp> diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx index 48c5f2a09f9d..bef04349b40f 100644 --- a/oox/source/core/filterbase.cxx +++ b/oox/source/core/filterbase.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/frame/XModel.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index ccebf1829fd9..842429d8d062 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/beans/XPropertyAccess.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/embed/XRelationshipAccess.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/xml/sax/InputSource.hpp> #include <com/sun/star/xml/sax/XFastParser.hpp> #include <com/sun/star/xml/sax/XFastSAXSerializable.hpp> diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index c7d23688cf11..abe671c6e9ee 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -19,6 +19,7 @@ #include "drawingml/chart/objectformatter.hxx" +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/util/XNumberFormatTypes.hpp> #include <osl/thread.h> diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 963bcebdc370..3dc86027f6a2 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -71,6 +71,7 @@ #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/BitmapMode.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceName.hpp> #include <com/sun/star/table/CellAddress.hpp> diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx index 1d6e7c627d6f..328d16a2f47e 100644 --- a/oox/source/ppt/pptimport.cxx +++ b/oox/source/ppt/pptimport.cxx @@ -19,6 +19,7 @@ #include <sal/config.h> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <osl/diagnose.h> #include "oox/ppt/pptimport.hxx" diff --git a/package/source/manifest/ManifestReader.hxx b/package/source/manifest/ManifestReader.hxx index 164933d50e24..38c6af817363 100644 --- a/package/source/manifest/ManifestReader.hxx +++ b/package/source/manifest/ManifestReader.hxx @@ -22,6 +22,7 @@ #include <cppuhelper/implbase2.hxx> #include <com/sun/star/packages/manifest/XManifestReader.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> namespace com { namespace sun { namespace star { diff --git a/package/source/manifest/ManifestWriter.hxx b/package/source/manifest/ManifestWriter.hxx index 36ed148824c2..c73fae6dcff1 100644 --- a/package/source/manifest/ManifestWriter.hxx +++ b/package/source/manifest/ManifestWriter.hxx @@ -22,6 +22,7 @@ #include <cppuhelper/implbase2.hxx> #include <com/sun/star/packages/manifest/XManifestWriter.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> namespace com { namespace sun { namespace star { diff --git a/package/source/xstor/ocompinstream.cxx b/package/source/xstor/ocompinstream.cxx index dad94aa0ee82..bcf502798b5d 100644 --- a/package/source/xstor/ocompinstream.cxx +++ b/package/source/xstor/ocompinstream.cxx @@ -20,6 +20,7 @@ #include "ocompinstream.hxx" #include <com/sun/star/embed/StorageFormats.hpp> #include <com/sun/star/lang/DisposedException.hpp> +#include <cppuhelper/queryinterface.hxx> #include <osl/diagnose.h> #include "owriteablestream.hxx" diff --git a/package/source/xstor/oseekinstream.cxx b/package/source/xstor/oseekinstream.cxx index bdd7f6004d06..53bf7a3db989 100644 --- a/package/source/xstor/oseekinstream.cxx +++ b/package/source/xstor/oseekinstream.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <osl/diagnose.h> #include "oseekinstream.hxx" diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx index 02c8ee8196a8..9a2ac17c39ae 100644 --- a/package/source/xstor/owriteablestream.cxx +++ b/package/source/xstor/owriteablestream.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/embed/StorageFormats.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/exc_hlp.hxx> #include <osl/diagnose.h> diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index 1171efb1c107..9c345d699fe1 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -39,6 +39,7 @@ #include <PackageConstants.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/exc_hlp.hxx> #include <rtl/instance.hxx> diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx index 1a1547ffd3df..e7ebb7355201 100644 --- a/pyuno/source/module/pyuno_module.cxx +++ b/pyuno/source/module/pyuno_module.cxx @@ -41,6 +41,7 @@ #include <uno/current_context.hxx> #include <cppuhelper/bootstrap.hxx> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/reflection/XConstantTypeDescription.hpp> #include <com/sun/star/reflection/XIdlReflection.hpp> #include <com/sun/star/reflection/XIdlClass.hpp> diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index bb6047d5b891..4d7746303d45 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -25,6 +25,7 @@ #include <formula/formdata.hxx> #include <formula/funcutl.hxx> #include <formula/tokenarray.hxx> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <boost/scoped_ptr.hpp> diff --git a/sc/inc/ScPanelFactory.hxx b/sc/inc/ScPanelFactory.hxx index afef80e29d55..8a0c704f3337 100644 --- a/sc/inc/ScPanelFactory.hxx +++ b/sc/inc/ScPanelFactory.hxx @@ -21,6 +21,7 @@ #include <cppuhelper/compbase1.hxx> #include <cppuhelper/basemutex.hxx> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ui/XUIElementFactory.hpp> #include <boost/noncopyable.hpp> diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx index 5583427798d1..75df17de0a36 100644 --- a/sc/inc/appluno.hxx +++ b/sc/inc/appluno.hxx @@ -22,6 +22,7 @@ #include <svl/itemprop.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sheet/XRecentFunctions.hpp> #include <com/sun/star/sheet/XFunctionDescriptions.hpp> diff --git a/sc/inc/filtuno.hxx b/sc/inc/filtuno.hxx index 68561c1d8155..5b8969b172f6 100644 --- a/sc/inc/filtuno.hxx +++ b/sc/inc/filtuno.hxx @@ -24,6 +24,7 @@ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/document/XImporter.hpp> #include <com/sun/star/document/XExporter.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase5.hxx> #include "scdllapi.h" diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx index 2db4f534d55a..21328994f4bb 100644 --- a/sc/source/filter/oox/ooxformulaparser.cxx +++ b/sc/source/filter/oox/ooxformulaparser.cxx @@ -19,6 +19,7 @@ #include "ooxformulaparser.hxx" +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <osl/diagnose.h> #include <cppuhelper/supportsservice.hxx> diff --git a/sc/source/filter/oox/workbooksettings.cxx b/sc/source/filter/oox/workbooksettings.cxx index 2f4cd751f180..cb2b221c0c29 100644 --- a/sc/source/filter/oox/workbooksettings.cxx +++ b/sc/source/filter/oox/workbooksettings.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/sheet/XCalculatable.hpp> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <unotools/mediadescriptor.hxx> #include <oox/core/filterbase.hxx> #include <oox/helper/attributelist.hxx> diff --git a/sc/source/ui/sidebar/ScPanelFactory.cxx b/sc/source/ui/sidebar/ScPanelFactory.cxx index cb7a91a5b6c8..6f7fdf99c1ae 100644 --- a/sc/source/ui/sidebar/ScPanelFactory.cxx +++ b/sc/source/ui/sidebar/ScPanelFactory.cxx @@ -31,6 +31,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <vcl/window.hxx> #include <rtl/ref.hxx> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <comphelper/namedvaluecollection.hxx> diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx index 80af44f6d5b2..99c403df5208 100644 --- a/scaddins/source/datefunc/datefunc.hxx +++ b/scaddins/source/datefunc/datefunc.hxx @@ -25,6 +25,7 @@ #include <string.h> #include <com/sun/star/lang/XServiceName.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/sheet/XAddIn.hpp> #include <com/sun/star/sheet/XCompatibilityNames.hpp> #include <com/sun/star/sheet/addin/XDateFunctions.hpp> diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx index 19edf0ecaee4..316d0129dd98 100644 --- a/scaddins/source/pricing/pricing.hxx +++ b/scaddins/source/pricing/pricing.hxx @@ -31,6 +31,7 @@ #include <string.h> #include <com/sun/star/lang/XServiceName.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/sheet/XAddIn.hpp> #include <com/sun/star/sheet/XCompatibilityNames.hpp> #include <com/sun/star/sheet/addin/XPricingFunctions.hpp> diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx index 39845cad2fc1..db35553fd432 100644 --- a/sfx2/source/dialog/backingcomp.cxx +++ b/sfx2/source/dialog/backingcomp.cxx @@ -42,6 +42,7 @@ #include <com/sun/star/lang/XComponent.hpp> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/keycod.hxx> diff --git a/shell/source/cmdmail/cmdmailsuppl.hxx b/shell/source/cmdmail/cmdmailsuppl.hxx index c90cfa4d1671..eca787a1680f 100644 --- a/shell/source/cmdmail/cmdmailsuppl.hxx +++ b/shell/source/cmdmail/cmdmailsuppl.hxx @@ -23,6 +23,7 @@ #include <cppuhelper/implbase3.hxx> #include <osl/mutex.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/system/XSimpleMailClient.hpp> diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx index 38e071bcedd3..6d324b0f6a4a 100644 --- a/shell/source/win32/SysShentry.cxx +++ b/shell/source/win32/SysShentry.cxx @@ -53,7 +53,8 @@ extern "C" // returns a factory to create XFilePicker-Services -SAL_DLLPUBLIC_EXPORT void* SAL_CALL syssh_component_getFactory( const sal_Char* pImplName, uno_Interface*, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL syssh_component_getFactory( + const sal_Char* pImplName, void*, void* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx index b0329df05159..d99d6a7f5e83 100644 --- a/shell/source/win32/simplemail/smplmailentry.cxx +++ b/shell/source/win32/simplemail/smplmailentry.cxx @@ -53,7 +53,8 @@ extern "C" // returns a factory to create XFilePicker-Services -SAL_DLLPUBLIC_EXPORT void* SAL_CALL smplmail_component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL smplmail_component_getFactory( + const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx b/sot/source/unoolestorage/xolesimplestorage.cxx index 15d9d46e781c..368da14a3639 100644 --- a/sot/source/unoolestorage/xolesimplestorage.cxx +++ b/sot/source/unoolestorage/xolesimplestorage.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/lang/DisposedException.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XSeekable.hpp> diff --git a/stoc/source/corereflection/crarray.cxx b/stoc/source/corereflection/crarray.cxx index 5a522a00c802..0dd2836e88be 100644 --- a/stoc/source/corereflection/crarray.cxx +++ b/stoc/source/corereflection/crarray.cxx @@ -19,6 +19,7 @@ #include <typelib/typedescription.h> #include <uno/data.h> +#include <cppuhelper/queryinterface.hxx> #include "base.hxx" diff --git a/stoc/source/corereflection/crcomp.cxx b/stoc/source/corereflection/crcomp.cxx index f243d789ee01..b0bf547f9f4f 100644 --- a/stoc/source/corereflection/crcomp.cxx +++ b/stoc/source/corereflection/crcomp.cxx @@ -18,6 +18,7 @@ */ #include <rtl/strbuf.hxx> +#include <cppuhelper/queryinterface.hxx> #include <com/sun/star/reflection/XIdlField.hpp> #include <com/sun/star/reflection/XIdlField2.hpp> diff --git a/stoc/source/corereflection/crenum.cxx b/stoc/source/corereflection/crenum.cxx index 31e8e90c7e82..f6a8b69dd318 100644 --- a/stoc/source/corereflection/crenum.cxx +++ b/stoc/source/corereflection/crenum.cxx @@ -19,6 +19,8 @@ #include "base.hxx" +#include <cppuhelper/queryinterface.hxx> + using namespace css::lang; using namespace css::reflection; using namespace css::uno; diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx index 6e57ee604888..d98659db6ff0 100644 --- a/stoc/source/corereflection/criface.cxx +++ b/stoc/source/corereflection/criface.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/uno/RuntimeException.hpp> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/exc_hlp.hxx> using namespace css::lang; diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx index 9eb5547aee02..d3c3c9a7c23c 100644 --- a/svl/source/fsstor/fsstorage.cxx +++ b/svl/source/fsstor/fsstorage.cxx @@ -46,6 +46,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/storagehelper.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/svl/source/fsstor/oinputstreamcontainer.cxx b/svl/source/fsstor/oinputstreamcontainer.cxx index 3a9280d75012..948b44c8dc87 100644 --- a/svl/source/fsstor/oinputstreamcontainer.cxx +++ b/svl/source/fsstor/oinputstreamcontainer.cxx @@ -20,6 +20,7 @@ #include "oinputstreamcontainer.hxx" #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> using namespace ::com::sun::star; diff --git a/svl/source/fsstor/ostreamcontainer.cxx b/svl/source/fsstor/ostreamcontainer.cxx index 2651ad4c8398..48fafcde9460 100644 --- a/svl/source/fsstor/ostreamcontainer.cxx +++ b/svl/source/fsstor/ostreamcontainer.cxx @@ -17,9 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ostreamcontainer.hxx" +#include <cppuhelper/queryinterface.hxx> + using namespace ::com::sun::star; diff --git a/svl/source/inc/fsfactory.hxx b/svl/source/inc/fsfactory.hxx index 6196e840f22a..eb8e11ea2a28 100644 --- a/svl/source/inc/fsfactory.hxx +++ b/svl/source/inc/fsfactory.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase2.hxx> #include <osl/diagnose.h> diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx index eb4568bb06a1..43923f1a2797 100644 --- a/svl/source/misc/strmadpt.cxx +++ b/svl/source/misc/strmadpt.cxx @@ -27,6 +27,7 @@ #include <osl/diagnose.h> #include <rtl/alloc.h> +#include <cppuhelper/queryinterface.hxx> #include <svl/instrm.hxx> #include <svl/outstrm.hxx> #include <svl/strmadpt.hxx> diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx index 34f9b440e6ad..edc00482c474 100644 --- a/svl/source/numbers/supservs.cxx +++ b/svl/source/numbers/supservs.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/lang/Locale.hpp> #include <comphelper/sharedmutex.hxx> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/queryinterface.hxx> #include <i18nlangtag/mslangid.hxx> #include <tools/debug.hxx> #include <osl/mutex.hxx> diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx index 513063407475..72ac37e54991 100644 --- a/svtools/source/graphic/graphic.cxx +++ b/svtools/source/graphic/graphic.cxx @@ -26,6 +26,7 @@ #include "graphic.hxx" #include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/queryinterface.hxx> #include <string.h> using namespace com::sun::star; diff --git a/svtools/source/hatchwindow/hatchwindow.cxx b/svtools/source/hatchwindow/hatchwindow.cxx index 595fb071a24f..dc1828d08642 100644 --- a/svtools/source/hatchwindow/hatchwindow.cxx +++ b/svtools/source/hatchwindow/hatchwindow.cxx @@ -23,6 +23,7 @@ #include "ipwin.hxx" #include <toolkit/helper/convert.hxx> +#include <cppuhelper/queryinterface.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx index 9dd46c7fd2a7..3d7058cd2aba 100644 --- a/svtools/source/uno/contextmenuhelper.cxx +++ b/svtools/source/uno/contextmenuhelper.cxx @@ -39,6 +39,7 @@ #include <osl/conditn.hxx> #include <cppuhelper/weak.hxx> +#include <cppuhelper/queryinterface.hxx> #include <comphelper/processfactory.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx index cdbcf2c56a1a..3d99d5ef4e16 100644 --- a/svtools/source/uno/framestatuslistener.cxx +++ b/svtools/source/uno/framestatuslistener.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <osl/mutex.hxx> +#include <cppuhelper/queryinterface.hxx> #include <vcl/svapp.hxx> #include <comphelper/processfactory.hxx> diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index e2e154ff2ecb..b78dc191e79f 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -25,6 +25,7 @@ #include <toolkit/awt/vclxwindow.hxx> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include <comphelper/property.hxx> #include <osl/diagnose.h> diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index f77f16aae914..566bc59da172 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -18,6 +18,7 @@ */ #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/queryinterface.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/toolbox.hxx> diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx index 6131baf342bb..d0f6eecf1d65 100644 --- a/svtools/source/uno/statusbarcontroller.cxx +++ b/svtools/source/uno/statusbarcontroller.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/util/URLTransformer.hpp> +#include <cppuhelper/queryinterface.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index e5ad4e3b5053..bc4ba578a2bf 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/awt/LineEndFormat.hpp> +#include <cppuhelper/queryinterface.hxx> #include <comphelper/processfactory.hxx> #include <toolkit/helper/convert.hxx> #include <toolkit/helper/property.hxx> diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx index 30b463815003..bd39f4b4975c 100644 --- a/svx/source/accessibility/AccessibleGraphicShape.cxx +++ b/svx/source/accessibility/AccessibleGraphicShape.cxx @@ -24,6 +24,8 @@ #include <svx/svdobj.hxx> #include <svx/svdmodel.hxx> +#include <cppuhelper/queryinterface.hxx> + using namespace ::accessibility; using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx index dc57aec9cc17..7f0051d30809 100644 --- a/svx/source/accessibility/AccessibleOLEShape.cxx +++ b/svx/source/accessibility/AccessibleOLEShape.cxx @@ -23,6 +23,8 @@ #include <svx/SvxShapeTypes.hxx> #include <svx/svdoole2.hxx> +#include <cppuhelper/queryinterface.hxx> + using namespace accessibility; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 2cecce0f1668..3b0c496875c8 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -51,6 +51,7 @@ #include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <svx/svdview.hxx> +#include <cppuhelper/queryinterface.hxx> #include <comphelper/servicehelper.hxx> #include "AccessibleEmptyEditSource.hxx" diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 64b78c5d5948..f3cdb1fb9e46 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -52,6 +52,7 @@ #include <comphelper/types.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> #include <sal/macros.h> diff --git a/svx/source/inc/xfm_addcondition.hxx b/svx/source/inc/xfm_addcondition.hxx index 61e86bb54ef7..b55a0f3f9a03 100644 --- a/svx/source/inc/xfm_addcondition.hxx +++ b/svx/source/inc/xfm_addcondition.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_SVX_SOURCE_INC_XFM_ADDCONDITION_HXX #define INCLUDED_SVX_SOURCE_INC_XFM_ADDCONDITION_HXX +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/xforms/XModel.hpp> #include <svtools/genericunodialog.hxx> #include <comphelper/proparrhlp.hxx> diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 8960b3b5e6f3..746d387ae951 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -33,6 +33,7 @@ #include <svtools/toolboxcontroller.hxx> #include <osl/mutex.hxx> #include <comphelper/processfactory.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <boost/scoped_ptr.hpp> diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index e95d68a5ef8d..f84080a0c959 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -23,6 +23,7 @@ #include <svx/dialmgr.hxx> #include <comphelper/processfactory.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx index c9713cb13d5b..ab0452b8b9c1 100644 --- a/sw/source/core/access/acchyperlink.cxx +++ b/sw/source/core/access/acchyperlink.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/document/XLinkTargetSupplier.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <swurl.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 10a02a629ca1..188c99b73a00 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -35,6 +35,7 @@ #include <svtools/simptabl.hxx> #include <svtools/treelistentry.hxx> #include <com/sun/star/sdbc/XCloseable.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/uno/XNamingService.hpp> diff --git a/sw/source/uibase/inc/SwXFilterOptions.hxx b/sw/source/uibase/inc/SwXFilterOptions.hxx index 02ae7d295f35..4c583d68dac9 100644 --- a/sw/source/uibase/inc/SwXFilterOptions.hxx +++ b/sw/source/uibase/inc/SwXFilterOptions.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/document/XImporter.hpp> #include <com/sun/star/document/XExporter.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase5.hxx> diff --git a/toolkit/source/awt/vclxbitmap.cxx b/toolkit/source/awt/vclxbitmap.cxx index e989da30f8ff..c6ccd6ff8bc9 100644 --- a/toolkit/source/awt/vclxbitmap.cxx +++ b/toolkit/source/awt/vclxbitmap.cxx @@ -20,6 +20,7 @@ #include <toolkit/awt/vclxbitmap.hxx> #include <toolkit/helper/macros.hxx> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <tools/stream.hxx> #include <rtl/uuid.h> #include <vcl/dibtools.hxx> diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx index 2b78ada73fcd..496a3f7020b6 100644 --- a/toolkit/source/awt/vclxcontainer.cxx +++ b/toolkit/source/awt/vclxcontainer.cxx @@ -21,6 +21,7 @@ #include <toolkit/helper/macros.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <rtl/uuid.h> #include <vcl/svapp.hxx> diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx index 36b5a188f433..57cd040d40e0 100644 --- a/toolkit/source/awt/vclxdevice.cxx +++ b/toolkit/source/awt/vclxdevice.cxx @@ -27,6 +27,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/macros.hxx> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <rtl/uuid.h> diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx index 181633f1c8f4..d3b4f2767f18 100644 --- a/toolkit/source/awt/vclxfont.cxx +++ b/toolkit/source/awt/vclxfont.cxx @@ -23,6 +23,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/macros.hxx> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <rtl/uuid.h> #include <rtl/ustring.h> diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx index ded9805ea4d1..3dc4246f685e 100644 --- a/toolkit/source/awt/vclxgraphics.cxx +++ b/toolkit/source/awt/vclxgraphics.cxx @@ -24,6 +24,7 @@ #include <toolkit/helper/macros.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <rtl/uuid.h> #include <vcl/svapp.hxx> diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index d8711d6b8c64..38842b089213 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include <rtl/uuid.h> #include <osl/mutex.hxx> diff --git a/toolkit/source/awt/vclxpointer.cxx b/toolkit/source/awt/vclxpointer.cxx index 7a3df1e50ece..2ec98adf6f3c 100644 --- a/toolkit/source/awt/vclxpointer.cxx +++ b/toolkit/source/awt/vclxpointer.cxx @@ -21,6 +21,7 @@ #include <toolkit/awt/vclxpointer.hxx> #include <toolkit/helper/macros.hxx> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> // class VCLXPointer diff --git a/toolkit/source/awt/vclxregion.cxx b/toolkit/source/awt/vclxregion.cxx index ae777e654592..c2344b720237 100644 --- a/toolkit/source/awt/vclxregion.cxx +++ b/toolkit/source/awt/vclxregion.cxx @@ -22,6 +22,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/convert.hxx> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <rtl/uuid.h> #include <vcl/svapp.hxx> diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx index e9055771a85e..1ee5600b65c6 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -26,6 +26,7 @@ #include <toolkit/awt/vclxsystemdependentwindow.hxx> #include <toolkit/helper/macros.hxx> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #ifdef MACOSX #include "premac.h" diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 6e838dd7bb78..002ef31763da 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -27,6 +27,7 @@ #include <toolkit/helper/property.hxx> #include <toolkit/helper/convert.hxx> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <com/sun/star/awt/VisualEffect.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/system/SystemShellExecute.hpp> diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index 9dfd49532a3a..a8bd68f8dc8f 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <comphelper/processfactory.hxx> diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 8e3d5b16040c..95592918e520 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <comphelper/sequence.hxx> diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx index 145539eb94ad..ced5b7691cc4 100644 --- a/toolkit/source/controls/stdtabcontroller.cxx +++ b/toolkit/source/controls/stdtabcontroller.cxx @@ -26,6 +26,7 @@ #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/macros.hxx> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <rtl/uuid.h> #include <tools/debug.hxx> diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx index d61e723f4afe..1ea8acca03e1 100644 --- a/toolkit/source/controls/stdtabcontrollermodel.cxx +++ b/toolkit/source/controls/stdtabcontrollermodel.cxx @@ -25,6 +25,7 @@ #include <toolkit/helper/servicenames.hxx> #include <toolkit/helper/property.hxx> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <rtl/uuid.h> #include <tools/debug.hxx> diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx index ab3a006c5ff1..3b293a53bf00 100644 --- a/toolkit/source/controls/tkscrollbar.cxx +++ b/toolkit/source/controls/tkscrollbar.cxx @@ -21,6 +21,7 @@ #include "toolkit/helper/property.hxx" #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <toolkit/awt/vclxwindows.hxx> diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index be64e34366ae..2a7abdf0947b 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -42,6 +42,7 @@ // for introspection #include <toolkit/awt/vclxwindows.hxx> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <comphelper/processfactory.hxx> #include <vcl/wrkwin.hxx> #include <vcl/svapp.hxx> diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx index fb4e48c381e5..797fad2e0ce0 100644 --- a/toolkit/source/helper/listenermultiplexer.cxx +++ b/toolkit/source/helper/listenermultiplexer.cxx @@ -19,7 +19,7 @@ #include <toolkit/helper/listenermultiplexer.hxx> #include <com/sun/star/lang/DisposedException.hpp> - +#include <cppuhelper/queryinterface.hxx> // class ListenerMultiplexerBase diff --git a/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx index 07de9157185b..1d9d1465fad1 100644 --- a/ucb/source/ucp/file/filid.cxx +++ b/ucb/source/ucp/file/filid.cxx @@ -20,6 +20,8 @@ #include "filid.hxx" #include "shell.hxx" +#include <cppuhelper/queryinterface.hxx> + using namespace fileaccess; using namespace com::sun::star; using namespace com::sun::star::ucb; diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx index b9f8a556943a..cc64e8c33190 100644 --- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx +++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx @@ -23,6 +23,7 @@ #include "com/sun/star/lang/XTypeProvider.hpp" #include "com/sun/star/task/DocumentPasswordRequest.hpp" +#include <cppuhelper/queryinterface.hxx> #include "cppuhelper/typeprovider.hxx" #include "ucbhelper/interactionrequest.hxx" diff --git a/ucb/source/ucp/webdav-neon/NeonInputStream.cxx b/ucb/source/ucp/webdav-neon/NeonInputStream.cxx index 214391a285ae..8f487aac4ef8 100644 --- a/ucb/source/ucp/webdav-neon/NeonInputStream.cxx +++ b/ucb/source/ucp/webdav-neon/NeonInputStream.cxx @@ -26,10 +26,12 @@ * ************************************************************************/ -#include <string.h> - #include "NeonInputStream.hxx" +#include <cppuhelper/queryinterface.hxx> + +#include <string.h> + using namespace cppu; using namespace com::sun::star::io; using namespace com::sun::star::uno; diff --git a/ucbhelper/source/provider/contentidentifier.cxx b/ucbhelper/source/provider/contentidentifier.cxx index f040b3b166ec..b95d3f4fc95b 100644 --- a/ucbhelper/source/provider/contentidentifier.cxx +++ b/ucbhelper/source/provider/contentidentifier.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <ucbhelper/contentidentifier.hxx> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <osl/mutex.hxx> using namespace com::sun::star::uno; diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx index 21f2d179f0da..8e3b68ae36c8 100644 --- a/ucbhelper/source/provider/interactionrequest.cxx +++ b/ucbhelper/source/provider/interactionrequest.cxx @@ -28,6 +28,7 @@ #include <osl/mutex.hxx> #include <osl/diagnose.h> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> using namespace com::sun::star; using namespace ucbhelper; diff --git a/ucbhelper/source/provider/simplenameclashresolverequest.cxx b/ucbhelper/source/provider/simplenameclashresolverequest.cxx index b1d2a48afa9d..55832d043d7c 100644 --- a/ucbhelper/source/provider/simplenameclashresolverequest.cxx +++ b/ucbhelper/source/provider/simplenameclashresolverequest.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/ucb/NameClashResolveRequest.hpp> #include <com/sun/star/ucb/XInteractionSupplyName.hpp> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/queryinterface.hxx> #include <ucbhelper/simplenameclashresolverequest.hxx> using namespace com::sun::star; diff --git a/unotools/source/config/xmlaccelcfg.cxx b/unotools/source/config/xmlaccelcfg.cxx index 89379c58cfa3..6e906c8b5992 100644 --- a/unotools/source/config/xmlaccelcfg.cxx +++ b/unotools/source/config/xmlaccelcfg.cxx @@ -22,6 +22,7 @@ #include <vector> #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <cppuhelper/implbase1.hxx> +#include <cppuhelper/queryinterface.hxx> using namespace com::sun::star::uno; using namespace com::sun::star::xml::sax; diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx index 7c6b4adb1c16..f705370a45b6 100644 --- a/uui/source/requeststringresolver.hxx +++ b/uui/source/requeststringresolver.hxx @@ -21,6 +21,7 @@ #define INCLUDED_UUI_SOURCE_REQUESTSTRINGRESOLVER_HXX #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/task/XInteractionRequestStringResolver.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase2.hxx> diff --git a/vcl/source/app/dndhelp.cxx b/vcl/source/app/dndhelp.cxx index 7b056828893c..2e690c75ac7f 100644 --- a/vcl/source/app/dndhelp.cxx +++ b/vcl/source/app/dndhelp.cxx @@ -19,6 +19,8 @@ #include <vcl/dndhelp.hxx> +#include <cppuhelper/queryinterface.hxx> + using namespace ::com::sun::star; vcl::unohelper::DragAndDropClient::~DragAndDropClient() {} diff --git a/vcl/source/app/unohelp2.cxx b/vcl/source/app/unohelp2.cxx index 8e5def4411ff..ff34ed41621b 100644 --- a/vcl/source/app/unohelp2.cxx +++ b/vcl/source/app/unohelp2.cxx @@ -24,6 +24,7 @@ #include <vcl/svapp.hxx> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp> +#include <cppuhelper/queryinterface.hxx> using namespace ::com::sun::star; diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index ede76a02ca92..92ec4acc06ff 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -39,6 +39,7 @@ #include <com/sun/star/i18n/WordType.hpp> #include <cppuhelper/weak.hxx> +#include <cppuhelper/queryinterface.hxx> #include <vcl/unohelp.hxx> #include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index 120eaea6441f..de588345c7fe 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -28,6 +28,7 @@ #include <com/sun/star/awt/XDisplayConnection.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XDesktop2.hpp> #include <osl/thread.h> diff --git a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx index a71a589eb65f..206a37581e07 100644 --- a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx +++ b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx @@ -17,10 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <string.h> - #include "bufferedinputstream.hxx" +#include <cppuhelper/queryinterface.hxx> + +#include <string.h> using namespace cppu; using namespace com::sun::star::uno; diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.cxx b/xmlhelp/source/cxxhelp/provider/inputstream.cxx index b0ab09c299d3..af845caacb2f 100644 --- a/xmlhelp/source/cxxhelp/provider/inputstream.cxx +++ b/xmlhelp/source/cxxhelp/provider/inputstream.cxx @@ -20,6 +20,8 @@ #include "inputstream.hxx" +#include <cppuhelper/queryinterface.hxx> + using namespace chelp; using namespace com::sun::star; diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index 78200f017e84..6bd3aaee31fa 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -37,6 +37,7 @@ #include <xmloff/SchXMLSeriesHelper.hxx> #include "vector" +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/chart/XChartDocument.hpp> #include <com/sun/star/chart/XDiagram.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx index 68049c2d3f6c..52a09d550e3e 100644 --- a/xmloff/source/chart/SchXMLImport.cxx +++ b/xmloff/source/chart/SchXMLImport.cxx @@ -36,6 +36,7 @@ #include <com/sun/star/chart/XChartDocument.hpp> #include <com/sun/star/chart/ChartDataRowSource.hpp> #include <com/sun/star/container/XChild.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/chart2/data/XDataReceiver.hpp> #include <com/sun/star/chart2/data/XDataProvider.hpp> diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index 6298cc74c389..d1c1110bc6a7 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -53,6 +53,7 @@ #include <com/sun/star/chart2/data/LabeledDataSequence.hpp> #include <com/sun/star/drawing/CameraGeometry.hpp> #include <com/sun/star/drawing/FillStyle.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/util/XStringMapping.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index 2c13b80983f2..59a2844953f8 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/chart/ChartAxisAssign.hpp> #include <com/sun/star/chart/ChartSymbolType.hpp> #include <com/sun/star/container/XChild.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/chart/ChartLegendPosition.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/embed/Aspects.hpp> diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index 891e7bded80f..cf195df204ab 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -43,6 +43,7 @@ #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceName.hpp> #include <comphelper/processfactory.hxx> diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index c5b41a506e40..9b49b827d082 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -64,6 +64,7 @@ #include "XMLBase64Export.hxx" #include <xmloff/xmlerror.hxx> #include <com/sun/star/lang/ServiceNotRegisteredException.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <xmloff/XMLFilterServiceNames.h> #include <xmloff/XMLEmbeddedObjectExportFilter.hxx> diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 8840494c0025..2988a4902074 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -24,6 +24,7 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmlmetae.hxx> #include <com/sun/star/lang/ServiceNotRegisteredException.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/presentation/XPresentationSupplier.hpp> #include <com/sun/star/presentation/XCustomPresentationSupplier.hpp> #include <com/sun/star/geometry/RealPoint2D.hpp> diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index b55a0c9fa9c7..06df8eca4403 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -32,6 +32,7 @@ #include <xmloff/xmluconv.hxx> #include <xmloff/DocumentSettingsContext.hxx> #include <com/sun/star/form/XFormsSupplier.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/task/XStatusIndicatorSupplier.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index 4e8f660ba1aa..f6e4f767b6d5 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/geometry/RealPoint2D.hpp> #include <com/sun/star/text/XTextCursor.hpp> #include <com/sun/star/util/DateTime.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/implbase1.hxx> #include <sax/tools/converter.hxx> #include "XMLNumberStylesImport.hxx" diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 62ff05dd783b..74bb00ccfbe7 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -48,6 +48,7 @@ #include <com/sun/star/drawing/PointSequenceSequence.hpp> #include <com/sun/star/drawing/PointSequence.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/beans/XMultiPropertyStates.hpp> #include "xexptran.hxx" diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx index 4522b2fc92b2..8cdcabd08782 100644 --- a/xmloff/source/style/XMLPageExport.cxx +++ b/xmloff/source/style/XMLPageExport.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XIndexReplace.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <xmloff/families.hxx> #include <xmloff/xmlexp.hxx> #include "PageMasterPropHdlFactory.hxx" diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx index a102b799be8f..405c9db021a8 100644 --- a/xmloff/source/table/XMLTableExport.cxx +++ b/xmloff/source/table/XMLTableExport.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/table/XMergeableCell.hpp> #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmlprmap.hxx> diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 2cfe53a74c2d..d70efff118fc 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -23,6 +23,7 @@ #include <boost/scoped_array.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/text/XChapterNumberingSupplier.hpp> #include <com/sun/star/text/XTextFramesSupplier.hpp> diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index 36fb946ab91d..7676d74c5fe8 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -22,6 +22,7 @@ #include <rtl/ustrbuf.hxx> #include <boost/ptr_container/ptr_vector.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/text/XTextFrame.hpp> #include <com/sun/star/text/XTextCursor.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx index f5ce270ff163..e03d834a64c2 100644 --- a/xmloff/source/text/txtstyle.cxx +++ b/xmloff/source/text/txtstyle.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/beans/XPropertyState.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/style/XStyle.hpp> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx index cbd5ab0ea1f3..1c8012e8925d 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx @@ -47,6 +47,7 @@ #include <com/sun/star/style/VerticalAlignment.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/util/NumberFormat.hpp> diff --git a/xmlsecurity/source/framework/decryptorimpl.hxx b/xmlsecurity/source/framework/decryptorimpl.hxx index 1833d07a91dd..1474aef4511f 100644 --- a/xmlsecurity/source/framework/decryptorimpl.hxx +++ b/xmlsecurity/source/framework/decryptorimpl.hxx @@ -25,6 +25,7 @@ #include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/implbase3.hxx> #include "encryptionengine.hxx" diff --git a/xmlsecurity/source/framework/encryptorimpl.hxx b/xmlsecurity/source/framework/encryptorimpl.hxx index dc6df452cd71..94b84c5b2c32 100644 --- a/xmlsecurity/source/framework/encryptorimpl.hxx +++ b/xmlsecurity/source/framework/encryptorimpl.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/implbase4.hxx> #include "encryptionengine.hxx" diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx index e6887c8adb21..27088b9dab2b 100644 --- a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx +++ b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx @@ -29,6 +29,7 @@ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/implbase6.hxx> #include "buffernode.hxx" diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.hxx b/xmlsecurity/source/framework/signaturecreatorimpl.hxx index e913283e6071..76653a111e29 100644 --- a/xmlsecurity/source/framework/signaturecreatorimpl.hxx +++ b/xmlsecurity/source/framework/signaturecreatorimpl.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/implbase4.hxx> #include "signatureengine.hxx" diff --git a/xmlsecurity/source/framework/signatureverifierimpl.hxx b/xmlsecurity/source/framework/signatureverifierimpl.hxx index 382c7c6a6fc6..950a9a499e83 100644 --- a/xmlsecurity/source/framework/signatureverifierimpl.hxx +++ b/xmlsecurity/source/framework/signatureverifierimpl.hxx @@ -25,6 +25,7 @@ #include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase3.hxx> |