accessibility/source/extended/accessibletabbar.cxx
| 1
accessibility/source/standard/accessiblemenucomponent.cxx
| 1
avmedia/source/framework/mediaitem.cxx
| 1
avmedia/source/viewer/mediawindow.cxx
| 1
basctl/source/basicide/baside2b.cxx
| 1
canvas/source/tools/canvastools.cxx
| 1
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
| 3
chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
| 2
chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
| 1
chart2/source/controller/dialogs/TitleDialogData.cxx
| 4
chart2/source/controller/dialogs/dlg_DataEditor.cxx
| 1
chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
| 1
chart2/source/controller/dialogs/dlg_View3D.cxx
| 2
chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
| 2
chart2/source/controller/dialogs/tp_DataSource.cxx
| 3
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
| 1
chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
| 1
chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
| 2
chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
| 2
chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
| 1
chart2/source/controller/main/DragMethod_PieSegment.cxx
| 1
chart2/source/controller/main/DragMethod_RotateDiagram.cxx
| 1
chart2/source/controller/main/ObjectHierarchy.cxx
| 1
chart2/source/controller/main/PositionAndSizeHelper.cxx
| 3
chart2/source/controller/main/SelectionHelper.cxx
| 1
chart2/source/controller/main/ShapeController.cxx
| 2
chart2/source/controller/main/UndoCommandDispatch.cxx
| 1
chart2/source/model/template/BarChartTypeTemplate.cxx
| 1
chart2/source/tools/ChartViewHelper.cxx
| 1
chart2/source/tools/DataSeriesHelper.cxx
| 1
chart2/source/tools/LifeTime.cxx
| 1
chart2/source/tools/RangeHighlighter.cxx
| 1
chart2/source/tools/ReferenceSizeProvider.cxx
| 2
chart2/source/tools/StatisticsHelper.cxx
| 2
chart2/source/tools/WrappedDefaultProperty.cxx
| 3
chart2/source/view/axes/VAxisBase.cxx
| 1
chart2/source/view/axes/VCartesianAxis.cxx
| 2
chart2/source/view/axes/VPolarAngleAxis.cxx
| 1
chart2/source/view/charttypes/CandleStickChart.cxx
| 1
chart2/source/view/charttypes/PieChart.cxx
| 1
comphelper/source/misc/componentmodule.cxx
| 3
comphelper/source/processfactory/processfactory.cxx
| 2
connectivity/source/commontools/dbtools2.cxx
| 2
connectivity/source/commontools/paramwrapper.cxx
| 1
connectivity/source/drivers/mork/MColumnAlias.cxx
| 1
connectivity/source/drivers/writer/WDatabaseMetaData.cxx
| 1
connectivity/source/drivers/writer/WTable.cxx
| 1
cui/source/customize/cfg.cxx
| 1
cui/source/options/optasian.cxx
| 1
cui/source/options/optlingu.cxx
| 3
cui/source/tabpages/numfmt.cxx
| 1
dbaccess/source/core/api/querycomposer.cxx
| 1
dbaccess/source/filter/xml/xmlDatabase.cxx
| 1
dbaccess/source/filter/xml/xmlExport.cxx
| 1
dbaccess/source/filter/xml/xmlfilter.cxx
| 3
dbaccess/source/sdbtools/misc/sdbt_services.cxx
| 3
dbaccess/source/ui/control/sqledit.cxx
| 1
dbaccess/source/ui/dlg/UserAdmin.cxx
| 1
dbaccess/source/ui/dlg/adminpages.cxx
| 2
dbaccess/source/ui/querydesign/limitboxcontroller.cxx
| 1
desktop/source/deployment/misc/dp_ucb.cxx
| 1
drawinglayer/source/primitive2d/textlayoutdevice.cxx
| 1
extensions/source/abpilot/datasourcehandling.cxx
| 1
extensions/source/propctrlr/formcomponenthandler.cxx
| 1
extensions/source/propctrlr/formlinkdialog.cxx
| 2
filter/source/graphic/GraphicExportFilter.cxx
| 2
filter/source/msfilter/msocximex.cxx
| 1
filter/source/msfilter/mstoolbar.cxx
| 1
filter/source/msfilter/svdfppt.cxx
| 1
forms/source/component/ImageControl.cxx
| 1
forms/source/runtime/formoperations.cxx
| 1
framework/source/services/substitutepathvars.cxx
| 1
framework/source/uielement/controlmenucontroller.cxx
| 1
framework/source/uielement/fontmenucontroller.cxx
| 1
framework/source/uielement/toolbarmodemenucontroller.cxx
| 1
include/com/sun/star/uno/Reference.h
| 53 +---------
include/com/sun/star/uno/Reference.hxx
| 4
include/vbahelper/vbahelperinterface.hxx
| 5
oox/source/core/fragmenthandler2.cxx
| 3
oox/source/drawingml/chart/converterbase.cxx
| 1
oox/source/drawingml/chart/objectformatter.cxx
| 1
oox/source/drawingml/chart/typegroupconverter.cxx
| 1
oox/source/drawingml/textfield.cxx
| 1
oox/source/drawingml/textrun.cxx
| 1
oox/source/dump/pptxdumper.cxx
| 1
oox/source/export/drawingml.cxx
| 1
oox/source/ole/axcontrol.cxx
| 2
oox/source/ole/axcontrolfragment.cxx
| 1
oox/source/ole/oleobjecthelper.cxx
| 1
oox/source/ppt/pptshape.cxx
| 2
oox/source/ppt/presPropsfragmenthandler.cxx
| 1
oox/source/ppt/presentationfragmenthandler.cxx
| 4
oox/source/ppt/slidefragmenthandler.cxx
| 1
oox/source/ppt/slidepersist.cxx
| 4
oox/source/shape/ShapeFilterBase.cxx
| 1
oox/source/vml/vmldrawing.cxx
| 3
oox/source/vml/vmltextbox.cxx
| 1
pyuno/source/module/pyuno_runtime.cxx
| 1
reportdesign/inc/RptDef.hxx
| 4
reportdesign/source/core/api/FormattedField.cxx
| 1
reportdesign/source/core/sdr/RptObject.cxx
| 9 -
reportdesign/source/core/sdr/formatnormalizer.cxx
| 1
reportdesign/source/filter/xml/dbloader2.cxx
| 1
reportdesign/source/ui/misc/statusbarcontroller.cxx
| 1
reportdesign/source/ui/report/ReportController.cxx
| 1
sc/source/core/tool/addincol.cxx
| 1
sc/source/core/tool/formulaparserpool.cxx
| 1
sc/source/core/tool/interpr4.cxx
| 1
sc/source/filter/excel/excdoc.cxx
| 1
sc/source/filter/excel/excimp8.cxx
| 1
sc/source/filter/excel/expop2.cxx
| 1
sc/source/filter/excel/xecontent.cxx
| 1
sc/source/filter/excel/xeescher.cxx
| 1
sc/source/filter/excel/xistyle.cxx
| 1
sc/source/filter/excel/xlchart.cxx
| 1
sc/source/filter/ftools/fapihelper.cxx
| 1
sc/source/filter/html/htmlexp.cxx
| 1
sc/source/filter/html/htmlpars.cxx
| 1
sc/source/filter/oox/defnamesbuffer.cxx
| 1
sc/source/filter/oox/drawingfragment.cxx
| 1
sc/source/filter/oox/excelchartconverter.cxx
| 1
sc/source/filter/oox/externallinkbuffer.cxx
| 1
sc/source/filter/oox/numberformatsbuffer.cxx
| 1
sc/source/filter/oox/pagesettings.cxx
| 2
sc/source/filter/oox/querytablebuffer.cxx
| 1
sc/source/filter/oox/sheetdatabuffer.cxx
| 3
sc/source/filter/oox/stylesbuffer.cxx
| 2
sc/source/filter/oox/tablebuffer.cxx
| 1
sc/source/filter/oox/unitconverter.cxx
| 1
sc/source/filter/oox/viewsettings.cxx
| 3
sc/source/filter/oox/workbooksettings.cxx
| 1
sc/source/filter/oox/worksheetsettings.cxx
| 1
sc/source/filter/xcl97/xcl97esc.cxx
| 3
sc/source/filter/xcl97/xcl97rec.cxx
| 1
sc/source/filter/xml/XMLCalculationSettingsContext.cxx
| 1
sc/source/filter/xml/XMLExportDDELinks.cxx
| 1
sc/source/filter/xml/XMLExportDatabaseRanges.cxx
| 1
sc/source/filter/xml/XMLExportIterator.cxx
| 5
sc/source/filter/xml/XMLTableSourceContext.cxx
| 1
sc/source/filter/xml/xmlexprt.cxx
| 2
sc/source/filter/xml/xmltabi.cxx
| 1
sc/source/ui/miscdlgs/solveroptions.cxx
| 1
sc/source/ui/vba/vbaborders.cxx
| 1
sc/source/ui/vba/vbahyperlink.cxx
| 1
sc/source/ui/vba/vbasheetobjects.cxx
| 1
sc/source/ui/vba/vbatitle.hxx
| 3
sc/source/ui/vba/vbavalidation.cxx
| 1
sd/source/core/drawdoc.cxx
| 1
sd/source/filter/eppt/eppt.cxx
| 1
sd/source/filter/eppt/epptso.cxx
| 1
sd/source/filter/eppt/pptexanimations.cxx
| 1
sd/source/filter/eppt/pptx-epptbase.cxx
| 1
sd/source/filter/html/htmlex.cxx
| 1
sd/source/filter/ppt/pptin.cxx
| 2
sd/source/filter/ppt/pptinanimations.cxx
| 1
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
| 2
sd/source/ui/app/sdxfer.cxx
| 3
sd/source/ui/dlg/filedlg.cxx
| 1
sd/source/ui/dlg/sdtreelb.cxx
| 1
sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
| 2
sd/source/ui/framework/factories/Pane.cxx
| 3
sd/source/ui/framework/module/SlideSorterModule.cxx
| 1
sd/source/ui/framework/module/ViewTabBarModule.cxx
| 1
sd/source/ui/func/fuinsfil.cxx
| 3
sd/source/ui/func/futempl.cxx
| 1
sd/source/ui/presenter/PresenterHelper.cxx
| 1
sd/source/ui/slideshow/PaneHider.cxx
| 1
sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
| 1
sd/source/ui/unoidl/unodoc.cxx
| 1
sd/source/ui/view/PresentationViewShellBase.cxx
| 1
sd/source/ui/view/sdview2.cxx
| 1
sfx2/source/appl/opengrf.cxx
| 1
sfx2/source/control/statcach.cxx
| 1
sfx2/source/dialog/documentfontsdialog.cxx
| 1
sfx2/source/dialog/versdlg.cxx
| 1
sfx2/source/doc/Metadatable.cxx
| 1
sfx2/source/doc/docfilt.cxx
| 2
sfx2/source/doc/docinsert.cxx
| 1
sfx2/source/doc/guisaveas.cxx
| 1
sfx2/source/doc/iframe.cxx
| 1
sfx2/source/sidebar/ResourceManager.cxx
| 1
sfx2/source/sidebar/SidebarPanelBase.cxx
| 2
sfx2/source/sidebar/Tools.cxx
| 1
sfx2/source/view/ipclient.cxx
| 3
sfx2/source/view/sfxbasecontroller.cxx
| 2
sfx2/source/view/userinputinterception.cxx
| 1
slideshow/source/engine/rehearsetimingsactivity.cxx
| 1
starmath/source/unodoc.cxx
| 1
svtools/source/dialogs/addresstemplate.cxx
| 1
svtools/source/misc/bindablecontrolhelper.cxx
| 1
svx/source/accessibility/AccessibleGraphicShape.cxx
| 3
svx/source/accessibility/AccessibleOLEShape.cxx
| 3
svx/source/accessibility/DescriptionGenerator.cxx
| 1
svx/source/core/graphichelper.cxx
| 1
svx/source/dialog/langbox.cxx
| 3
svx/source/fmcomp/gridctrl.cxx
| 1
svx/source/form/fmmodel.cxx
| 5
svx/source/form/fmtools.cxx
| 5
svx/source/form/formcontrolfactory.cxx
| 1
svx/source/gallery2/galbrws2.cxx
| 1
svx/source/gallery2/galobj.cxx
| 2
svx/source/svdraw/svdmrkv.cxx
| 1
svx/source/table/accessibletableshape.cxx
| 1
sw/source/core/access/AccessibilityCheck.cxx
| 1
sw/source/core/doc/DocumentStatisticsManager.cxx
| 1
sw/source/core/doc/doccomp.cxx
| 1
sw/source/core/doc/docglbl.cxx
| 1
sw/source/core/doc/docglos.cxx
| 2
sw/source/core/doc/rdfhelper.cxx
| 1
sw/source/core/draw/dpage.cxx
| 1
sw/source/core/draw/drawdoc.cxx
| 1
sw/source/core/fields/docufld.cxx
| 1
sw/source/core/text/txtftn.cxx
| 1
sw/source/core/unocore/unodraw.cxx
| 1
sw/source/core/unocore/unoredline.cxx
| 2
sw/source/core/unocore/unorefmk.cxx
| 1
sw/source/core/unocore/unostyle.cxx
| 1
sw/source/filter/docx/swdocxreader.cxx
| 1
sw/source/filter/html/htmlfld.cxx
| 2
sw/source/filter/html/htmlforw.cxx
| 1
sw/source/filter/html/wrthtml.cxx
| 1
sw/source/filter/rtf/swparrtf.cxx
| 1
sw/source/filter/ww8/docxtablestyleexport.cxx
| 1
sw/source/filter/ww8/rtfexport.cxx
| 1
sw/source/filter/ww8/wrtww8.cxx
| 1
sw/source/filter/xml/xmlfmt.cxx
| 1
sw/source/filter/xml/xmlmeta.cxx
| 1
sw/source/filter/xml/xmltbli.cxx
| 1
sw/source/filter/xml/xmltexti.cxx
| 1
sw/source/ui/dbui/dbinsdlg.cxx
| 1
sw/source/ui/fldui/fldedt.cxx
| 1
sw/source/ui/fldui/fldtdlg.cxx
| 1
sw/source/ui/frmdlg/cption.cxx
| 1
sw/source/ui/misc/bookmark.cxx
| 1
sw/source/ui/vba/vbaframes.cxx
| 1
sw/source/ui/vba/vbarevision.cxx
| 1
sw/source/ui/vba/vbarevisions.cxx
| 1
sw/source/ui/vba/vbasections.cxx
| 1
sw/source/uibase/app/docst.cxx
| 2
sw/source/uibase/dbui/dbtree.cxx
| 1
sw/source/uibase/docvw/srcedtw.cxx
| 1
sw/source/uibase/fldui/xfldui.cxx
| 1
sw/source/uibase/misc/glshell.cxx
| 3
sw/source/uibase/uiview/srcview.cxx
| 1
sw/source/uibase/uiview/view2.cxx
| 1
sw/source/uibase/uno/dlelstnr.cxx
| 1
sw/source/uibase/uno/unodispatch.cxx
| 1
sw/source/uibase/uno/unodoc.cxx
| 3
sw/source/uibase/utlui/uitool.cxx
| 1
testtools/source/bridgetest/bridgetest.cxx
| 1
toolkit/source/awt/vclxfont.cxx
| 1
ucbhelper/source/provider/getcomponentcontext.cxx
| 3
ucbhelper/source/provider/simpleioerrorrequest.cxx
| 1
unotools/source/config/moduleoptions.cxx
| 1
vbahelper/source/vbahelper/vbahelper.cxx
| 1
vbahelper/source/vbahelper/vbatextframe.cxx
| 1
vcl/qa/cppunit/lifecycle.cxx
| 1
vcl/source/app/salvtables.cxx
| 1
vcl/source/graphic/UnoGraphicDescriptor.cxx
| 1
vcl/source/window/accessibility.cxx
| 1
vcl/source/window/window.cxx
| 2
writerfilter/source/dmapper/SmartTagHandler.cxx
| 2
writerperfect/qa/unit/ImportTest.cxx
| 1
writerperfect/source/writer/EPUBPackage.cxx
| 1
xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
| 1
xmloff/source/core/DocumentSettingsContext.cxx
| 1
xmloff/source/core/RDFaExportHelper.cxx
| 1
xmloff/source/core/xmlexp.cxx
| 1
xmloff/source/core/xmluconv.cxx
| 1
xmloff/source/draw/SignatureLineContext.cxx
| 1
xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
| 1
xmloff/source/draw/XMLImageMapContext.cxx
| 1
xmloff/source/draw/layerexp.cxx
| 1
xmloff/source/draw/layerimp.cxx
| 1
xmloff/source/draw/sdxmlimp.cxx
| 1
xmloff/source/draw/ximppage.cxx
| 3
xmloff/source/draw/ximpshow.cxx
| 1
xmloff/source/draw/ximpstyl.cxx
| 2
xmloff/source/forms/layerexport.cxx
| 1
xmloff/source/forms/officeforms.cxx
| 1
xmloff/source/style/PageMasterImportContext.cxx
| 1
xmloff/source/style/XMLFontAutoStylePool.cxx
| 1
xmloff/source/style/XMLPageExport.cxx
| 1
xmloff/source/style/prstylei.cxx
| 1
xmloff/source/style/styleexp.cxx
| 1
xmloff/source/style/xmlnume.cxx
| 2
xmloff/source/style/xmlnumi.cxx
| 2
xmloff/source/style/xmlstyle.cxx
| 3
xmloff/source/table/XMLTableExport.cxx
| 2
xmloff/source/table/XMLTableImport.cxx
| 3
xmloff/source/text/XMLAutoMarkFileContext.cxx
| 1
xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
| 1
xmloff/source/text/XMLFootnoteImportContext.cxx
| 1
xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
| 1
xmloff/source/text/XMLIndexTOCContext.cxx
| 1
xmloff/source/text/XMLLineNumberingExport.cxx
| 1
xmloff/source/text/XMLLineNumberingImportContext.cxx
| 1
xmloff/source/text/XMLRedlineExport.cxx
| 1
xmloff/source/text/XMLSectionExport.cxx
| 3
xmloff/source/text/XMLSectionImportContext.cxx
| 1
xmloff/source/text/XMLTextColumnsContext.cxx
| 3
xmloff/source/text/XMLTextFrameContext.cxx
| 1
xmloff/source/text/XMLTextListAutoStylePool.cxx
| 1
xmloff/source/text/XMLTextMarkImportContext.cxx
| 1
xmloff/source/text/XMLTextMasterPageContext.cxx
| 3
xmloff/source/text/XMLTextNumRuleInfo.cxx
| 1
xmloff/source/text/XMLTextShapeImportHelper.cxx
| 1
xmloff/source/text/XMLTextShapeStyleContext.cxx
| 1
xmloff/source/text/txtexppr.cxx
| 1
xmloff/source/text/txtflde.cxx
| 2
xmloff/source/text/txtfldi.cxx
| 1
xmloff/source/text/txtimp.cxx
| 1
xmloff/source/text/txtparai.cxx
| 2
xmloff/source/text/txtstyle.cxx
| 2
xmloff/source/text/txtstyli.cxx
| 1
xmloff/source/text/txtvfldi.cxx
| 1
xmloff/source/xforms/xformsapi.cxx
| 1
xmloff/source/xforms/xformsexport.cxx
| 1
xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
| 1
xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
| 1
xmlsecurity/source/helper/documentsignaturemanager.cxx
| 1
xmlsecurity/source/helper/ooxmlsecexporter.cxx
| 1
322 files changed, 408 insertions(+), 104 deletions(-)
New commits:
commit b512ce255f46d90e682634e4dd17e146af7f9080
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Sun Apr 26 22:07:21 2020 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Mon Apr 27 07:19:30 2020 +0200
Make upcasting css::uno::Reference ctor require complete types
The main reason for the "home-grown" UpCast introduced with
904b3d1fceee5827076758ed2a81f80cb73493ca "Up-cast conversion constructor for
css::uno::Reference" in 2013 was probably that we could not yet rely on
C++11
std::is_base_of back then. A (welcome) side effect was that the derived
class
could be incomplete.
However, specializations of UpCast relying on whether or not T2 is
incomplete
are obviously an ODR violation if the type is incomplete in some TUs and
complete (and derived from T1) in others. And even if UpCast had internal
linkage, it would still be brittle that its behavior depends on the
completeness
of T2 at the point of the template's instantiation, and not necessarily at
the
point of use.
That means we should better base that ctor on std::is_base_of (which we can
do
now since 39a1edd6fec902ef378acce8af42c4d7fba280d0 "Make css::uno::Reference
upcast ctor LIBO_INTERNAL_ONLY"), which causes a compilation error at least
on
Clang and GCC if the completeness requirements are not met. This change
fixes
all the cases where types need to be complete now, plus any resulting
loplugin:referencecasting warnings ("the source reference is already a
subtype
of the destination reference").
Change-Id: Ieb9e3552e90adbf2c5a5af933dcb872e20661a2f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92950
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/accessibility/source/extended/accessibletabbar.cxx
b/accessibility/source/extended/accessibletabbar.cxx
index 2ba95b88bfb8..a1393d067a59 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/awt/XDevice.hpp>
+#include <com/sun/star/awt/XWindowPeer.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <cppuhelper/supportsservice.hxx>
#include <unotools/accessiblestatesethelper.hxx>
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx
b/accessibility/source/standard/accessiblemenucomponent.cxx
index fb46c3e2d968..ff927df47d14 100644
--- a/accessibility/source/standard/accessiblemenucomponent.cxx
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/awt/XDevice.hpp>
+#include <com/sun/star/awt/XWindowPeer.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
diff --git a/avmedia/source/framework/mediaitem.cxx
b/avmedia/source/framework/mediaitem.cxx
index c75900fee6b0..3b83f3853ce8 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/document/XStorageBasedDocument.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <com/sun/star/uri/UriReferenceFactory.hpp>
diff --git a/avmedia/source/viewer/mediawindow.cxx
b/avmedia/source/viewer/mediawindow.cxx
index 45c132df06a7..e823c2e8dac5 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -31,6 +31,7 @@
#include <com/sun/star/media/XPlayer.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <memory>
#include <sal/log.hxx>
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 270c6cfc5b12..a722b802a55c 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -36,6 +36,7 @@
#include <basic/sbuno.hxx>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/beans/XPropertiesChangeListener.hpp>
+#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/script/XLibraryContainer2.hpp>
#include <comphelper/string.hxx>
#include <officecfg/Office/Common.hxx>
diff --git a/canvas/source/tools/canvastools.cxx
b/canvas/source/tools/canvastools.cxx
index 30f92f484967..54e93fcb3625 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -34,6 +34,7 @@
#include <basegfx/utils/canvastools.hxx>
#include <basegfx/vector/b2ivector.hxx>
#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/awt/XWindow2.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/geometry/AffineMatrix2D.hpp>
#include <com/sun/star/geometry/Matrix2D.hpp>
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index b0a1d5f85746..b15f33f1871a 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -34,6 +34,9 @@
#include <com/sun/star/chart/ChartAxisPosition.hpp>
#include <com/sun/star/chart/ChartAxisLabelPosition.hpp>
#include <com/sun/star/chart/ChartAxisMarkPosition.hpp>
+#include <com/sun/star/chart2/XAxis.hpp>
+#include <com/sun/star/chart2/XDiagram.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <CharacterProperties.hxx>
#include <LinePropertiesHelper.hxx>
diff --git
a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index a4239d10ce22..7b9d07f002bb 100644
---
a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++
b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -19,6 +19,8 @@
#include "WrappedAxisAndGridExistenceProperties.hxx"
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/chart2/XAxis.hpp>
+#include <com/sun/star/chart2/XDiagram.hpp>
#include <AxisHelper.hxx>
#include <WrappedProperty.hxx>
#include "Chart2ModelContact.hxx"
diff --git
a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index 2b599040dced..95759509c563 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/chart2/SymbolStyle.hpp>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/chart/ChartSymbolType.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
#include <vcl/GraphicLoader.hxx>
diff --git a/chart2/source/controller/dialogs/TitleDialogData.cxx
b/chart2/source/controller/dialogs/TitleDialogData.cxx
index 907bc7324fda..e4e9099011a6 100644
--- a/chart2/source/controller/dialogs/TitleDialogData.cxx
+++ b/chart2/source/controller/dialogs/TitleDialogData.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <com/sun/star/frame/XModel.hpp>
+
#include <TitleDialogData.hxx>
#include <TitleHelper.hxx>
#include <ChartModelHelper.hxx>
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index bc85e6c418b0..3cb9598cb2e9 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -22,6 +22,7 @@
#include <comphelper/stl_types.hxx>
#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/frame/XStorable.hpp>
using namespace ::com::sun::star;
diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
index 7acd590c6ed1..a7aeb35d72d6 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
@@ -27,6 +27,7 @@
#include <AxisHelper.hxx>
#include <ObjectNameProvider.hxx>
+#include <com/sun/star/frame/XModel.hpp>
#include <comphelper/servicehelper.hxx>
using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx
b/chart2/source/controller/dialogs/dlg_View3D.cxx
index 311182615935..b81b7ecacbf1 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -25,6 +25,8 @@
#include "tp_3D_SceneIllumination.hxx"
#include <ChartModelHelper.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/chart2/XDiagram.hpp>
+#include <com/sun/star/frame/XModel.hpp>
namespace chart
{
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index 1168fe0f18c7..c24cf6fab0d9 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -22,7 +22,9 @@
#include <ThreeDHelper.hxx>
#include <ControllerLockGuard.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/chart2/XDiagram.hpp>
#include <com/sun/star/drawing/ShadeMode.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <tools/diagnose_ex.h>
#include <vcl/svapp.hxx>
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx
b/chart2/source/controller/dialogs/tp_DataSource.cxx
index eb22751a0ec3..d09fcf81ff87 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -28,7 +28,10 @@
#include "DialogModel.hxx"
#include <TabPageNotifiable.hxx>
#include <com/sun/star/chart2/XChartType.hpp>
+#include <com/sun/star/chart2/XDataSeries.hpp>
+#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
#include <com/sun/star/chart2/data/XDataProvider.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/util/XModifiable.hpp>
#include <com/sun/star/chart2/data/XDataSink.hpp>
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index 303af1ceb26f..d60b259dad62 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -36,6 +36,7 @@
#include <editeng/fhgtitem.hxx>
#include <com/sun/star/container/XChild.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <sfx2/objsh.hxx>
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index 59ebe40c27fd..da0a880626b0 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -37,6 +37,7 @@
#include <com/sun/star/chart/ChartAxisPosition.hpp>
#include <com/sun/star/chart/TimeInterval.hpp>
#include <com/sun/star/chart2/XAxis.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/chart2/AxisOrientation.hpp>
#include <com/sun/star/chart2/AxisType.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index a931151e1c2c..4920d2b727e0 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -37,7 +37,7 @@
#include <com/sun/star/chart2/Symbol.hpp>
#include <com/sun/star/chart2/RelativePosition.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-
+#include <com/sun/star/frame/XModel.hpp>
#include <svx/xflclit.hxx>
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
diff --git
a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
index 63ab0723ee34..244cbf9a23bb 100644
--- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
+++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
@@ -30,6 +30,8 @@
#include <AxisHelper.hxx>
#include <chartview/ExplicitValueProvider.hxx>
#include <com/sun/star/chart2/XChartDocument.hpp>
+#include <com/sun/star/chart2/XDataSeries.hpp>
+#include <com/sun/star/chart2/XTitle.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/chart2/XAxis.hpp>
diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
index 21ac2411bf0c..496b25e2692f 100644
--- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
@@ -43,6 +43,7 @@
#include <com/sun/star/chart2/DataPointLabel.hpp>
#include <com/sun/star/chart2/Symbol.hpp>
#include <com/sun/star/chart2/RelativePosition.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <memory>
using namespace com::sun::star;
diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx
b/chart2/source/controller/main/DragMethod_PieSegment.cxx
index cb98c4e7462a..9814a5db6595 100644
--- a/chart2/source/controller/main/DragMethod_PieSegment.cxx
+++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx
@@ -25,6 +25,7 @@
#include <ObjectIdentifier.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/awt/Point.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <tools/diagnose_ex.h>
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
index 6868f68a191e..7501f0bf7204 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
@@ -31,6 +31,7 @@
#include <svx/scene3d.hxx>
#include <basegfx/matrix/b3dhommatrix.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <svx/sdr/contact/viewcontactofe3dscene.hxx>
#include <drawinglayer/geometry/viewinformation3d.hxx>
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx
b/chart2/source/controller/main/ObjectHierarchy.cxx
index e872964a38b8..bf7c812b16b1 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -34,6 +34,7 @@
#include <algorithm>
#include <iterator>
+#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/chart2/XTitled.hpp>
#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx
b/chart2/source/controller/main/PositionAndSizeHelper.cxx
index c1e0e14441bd..84e4325e3ef2 100644
--- a/chart2/source/controller/main/PositionAndSizeHelper.cxx
+++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx
@@ -21,9 +21,10 @@
#include <ControllerLockGuard.hxx>
#include <com/sun/star/chart2/LegendPosition.hpp>
#include <com/sun/star/chart/ChartLegendExpansion.hpp>
+#include <com/sun/star/chart2/XDiagram.hpp>
#include <com/sun/star/chart2/RelativePosition.hpp>
#include <com/sun/star/chart2/RelativeSize.hpp>
-
+#include <com/sun/star/frame/XModel.hpp>
#include <tools/gen.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/awt/Rectangle.hpp>
diff --git a/chart2/source/controller/main/SelectionHelper.cxx
b/chart2/source/controller/main/SelectionHelper.cxx
index 5065a5768736..5475be204c00 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -22,6 +22,7 @@
#include <DiagramHelper.hxx>
#include <ChartModelHelper.hxx>
+#include <com/sun/star/frame/XModel.hpp>
#include <svx/svdpage.hxx>
#include <svx/svditer.hxx>
#include <svx/obj3d.hxx>
diff --git a/chart2/source/controller/main/ShapeController.cxx
b/chart2/source/controller/main/ShapeController.cxx
index 76559121c11c..8161717fe339 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -24,7 +24,7 @@
#include <dlg_ShapeFont.hxx>
#include <dlg_ShapeParagraph.hxx>
#include <chartview/DrawModelWrapper.hxx>
-
+#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/frame/CommandGroup.hpp>
#include <com/sun/star/frame/XStorable.hpp>
diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx
b/chart2/source/controller/main/UndoCommandDispatch.cxx
index 6cb42ff88f61..e4bd85a3be34 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -19,6 +19,7 @@
#include "UndoCommandDispatch.hxx"
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/util/XModifyBroadcaster.hpp>
#include <com/sun/star/document/UndoFailedException.hpp>
#include <com/sun/star/document/XUndoManagerSupplier.hpp>
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx
b/chart2/source/model/template/BarChartTypeTemplate.cxx
index ffc694fbd5df..dce1ffbb09d9 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/chart2/DataPointGeometry3D.hpp>
+#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <tools/diagnose_ex.h>
diff --git a/chart2/source/tools/ChartViewHelper.cxx
b/chart2/source/tools/ChartViewHelper.cxx
index 872960f17e41..a341f8894f14 100644
--- a/chart2/source/tools/ChartViewHelper.cxx
+++ b/chart2/source/tools/ChartViewHelper.cxx
@@ -20,6 +20,7 @@
#include <ChartViewHelper.hxx>
#include <servicenames.hxx>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
diff --git a/chart2/source/tools/DataSeriesHelper.cxx
b/chart2/source/tools/DataSeriesHelper.cxx
index 3dbcd65f70a2..a772f11c5fb1 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -29,6 +29,7 @@
#include <com/sun/star/chart2/AxisType.hpp>
#include <com/sun/star/chart2/SymbolStyle.hpp>
#include <com/sun/star/chart2/Symbol.hpp>
+#include <com/sun/star/chart2/XDiagram.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx
index 5ac9ba648e60..5817db73a2e1 100644
--- a/chart2/source/tools/LifeTime.cxx
+++ b/chart2/source/tools/LifeTime.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/util/CloseVetoException.hpp>
#include <com/sun/star/util/XCloseListener.hpp>
+#include <com/sun/star/util/XCloseable.hpp>
#include <tools/diagnose_ex.h>
#include <sal/log.hxx>
diff --git a/chart2/source/tools/RangeHighlighter.cxx
b/chart2/source/tools/RangeHighlighter.cxx
index ea49fc64a07f..9efdbc5d439b 100644
--- a/chart2/source/tools/RangeHighlighter.cxx
+++ b/chart2/source/tools/RangeHighlighter.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/chart2/ScaleData.hpp>
#include <com/sun/star/chart2/XAxis.hpp>
+#include <com/sun/star/chart2/XDataSeries.hpp>
#include <com/sun/star/chart/ErrorBarStyle.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/drawing/XShape.hpp>
diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx
b/chart2/source/tools/ReferenceSizeProvider.cxx
index 7cd07d911703..865acc660c08 100644
--- a/chart2/source/tools/ReferenceSizeProvider.cxx
+++ b/chart2/source/tools/ReferenceSizeProvider.cxx
@@ -22,7 +22,7 @@
#include <ChartModelHelper.hxx>
#include <DiagramHelper.hxx>
#include <AxisHelper.hxx>
-
+#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/chart2/XTitled.hpp>
#include <com/sun/star/chart2/XTitle.hpp>
#include <com/sun/star/chart2/XDataSeries.hpp>
diff --git a/chart2/source/tools/StatisticsHelper.cxx
b/chart2/source/tools/StatisticsHelper.cxx
index f90edf2fe15a..02dab3b9bd89 100644
--- a/chart2/source/tools/StatisticsHelper.cxx
+++ b/chart2/source/tools/StatisticsHelper.cxx
@@ -25,7 +25,7 @@
#include <rtl/math.hxx>
#include <rtl/ustrbuf.hxx>
#include <comphelper/processfactory.hxx>
-
+#include <com/sun/star/chart2/XDataSeries.hpp>
#include <com/sun/star/chart2/data/LabeledDataSequence.hpp>
#include <com/sun/star/chart2/data/XNumericalDataSequence.hpp>
#include <com/sun/star/chart2/data/XDataProvider.hpp>
diff --git a/chart2/source/tools/WrappedDefaultProperty.cxx
b/chart2/source/tools/WrappedDefaultProperty.cxx
index 6638654e76c1..74d2b4b0aae0 100644
--- a/chart2/source/tools/WrappedDefaultProperty.cxx
+++ b/chart2/source/tools/WrappedDefaultProperty.cxx
@@ -21,8 +21,7 @@
#include <tools/diagnose_ex.h>
#include <com/sun/star/beans/XPropertySet.hpp>
-
-namespace com::sun::star::beans { class XPropertyState; }
+#include <com/sun/star/beans/XPropertyState.hpp>
using namespace ::com::sun::star;
diff --git a/chart2/source/view/axes/VAxisBase.cxx
b/chart2/source/view/axes/VAxisBase.cxx
index 164a9147cc4f..6e6f40b65684 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -23,6 +23,7 @@
#include "Tickmarks.hxx"
#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/chart2/AxisType.hpp>
+#include <com/sun/star/chart2/XAxis.hpp>
#include <com/sun/star/chart2/data/XTextualDataSequence.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx
b/chart2/source/view/axes/VCartesianAxis.cxx
index 37c503eac30f..1c62bfb93903 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -29,7 +29,7 @@
#include "Tickmarks_Equidistant.hxx"
#include <ExplicitCategoriesProvider.hxx>
#include <com/sun/star/chart2/AxisType.hpp>
-
+#include <com/sun/star/chart2/XAxis.hpp>
#include <rtl/math.hxx>
#include <tools/diagnose_ex.h>
#include <tools/color.hxx>
diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx
b/chart2/source/view/axes/VPolarAngleAxis.cxx
index f9b7399694b0..1a93888b7428 100644
--- a/chart2/source/view/axes/VPolarAngleAxis.cxx
+++ b/chart2/source/view/axes/VPolarAngleAxis.cxx
@@ -25,6 +25,7 @@
#include <NumberFormatterWrapper.hxx>
#include <PolarLabelPositionHelper.hxx>
#include <PlottingPositionHelper.hxx>
+#include <com/sun/star/chart2/XAxis.hpp>
#include <tools/color.hxx>
#include <memory>
diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx
b/chart2/source/view/charttypes/CandleStickChart.cxx
index 4204ab3fecfa..a82c8896592b 100644
--- a/chart2/source/view/charttypes/CandleStickChart.cxx
+++ b/chart2/source/view/charttypes/CandleStickChart.cxx
@@ -25,6 +25,7 @@
#include "BarPositionHelper.hxx"
#include <DateHelper.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
diff --git a/chart2/source/view/charttypes/PieChart.cxx
b/chart2/source/view/charttypes/PieChart.cxx
index 0e3829c00ab2..009552c1800f 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -27,6 +27,7 @@
#include <ObjectIdentifier.hxx>
#include <com/sun/star/chart/DataLabelPlacement.hpp>
+#include <com/sun/star/chart2/XChartType.hpp>
#include <com/sun/star/chart2/XColorScheme.hpp>
#include <com/sun/star/container/XChild.hpp>
diff --git a/comphelper/source/misc/componentmodule.cxx
b/comphelper/source/misc/componentmodule.cxx
index 33c4a3118a7d..76c3b823557f 100644
--- a/comphelper/source/misc/componentmodule.cxx
+++ b/comphelper/source/misc/componentmodule.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <com/sun/star/lang/XSingleComponentFactory.hpp>
#include <comphelper/componentmodule.hxx>
#include <vector>
diff --git a/comphelper/source/processfactory/processfactory.cxx
b/comphelper/source/processfactory/processfactory.cxx
index 515c4b6a7476..8df1e244ca19 100644
--- a/comphelper/source/processfactory/processfactory.cxx
+++ b/comphelper/source/processfactory/processfactory.cxx
@@ -21,10 +21,10 @@
#include <comphelper/processfactory.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/uno/DeploymentException.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-namespace com::sun::star::lang { class XMultiServiceFactory; }
namespace com::sun::star::uno { class XComponentContext; }
using namespace ::com::sun::star;
diff --git a/connectivity/source/commontools/dbtools2.cxx
b/connectivity/source/commontools/dbtools2.cxx
index 38efeea57598..a9e0caff2eeb 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -24,8 +24,10 @@
#include <unotools/confignode.hxx>
#include <resource/sharedresources.hxx>
#include <strings.hrc>
+#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
#include <com/sun/star/sdbc/SQLException.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
+#include <com/sun/star/sdbc/XDataSource.hpp>
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/DriverManager.hpp>
diff --git a/connectivity/source/commontools/paramwrapper.cxx
b/connectivity/source/commontools/paramwrapper.cxx
index d0d36cdadbf9..ffe42419daa6 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <com/sun/star/lang/WrappedTargetException.hpp>
#include <com/sun/star/sdb/XParametersSupplier.hpp>
+#include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <tools/diagnose_ex.h>
diff --git a/connectivity/source/drivers/mork/MColumnAlias.cxx
b/connectivity/source/drivers/mork/MColumnAlias.cxx
index e56c9a8442c0..b320d8c459e3 100644
--- a/connectivity/source/drivers/mork/MColumnAlias.cxx
+++ b/connectivity/source/drivers/mork/MColumnAlias.cxx
@@ -19,6 +19,7 @@
#include "MColumnAlias.hxx"
+#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <officecfg/Office/DataAccess.hxx>
diff --git a/connectivity/source/drivers/writer/WDatabaseMetaData.cxx
b/connectivity/source/drivers/writer/WDatabaseMetaData.cxx
index 0c2e7129ed5c..2e55a46d2c6d 100644
--- a/connectivity/source/drivers/writer/WDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/writer/WDatabaseMetaData.cxx
@@ -20,6 +20,7 @@
#include <writer/WDatabaseMetaData.hxx>
#include <writer/WConnection.hxx>
#include <com/sun/star/sdbc/SQLException.hpp>
+#include <com/sun/star/text/XTextDocument.hpp>
#include <com/sun/star/text/XTextTablesSupplier.hpp>
using namespace ::com::sun::star;
diff --git a/connectivity/source/drivers/writer/WTable.cxx
b/connectivity/source/drivers/writer/WTable.cxx
index 4e95eedab7a5..7236df2476dd 100644
--- a/connectivity/source/drivers/writer/WTable.cxx
+++ b/connectivity/source/drivers/writer/WTable.cxx
@@ -21,6 +21,7 @@
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/SQLException.hpp>
+#include <com/sun/star/text/XTextDocument.hpp>
#include <com/sun/star/text/XTextTable.hpp>
#include <com/sun/star/text/XTextTablesSupplier.hpp>
#include <com/sun/star/table/XCellRange.hpp>
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 89fc0f483bec..9ddac7620b8d 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -82,6 +82,7 @@
#include <com/sun/star/ui/theWindowStateConfiguration.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <com/sun/star/util/thePathSettings.hpp>
#include <comphelper/documentinfo.hxx>
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 9dfba2928e7b..6907eca46716 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -25,6 +25,7 @@
#include <o3tl/any.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <svl/asiancfg.hxx>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/i18n/XForbiddenCharacters.hpp>
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index c139060bc00c..57149d726bda 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -31,6 +31,7 @@
#include <tools/diagnose_ex.h>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/linguistic2/LinguServiceManager.hpp>
+#include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
#include <com/sun/star/linguistic2/XSpellChecker.hpp>
#include <com/sun/star/linguistic2/XProofreader.hpp>
#include <com/sun/star/linguistic2/XHyphenator.hpp>
@@ -881,7 +882,7 @@ SvxLinguTabPage::SvxLinguTabPage(weld::Container* pPage,
weld::DialogController*
m_xMoreDictsLink->hide();
xProp = LinguMgr::GetLinguPropertySet();
- xDicList.set( LinguMgr::GetDictionaryList(), UNO_QUERY );
+ xDicList.set( LinguMgr::GetDictionaryList() );
if (xDicList.is())
{
// keep references to all **currently** available dictionaries,
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index deb9ee5a7d10..109c9ef8982f 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -41,6 +41,7 @@
#include <sfx2/basedlgs.hxx>
#include <svx/flagsdef.hxx>
#include <vector>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <memory>
diff --git a/dbaccess/source/core/api/querycomposer.cxx
b/dbaccess/source/core/api/querycomposer.cxx
index 1718e15f5ab3..043b0c083a17 100644
--- a/dbaccess/source/core/api/querycomposer.cxx
+++ b/dbaccess/source/core/api/querycomposer.cxx
@@ -19,6 +19,7 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/sdbc/ColumnSearch.hpp>
+#include <com/sun/star/sdbc/XConnection.hpp>
#include <comphelper/sequence.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <unotools/configmgr.hxx>
diff --git a/dbaccess/source/filter/xml/xmlDatabase.cxx
b/dbaccess/source/filter/xml/xmlDatabase.cxx
index d76dfbe791ee..9de9bf349810 100644
--- a/dbaccess/source/filter/xml/xmlDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlDatabase.cxx
@@ -24,6 +24,7 @@
#include "xmlDataSource.hxx"
#include "xmlDocuments.hxx"
#include "xmlEnums.hxx"
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/sdb/XReportDocumentsSupplier.hpp>
#include <com/sun/star/sdb/XFormDocumentsSupplier.hpp>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx
b/dbaccess/source/filter/xml/xmlExport.cxx
index b5edc7b4d3e4..299c59eb1dad 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -32,6 +32,7 @@
#include <sal/log.hxx>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/sdb/XFormDocumentsSupplier.hpp>
#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx
b/dbaccess/source/filter/xml/xmlfilter.cxx
index 10c28a6d00bc..7de744403d03 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -21,6 +21,7 @@
#include <sal/log.hxx>
#include <vcl/errinf.hxx>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/uri/UriReferenceFactory.hpp>
#include <com/sun/star/util/MeasureUnit.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
@@ -344,7 +345,7 @@ bool ODBFilter::implImport( const Sequence< PropertyValue
>& rDescriptor )
uno::Reference< XNumberFormatsSupplier >
xNum(m_xDataSource->getPropertyValue(PROPERTY_NUMBERFORMATSSUPPLIER),UNO_QUERY);
SetNumberFormatsSupplier(xNum);
- uno::Reference<XComponent> xModel(GetModel(),UNO_QUERY);
+ uno::Reference<XComponent> xModel(GetModel());
ErrCode nRet = ReadThroughComponent( xStorage
,xModel
,"settings.xml"
diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx
b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
index a554611a8475..5023e9fcc2db 100644
--- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx
+++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <com/sun/star/lang/XSingleComponentFactory.hpp>
#include <connectiontools.hxx>
#include <cppuhelper/factory.hxx>
diff --git a/dbaccess/source/ui/control/sqledit.cxx
b/dbaccess/source/ui/control/sqledit.cxx
index 84cfa4ff8878..ccbe210afd5f 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/beans/XPropertiesChangeListener.hpp>
+#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <officecfg/Office/Common.hxx>
#include <sqledit.hxx>
#include <QueryTextView.hxx>
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx
b/dbaccess/source/ui/dlg/UserAdmin.cxx
index 17f8b4e4e314..3e63f9424fce 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -20,6 +20,7 @@
#include "UserAdmin.hxx"
#include <com/sun/star/sdbc/SQLException.hpp>
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
+#include <com/sun/star/sdbc/XDriver.hpp>
#include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
#include <com/sun/star/sdbcx/XUsersSupplier.hpp>
#include <com/sun/star/sdbcx/XDrop.hpp>
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx
b/dbaccess/source/ui/dlg/adminpages.cxx
index 1b8f70dd49e5..4dbdb3d6afad 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -30,7 +30,7 @@
#include "odbcconfig.hxx"
#include "optionalboolitem.hxx"
#include <sqlmessage.hxx>
-
+#include <com/sun/star/sdbc/XConnection.hpp>
#include <comphelper/types.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index 5e5c97768cd2..1c4669c17324 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -12,6 +12,7 @@
#include <uiservices.hxx>
#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
diff --git a/desktop/source/deployment/misc/dp_ucb.cxx
b/desktop/source/deployment/misc/dp_ucb.cxx
index 7f72208e5d6a..09ce86610cb8 100644
--- a/desktop/source/deployment/misc/dp_ucb.cxx
+++ b/desktop/source/deployment/misc/dp_ucb.cxx
@@ -27,6 +27,7 @@
#include <rtl/ustrbuf.hxx>
#include <ucbhelper/content.hxx>
#include <xmlscript/xml_helper.hxx>
+#include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/ucb/CommandFailedException.hpp>
#include <com/sun/star/ucb/ContentInfo.hpp>
#include <com/sun/star/ucb/ContentInfoAttribute.hpp>
diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index 6bcc0cce5317..e3e57b2b5997 100644
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@@ -21,6 +21,7 @@
#include <algorithm>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <drawinglayer/attribute/fontattribute.hxx>
#include <drawinglayer/primitive2d/textlayoutdevice.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/extensions/source/abpilot/datasourcehandling.cxx
b/extensions/source/abpilot/datasourcehandling.cxx
index 46b71839d8e2..3ee8f4d368ab 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/sdb/DatabaseContext.hpp>
#include <com/sun/star/sdb/SQLContext.hpp>
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx
b/extensions/source/propctrlr/formcomponenthandler.cxx
index 383bb51ed585..8487df2e39a0 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -57,6 +57,7 @@
#include <com/sun/star/sdb/XQueriesSupplier.hpp>
#include <com/sun/star/form/ListSourceType.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx
b/extensions/source/propctrlr/formlinkdialog.cxx
index 72a0e2e2dd32..25e9d017f192 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -38,7 +38,7 @@
#include <com/sun/star/sdbc/XRowSet.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
#include <com/sun/star/sdb/SQLContext.hpp>
-
+#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
namespace pcr
{
diff --git a/filter/source/graphic/GraphicExportFilter.cxx
b/filter/source/graphic/GraphicExportFilter.cxx
index b7123363ddd2..457949ab770d 100644
--- a/filter/source/graphic/GraphicExportFilter.cxx
+++ b/filter/source/graphic/GraphicExportFilter.cxx
@@ -20,6 +20,8 @@
#include "GraphicExportFilter.hxx"
#include <com/sun/star/drawing/GraphicExportFilter.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
+#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <vcl/graphicfilter.hxx>
diff --git a/filter/source/msfilter/msocximex.cxx
b/filter/source/msfilter/msocximex.cxx
index 75ba2678e4c8..fbe3282d6788 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -20,6 +20,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
diff --git a/filter/source/msfilter/mstoolbar.cxx
b/filter/source/msfilter/mstoolbar.cxx
index 8b792eb3b98d..427cb440f1bd 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -11,6 +11,7 @@
#include <sal/log.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XIndexContainer.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/ui/XUIConfigurationManager.hpp>
#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index f4ee10034c50..3316fa67faf0 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -31,6 +31,7 @@
#include <sot/stg.hxx>
#include <com/sun/star/embed/Aspects.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/office/XAnnotation.hpp>
#include <com/sun/star/office/XAnnotationAccess.hpp>
#include <com/sun/star/text/XText.hpp>
diff --git a/forms/source/component/ImageControl.cxx
b/forms/source/component/ImageControl.cxx
index 9080ecedf13a..97928cff6fa9 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -33,6 +33,7 @@
#include <com/sun/star/form/FormComponentType.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/awt/MouseButton.hpp>
diff --git a/forms/source/runtime/formoperations.cxx
b/forms/source/runtime/formoperations.cxx
index 696616031f23..0e23b5a7ec63 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -40,6 +40,7 @@
#include <com/sun/star/sdb/OrderDialog.hpp>
#include <com/sun/star/sdb/FilterDialog.hpp>
#include <com/sun/star/sdbc/SQLException.hpp>
+#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/form/XReset.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
diff --git a/framework/source/services/substitutepathvars.cxx
b/framework/source/services/substitutepathvars.cxx
index 651847c6ecd0..f27ff6d1d206 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -39,6 +39,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/NoSuchElementException.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/util/XStringSubstitution.hpp>
#include <unordered_map>
diff --git a/framework/source/uielement/controlmenucontroller.cxx
b/framework/source/uielement/controlmenucontroller.cxx
index 9e6d490d3e33..4403c89cd091 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -21,6 +21,7 @@
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XStatusListener.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
diff --git a/framework/source/uielement/fontmenucontroller.cxx
b/framework/source/uielement/fontmenucontroller.cxx
index 50cc9d344534..ed7bb926c3ad 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/awt/MenuItemStyle.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <toolkit/awt/vclxmenu.hxx>
diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx
b/framework/source/uielement/toolbarmodemenucontroller.cxx
index 2cc438ebb9e9..8c28cd64858f 100644
--- a/framework/source/uielement/toolbarmodemenucontroller.cxx
+++ b/framework/source/uielement/toolbarmodemenucontroller.cxx
@@ -22,6 +22,7 @@
#include <com/sun/star/awt/MenuItemStyle.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/ui/UIElementType.hpp>
#include <com/sun/star/frame/XModuleManager.hpp>
#include <com/sun/star/frame/ModuleManager.hpp>
diff --git a/include/com/sun/star/uno/Reference.h
b/include/com/sun/star/uno/Reference.h
index 951902b356bd..0221f0ca5f54 100644
--- a/include/com/sun/star/uno/Reference.h
+++ b/include/com/sun/star/uno/Reference.h
@@ -24,6 +24,10 @@
#include <cassert>
#include <cstddef>
+#if defined LIBO_INTERNAL_ONLY
+#include <type_traits>
+#endif
+
#include "rtl/alloc.h"
namespace com
@@ -167,51 +171,6 @@ enum UnoReference_SetThrow
UNO_SET_THROW
};
-#if defined LIBO_INTERNAL_ONLY
-/// @cond INTERNAL
-namespace detail {
-
-// A mechanism to enable up-casts, used by the Reference conversion
constructor,
-// but at the same time disable up-casts to XInterface, so that the conversion
-// operator for that special case is used in an expression like
-// Reference< XInterface >(x); heavily borrowed from boost::is_base_and_derived
-// (which manages to avoid compilation problems with ambiguous bases and cites
-// comp.lang.c++.moderated mail <http://groups.google.com/groups?
-// selm=df893da6.0301280859.522081f7%40posting.google.com> "SuperSubclass
-// (is_base_and_derived) complete implementation!" by Rani Sharoni and cites
-// Aleksey Gurtovoy for the workaround for MSVC), to avoid including Boost
-// headers in URE headers (basing on C++11 std::is_base_of does not work when
the types are
-// incomplete):
-
-template< typename T1, typename T2 > struct UpCast {
-private:
- template< bool, typename U1, typename > struct C
- { typedef U1 t; };
-
- template< typename U1, typename U2 > struct C< false, U1, U2 >
- { typedef U2 t; };
-
- struct S { char c[2]; };
-
- template< typename U > static char f(T2 *, U);
- static S f(T1 *, int);
-
- struct H {
- H(); // avoid C2514 "class has no constructors" from MSVC
- operator T1 * () const;
- operator T2 * ();
- };
-
-public:
- typedef typename C< sizeof (f(H(), 0)) == 1, void *, void >::t t;
-};
-
-template< typename T2 > struct UpCast< XInterface, T2 > {};
-
-}
-/// @endcond
-#endif
-
/** Template reference class for interface type derived from BaseReference.
A special constructor given the UNO_QUERY identifier queries interfaces
for reference type.
@@ -314,7 +273,9 @@ public:
template< class derived_type >
inline Reference(
const Reference< derived_type > & rRef,
- typename detail::UpCast< interface_type, derived_type >::t = 0 );
+ std::enable_if_t<
+ std::is_base_of_v<interface_type, derived_type>
+ && !std::is_same_v<interface_type, XInterface>, void *> = nullptr);
#endif
/** Constructor: Sets given interface pointer.
diff --git a/include/com/sun/star/uno/Reference.hxx
b/include/com/sun/star/uno/Reference.hxx
index b3c01aaa2391..c78f2681e3d5 100644
--- a/include/com/sun/star/uno/Reference.hxx
+++ b/include/com/sun/star/uno/Reference.hxx
@@ -135,7 +135,9 @@ inline Reference< interface_type >::Reference( Reference<
interface_type > && rR
template< class interface_type > template< class derived_type >
inline Reference< interface_type >::Reference(
const Reference< derived_type > & rRef,
- typename detail::UpCast< interface_type, derived_type >::t )
+ std::enable_if_t<
+ std::is_base_of_v<interface_type, derived_type>
+ && !std::is_same_v<interface_type, XInterface>, void *>)
{
interface_type * p = rRef.get();
_pInterface = p;
diff --git a/include/vbahelper/vbahelperinterface.hxx
b/include/vbahelper/vbahelperinterface.hxx
index 20f3d7ab77ce..5feb4ab83eba 100644
--- a/include/vbahelper/vbahelperinterface.hxx
+++ b/include/vbahelper/vbahelperinterface.hxx
@@ -24,6 +24,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/uno/XComponentContext.hpp>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx>
#include <ooo/vba/XHelperInterface.hpp>
@@ -31,10 +32,6 @@
#include <sal/types.h>
#include <vbahelper/vbahelper.hxx>
-namespace com { namespace sun { namespace star {
- namespace uno { class XComponentContext; } }
-} }
-
// use this class when you have an object like
// interface XAnInterface which contains XHelperInterface in its inheritance
hierarchy
// interface XAnInterface
diff --git a/oox/source/core/fragmenthandler2.cxx
b/oox/source/core/fragmenthandler2.cxx
index a4855c1be8f0..121f3443731f 100644
--- a/oox/source/core/fragmenthandler2.cxx
+++ b/oox/source/core/fragmenthandler2.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <com/sun/star/frame/XModel.hpp>
#include <oox/core/fragmenthandler2.hxx>
#include <oox/core/xmlfilterbase.hxx>
#include <oox/helper/attributelist.hxx>
diff --git a/oox/source/drawingml/chart/converterbase.cxx
b/oox/source/drawingml/chart/converterbase.cxx
index e24d6c72821e..59e99289b45e 100644
--- a/oox/source/drawingml/chart/converterbase.cxx
+++ b/oox/source/drawingml/chart/converterbase.cxx
@@ -27,6 +27,7 @@
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/chart2/RelativePosition.hpp>
#include <com/sun/star/chart2/RelativeSize.hpp>
+#include <com/sun/star/chart2/XTitle.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <osl/diagnose.h>
diff --git a/oox/source/drawingml/chart/objectformatter.cxx
b/oox/source/drawingml/chart/objectformatter.cxx
index b82fdbe6e026..bc3af886c8af 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/chart2/XChartDocument.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/util/XNumberFormatTypes.hpp>
diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx
b/oox/source/drawingml/chart/typegroupconverter.cxx
index f55ac931fb98..4667afdeae02 100644
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
@@ -31,6 +31,7 @@
#include <com/sun/star/chart2/XChartTypeContainer.hpp>
#include <com/sun/star/chart2/XCoordinateSystem.hpp>
#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
+#include <com/sun/star/chart2/XDiagram.hpp>
#include <com/sun/star/chart2/data/XDataSink.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
#include <osl/diagnose.h>
diff --git a/oox/source/drawingml/textfield.cxx
b/oox/source/drawingml/textfield.cxx
index ad1d9e61e399..7425e0416fec 100644
--- a/oox/source/drawingml/textfield.cxx
+++ b/oox/source/drawingml/textfield.cxx
@@ -22,6 +22,7 @@
#include <rtl/ustring.hxx>
#include <rtl/string.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/text/XTextField.hpp>
diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx
index 702ac6454cc3..8b34fd99082e 100644
--- a/oox/source/drawingml/textrun.cxx
+++ b/oox/source/drawingml/textrun.cxx
@@ -19,6 +19,7 @@
#include <drawingml/textrun.hxx>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/text/ControlCharacter.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
diff --git a/oox/source/dump/pptxdumper.cxx b/oox/source/dump/pptxdumper.cxx
index e3c9dce330af..fb1b42fb10b5 100644
--- a/oox/source/dump/pptxdumper.cxx
+++ b/oox/source/dump/pptxdumper.cxx
@@ -19,6 +19,7 @@
#include <oox/dump/pptxdumper.hxx>
+#include <com/sun/star/io/XInputStream.hpp>
#include <oox/dump/oledumper.hxx>
#include <oox/dump/xlsbdumper.hxx>
#include <oox/helper/zipstorage.hxx>
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 254bf0d96a6f..6655a21758cf 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -70,6 +70,7 @@
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/i18n/BreakIterator.hpp>
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 0f7ef9647f85..78cc0b76770d 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -34,6 +34,7 @@
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XIndexContainer.hpp>
+#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/form/XForm.hpp>
#include <com/sun/star/form/XFormComponent.hpp>
#include <com/sun/star/form/XFormsSupplier.hpp>
@@ -41,6 +42,7 @@
#include <com/sun/star/form/binding/XListEntrySink.hpp>
#include <com/sun/star/form/binding/XListEntrySource.hpp>
#include <com/sun/star/form/binding/XValueBinding.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/sheet/XCellRangeAddressable.hpp>
#include <com/sun/star/sheet/XCellRangeReferrer.hpp>
diff --git a/oox/source/ole/axcontrolfragment.cxx
b/oox/source/ole/axcontrolfragment.cxx
index 54020a033e40..a0f0b109669a 100644
--- a/oox/source/ole/axcontrolfragment.cxx
+++ b/oox/source/ole/axcontrolfragment.cxx
@@ -19,6 +19,7 @@
#include <oox/ole/axcontrolfragment.hxx>
+#include <com/sun/star/io/XInputStream.hpp>
#include <oox/core/xmlfilterbase.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/binaryinputstream.hxx>
diff --git a/oox/source/ole/oleobjecthelper.cxx
b/oox/source/ole/oleobjecthelper.cxx
index 8a0ca5a7c9b4..a77a784af629 100644
--- a/oox/source/ole/oleobjecthelper.cxx
+++ b/oox/source/ole/oleobjecthelper.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/document/XEmbeddedObjectResolver.hpp>
#include <com/sun/star/embed/Aspects.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index a781aa5e4a6e..0fc486c05a3f 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -23,7 +23,9 @@
#include <drawingml/table/tableproperties.hxx>
#include <com/sun/star/container/XNamed.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/text/XText.hpp>
#include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/oox/source/ppt/presPropsfragmenthandler.cxx
b/oox/source/ppt/presPropsfragmenthandler.cxx
index 60ce67133556..53d831b60ae9 100644
--- a/oox/source/ppt/presPropsfragmenthandler.cxx
+++ b/oox/source/ppt/presPropsfragmenthandler.cxx
@@ -8,6 +8,7 @@
*/
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/presentation/XPresentationSupplier.hpp>
#include <oox/core/xmlfilterbase.hxx>
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx
b/oox/source/ppt/presentationfragmenthandler.cxx
index 908b13fdc4ab..ea8d692ac2fc 100644
--- a/oox/source/ppt/presentationfragmenthandler.cxx
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
@@ -28,7 +28,9 @@
#include <com/sun/star/drawing/XDrawPages.hpp>
#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
#include <com/sun/star/drawing/XMasterPageTarget.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/text/XTextField.hpp>
#include <com/sun/star/xml/dom/XDocument.hpp>
#include <com/sun/star/xml/sax/XFastSAXSerializable.hpp>
#include <com/sun/star/presentation/XPresentationPage.hpp>
@@ -143,7 +145,7 @@ static void ResolveTextFields( XmlFilterBase const &
rFilter )
Reference< container::XNamed > xNamed( xDrawPage,
UNO_QUERY_THROW );
aURL = "#" + xNamed->getName();
xPropSet->setPropertyValue( sURL, Any( aURL ) );
- Reference< text::XTextContent > xContent(
rTextField.xTextField, UNO_QUERY);
+ Reference< text::XTextContent > xContent(
rTextField.xTextField);
Reference< text::XTextRange > xTextRange =
rTextField.xTextCursor;
rTextField.xText->insertTextContent( xTextRange,
xContent, true );
}
diff --git a/oox/source/ppt/slidefragmenthandler.cxx
b/oox/source/ppt/slidefragmenthandler.cxx
index d316c53f3b49..5feaf8532513 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -19,6 +19,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XNamed.hpp>
+#include <com/sun/star/drawing/XDrawPage.hpp>
#include <tools/diagnose_ex.h>
#include <oox/helper/attributelist.hxx>
diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx
index 65dc198759ea..6f4be017c605 100644
--- a/oox/source/ppt/slidepersist.cxx
+++ b/oox/source/ppt/slidepersist.cxx
@@ -18,7 +18,9 @@
*/
#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <oox/ppt/timenode.hxx>
#include <oox/ppt/pptshape.hxx>
#include <oox/ppt/slidepersist.hxx>
@@ -129,7 +131,7 @@ void SlidePersist::createXShapes( XmlFilterBase&
rFilterBase )
{
applyTextStyles( rFilterBase );
- Reference< XShapes > xShapes( getPage(), UNO_QUERY );
+ Reference< XShapes > xShapes( getPage() );
std::vector< oox::drawingml::ShapePtr >& rShapes(
maShapesPtr->getChildren() );
for (auto const& shape : rShapes)
diff --git a/oox/source/shape/ShapeFilterBase.cxx
b/oox/source/shape/ShapeFilterBase.cxx
index 7a32e82c3310..80be6d7fde53 100644
--- a/oox/source/shape/ShapeFilterBase.cxx
+++ b/oox/source/shape/ShapeFilterBase.cxx
@@ -25,6 +25,7 @@
#include <oox/drawingml/theme.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/xml/sax/XFastSAXSerializable.hpp>
namespace oox::shape {
diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx
index f9c36cda758c..cc24d1f10468 100644
--- a/oox/source/vml/vmldrawing.cxx
+++ b/oox/source/vml/vmldrawing.cxx
@@ -22,6 +22,7 @@
#include <algorithm>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/drawing/XControlShape.hpp>
+#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/text/HoriOrientation.hpp>
@@ -145,7 +146,7 @@ void Drawing::finalizeFragmentImport()
void Drawing::convertAndInsert() const
{
- Reference< XShapes > xShapes( mxDrawPage, UNO_QUERY );
+ Reference< XShapes > xShapes( mxDrawPage );
mxShapes->convertAndInsert( xShapes );
// Group together form control radio buttons that are in the same groupBox
diff --git a/oox/source/vml/vmltextbox.cxx b/oox/source/vml/vmltextbox.cxx
index 5b79e8410bf9..ed11aa4ec825 100644
--- a/oox/source/vml/vmltextbox.cxx
+++ b/oox/source/vml/vmltextbox.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/awt/FontWeight.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/text/XTextAppend.hpp>
#include <com/sun/star/text/WritingMode.hpp>
#include <com/sun/star/style/ParagraphAdjust.hpp>
diff --git a/pyuno/source/module/pyuno_runtime.cxx
b/pyuno/source/module/pyuno_runtime.cxx
index 8bfb9767baed..ce7f36272f4b 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -37,6 +37,7 @@
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/script/Converter.hpp>
#include <com/sun/star/script/InvocationAdapterFactory.hpp>
+#include <com/sun/star/script/XInvocation2.hpp>
#include <com/sun/star/reflection/theCoreReflection.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <comphelper/sequence.hxx>
diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx
index 2876e97c8c19..92a7c5b6f6d8 100644
--- a/reportdesign/inc/RptDef.hxx
+++ b/reportdesign/inc/RptDef.hxx
@@ -27,6 +27,7 @@
#include "dllapi.h"
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/style/XStyle.hpp>
#include <svx/fmglob.hxx>
#include <svx/svdtypes.hxx>
@@ -35,9 +36,6 @@ namespace com { namespace sun { namespace star {
class XReportComponent;
class XReportDefinition;
}
- namespace style {
- class XStyle;
- }
}}}
namespace rptui
diff --git a/reportdesign/source/core/api/FormattedField.cxx
b/reportdesign/source/core/api/FormattedField.cxx
index a4342fad3fbe..28993e861411 100644
--- a/reportdesign/source/core/api/FormattedField.cxx
+++ b/reportdesign/source/core/api/FormattedField.cxx
@@ -19,6 +19,7 @@
#include <FormattedField.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
+#include <com/sun/star/sdbc/XDataSource.hpp>
#include <strings.hxx>
#include <strings.hrc>
#include <core_resource.hxx>
diff --git a/reportdesign/source/core/sdr/RptObject.cxx
b/reportdesign/source/core/sdr/RptObject.cxx
index 157ed10b7ca6..781d16cb0f34 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -47,6 +47,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/embed/XComponentSupplier.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/container/XContainer.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/report/XShape.hpp>
@@ -1098,7 +1099,7 @@ void OOle2Obj::impl_setUnoShape( const uno::Reference<
uno::XInterface >& rxUnoS
static uno::Reference< chart2::data::XDatabaseDataProvider >
lcl_getDataProvider(const uno::Reference < embed::XEmbeddedObject >& _xObj)
{
uno::Reference< chart2::data::XDatabaseDataProvider > xSource;
- uno::Reference< embed::XComponentSupplier >
xCompSupp(_xObj,uno::UNO_QUERY);
+ uno::Reference< embed::XComponentSupplier > xCompSupp(_xObj);
if( xCompSupp.is())
{
uno::Reference< chart2::XChartDocument> xChartDoc(
xCompSupp->getComponent(), uno::UNO_QUERY );
@@ -1142,7 +1143,7 @@ void OOle2Obj::impl_createDataProvider_nothrow(const
uno::Reference< frame::XMod
{
uno::Reference < embed::XEmbeddedObject > xObj = GetObjRef();
uno::Reference< chart2::data::XDataReceiver > xReceiver;
- uno::Reference< embed::XComponentSupplier > xCompSupp( xObj,
uno::UNO_QUERY );
+ uno::Reference< embed::XComponentSupplier > xCompSupp( xObj );
if( xCompSupp.is())
xReceiver.set( xCompSupp->getComponent(), uno::UNO_QUERY );
OSL_ASSERT( xReceiver.is());
@@ -1168,7 +1169,7 @@ void OOle2Obj::initializeOle()
OReportModel& rRptModel(static_cast< OReportModel&
>(getSdrModelFromSdrObject()));
rRptModel.GetUndoEnv().AddElement(lcl_getDataProvider(xObj));
- uno::Reference< embed::XComponentSupplier > xCompSupp( xObj,
uno::UNO_QUERY );
+ uno::Reference< embed::XComponentSupplier > xCompSupp( xObj );
if( xCompSupp.is() )
{
uno::Reference< beans::XPropertySet > xChartProps(
xCompSupp->getComponent(), uno::UNO_QUERY );
@@ -1182,7 +1183,7 @@ void OOle2Obj::initializeChart( const uno::Reference<
frame::XModel>& _xModel)
{
uno::Reference < embed::XEmbeddedObject > xObj = GetObjRef();
uno::Reference< chart2::data::XDataReceiver > xReceiver;
- uno::Reference< embed::XComponentSupplier > xCompSupp( xObj,
uno::UNO_QUERY );
+ uno::Reference< embed::XComponentSupplier > xCompSupp( xObj );
if( xCompSupp.is())
xReceiver.set( xCompSupp->getComponent(), uno::UNO_QUERY );
OSL_ASSERT( xReceiver.is());
diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx
b/reportdesign/source/core/sdr/formatnormalizer.cxx
index 7511792eb0d4..0db0bcac38e8 100644
--- a/reportdesign/source/core/sdr/formatnormalizer.cxx
+++ b/reportdesign/source/core/sdr/formatnormalizer.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/sdbc/SQLException.hpp>
#include <com/sun/star/sdb/XParametersSupplier.hpp>
+#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
#include <com/sun/star/util/XNumberFormatTypes.hpp>
#include <dbaccess/dbsubcomponentcontroller.hxx>
diff --git a/reportdesign/source/filter/xml/dbloader2.cxx
b/reportdesign/source/filter/xml/dbloader2.cxx
index 2f64334d856f..92fcdc8f0342 100644
--- a/reportdesign/source/filter/xml/dbloader2.cxx
+++ b/reportdesign/source/filter/xml/dbloader2.cxx
@@ -24,6 +24,7 @@
#include <comphelper/types.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/embed/XStorage.hpp>
namespace rptxml
{
diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx
b/reportdesign/source/ui/misc/statusbarcontroller.cxx
index 4f5e9e1dd12e..bae4a793a6b7 100644
--- a/reportdesign/source/ui/misc/statusbarcontroller.cxx
+++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx
@@ -31,6 +31,7 @@
#include <vcl/status.hxx>
#include <osl/mutex.hxx>
#include <toolkit/helper/vclunohelper.hxx>
+#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
namespace rptui
diff --git a/reportdesign/source/ui/report/ReportController.cxx
b/reportdesign/source/ui/report/ReportController.cxx
index bf61da78c8d2..d723bfe70890 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -44,6 +44,7 @@
#include <com/sun/star/style/PageStyleLayout.hpp>
#include <com/sun/star/style/ParagraphAdjust.hpp>
#include <com/sun/star/util/NumberFormatter.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index 18bd1794898d..48f5d4c03846 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -27,6 +27,7 @@
#include <osl/diagnose.h>
#include <com/sun/star/container/XContentEnumerationAccess.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceName.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
diff --git a/sc/source/core/tool/formulaparserpool.cxx
b/sc/source/core/tool/formulaparserpool.cxx
index f47ae78c6c7e..9a766cd4863c 100644
--- a/sc/source/core/tool/formulaparserpool.cxx
+++ b/sc/source/core/tool/formulaparserpool.cxx
@@ -19,6 +19,7 @@
#include <formulaparserpool.hxx>
#include <com/sun/star/container/XContentEnumerationAccess.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XSingleComponentFactory.hpp>
#include <com/sun/star/sheet/XFilterFormulaParser.hpp>
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 2be1e335a40e..6fd4da8a1e36 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -42,6 +42,7 @@
#include <signal.h>
#include <com/sun/star/table/XCellRange.hpp>
+#include <com/sun/star/script/XInvocation.hpp>
#include <com/sun/star/sheet/XSheetCellRange.hpp>
#include <global.hxx>
diff --git a/sc/source/filter/excel/excdoc.cxx
b/sc/source/filter/excel/excdoc.cxx
index 7dec24838460..1760b96c70ac 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -48,6 +48,7 @@
#include <xltools.hxx>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <o3tl/safeint.hxx>
#include <oox/token/tokens.hxx>
#include <oox/token/namespaces.hxx>
diff --git a/sc/source/filter/excel/excimp8.cxx
b/sc/source/filter/excel/excimp8.cxx
index 122a4ec952f3..451f26bcd076 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -55,6 +55,7 @@
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <cppuhelper/implbase.hxx>
#include "xltoolbar.hxx"
#include <oox/ole/vbaproject.hxx>
diff --git a/sc/source/filter/excel/expop2.cxx
b/sc/source/filter/excel/expop2.cxx
index d9108d23405e..ee8ba0fff2b9 100644
--- a/sc/source/filter/excel/expop2.cxx
+++ b/sc/source/filter/excel/expop2.cxx
@@ -37,6 +37,7 @@
#include <officecfg/Office/Calc.hxx>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+#include <com/sun/star/frame/XModel.hpp>
namespace com::sun::star::document { class XDocumentProperties; }
diff --git a/sc/source/filter/excel/xecontent.cxx
b/sc/source/filter/excel/xecontent.cxx
index 2ed3ae3d29ef..fa6a9c2c8874 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -22,6 +22,7 @@
#include <vector>
#include <algorithm>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/sheet/XAreaLinks.hpp>
#include <com/sun/star/sheet/XAreaLink.hpp>
#include <com/sun/star/sheet/TableValidationVisibility.hpp>
diff --git a/sc/source/filter/excel/xeescher.cxx
b/sc/source/filter/excel/xeescher.cxx
index 53e81cbefade..2882cbaece72 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/form/FormComponentType.hpp>
#include <com/sun/star/awt/VisualEffect.hpp>
#include <com/sun/star/awt/ScrollBarOrientation.hpp>
+#include <com/sun/star/awt/XControlModel.hpp>
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/form/binding/XBindableValue.hpp>
#include <com/sun/star/form/binding/XListEntrySink.hpp>
diff --git a/sc/source/filter/excel/xistyle.cxx
b/sc/source/filter/excel/xistyle.cxx
index c08826573856..886f20dc5551 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -73,6 +73,7 @@
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/frame/XModel.hpp>
using ::std::vector;
using namespace ::com::sun::star;
diff --git a/sc/source/filter/excel/xlchart.cxx
b/sc/source/filter/excel/xlchart.cxx
index 8d271665ce82..da30a49b6711 100644
--- a/sc/source/filter/excel/xlchart.cxx
+++ b/sc/source/filter/excel/xlchart.cxx
@@ -34,6 +34,7 @@
#include <com/sun/star/chart/XChartDocument.hpp>
#include <com/sun/star/chart/XSecondAxisTitleSupplier.hpp>
#include <com/sun/star/chart2/Symbol.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <rtl/math.hxx>
diff --git a/sc/source/filter/ftools/fapihelper.cxx
b/sc/source/filter/ftools/fapihelper.cxx
index e0230edfcf72..b5833a697b5d 100644
--- a/sc/source/filter/ftools/fapihelper.cxx
+++ b/sc/source/filter/ftools/fapihelper.cxx
@@ -20,6 +20,7 @@
#include <fapihelper.hxx>
#include <algorithm>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/lang/XServiceName.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
diff --git a/sc/source/filter/html/htmlexp.cxx
b/sc/source/filter/html/htmlexp.cxx
index e105d94a6313..2b362fd1cf45 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -72,6 +72,7 @@
#include <strings.hrc>
#include <globstr.hrc>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
diff --git a/sc/source/filter/html/htmlpars.cxx
b/sc/source/filter/html/htmlpars.cxx
index 02c60140b844..564205bcf64e 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -61,6 +61,7 @@
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <utility>
using ::editeng::SvxBorderLine;
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx
b/sc/source/filter/oox/defnamesbuffer.cxx
index 3f7e5c7609b8..2bf5d5c4c0ac 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -22,6 +22,7 @@
#include <com/sun/star/sheet/NamedRangeFlag.hpp>
#include <com/sun/star/sheet/XPrintAreas.hpp>
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
#include <oox/helper/binaryinputstream.hxx>
diff --git a/sc/source/filter/oox/drawingfragment.cxx
b/sc/source/filter/oox/drawingfragment.cxx
index 1245d3baa0df..4fb6cfaacca2 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -22,6 +22,7 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/container/XNameReplace.hpp>
#include <com/sun/star/document/XEventsSupplier.hpp>
#include <com/sun/star/drawing/XControlShape.hpp>
diff --git a/sc/source/filter/oox/excelchartconverter.cxx
b/sc/source/filter/oox/excelchartconverter.cxx
index d0802f773d7a..50695b1fb8f9 100644
--- a/sc/source/filter/oox/excelchartconverter.cxx
+++ b/sc/source/filter/oox/excelchartconverter.cxx
@@ -20,6 +20,7 @@
#include <excelchartconverter.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/chart2/data/XDataProvider.hpp>
#include <com/sun/star/chart2/data/XDataReceiver.hpp>
#include <com/sun/star/chart2/data/XSheetDataProvider.hpp>
diff --git a/sc/source/filter/oox/externallinkbuffer.cxx
b/sc/source/filter/oox/externallinkbuffer.cxx
index 2c6f9d20b78a..93f10d4d6264 100644
--- a/sc/source/filter/oox/externallinkbuffer.cxx
+++ b/sc/source/filter/oox/externallinkbuffer.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/sheet/XDDELinks.hpp>
#include <com/sun/star/sheet/XDDELinkResults.hpp>
#include <com/sun/star/sheet/XExternalDocLinks.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <o3tl/safeint.hxx>
#include <osl/diagnose.h>
#include <sal/log.hxx>
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx
b/sc/source/filter/oox/numberformatsbuffer.cxx
index 1296853dbe48..85e84a659494 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -21,6 +21,7 @@
#include <biffhelper.hxx>
#include <com/sun/star/i18n/NumberFormatIndex.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/util/XNumberFormatTypes.hpp>
#include <com/sun/star/util/XNumberFormats.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
diff --git a/sc/source/filter/oox/pagesettings.cxx
b/sc/source/filter/oox/pagesettings.cxx
index 74a1f169b051..461af3e85599 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -24,7 +24,9 @@
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/container/XNamed.hpp>
#include <com/sun/star/sheet/XHeaderFooterContent.hpp>
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <com/sun/star/style/GraphicLocation.hpp>
+#include <com/sun/star/style/XStyle.hpp>
#include <com/sun/star/text/FilenameDisplayFormat.hpp>
#include <com/sun/star/text/XText.hpp>
#include <com/sun/star/text/XTextCursor.hpp>
diff --git a/sc/source/filter/oox/querytablebuffer.cxx
b/sc/source/filter/oox/querytablebuffer.cxx
index 3764266b9330..d587349105ef 100644
--- a/sc/source/filter/oox/querytablebuffer.cxx
+++ b/sc/source/filter/oox/querytablebuffer.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/sheet/XAreaLink.hpp>
#include <com/sun/star/sheet/XAreaLinks.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <osl/diagnose.h>
#include <oox/core/filterbase.hxx>
#include <oox/helper/binaryinputstream.hxx>
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx
b/sc/source/filter/oox/sheetdatabuffer.cxx
index e2675c04c865..d6757af4df91 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -21,6 +21,9 @@
#include <algorithm>
#include <com/sun/star/sheet/XArrayFormulaTokens.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+#include <com/sun/star/table/XCell.hpp>
+#include <com/sun/star/table/XCellRange.hpp>
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/util/NumberFormat.hpp>
#include <com/sun/star/util/XNumberFormatTypes.hpp>
diff --git a/sc/source/filter/oox/stylesbuffer.cxx
b/sc/source/filter/oox/stylesbuffer.cxx
index c0b01df8be3e..d564806cd41c 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -30,6 +30,8 @@
#include <com/sun/star/awt/XDevice.hpp>
#include <com/sun/star/awt/XFont2.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/style/XStyle.hpp>
#include <com/sun/star/text/WritingMode2.hpp>
#include <com/sun/star/table/BorderLineStyle.hpp>
diff --git a/sc/source/filter/oox/tablebuffer.cxx
b/sc/source/filter/oox/tablebuffer.cxx
index df5df5b090a5..b0cf1b879409 100644
--- a/sc/source/filter/oox/tablebuffer.cxx
+++ b/sc/source/filter/oox/tablebuffer.cxx
@@ -22,6 +22,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sheet/XDatabaseRange.hpp>
#include <com/sun/star/sheet/XDatabaseRanges.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <oox/helper/attributelist.hxx>
diff --git a/sc/source/filter/oox/unitconverter.cxx
b/sc/source/filter/oox/unitconverter.cxx
index c5036267e420..ce379a2bc426 100644
--- a/sc/source/filter/oox/unitconverter.cxx
+++ b/sc/source/filter/oox/unitconverter.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/awt/XDevice.hpp>
#include <com/sun/star/awt/XFont.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/util/Date.hpp>
#include <com/sun/star/util/DateTime.hpp>
#include <osl/diagnose.h>
diff --git a/sc/source/filter/oox/viewsettings.cxx
b/sc/source/filter/oox/viewsettings.cxx
index 22294d7f812e..f70e7a91c9a7 100644
--- a/sc/source/filter/oox/viewsettings.cxx
+++ b/sc/source/filter/oox/viewsettings.cxx
@@ -26,6 +26,9 @@
#include <com/sun/star/document/IndexedPropertyValues.hpp>
#include <com/sun/star/document/XViewDataSupplier.hpp>
#include <com/sun/star/document/NamedPropertyValues.hpp>
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+#include <com/sun/star/table/XCellRange.hpp>
#include <osl/diagnose.h>
#include <unotools/mediadescriptor.hxx>
#include <oox/core/filterbase.hxx>
diff --git a/sc/source/filter/oox/workbooksettings.cxx
b/sc/source/filter/oox/workbooksettings.cxx
index 5f83e42f1a24..19967601cd30 100644
--- a/sc/source/filter/oox/workbooksettings.cxx
+++ b/sc/source/filter/oox/workbooksettings.cxx
@@ -20,6 +20,7 @@
#include <workbooksettings.hxx>
#include <com/sun/star/sheet/XCalculatable.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/util/Date.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/sc/source/filter/oox/worksheetsettings.cxx
b/sc/source/filter/oox/worksheetsettings.cxx
index 08899e4e641a..284e0139ceae 100644
--- a/sc/source/filter/oox/worksheetsettings.cxx
+++ b/sc/source/filter/oox/worksheetsettings.cxx
@@ -20,6 +20,7 @@
#include <memory>
#include <worksheetsettings.hxx>
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <oox/core/binarycodec.hxx>
#include <oox/core/filterbase.hxx>
#include <oox/helper/binaryinputstream.hxx>
diff --git a/sc/source/filter/xcl97/xcl97esc.cxx
b/sc/source/filter/xcl97/xcl97esc.cxx
index 3cc4881b23c2..8af611f4315a 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -20,6 +20,7 @@
#include <memory>
#include <com/sun/star/awt/XControlModel.hpp>
#include <com/sun/star/embed/XClassifiedObject.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/form/XFormsSupplier.hpp>
#include <com/sun/star/script/XEventAttacherManager.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -209,7 +210,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const
Reference< XShape >& rxShape
if( mbIsRootDff )
{
//! not-const because GetObjRef may load the OLE object
- Reference < XClassifiedObject > xObj(
static_cast<SdrOle2Obj*>(pObj)->GetObjRef(), UNO_QUERY );
+ Reference < XClassifiedObject > xObj(
static_cast<SdrOle2Obj*>(pObj)->GetObjRef() );
if ( xObj.is() )
{
SvGlobalName aObjClsId( xObj->getClassID() );
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx
b/sc/source/filter/xcl97/xcl97rec.cxx
index d61040b1b030..a5b3e5de9e35 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -56,6 +56,7 @@
#include <tabprotection.hxx>
#include <com/sun/star/embed/Aspects.hpp>
+#include <com/sun/star/chart/XChartDocument.hpp>
#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
#include <com/sun/star/chart2/XChartTypeContainer.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp>
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
index d2dd7e8ec923..0e65e541afcd 100644
--- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
@@ -27,6 +27,7 @@
#include <sax/tools/converter.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/frame/XModel.hpp>
using namespace com::sun::star;
using namespace xmloff::token;
diff --git a/sc/source/filter/xml/XMLExportDDELinks.cxx
b/sc/source/filter/xml/XMLExportDDELinks.cxx
index 1f17b91390f3..9d2ef95b64bc 100644
--- a/sc/source/filter/xml/XMLExportDDELinks.cxx
+++ b/sc/source/filter/xml/XMLExportDDELinks.cxx
@@ -26,6 +26,7 @@
#include <document.hxx>
#include <scmatrix.hxx>
#include <com/sun/star/sheet/XDDELink.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index 12bd017c5dc2..ba0fcc71de5a 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -40,6 +40,7 @@
#include <svx/dataaccessdescriptor.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/sheet/DataImportMode.hpp>
#include <com/sun/star/sheet/XDatabaseRanges.hpp>
#include <com/sun/star/sheet/XDatabaseRange.hpp>
diff --git a/sc/source/filter/xml/XMLExportIterator.cxx
b/sc/source/filter/xml/XMLExportIterator.cxx
index 80b911b74383..ae68f6cbec84 100644
--- a/sc/source/filter/xml/XMLExportIterator.cxx
+++ b/sc/source/filter/xml/XMLExportIterator.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <com/sun/star/table/XCellRange.hpp>
#include "XMLExportIterator.hxx"
@@ -651,7 +654,7 @@ void ScMyNotEmptyCellsIterator::SetCurrentTable(const SCTAB
nTable,
static_cast<SCROW>(rExport.GetSharedData()->GetLastRow(nCurrentTable))));
xTable.set(rxTable);
- xCellRange.set(xTable, uno::UNO_QUERY);
+ xCellRange.set(xTable);
}
}
diff --git a/sc/source/filter/xml/XMLTableSourceContext.cxx
b/sc/source/filter/xml/XMLTableSourceContext.cxx
index 89957208b6a0..58d3f44536d1 100644
--- a/sc/source/filter/xml/XMLTableSourceContext.cxx
+++ b/sc/source/filter/xml/XMLTableSourceContext.cxx
@@ -26,6 +26,7 @@
#include <xmloff/xmlnmspe.hxx>
#include <sax/tools/converter.hxx>
#include <com/sun/star/sheet/XSheetLinkable.hpp>
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
using namespace com::sun::star;
using namespace xmloff::token;
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index b626eb3b72f3..c499552d3074 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -139,7 +139,7 @@
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
#include <com/sun/star/table/XColumnRowRange.hpp>
#include <com/sun/star/util/XProtectable.hpp>
-
+#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/chart2/data/XRangeXMLConversion.hpp>
#include <com/sun/star/chart2/data/XDataReceiver.hpp>
diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx
index deec843b3839..0bab6377d4ee 100644
--- a/sc/source/filter/xml/xmltabi.cxx
+++ b/sc/source/filter/xml/xmltabi.cxx
@@ -43,6 +43,7 @@
#include <tools/urlobj.hxx>
#include <sax/fastattribs.hxx>
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <comphelper/servicehelper.hxx>
using namespace com::sun::star;
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx
b/sc/source/ui/miscdlgs/solveroptions.cxx
index 2136f4e14ad8..e22647b3d5f9 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -30,6 +30,7 @@
#include <algorithm>
+#include <com/sun/star/sheet/XSolver.hpp>
#include <com/sun/star/sheet/XSolverDescription.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx
index 35abba15ae12..41e8f03c56d6 100644
--- a/sc/source/ui/vba/vbaborders.cxx
+++ b/sc/source/ui/vba/vbaborders.cxx
@@ -26,6 +26,7 @@
#include <ooo/vba/excel/XlColorIndex.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/table/TableBorder.hpp>
+#include <com/sun/star/table/XCellRange.hpp>
#include <com/sun/star/table/XColumnRowRange.hpp>
#include "vbapalette.hxx"
diff --git a/sc/source/ui/vba/vbahyperlink.cxx
b/sc/source/ui/vba/vbahyperlink.cxx
index 1a5bd6093485..9dc88cdd06cb 100644
--- a/sc/source/ui/vba/vbahyperlink.cxx
+++ b/sc/source/ui/vba/vbahyperlink.cxx
@@ -24,6 +24,7 @@
#include <vbahelper/helperdecl.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/table/XCellRange.hpp>
#include <com/sun/star/text/XText.hpp>
diff --git a/sc/source/ui/vba/vbasheetobjects.cxx
b/sc/source/ui/vba/vbasheetobjects.cxx
index 74da487f8518..e0082be6b5a6 100644
--- a/sc/source/ui/vba/vbasheetobjects.cxx
+++ b/sc/source/ui/vba/vbasheetobjects.cxx
@@ -32,6 +32,7 @@
#include <com/sun/star/form/XFormsSupplier.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include "vbasheetobject.hxx"
#include <cppuhelper/implbase.hxx>
diff --git a/sc/source/ui/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxx
index 6d1c1adf9e01..6b79867d254f 100644
--- a/sc/source/ui/vba/vbatitle.hxx
+++ b/sc/source/ui/vba/vbatitle.hxx
@@ -24,12 +24,11 @@
#include "vbafont.hxx"
#include "vbapalette.hxx"
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/script/BasicErrorException.hpp>
#include <basic/sberrors.hxx>
#include <memory>
-namespace com { namespace sun { namespace star { namespace drawing { class
XShape; } } } }
-
template< typename... Ifc >
class TitleImpl : public InheritedHelperInterfaceImpl< Ifc... >
{
diff --git a/sc/source/ui/vba/vbavalidation.cxx
b/sc/source/ui/vba/vbavalidation.cxx
index d3d166643221..65d6f985c343 100644
--- a/sc/source/ui/vba/vbavalidation.cxx
+++ b/sc/source/ui/vba/vbavalidation.cxx
@@ -22,6 +22,7 @@
#include <com/sun/star/sheet/XSheetCondition.hpp>
#include <com/sun/star/sheet/ValidationType.hpp>
#include <com/sun/star/sheet/ValidationAlertStyle.hpp>
+#include <com/sun/star/table/XCellRange.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <ooo/vba/excel/XlDVType.hpp>
#include <ooo/vba/excel/XlDVAlertStyle.hpp>
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 02c7b5667d8a..ab0b932c8df3 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/beans/XPropertyContainer.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <editeng/forbiddencharacterstable.hxx>
#include <svl/srchitem.hxx>
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 246be042c7db..a6259824f49c 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -30,6 +30,7 @@
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/office/XAnnotation.hpp>
#include <com/sun/star/office/XAnnotationAccess.hpp>
#include <com/sun/star/office/XAnnotationEnumeration.hpp>
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index f3e7faf875f3..51403da517cd 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -38,6 +38,7 @@
#include <com/sun/star/awt/FontPitch.hpp>
#include <com/sun/star/awt/Rectangle.hpp>
#include <com/sun/star/awt/FontDescriptor.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/style/TabStop.hpp>
#include <com/sun/star/drawing/CircleKind.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
diff --git a/sd/source/filter/eppt/pptexanimations.cxx
b/sd/source/filter/eppt/pptexanimations.cxx
index bfd0c35dd664..eaa346b809ed 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -41,6 +41,7 @@
#include <com/sun/star/animations/AnimationColorSpace.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
+#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/awt/FontWeight.hpp>
#include <com/sun/star/awt/FontUnderline.hpp>
#include <com/sun/star/awt/FontSlant.hpp>
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx
b/sd/source/filter/eppt/pptx-epptbase.cxx
index 8fa6914709c1..acd5df022a4f 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -38,6 +38,7 @@
#include <com/sun/star/awt/FontPitch.hpp>
#include <com/sun/star/container/XNamed.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/presentation/XPresentationPage.hpp>
#include <com/sun/star/text/XSimpleText.hpp>
#include <com/sun/star/style/XStyle.hpp>
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 41f455b221fe..13d54a55bb6c 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -20,6 +20,7 @@
#include "htmlex.hxx"
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/drawing/GraphicExportFilter.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/ucb/SimpleFileAccess.hpp>
#include <sal/log.hxx>
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index abe8420b2a80..17946aed3fbf 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -83,7 +83,7 @@
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
-
+#include <com/sun/star/frame/XModel.hpp>
#include <comphelper/string.hxx>
#include <oox/ole/olehelper.hxx>
diff --git a/sd/source/filter/ppt/pptinanimations.cxx
b/sd/source/filter/ppt/pptinanimations.cxx
index 39994f41f7ca..be51eb9003e4 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -47,6 +47,7 @@
#include <com/sun/star/presentation/EffectCommands.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/presentation/ParagraphTarget.hpp>
#include <com/sun/star/presentation/TextAnimationType.hpp>
#include <comphelper/processfactory.hxx>
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index af0204877141..2f97fcafc696 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -26,6 +26,8 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/frame/XController.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index f4806807a329..9ce97f817e73 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
#include <com/sun/star/embed/XEmbedPersist.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index d45b4823cf9c..05c4243dc539 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <com/sun/star/ui/dialogs/FilePickerEvent.hpp>
#include <vcl/idle.hxx>
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 8b2ca9ea209e..485c0f48fa30 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -45,6 +45,7 @@
#include <ViewShellBase.hxx>
#include <com/sun/star/embed/XEmbedPersist.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#include <svtools/acceleratorexecute.hxx>
#include <svtools/embedtransfer.hxx>
diff --git
a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
index 882549fa059b..f9e491bf487e 100644
---
a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
+++
b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
@@ -19,6 +19,8 @@
#include "ConfigurationControllerBroadcaster.hxx"
#include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
+#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
+#include <com/sun/star/drawing/framework/XResource.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <tools/diagnose_ex.h>
diff --git a/sd/source/ui/framework/factories/Pane.cxx
b/sd/source/ui/framework/factories/Pane.cxx
index e11b78730f96..6ca637ea6694 100644
--- a/sd/source/ui/framework/factories/Pane.cxx
+++ b/sd/source/ui/framework/factories/Pane.cxx
@@ -23,6 +23,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/window.hxx>
#include <cppcanvas/vclfactory.hxx>
+#include <com/sun/star/rendering/XSpriteCanvas.hpp>
#include <comphelper/servicehelper.hxx>
using namespace ::com::sun::star;
@@ -168,7 +169,7 @@ Reference<rendering::XCanvas> Pane::CreateCanvas()
::cppcanvas::SpriteCanvasSharedPtr pCanvas (
cppcanvas::VCLFactory::createSpriteCanvas(*mpWindow));
if (pCanvas.get() != nullptr)
- xCanvas.set(pCanvas->getUNOSpriteCanvas(), UNO_QUERY);
+ xCanvas.set(pCanvas->getUNOSpriteCanvas());
}
return xCanvas;
diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx
b/sd/source/ui/framework/module/SlideSorterModule.cxx
index cefdc32a6251..2f5d55b7eb84 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.cxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/drawing/framework/XTabBar.hpp>
#include <com/sun/star/drawing/framework/TabBarButton.hpp>
#include <com/sun/star/drawing/framework/XControllerManager.hpp>
+#include <com/sun/star/frame/XController.hpp>
#include <strings.hrc>
#include <sdresid.hxx>
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx
b/sd/source/ui/framework/module/ViewTabBarModule.cxx
index 0828cf46f5c2..692a0ab5c349 100644
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
