[Libreoffice-commits] core.git: 5 commits - animations/source avmedia/source basic/source bridges/source chart2/source codemaker/source configmgr/source connectivity/source cppuhelper/source cppu/source dbaccess/source desktop/source dtrans/source editeng/source embeddedobj/source embedserv/source extensions/source filter/source forms/source fpicker/source framework/inc framework/source i18nlangtag/source include/com include/comphelper include/cppu include/cppuhelper include/svl include/svtools include/toolkit include/uno io/source Makefile.in oox/source package/source pyuno/source reportdesign/source scaddins/source sc/inc sc/source sd/source sfx2/source shell/source sot/source stoc/source svl/source svtools/source svx/source sw/source toolkit/source ucbhelper/source ucb/source UnoControls/inc UnoControls/source unotools/source unoxml/source uui/source vcl/source vcl/unx xmlhelp/source xmloff/source xmlscript/source xmlsecurity/source
Michael Stahl
mstahl at redhat.com
Tue Nov 18 09:57:19 PST 2014
Makefile.in | 2
UnoControls/inc/multiplexer.hxx | 1
UnoControls/source/base/basecontainercontrol.cxx | 1
UnoControls/source/base/basecontrol.cxx | 1
UnoControls/source/base/multiplexer.cxx | 1
UnoControls/source/controls/OConnectionPointContainerHelper.cxx | 2
UnoControls/source/controls/OConnectionPointHelper.cxx | 2
UnoControls/source/controls/framecontrol.cxx | 1
UnoControls/source/controls/progressbar.cxx | 1
UnoControls/source/controls/progressmonitor.cxx | 1
UnoControls/source/controls/statusindicator.cxx | 1
UnoControls/source/inc/OConnectionPointHelper.hxx | 1
animations/source/animcore/animcore.cxx | 1
avmedia/source/framework/soundhandler.cxx | 1
avmedia/source/opengl/oglmanager.hxx | 1
basic/source/uno/namecont.cxx | 2
bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx | 1
chart2/source/model/inc/XMLFilter.hxx | 1
chart2/source/view/inc/PlotterBase.hxx | 1
codemaker/source/cppumaker/cpputype.cxx | 26 ++++++++--
configmgr/source/propertynode.cxx | 1
connectivity/source/commontools/TTableHelper.cxx | 1
connectivity/source/drivers/ado/ACallableStatement.cxx | 1
connectivity/source/drivers/ado/APreparedStatement.cxx | 1
connectivity/source/drivers/ado/AStatement.cxx | 1
connectivity/source/drivers/calc/CTable.cxx | 1
connectivity/source/drivers/dbase/DTable.cxx | 1
connectivity/source/drivers/file/FPreparedStatement.cxx | 1
connectivity/source/drivers/firebird/Driver.hxx | 1
connectivity/source/drivers/firebird/Statement.cxx | 1
connectivity/source/drivers/flat/ETable.cxx | 1
connectivity/source/drivers/jdbc/CallableStatement.cxx | 1
connectivity/source/drivers/jdbc/JStatement.cxx | 1
connectivity/source/drivers/jdbc/PreparedStatement.cxx | 1
connectivity/source/drivers/macab/MacabDriver.hxx | 1
connectivity/source/drivers/mork/MStatement.cxx | 1
connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx | 1
connectivity/source/drivers/odbc/OStatement.cxx | 1
connectivity/source/drivers/postgresql/pq_xbase.cxx | 1
connectivity/source/inc/calc/CDriver.hxx | 2
connectivity/source/inc/dbase/DDriver.hxx | 1
connectivity/source/inc/flat/EDriver.hxx | 1
connectivity/source/inc/hsqldb/HDriver.hxx | 1
connectivity/source/inc/mysql/YDriver.hxx | 1
connectivity/source/inc/odbc/ODriver.hxx | 1
cppu/source/AffineBridge/AffineBridge.cxx | 1
cppu/source/LogBridge/LogBridge.cxx | 1
cppu/source/UnsafeBridge/UnsafeBridge.cxx | 1
cppu/source/helper/purpenv/helper_purpenv_Environment.cxx | 1
cppuhelper/source/defaultbootstrap.cxx | 1
cppuhelper/source/factory.cxx | 1
cppuhelper/source/propshlp.cxx | 1
cppuhelper/source/shlib.cxx | 1
cppuhelper/source/typeprovider.cxx | 3 -
cppuhelper/source/weak.cxx | 1
dbaccess/source/core/api/View.cxx | 1
dbaccess/source/core/api/callablestatement.cxx | 1
dbaccess/source/core/api/datacolumn.cxx | 1
dbaccess/source/core/api/preparedstatement.cxx | 1
dbaccess/source/core/api/resultset.cxx | 1
dbaccess/source/core/api/statement.cxx | 1
dbaccess/source/inc/apitools.hxx | 1
dbaccess/source/ui/inc/RelationController.hxx | 1
dbaccess/source/ui/inc/TableController.hxx | 1
dbaccess/source/ui/inc/unosqlmessage.hxx | 2
dbaccess/source/ui/misc/singledoccontroller.cxx | 1
dbaccess/source/ui/querydesign/limitboxcontroller.cxx | 1
desktop/source/offacc/acceptor.hxx | 1
dtrans/source/generic/clipboardmanager.hxx | 1
dtrans/source/generic/generic_clipboard.hxx | 1
dtrans/source/win32/clipb/wcbentry.cxx | 2
dtrans/source/win32/dnd/dndentry.cxx | 3 -
dtrans/source/win32/ftransl/ftranslentry.cxx | 2
editeng/source/editeng/eeobj.cxx | 1
embeddedobj/source/commonembedding/miscobj.cxx | 1
embeddedobj/source/commonembedding/specialobject.cxx | 1
embeddedobj/source/inc/oleembobj.hxx | 1
embeddedobj/source/msole/xolefactory.hxx | 1
embedserv/source/embed/servprov.cxx | 1
extensions/source/bibliography/datman.cxx | 1
extensions/source/ole/servprov.cxx | 1
extensions/source/plugin/base/plmodel.cxx | 1
extensions/source/plugin/base/xplugin.cxx | 1
extensions/source/propctrlr/propcontroller.cxx | 1
extensions/source/scanner/scanner.cxx | 1
extensions/source/scanner/scanunx.cxx | 1
filter/source/config/cache/configflush.hxx | 1
filter/source/config/cache/typedetection.hxx | 1
filter/source/flash/swfdialog.cxx | 1
filter/source/flash/swfuno.hxx | 1
filter/source/svg/svgdialog.cxx | 1
filter/source/svg/svgdialog.hxx | 1
filter/source/t602/t602filter.hxx | 1
filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx | 1
forms/source/component/EventThread.cxx | 2
forms/source/component/File.cxx | 1
forms/source/component/FormattedFieldWrapper.cxx | 1
forms/source/component/imgprod.cxx | 1
forms/source/richtext/richtextcontrol.hxx | 1
forms/source/runtime/formoperations.hxx | 1
fpicker/source/aqua/FPentry.mm | 2
fpicker/source/win32/filepicker/FPentry.cxx | 2
fpicker/source/win32/filepicker/FilePicker.cxx | 1
fpicker/source/win32/filepicker/FilePicker.hxx | 1
fpicker/source/win32/folderpicker/FolderPicker.hxx | 1
framework/inc/uielement/menubarmanager.hxx | 1
framework/inc/uifactory/configurationaccessfactorymanager.hxx | 1
framework/source/fwe/classes/actiontriggercontainer.cxx | 1
framework/source/fwe/classes/actiontriggerpropertyset.cxx | 1
framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx | 1
framework/source/fwe/classes/rootactiontriggercontainer.cxx | 1
framework/source/fwe/helper/propertysetcontainer.cxx | 1
framework/source/inc/loadenv/actionlockguard.hxx | 1
framework/source/uielement/buttontoolbarcontroller.cxx | 1
framework/source/uielement/menubarmanager.cxx | 1
framework/source/uielement/statusbarmanager.cxx | 1
i18nlangtag/source/isolang/inunx.cxx | 3 -
i18nlangtag/source/isolang/inwnt.cxx | 1
i18nlangtag/source/languagetag/languagetag.cxx | 1
include/com/sun/star/uno/Any.h | 6 +-
include/com/sun/star/uno/Any.hxx | 3 -
include/com/sun/star/uno/Reference.hxx | 2
include/com/sun/star/uno/Type.h | 1
include/com/sun/star/uno/Type.hxx | 1
include/com/sun/star/uno/genfunc.hxx | 1
include/comphelper/servicedecl.hxx | 1
include/cppu/EnvGuards.hxx | 1
include/cppu/helper/purpenv/Environment.hxx | 2
include/cppu/helper/purpenv/Mapping.hxx | 4 -
include/cppu/unotype.hxx | 4 -
include/cppuhelper/bootstrap.hxx | 1
include/cppuhelper/compbase_ex.hxx | 5 +
include/cppuhelper/component.hxx | 6 +-
include/cppuhelper/component_context.hxx | 1
include/cppuhelper/factory.hxx | 1
include/cppuhelper/implbase_ex.hxx | 4 -
include/cppuhelper/propshlp.hxx | 2
include/cppuhelper/proptypehlp.h | 3 -
include/cppuhelper/proptypehlp.hxx | 2
include/cppuhelper/shlib.hxx | 2
include/cppuhelper/typeprovider.hxx | 1
include/cppuhelper/weak.hxx | 2
include/cppuhelper/weakagg.hxx | 1
include/svl/numuno.hxx | 1
include/svtools/contextmenuhelper.hxx | 1
include/toolkit/controls/controlmodelcontainerbase.hxx | 1
include/uno/dispatcher.h | 1
include/uno/mapping.hxx | 2
include/uno/threadpool.h | 2
io/source/acceptor/acc_pipe.cxx | 1
io/source/acceptor/acc_socket.cxx | 1
io/source/acceptor/acceptor.hxx | 1
oox/source/core/filterbase.cxx | 1
oox/source/core/xmlfilterbase.cxx | 1
oox/source/drawingml/chart/objectformatter.cxx | 1
oox/source/export/chartexport.cxx | 1
oox/source/ppt/pptimport.cxx | 1
package/source/manifest/ManifestReader.hxx | 1
package/source/manifest/ManifestWriter.hxx | 1
package/source/xstor/ocompinstream.cxx | 1
package/source/xstor/oseekinstream.cxx | 1
package/source/xstor/owriteablestream.cxx | 1
package/source/xstor/xstorage.cxx | 1
pyuno/source/module/pyuno_module.cxx | 1
reportdesign/source/ui/dlg/Formula.cxx | 1
sc/inc/ScPanelFactory.hxx | 1
sc/inc/appluno.hxx | 1
sc/inc/filtuno.hxx | 1
sc/source/filter/oox/ooxformulaparser.cxx | 1
sc/source/filter/oox/workbooksettings.cxx | 1
sc/source/ui/sidebar/ScPanelFactory.cxx | 1
scaddins/source/datefunc/datefunc.hxx | 1
scaddins/source/pricing/pricing.hxx | 1
sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx | 2
sfx2/source/dialog/backingcomp.cxx | 1
shell/source/cmdmail/cmdmailsuppl.hxx | 1
shell/source/win32/SysShentry.cxx | 3 -
shell/source/win32/simplemail/smplmailentry.cxx | 3 -
sot/source/unoolestorage/xolesimplestorage.cxx | 1
stoc/source/corereflection/crarray.cxx | 1
stoc/source/corereflection/crcomp.cxx | 1
stoc/source/corereflection/crenum.cxx | 2
stoc/source/corereflection/criface.cxx | 1
svl/source/fsstor/fsstorage.cxx | 1
svl/source/fsstor/oinputstreamcontainer.cxx | 1
svl/source/fsstor/ostreamcontainer.cxx | 3 -
svl/source/inc/fsfactory.hxx | 1
svl/source/misc/strmadpt.cxx | 1
svl/source/numbers/supservs.cxx | 1
svl/source/undo/undo.cxx | 1
svtools/source/graphic/graphic.cxx | 1
svtools/source/hatchwindow/hatchwindow.cxx | 1
svtools/source/uno/contextmenuhelper.cxx | 1
svtools/source/uno/framestatuslistener.cxx | 1
svtools/source/uno/genericunodialog.cxx | 1
svtools/source/uno/popupwindowcontroller.cxx | 1
svtools/source/uno/statusbarcontroller.cxx | 1
svtools/source/uno/unoiface.cxx | 1
svx/source/accessibility/AccessibleGraphicShape.cxx | 2
svx/source/accessibility/AccessibleOLEShape.cxx | 2
svx/source/accessibility/AccessibleShape.cxx | 1
svx/source/fmcomp/fmgridif.cxx | 1
svx/source/inc/xfm_addcondition.hxx | 1
svx/source/tbxctrls/tbunocontroller.cxx | 1
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 1
sw/source/core/access/acchyperlink.cxx | 1
sw/source/ui/dbui/addresslistdialog.cxx | 1
sw/source/uibase/inc/SwXFilterOptions.hxx | 1
toolkit/source/awt/vclxbitmap.cxx | 1
toolkit/source/awt/vclxcontainer.cxx | 1
toolkit/source/awt/vclxdevice.cxx | 1
toolkit/source/awt/vclxfont.cxx | 1
toolkit/source/awt/vclxgraphics.cxx | 1
toolkit/source/awt/vclxmenu.cxx | 1
toolkit/source/awt/vclxpointer.cxx | 1
toolkit/source/awt/vclxregion.cxx | 1
toolkit/source/awt/vclxsystemdependentwindow.cxx | 1
toolkit/source/awt/vclxwindows.cxx | 1
toolkit/source/controls/controlmodelcontainerbase.cxx | 1
toolkit/source/controls/dialogcontrol.cxx | 1
toolkit/source/controls/stdtabcontroller.cxx | 1
toolkit/source/controls/stdtabcontrollermodel.cxx | 1
toolkit/source/controls/tkscrollbar.cxx | 1
toolkit/source/controls/unocontrols.cxx | 1
toolkit/source/helper/accessibilityclient.cxx | 1
toolkit/source/helper/listenermultiplexer.cxx | 2
ucb/source/ucp/file/filid.cxx | 2
ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx | 1
ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx | 1
ucb/source/ucp/webdav-neon/NeonInputStream.cxx | 6 +-
ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx | 1
ucbhelper/source/provider/contentidentifier.cxx | 1
ucbhelper/source/provider/interactionrequest.cxx | 1
ucbhelper/source/provider/simplenameclashresolverequest.cxx | 1
unotools/source/config/xmlaccelcfg.cxx | 1
unoxml/source/events/eventdispatcher.cxx | 2
unoxml/source/events/eventdispatcher.hxx | 2
uui/source/requeststringresolver.hxx | 1
vcl/source/app/dndhelp.cxx | 2
vcl/source/app/unohelp2.cxx | 1
vcl/source/edit/textview.cxx | 1
vcl/unx/generic/dtrans/X11_selection.hxx | 1
xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx | 5 +
xmlhelp/source/cxxhelp/provider/inputstream.cxx | 2
xmloff/source/chart/SchXMLChartContext.cxx | 1
xmloff/source/chart/SchXMLImport.cxx | 1
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 1
xmloff/source/chart/SchXMLSeries2Context.cxx | 1
xmloff/source/chart/SchXMLTools.cxx | 1
xmloff/source/core/xmlexp.cxx | 1
xmloff/source/draw/sdxmlexp.cxx | 1
xmloff/source/draw/sdxmlimp.cxx | 1
xmloff/source/draw/ximppage.cxx | 1
xmloff/source/draw/ximpshap.cxx | 1
xmloff/source/forms/handler/form_handler_factory.cxx | 1
xmloff/source/style/XMLPageExport.cxx | 1
xmloff/source/table/XMLTableExport.cxx | 1
xmloff/source/text/txtimp.cxx | 1
xmloff/source/text/txtparai.cxx | 1
xmloff/source/text/txtstyle.cxx | 1
xmlscript/source/xmldlg_imexp/xmldlg_export.cxx | 1
xmlsecurity/source/framework/decryptorimpl.hxx | 1
xmlsecurity/source/framework/encryptorimpl.hxx | 1
xmlsecurity/source/framework/saxeventkeeperimpl.hxx | 1
xmlsecurity/source/framework/signaturecreatorimpl.hxx | 1
xmlsecurity/source/framework/signatureverifierimpl.hxx | 1
266 files changed, 312 insertions(+), 56 deletions(-)
New commits:
commit 15b4ab8d1943f625b3648f72ebd1872467c5854c
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Nov 18 00:06:30 2014 +0100
cppuhelper: clean up public headers with include-what-you-use
Change-Id: I41ba46831f24b2960a1fe982b74a2b623e682e0b
diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx
index 90e53ef..0c70647 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 a286648..829ae6b 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 a2dbe42..5da9907 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 ad58593..8157e66 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 a5329ac..f7125f9 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 fe2305a..c580013 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 d0e22aa..466fa29 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 91475d2..9af003a 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 aa13e31..035d5ed 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 50c6a0d..fa9ef0b 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 3ac295a..638174e 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 9aed809..1c9596d 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 5d0a18c..a352718 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 cb4ec21..5151588 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 5c9126d..da1ec5a 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 4c2c8a1..9004264 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 4395c78..887f8ca 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 5f2b28f..1a84f0c 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 8e0c510..b66718d 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 691408e..2e581fe 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 ad4244e..82cfb93 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 3174f78..071df96 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 bd376ce..19fc244 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 d54540c..5939f0a 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 2ed77a0..7725c69 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 f834344..f30616e 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 ce30f3b..3688e91 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 d7ee029..86f479c 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 bf3cb56..2c102c1 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 6b82ce0..50cea16 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 1c85088..bbec3e4 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 a5ae705..a56c844 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 6d7a652..0c981b0 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 de88682..e6bdf6d 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 ee265ce..87e5477 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 6e66f5b..707165c 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 05a3728..9ad46bc 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 cbc8e85..b08b1c4 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 66bb5d1..099182b 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 5499716..ac06003 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 210a543..e50e951 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 8e87754..1fbbf8f 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 a212e7d..29100b6 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 c57a61d..d19e656 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 c150364..8868d59 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 b20ec1b..e56ebea 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 212a9be..deb3a2b 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 4ec165d..547eab3 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 d094096..23b733f 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 9582a7e..f8c36db 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 d3eb2fd..353de68 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 0a59d41..e3a7132 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 09e0dd0..20a45c7 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 6d8d565..b577418 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 b701098..458599c 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 999a7fe..9c40b96 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 45cfaf2..438f455 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 ee89733..3f55ef2 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 ed2768b..dd3e131 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 812af20..e19c748 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 89c8845..a65e672 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 0d93717..cc412ac 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 a9f6d63..5427dcd 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 efac99d..5e4c63e 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 fa4bb1b..3ddc84a 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 401fb55..2bf54c5 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 f97df51..ae383fb 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 4ff96a1..39fb7d2 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 4fa109e..04ffae9 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 b4dac71..6ea005e 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 d68e682..006b4ed 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 49fa958..cc2e1ed 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 221e9de..39f4c64 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 befe3a9..f2c5cc3 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 4386de4..a151bc9 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 4e5dda0..188bdef 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 45e8823..c6537db 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 125e8c8..a66d797 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 de901b6..a4583d0 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 c5c99d6..6c91529 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 2af211d..3a77307 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 1d57453..ef0cc16 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 3243eb5..5f6cb47 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 68871a6..064240f 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 ced0df9..307d92f 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 f628dfd..8e35877 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 8e09f47..c99443a 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 34e437e..0139720 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 e3ae3ff..32ba7bc 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 948e8c8..64ea9f0 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 e81e5b9..e16a427 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 911a829..a884de9 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 1af90ec..9b97f1e 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 18cff92..2461d58 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 2e7cda5..f5f1fe2 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 925d466..bd6fc8f 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 400ade0..191219a 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 f3d1673..4f069bb 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 b4f9afe..365a443 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 d1c71ed..27acc50 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 1c06d9b..6cafe93 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 127a365..e9198e5 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 23819a8..fe5196b 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 8284460..8365ab4 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 2dd1e74..2219b5c 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 64b179e..72c7ff0 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 a7b5343..8c166e4 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 499bcbc..0b1eb22 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 4d94280..debddcf 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 a5ff857..f902e53 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 e22bb45..ffcd50f 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 95c5183..f22ff2c 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 b507674..2d82e288c 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 efbe8dc..e2335fb 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 8bb916c..fc1ded2 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 a0d863c..ac1e075 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 9a3d267..c93a796 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 bc2c6c1..3a62ef5 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 6b77bf5..5034409 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 41a8073..60ee36c 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 8575fb3..abc0cad 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 9a24568..d1a3373 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 d49f38f..6b5d58c 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 65dbe8e..0d44bc3 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 48c5f2a..bef0434 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 ccebf18..842429d 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 c7d2368..abe671c 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 963bceb..3dc8602 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 1d6e7c6..328d16a 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 164933d..38c6af8 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 36ed148..c73fae6 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 dad94aa..bcf5027 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 bdd7f60..53bf7a3 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 02c8ee8..9a2ac17 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 1171efb..9c345d6 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 1a1547f..e7ebb73 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 bb6047d..4d77463 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 afef80e..8a0c704 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 5583427..75df17d 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 68561c1..5b8969b 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 2db4f53..2132899 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 2f4cd75..cb2b221 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 cb7a91a..6f7fdf9 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 80af44f..99c403d 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 19edf0e..316d012 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 39845ca..db35553 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 c90cfa4..eca787a 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 38e071b..6d324b0 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 b0329df..d99d6a7 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 15d9d46..368da14 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 5a522a0..0dd2836 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 f243d78..b0bf547 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 31e8e90..f6a8b69 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 6e57ee6..d98659d 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 9eb5547..d3c3c9a 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 3a9280d..948b44c 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 2651ad4..48fafcd 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 6196e84..eb8e11e 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 eb4568b..43923f1 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 34f9b44..edc0048 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 5130634..72ac37e 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 595fb07..dc1828d 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 9dd46c7..3d7058c 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 cdbcf2c..3d99d5e 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 e2e154f..b78dc19 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 f77f16a..566bc59 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 6131baf..d0f6eec 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 e5ad4e3..bc4ba57 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 30b4638..bd39f4b 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 dc57aec..7f0051d 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 2cecce0..3b0c496 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 64b78c5..f3cdb1f 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 61e86bb..b55a0f3 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 8960b3b..746d387 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 e95d68a..f84080a 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 c9713cb..ab0452b 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 10a02a6..188c99b 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 02ae7d2..4c583d6 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 e989da3..c6ccd6f 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 2b78ada..496a3f7 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 36b5a18..57cd040 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 181633f..d3b4f27 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 ded9805..3dc4246 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 d8711d6..38842b0 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 7a3df1e..2ec98ad 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 ae777e6..c2344b7 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 e905577..1ee5600 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 6e838dd..002ef31 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 9dfd495..a8bd68f 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 8e3d5b1..9559291 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 145539e..ced5b76 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 d61e723..1ea8acc 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 ab3a006..3b293a5 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 be64e34..2a7abdf 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 fb4e48c..797fad2 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 07de915..1d9d146 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 b9f8a55..cc64e8c 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 214391a..8f487aa 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 f040b3b..b95d3f4 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 21f2d17..8e3b68a 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 b1d2a48..55832d0 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 89379c5..6e906c8 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 7c6b4ad..f705370 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>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list