diff options
322 files changed, 408 insertions, 104 deletions
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 --- a/sd/source/ui/framework/module/ViewTabBarModule.cxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx @@ -22,6 +22,7 @@ #include <framework/FrameworkHelper.hxx> #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XTabBar.hpp> +#include <com/sun/star/frame/XController.hpp> #include <strings.hrc> #include <sdresid.hxx> diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 90051588f815..a916ab0dad28 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -40,6 +40,7 @@ #include <tools/debug.hxx> #include <com/sun/star/ui/dialogs/XFilterManager.hpp> #include <com/sun/star/ui/dialogs/XFilePicker.hpp> +#include <com/sun/star/ui/dialogs/XFilePicker3.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <sdresid.hxx> @@ -132,7 +133,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) sfx2::FileDialogHelper aFileDialog( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, FileDialogFlags::Insert, mpWindow ? mpWindow->GetFrameWeld() : nullptr); - Reference< XFilePicker > xFilePicker( aFileDialog.GetFilePicker(), UNO_QUERY ); + Reference< XFilePicker > xFilePicker( aFileDialog.GetFilePicker() ); Reference< XFilterManager > xFilterManager( xFilePicker, UNO_QUERY ); OUString aOwnCont; OUString aOtherCont; diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index a1d376e13622..14f9e3c32955 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <futempl.hxx> diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index 84e7e047c6de..4fce3397eae0 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -24,6 +24,7 @@ #include "PresenterHelper.hxx" #include "PresenterCanvas.hxx" #include <cppcanvas/vclfactory.hxx> +#include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/window.hxx> diff --git a/sd/source/ui/slideshow/PaneHider.cxx b/sd/source/ui/slideshow/PaneHider.cxx index 079633271e89..882425f45d9a 100644 --- a/sd/source/ui/slideshow/PaneHider.cxx +++ b/sd/source/ui/slideshow/PaneHider.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/drawing/framework/XConfiguration.hpp> +#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <tools/diagnose_ex.h> diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index a45ece0aee84..8ae3afdad243 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -31,6 +31,7 @@ #include <sdpage.hxx> #include <FrameView.hxx> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/frame/XController.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx index 813b291cc4db..bbc7fc1e6313 100644 --- a/sd/source/ui/unoidl/unodoc.cxx +++ b/sd/source/ui/unoidl/unodoc.cxx @@ -19,6 +19,7 @@ #include <rtl/ustring.hxx> #include <sfx2/sfxmodelfactory.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <sddll.hxx> diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx index d37abee068a8..1d73a4bea974 100644 --- a/sd/source/ui/view/PresentationViewShellBase.cxx +++ b/sd/source/ui/view/PresentationViewShellBase.cxx @@ -26,6 +26,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/frame/XFrame.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index a02e923200a5..62704f1b8fdc 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -21,6 +21,7 @@ #include <vector> #include <com/sun/star/embed/XEmbedPersist.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <comphelper/sequenceashashmap.hxx> #include <tools/urlobj.hxx> #include <svx/svdoole2.hxx> diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx index 6ef8ecdf4b61..fd547986d0da 100644 --- a/sfx2/source/appl/opengrf.cxx +++ b/sfx2/source/appl/opengrf.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> +#include <com/sun/star/ui/dialogs/XFilePicker3.hpp> #include <o3tl/any.hxx> #include <vcl/stdtext.hxx> #include <vcl/graphicfilter.hxx> diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index fa8817f5eb8e..dfdc10f83687 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -24,6 +24,7 @@ #include <framework/dispatchhelper.hxx> #include <com/sun/star/frame/DispatchResultState.hpp> +#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <cppuhelper/weak.hxx> #include <svl/eitem.hxx> diff --git a/sfx2/source/dialog/documentfontsdialog.cxx b/sfx2/source/dialog/documentfontsdialog.cxx index e64e0c5bba80..8e48a4a12f9d 100644 --- a/sfx2/source/dialog/documentfontsdialog.cxx +++ b/sfx2/source/dialog/documentfontsdialog.cxx @@ -22,6 +22,7 @@ #include <sfx2/objsh.hxx> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> using namespace ::com::sun::star; diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 7492e4e43aff..68abca31ba61 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -20,6 +20,7 @@ #include <sal/config.h> #include <com/sun/star/document/XCmisDocument.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/util/RevisionTag.hpp> #include <com/sun/star/beans/NamedValue.hpp> diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx index 6eecf322ba43..22aeb427703d 100644 --- a/sfx2/source/doc/Metadatable.cxx +++ b/sfx2/source/doc/Metadatable.cxx @@ -25,6 +25,7 @@ #include <sfx2/XmlIdRegistry.hxx> #include <vcl/svapp.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <comphelper/random.hxx> diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx index 953b60a5ec68..2e71007b3129 100644 --- a/sfx2/source/doc/docfilt.cxx +++ b/sfx2/source/doc/docfilt.cxx @@ -25,7 +25,7 @@ #include <sot/storage.hxx> #include <comphelper/fileformat.h> #include <com/sun/star/beans/XPropertySet.hpp> - +#include <com/sun/star/embed/XStorage.hpp> #include <sfx2/docfilt.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/objsh.hxx> diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx index 3d585992307b..19649cc26ff9 100644 --- a/sfx2/source/doc/docinsert.cxx +++ b/sfx2/source/doc/docinsert.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/ui/dialogs/ControlActions.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/lang/IllegalArgumentException.hpp> #include <tools/urlobj.hxx> diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index bcb058770d33..eb94e0873e6e 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> +#include <com/sun/star/ui/dialogs/XFilePicker3.hpp> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index aad8ca85fdbb..d722ac987b33 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -19,6 +19,7 @@ #include <sal/config.h> +#include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/Frame.hpp> #include <com/sun/star/frame/XFrame2.hpp> diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx index 45976530a9d3..f3440e6dcb46 100644 --- a/sfx2/source/sidebar/ResourceManager.cxx +++ b/sfx2/source/sidebar/ResourceManager.cxx @@ -35,6 +35,7 @@ #include <vcl/EnumContext.hxx> #include <com/sun/star/frame/ModuleManager.hpp> +#include <com/sun/star/ui/XSidebarPanel.hpp> #include <com/sun/star/ui/XUpdateModel.hpp> #include <map> diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx b/sfx2/source/sidebar/SidebarPanelBase.cxx index 3f9d00fe59ba..666a573f627b 100644 --- a/sfx2/source/sidebar/SidebarPanelBase.cxx +++ b/sfx2/source/sidebar/SidebarPanelBase.cxx @@ -23,7 +23,7 @@ #include <sfx2/sidebar/SidebarModelUpdate.hxx> #include <vcl/layout.hxx> #include <comphelper/processfactory.hxx> - +#include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/ui/ContextChangeEventMultiplexer.hpp> #include <com/sun/star/ui/UIElementType.hpp> diff --git a/sfx2/source/sidebar/Tools.cxx b/sfx2/source/sidebar/Tools.cxx index 7811c9c7c82d..eb936c4ff412 100644 --- a/sfx2/source/sidebar/Tools.cxx +++ b/sfx2/source/sidebar/Tools.cxx @@ -26,6 +26,7 @@ #include <vcl/gradient.hxx> #include <com/sun/star/frame/XDispatchProvider.hpp> +#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/frame/ModuleManager.hpp> diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index fe17638fe599..5dc6267e5c94 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/EmbedStates.hpp> #include <com/sun/star/embed/UnreachableStateException.hpp> diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index cf6f2485425d..1ad856065b8e 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -19,7 +19,7 @@ #include <time.h> #include <sfx2/sfxbasecontroller.hxx> - +#include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/util/XCloseBroadcaster.hpp> diff --git a/sfx2/source/view/userinputinterception.cxx b/sfx2/source/view/userinputinterception.cxx index e507a16a9ff9..ad605627f63f 100644 --- a/sfx2/source/view/userinputinterception.cxx +++ b/sfx2/source/view/userinputinterception.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/awt/KeyModifier.hpp> #include <com/sun/star/awt/XKeyHandler.hpp> #include <com/sun/star/awt/XMouseClickHandler.hpp> +#include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/uno/XInterface.hpp> #include <comphelper/interfacecontainer2.hxx> diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx index 1aedef9b9254..dd4e5beac67f 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.cxx +++ b/slideshow/source/engine/rehearsetimingsactivity.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/awt/MouseButton.hpp> #include <com/sun/star/awt/MouseEvent.hpp> #include <com/sun/star/rendering/XBitmap.hpp> +#include <com/sun/star/rendering/XCanvas.hpp> #include <eventqueue.hxx> #include <screenupdater.hxx> diff --git a/starmath/source/unodoc.cxx b/starmath/source/unodoc.cxx index 8e5230ad7f44..ac7a364390de 100644 --- a/starmath/source/unodoc.cxx +++ b/starmath/source/unodoc.cxx @@ -22,6 +22,7 @@ #include "register.hxx" #include <smdll.hxx> #include <document.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <vcl/svapp.hxx> using namespace ::com::sun::star; diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 48e10090d2dc..e1f798650cfd 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -40,6 +40,7 @@ #include <com/sun/star/sdb/SQLContext.hpp> #include <com/sun/star/sdbc/SQLWarning.hpp> #include <com/sun/star/sdbc/XConnection.hpp> +#include <com/sun/star/sdbc/XDataSource.hpp> #include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> diff --git a/svtools/source/misc/bindablecontrolhelper.cxx b/svtools/source/misc/bindablecontrolhelper.cxx index 7a47ea262e3e..0fe8d85034f4 100644 --- a/svtools/source/misc/bindablecontrolhelper.cxx +++ b/svtools/source/misc/bindablecontrolhelper.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/form/binding/XValueBinding.hpp> #include <com/sun/star/form/binding/XListEntrySink.hpp> #include <com/sun/star/form/binding/XListEntrySource.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/table/CellRangeAddress.hpp> diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx index 324af67e5ffb..10f42222d8b2 100644 --- a/svx/source/accessibility/AccessibleGraphicShape.cxx +++ b/svx/source/accessibility/AccessibleGraphicShape.cxx @@ -23,6 +23,7 @@ #include <svx/SvxShapeTypes.hxx> #include <svx/svdobj.hxx> +#include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XShapeDescriptor.hpp> #include <comphelper/sequence.hxx> #include <cppuhelper/queryinterface.hxx> @@ -140,7 +141,7 @@ OUString default: sName = "UnknownAccessibleGraphicShape"; - uno::Reference<drawing::XShapeDescriptor> xDescriptor (mxShape, uno::UNO_QUERY); + uno::Reference<drawing::XShapeDescriptor> xDescriptor (mxShape); if (xDescriptor.is()) sName += ": " + xDescriptor->getShapeType(); } diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx index 5f4b03995665..daf3fb29c42b 100644 --- a/svx/source/accessibility/AccessibleOLEShape.cxx +++ b/svx/source/accessibility/AccessibleOLEShape.cxx @@ -27,6 +27,7 @@ #include <cppuhelper/queryinterface.hxx> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> +#include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XShapeDescriptor.hpp> using namespace ::accessibility; @@ -168,7 +169,7 @@ OUString default: sName = "UnknownAccessibleOLEShape"; - uno::Reference<drawing::XShapeDescriptor> xDescriptor (mxShape, uno::UNO_QUERY); + uno::Reference<drawing::XShapeDescriptor> xDescriptor (mxShape); if (xDescriptor.is()) sName += ": " + xDescriptor->getShapeType(); } diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx index 95e24dfcc40b..1716f999f1d6 100644 --- a/svx/source/accessibility/DescriptionGenerator.cxx +++ b/svx/source/accessibility/DescriptionGenerator.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/container/XNamed.hpp> +#include <com/sun/star/drawing/XShape.hpp> #include <vcl/svapp.hxx> // Includes for string resources. diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx index e1278da3b5ab..c014ae7b1f89 100644 --- a/svx/source/core/graphichelper.cxx +++ b/svx/source/core/graphichelper.cxx @@ -36,6 +36,7 @@ #include <com/sun/star/container/NoSuchElementException.hpp> #include <com/sun/star/document/XExporter.hpp> #include <com/sun/star/drawing/GraphicExportFilter.hpp> +#include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/io/XInputStream.hpp> diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 40639ba80301..5b7526d94084 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/linguistic2/XAvailableLocales.hpp> +#include <com/sun/star/linguistic2/XLinguServiceManager2.hpp> #include <com/sun/star/linguistic2/XSpellChecker1.hpp> #include <linguistic/misc.hxx> #include <rtl/ustring.hxx> @@ -214,7 +215,7 @@ void SvxLanguageBox::SetLanguageList(SvxLanguageListFlags nLangList, bool bHasLa std::vector< LanguageType > aHyphAvailLang; std::vector< LanguageType > aThesAvailLang; Sequence< sal_Int16 > aSpellUsedLang; - Reference< XAvailableLocales > xAvail( LinguMgr::GetLngSvcMgr(), UNO_QUERY ); + Reference< XAvailableLocales > xAvail( LinguMgr::GetLngSvcMgr() ); if (xAvail.is()) { Sequence< css::lang::Locale > aTmp; diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index f9f692062368..c8e90ea1dd79 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/sdb/XRowsChangeBroadcaster.hpp> #include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbc/XResultSetUpdate.hpp> +#include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/sdbcx/Privilege.hpp> #include <com/sun/star/util/NumberFormatter.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx index d616287ec80f..690ffb77814b 100644 --- a/svx/source/form/fmmodel.cxx +++ b/svx/source/form/fmmodel.cxx @@ -22,6 +22,7 @@ #include <fmdocumentclassification.hxx> #include <fmcontrollayout.hxx> +#include <com/sun/star/form/XForms.hpp> #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> @@ -91,7 +92,7 @@ SdrPage* FmFormModel::RemovePage(sal_uInt16 nPgNum) if ( pToBeRemovedPage ) { - Reference< XNameContainer > xForms( pToBeRemovedPage->GetForms( false ), css::uno::UNO_QUERY ); + Reference< XNameContainer > xForms( pToBeRemovedPage->GetForms( false ) ); if ( xForms.is() ) m_pImpl->mxUndoEnv->RemoveForms( xForms ); } @@ -116,7 +117,7 @@ SdrPage* FmFormModel::RemoveMasterPage(sal_uInt16 nPgNum) if ( pPage ) { - Reference< XNameContainer > xForms( pPage->GetForms( false ), css::uno::UNO_QUERY ); + Reference< XNameContainer > xForms( pPage->GetForms( false ) ); if ( xForms.is() ) m_pImpl->mxUndoEnv->RemoveForms( xForms ); } diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index ec7304918b19..21df3d4b4411 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/sdb/SQLErrorEvent.hpp> #include <com/sun/star/sdb/XCompletedConnection.hpp> #include <com/sun/star/sdb/XResultSetAccess.hpp> +#include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/util/Language.hpp> @@ -183,7 +184,7 @@ OUString getLabelName(const Reference< css::beans::XPropertySet>& xControlModel) CursorWrapper::CursorWrapper(const Reference< css::sdbc::XRowSet>& _rxCursor, bool bUseCloned) { - ImplConstruct(Reference< css::sdbc::XResultSet>(_rxCursor, UNO_QUERY), bUseCloned); + ImplConstruct(Reference< css::sdbc::XResultSet>(_rxCursor), bUseCloned); } @@ -225,7 +226,7 @@ void CursorWrapper::ImplConstruct(const Reference< css::sdbc::XResultSet>& _rxCu CursorWrapper& CursorWrapper::operator=(const Reference< css::sdbc::XRowSet>& _rxCursor) { - m_xMoveOperations.set(_rxCursor, UNO_QUERY); + m_xMoveOperations.set(_rxCursor); m_xBookmarkOperations.set(_rxCursor, UNO_QUERY); m_xColumnsSupplier.set(_rxCursor, UNO_QUERY); if (!m_xMoveOperations.is() || !m_xBookmarkOperations.is() || !m_xColumnsSupplier.is()) diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index 3fd43e0c3b3b..5e4f17a8fb6b 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -35,6 +35,7 @@ #include <com/sun/star/awt/LineEndFormat.hpp> #include <com/sun/star/awt/ImageScaleMode.hpp> #include <com/sun/star/sdbc/DataType.hpp> +#include <com/sun/star/sdbc/XDataSource.hpp> #include <com/sun/star/util/XNumberFormatTypes.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/text/WritingMode2.hpp> diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 7cb1f32d37a9..7232929e6663 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -41,6 +41,7 @@ #include <comphelper/processfactory.hxx> #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> +#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/gallery/GalleryItemType.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/lang/XComponent.hpp> diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index f1ef6bc17bd5..5d97eb9f2a40 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -17,7 +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 <com/sun/star/lang/XUnoTunnel.hpp> #include <sfx2/objsh.hxx> #include <comphelper/fileformat.h> diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 7e360f4b43cd..1de49a696469 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -56,6 +56,7 @@ #include <array> +#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <boost/property_tree/json_parser.hpp> diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index c9b2c666aa1d..2b55d0e8c365 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -22,6 +22,7 @@ #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/drawing/XShape.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <vcl/svapp.hxx> diff --git a/sw/source/core/access/AccessibilityCheck.cxx b/sw/source/core/access/AccessibilityCheck.cxx index 3c2b1f7b5d8c..b59596da9a6b 100644 --- a/sw/source/core/access/AccessibilityCheck.cxx +++ b/sw/source/core/access/AccessibilityCheck.cxx @@ -19,6 +19,7 @@ #include <drawdoc.hxx> #include <svx/svdpage.hxx> #include <swtable.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/text/XTextContent.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <unoparagraph.hxx> diff --git a/sw/source/core/doc/DocumentStatisticsManager.cxx b/sw/source/core/doc/DocumentStatisticsManager.cxx index 75e605a4f83d..9508e6d7216c 100644 --- a/sw/source/core/doc/DocumentStatisticsManager.cxx +++ b/sw/source/core/doc/DocumentStatisticsManager.cxx @@ -31,6 +31,7 @@ #include <docufld.hxx> #include <docstat.hxx> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> +#include <com/sun/star/frame/XModel.hpp> using namespace ::com::sun::star; diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index 574747e77690..1fe455f50968 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -43,6 +43,7 @@ #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <cstddef> #include <memory> diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx index 4cc2afb20db1..b933843ff6b3 100644 --- a/sw/source/core/doc/docglbl.cxx +++ b/sw/source/core/doc/docglbl.cxx @@ -49,6 +49,7 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> +#include <com/sun/star/frame/XModel.hpp> using namespace ::com::sun::star; diff --git a/sw/source/core/doc/docglos.cxx b/sw/source/core/doc/docglos.cxx index 93d13933b9ae..269d00ad88fc 100644 --- a/sw/source/core/doc/docglos.cxx +++ b/sw/source/core/doc/docglos.cxx @@ -21,7 +21,7 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> - +#include <com/sun/star/frame/XModel.hpp> #include <osl/diagnose.h> #include <doc.hxx> diff --git a/sw/source/core/doc/rdfhelper.cxx b/sw/source/core/doc/rdfhelper.cxx index ff77293639cc..d404b477e8af 100644 --- a/sw/source/core/doc/rdfhelper.cxx +++ b/sw/source/core/doc/rdfhelper.cxx @@ -9,6 +9,7 @@ #include <rdfhelper.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/rdf/Literal.hpp> #include <com/sun/star/rdf/Statement.hpp> #include <com/sun/star/rdf/URI.hpp> diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx index 45f88403123c..39e5f93e37fe 100644 --- a/sw/source/core/draw/dpage.cxx +++ b/sw/source/core/draw/dpage.cxx @@ -38,6 +38,7 @@ #include <docsh.hxx> #include <flyfrm.hxx> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> +#include <com/sun/star/frame/XModel.hpp> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing; diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx index 6a91a4e8006d..7fa2bd715970 100644 --- a/sw/source/core/draw/drawdoc.cxx +++ b/sw/source/core/draw/drawdoc.cxx @@ -19,6 +19,7 @@ #include <svx/svxids.hrc> +#include <com/sun/star/frame/XModel.hpp> #include <svx/drawitem.hxx> #include <doc.hxx> #include <drawdoc.hxx> diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 6b4c4eb39b7c..92afe5024bc7 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -22,6 +22,7 @@ #include <textapi.hxx> #include <hintids.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/text/XText.hpp> #include <com/sun/star/script/Converter.hpp> #include <com/sun/star/text/PlaceholderType.hpp> diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index a0309aa0e77f..73aff1cf57bf 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -52,6 +52,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/CharSet.hpp> +#include <com/sun/star/text/XTextRange.hpp> using namespace ::com::sun::star; diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index b094b87653cf..a90358d43afb 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -67,6 +67,7 @@ #include <svx/scene3d.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <fmtwrapinfluenceonobjpos.hxx> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx index 79ae6444a146..615b1b04c4b4 100644 --- a/sw/source/core/unocore/unoredline.cxx +++ b/sw/source/core/unocore/unoredline.cxx @@ -19,7 +19,7 @@ #include <sal/config.h> #include <sal/log.hxx> - +#include <com/sun/star/text/XTextSection.hpp> #include <cppuhelper/typeprovider.hxx> #include <vcl/svapp.hxx> diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index 4de74f149ca5..a69fd2cab70c 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -48,6 +48,7 @@ #include <fmtmeta.hxx> #include <docsh.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/rdf/Statement.hpp> diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 16c089e78d0b..8236d9d928dd 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -73,6 +73,7 @@ #include <fmtruby.hxx> #include <SwStyleNameMapper.hxx> #include <sfx2/printer.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/style/ParagraphStyleCategory.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> diff --git a/sw/source/filter/docx/swdocxreader.cxx b/sw/source/filter/docx/swdocxreader.cxx index 84c0f18f7c0c..cb1aa91335ea 100644 --- a/sw/source/filter/docx/swdocxreader.cxx +++ b/sw/source/filter/docx/swdocxreader.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/document/XImporter.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/propertysequence.hxx> diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx index e104a1ea7185..068968178d23 100644 --- a/sw/source/filter/html/htmlfld.cxx +++ b/sw/source/filter/html/htmlfld.cxx @@ -19,7 +19,7 @@ #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> - +#include <com/sun/star/frame/XModel.hpp> #include <osl/diagnose.h> #include <docsh.hxx> #include <IDocumentFieldsAccess.hxx> diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index 052f5c70a57d..497d6d3ace11 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/form/FormSubmitEncoding.hpp> #include <com/sun/star/form/FormSubmitMethod.hpp> #include <com/sun/star/form/FormButtonType.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/script/XEventAttacherManager.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> #include <com/sun/star/form/XFormsSupplier.hpp> diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index a5cad5df2c57..2f83734aee37 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -44,6 +44,7 @@ #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <fmthdft.hxx> #include <fmtfld.hxx> #include <fmtpdsc.hxx> diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index 11fa1ea8744b..b6ae62bf6bf9 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -35,6 +35,7 @@ #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/document/XImporter.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> using namespace ::com::sun::star; diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx b/sw/source/filter/ww8/docxtablestyleexport.cxx index cae179d416fa..3854e2b6fef4 100644 --- a/sw/source/filter/ww8/docxtablestyleexport.cxx +++ b/sw/source/filter/ww8/docxtablestyleexport.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/frame/XModel.hpp> using namespace com::sun::star; using namespace oox; diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index ba48c017ef93..967e5a650981 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -23,6 +23,7 @@ #include "rtfsdrexport.hxx" #include "rtfattributeoutput.hxx" #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/i18n/ScriptType.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 6f5d843a2db9..42859e7a481e 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/XStorage.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <unotools/ucbstreamhelper.hxx> #include <algorithm> #include <map> diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index eb9b8e04194f..7966379588f8 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -43,6 +43,7 @@ #include <xmloff/XMLGraphicsDefaultStyle.hxx> #include <xmloff/table/XMLTableImport.hxx> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include "xmlimp.hxx" #include <cellatr.hxx> diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx index c047064d9a5e..10079d9f64ef 100644 --- a/sw/source/filter/xml/xmlmeta.cxx +++ b/sw/source/filter/xml/xmlmeta.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <osl/diagnose.h> #include <xmloff/xmlmetai.hxx> #include <xmloff/ProgressBarHelper.hxx> diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 70d024881465..5a95befacf47 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -19,6 +19,7 @@ #include <hintids.hxx> +#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/text/XTextTable.hpp> diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 18d695821160..9f9995868809 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/embed/OOoEmbeddedObjectFactory.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/embed/Aspects.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> #include <o3tl/any.hxx> #include <rtl/ustrbuf.hxx> diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 4d5248a5ef88..ba2d93f3ccc8 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -23,6 +23,7 @@ #include <hintids.hxx> #include <com/sun/star/container/XNameAccess.hpp> +#include <com/sun/star/sdbc/XDataSource.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbcx/XRowLocate.hpp> diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index b2ab53929819..2626d5c2d053 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -40,6 +40,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <memory> #include <swuiexp.hxx> diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index fd1b28077c04..4a12a7538586 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -42,6 +42,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> +#include <com/sun/star/frame/XModel.hpp> // carrier of the dialog SwFieldDlg::SwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, weld::Window *pParent) diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 7ed9fe628ff0..b9520dd71af3 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -30,6 +30,7 @@ #include <doc.hxx> #include <modcfg.hxx> #include <swmodule.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/text/XTextGraphicObjectsSupplier.hpp> #include <com/sun/star/text/XTextTablesSupplier.hpp> #include <com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp> diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index ed540b942f05..1c67f547558c 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -21,6 +21,7 @@ #include <sfx2/request.hxx> #include <svl/stritem.hxx> #include <vcl/weld.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/text/XBookmarksSupplier.hpp> #include <swabstdlg.hxx> diff --git a/sw/source/ui/vba/vbaframes.cxx b/sw/source/ui/vba/vbaframes.cxx index 0c1cfe890a31..676438a19ac1 100644 --- a/sw/source/ui/vba/vbaframes.cxx +++ b/sw/source/ui/vba/vbaframes.cxx @@ -18,6 +18,7 @@ */ #include "vbaframes.hxx" #include "vbaframe.hxx" +#include <com/sun/star/frame/XModel.hpp> #include <cppuhelper/implbase.hxx> using namespace ::ooo::vba; diff --git a/sw/source/ui/vba/vbarevision.cxx b/sw/source/ui/vba/vbarevision.cxx index c40091a2d8ac..d0439a8b3bb9 100644 --- a/sw/source/ui/vba/vbarevision.cxx +++ b/sw/source/ui/vba/vbarevision.cxx @@ -21,6 +21,7 @@ #include <sal/log.hxx> #include <com/sun/star/document/XRedlinesSupplier.hpp> #include <com/sun/star/container/XIndexAccess.hpp> +#include <com/sun/star/frame/XModel.hpp> #include "wordvbahelper.hxx" #include <docsh.hxx> #include <doc.hxx> diff --git a/sw/source/ui/vba/vbarevisions.cxx b/sw/source/ui/vba/vbarevisions.cxx index 2e022e35a81e..37e078176f3e 100644 --- a/sw/source/ui/vba/vbarevisions.cxx +++ b/sw/source/ui/vba/vbarevisions.cxx @@ -21,6 +21,7 @@ #include <cppuhelper/implbase.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/document/XRedlinesSupplier.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/text/XTextRangeCompare.hpp> using namespace ::ooo::vba; diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx index 3ed412bee04a..04a6cd560ab1 100644 --- a/sw/source/ui/vba/vbasections.cxx +++ b/sw/source/ui/vba/vbasections.cxx @@ -18,6 +18,7 @@ */ #include "vbasections.hxx" #include "vbasection.hxx" +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/style/XStyle.hpp> #include "wordvbahelper.hxx" diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index 530e2386d4a1..70a69a6d255c 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -22,7 +22,7 @@ #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> - +#include <com/sun/star/frame/XModel.hpp> #include <comphelper/flagguard.hxx> #include <o3tl/any.hxx> #include <sal/log.hxx> diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index 3791c7894b36..cf31941c31db 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/container/XNameAccess.hpp> +#include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdb/DatabaseContext.hpp> diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index ebaf5a9261ae..59d4e2555d97 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XPropertiesChangeListener.hpp> +#include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <cppuhelper/implbase.hxx> #include <officecfg/Office/Common.hxx> #include <rtl/ustring.hxx> diff --git a/sw/source/uibase/fldui/xfldui.cxx b/sw/source/uibase/fldui/xfldui.cxx index 31ec4c7c9501..96321fab72e0 100644 --- a/sw/source/uibase/fldui/xfldui.cxx +++ b/sw/source/uibase/fldui/xfldui.cxx @@ -20,6 +20,7 @@ #include <osl/diagnose.h> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/sdbc/DataType.hpp> +#include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdb/XQueriesSupplier.hpp> diff --git a/sw/source/uibase/misc/glshell.cxx b/sw/source/uibase/misc/glshell.cxx index c84545422bad..1e3c664f1592 100644 --- a/sw/source/uibase/misc/glshell.cxx +++ b/sw/source/uibase/misc/glshell.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 <com/sun/star/frame/XTitle.hpp> #include <svl/eitem.hxx> #include <svl/stritem.hxx> diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index 6b8f4d253f8b..0c3aaa4a3acc 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -19,6 +19,7 @@ #include <rtl/tencinfo.h> #include <osl/diagnose.h> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <unotools/tempfile.hxx> #include <tools/urlobj.hxx> diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index b5ad719e8045..72481f9a608b 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -23,6 +23,7 @@ #include <o3tl/any.hxx> #include <vcl/graphicfilter.hxx> #include <com/sun/star/sdb/DatabaseContext.hpp> +#include <com/sun/star/ui/dialogs/XFilePicker3.hpp> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/ListboxControlActions.hpp> diff --git a/sw/source/uibase/uno/dlelstnr.cxx b/sw/source/uibase/uno/dlelstnr.cxx index f76c63a2cb07..aeb72b54056f 100644 --- a/sw/source/uibase/uno/dlelstnr.cxx +++ b/sw/source/uibase/uno/dlelstnr.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/linguistic2/LinguServiceManager.hpp> #include <com/sun/star/linguistic2/XLinguServiceEventBroadcaster.hpp> +#include <com/sun/star/linguistic2/XProofreadingIterator.hpp> #include <com/sun/star/linguistic2/LinguServiceEventFlags.hpp> #include <unotools/lingucfg.hxx> diff --git a/sw/source/uibase/uno/unodispatch.cxx b/sw/source/uibase/uno/unodispatch.cxx index c23eda0113c2..77ef3e4a073e 100644 --- a/sw/source/uibase/uno/unodispatch.cxx +++ b/sw/source/uibase/uno/unodispatch.cxx @@ -19,6 +19,7 @@ #include <config_features.h> +#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <sfx2/viewfrm.hxx> diff --git a/sw/source/uibase/uno/unodoc.cxx b/sw/source/uibase/uno/unodoc.cxx index dfa3a3baecdd..a61b23778165 100644 --- a/sw/source/uibase/uno/unodoc.cxx +++ b/sw/source/uibase/uno/unodoc.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 <sfx2/sfxmodelfactory.hxx> #include <swdll.hxx> #include <unofreg.hxx> diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx index b8362420d276..583768ec2a40 100644 --- a/sw/source/uibase/utlui/uitool.cxx +++ b/sw/source/uibase/utlui/uitool.cxx @@ -38,6 +38,7 @@ #include <unotools/localedatawrapper.hxx> #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/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <comphelper/processfactory.hxx> diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index 3594ff37830d..f8129c53d2ba 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -39,6 +39,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMain.hpp> +#include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/bridge/UnoUrlResolver.hpp> #include <com/sun/star/bridge/XUnoUrlResolver.hpp> #include <com/sun/star/uno/RuntimeException.hpp> diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx index 5a3550c338da..2f1134eabdce 100644 --- a/toolkit/source/awt/vclxfont.cxx +++ b/toolkit/source/awt/vclxfont.cxx @@ -19,6 +19,7 @@ #include <memory> +#include <com/sun/star/awt/XDevice.hpp> #include <toolkit/awt/vclxfont.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/macros.hxx> diff --git a/ucbhelper/source/provider/getcomponentcontext.cxx b/ucbhelper/source/provider/getcomponentcontext.cxx index 5ccd9e840000..1a73d2f23211 100644 --- a/ucbhelper/source/provider/getcomponentcontext.cxx +++ b/ucbhelper/source/provider/getcomponentcontext.cxx @@ -20,12 +20,11 @@ #include <sal/config.h> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <ucbhelper/getcomponentcontext.hxx> -namespace com::sun::star::lang { class XMultiServiceFactory; } - css::uno::Reference< css::uno::XComponentContext > ucbhelper::getComponentContext( css::uno::Reference< css::lang::XMultiServiceFactory > const & factory) diff --git a/ucbhelper/source/provider/simpleioerrorrequest.cxx b/ucbhelper/source/provider/simpleioerrorrequest.cxx index aeb0a8429424..492c736a60ff 100644 --- a/ucbhelper/source/provider/simpleioerrorrequest.cxx +++ b/ucbhelper/source/provider/simpleioerrorrequest.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp> +#include <com/sun/star/ucb/XCommandProcessor.hpp> #include "simpleioerrorrequest.hxx" using namespace com::sun::star; diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index be70d4d7e0c1..8082749e998b 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XNameAccess.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/document/XTypeDetection.hpp> #include <com/sun/star/util/PathSubstitution.hpp> diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 1f2dea7bcfa0..f99701866e3d 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/frame/XModel2.hpp> #include <com/sun/star/script/BasicErrorException.hpp> #include <com/sun/star/script/XDefaultProperty.hpp> +#include <com/sun/star/script/XInvocation.hpp> #include <com/sun/star/script/Converter.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> diff --git a/vbahelper/source/vbahelper/vbatextframe.cxx b/vbahelper/source/vbahelper/vbatextframe.cxx index 23c79f43bd61..6e19734cd0e5 100644 --- a/vbahelper/source/vbahelper/vbatextframe.cxx +++ b/vbahelper/source/vbahelper/vbatextframe.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/TextFitToSizeType.hpp> +#include <com/sun/star/drawing/XShape.hpp> #include <vbahelper/vbatextframe.hxx> using namespace ::ooo::vba; diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx index caa309f4bc84..7df57d9ddf69 100644 --- a/vcl/qa/cppunit/lifecycle.cxx +++ b/vcl/qa/cppunit/lifecycle.cxx @@ -20,6 +20,7 @@ #include <vcl/layout.hxx> #include <vcl/scheduler.hxx> #include <com/sun/star/awt/XWindow.hpp> +#include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/lang/XComponent.hpp> class LifecycleTest : public test::BootstrapFixture diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index ebf0b499f86c..5ca6d0a59e52 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/accessibility/AccessibleRelationType.hpp> #include <com/sun/star/awt/XWindow.hpp> +#include <com/sun/star/awt/XWindowPeer.hpp> #include <o3tl/sorted_vector.hxx> #include <officecfg/Office/Common.hxx> #include <iconview.hxx> diff --git a/vcl/source/graphic/UnoGraphicDescriptor.cxx b/vcl/source/graphic/UnoGraphicDescriptor.cxx index e27f8c56d928..6f65828fe992 100644 --- a/vcl/source/graphic/UnoGraphicDescriptor.cxx +++ b/vcl/source/graphic/UnoGraphicDescriptor.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/graphic/GraphicType.hpp> +#include <com/sun/star/io/XInputStream.hpp> #include <vcl/outdev.hxx> #include <vcl/graph.hxx> diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx index b50c610645f4..ba1cdca98492 100644 --- a/vcl/source/window/accessibility.cxx +++ b/vcl/source/window/accessibility.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/XAccessibleEditableText.hpp> +#include <com/sun/star/awt/XWindowPeer.hpp> #include <sal/log.hxx> diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 39fa41aa607f..95466d4695d4 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -56,6 +56,8 @@ #include <helpwin.hxx> #include <com/sun/star/accessibility/AccessibleRelation.hpp> +#include <com/sun/star/accessibility/XAccessible.hpp> +#include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp> #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp> diff --git a/writerfilter/source/dmapper/SmartTagHandler.cxx b/writerfilter/source/dmapper/SmartTagHandler.cxx index 2f2c2a943ed0..56572ea74b4f 100644 --- a/writerfilter/source/dmapper/SmartTagHandler.cxx +++ b/writerfilter/source/dmapper/SmartTagHandler.cxx @@ -12,6 +12,8 @@ #include <com/sun/star/rdf/Literal.hpp> #include <com/sun/star/rdf/URI.hpp> #include <com/sun/star/rdf/XDocumentMetadataAccess.hpp> +#include <com/sun/star/text/XTextDocument.hpp> +#include <com/sun/star/text/XTextRange.hpp> #include <ooxml/resourceids.hxx> diff --git a/writerperfect/qa/unit/ImportTest.cxx b/writerperfect/qa/unit/ImportTest.cxx index 3a7b9c2293f0..07c82d4134cb 100644 --- a/writerperfect/qa/unit/ImportTest.cxx +++ b/writerperfect/qa/unit/ImportTest.cxx @@ -12,6 +12,7 @@ #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/document/XTypeDetection.hpp> +#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/table/XCellRange.hpp> diff --git a/writerperfect/source/writer/EPUBPackage.cxx b/writerperfect/source/writer/EPUBPackage.cxx index e13f2b3eb71b..914983e97580 100644 --- a/writerperfect/source/writer/EPUBPackage.cxx +++ b/writerperfect/source/writer/EPUBPackage.cxx @@ -10,6 +10,7 @@ #include "EPUBPackage.hxx" #include <com/sun/star/embed/ElementModes.hpp> +#include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/xml/sax/Writer.hpp> diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx index 7814a8b77a8f..74780fe7eecd 100644 --- a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx +++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx @@ -19,6 +19,7 @@ #include "SchXMLCalculationSettingsContext.hxx" #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/util/DateTime.hpp> #include <sax/tools/converter.hxx> diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx index 8167ac678217..d0e6937f767d 100644 --- a/xmloff/source/core/DocumentSettingsContext.cxx +++ b/xmloff/source/core/DocumentSettingsContext.cxx @@ -36,6 +36,7 @@ #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/formula/SymbolDescriptor.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/document/XViewDataSupplier.hpp> #include <com/sun/star/document/PrinterIndependentLayout.hpp> diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx index 169a4790b6ac..5b9e3b965840 100644 --- a/xmloff/source/core/RDFaExportHelper.cxx +++ b/xmloff/source/core/RDFaExportHelper.cxx @@ -27,6 +27,7 @@ #include <comphelper/stl_types.hxx> #include <comphelper/processfactory.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/uri/XUriReference.hpp> #include <com/sun/star/uri/UriReferenceFactory.hpp> #include <com/sun/star/rdf/Statement.hpp> diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 5bb3db71c7d4..6184fe2680c1 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/document/XBinaryStreamResolver.hpp> #include <com/sun/star/document/XEmbeddedObjectResolver.hpp> +#include <com/sun/star/text/XTextContent.hpp> #include <com/sun/star/xml/sax/SAXInvalidCharacterException.hpp> #include <com/sun/star/uri/XUriReferenceFactory.hpp> #include <com/sun/star/uri/UriReferenceFactory.hpp> diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index b7530decf44a..e6492898d6a3 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -37,6 +37,7 @@ #include <tools/fldunit.hxx> #include <com/sun/star/drawing/Position3D.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/style/NumberingType.hpp> #include <com/sun/star/text/DefaultNumberingProvider.hpp> diff --git a/xmloff/source/draw/SignatureLineContext.cxx b/xmloff/source/draw/SignatureLineContext.cxx index bbc99277cc47..10c2440fd022 100644 --- a/xmloff/source/draw/SignatureLineContext.cxx +++ b/xmloff/source/draw/SignatureLineContext.cxx @@ -11,6 +11,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/embed/XStorage.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/security/DocumentDigitalSignatures.hpp> diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx index 432b7538fa80..5676d248a73f 100644 --- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx +++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx @@ -20,6 +20,7 @@ #include <xmloff/XMLGraphicsDefaultStyle.hxx> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <tools/color.hxx> diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx index ea802af8a915..2586d95e82fa 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/xmloff/source/draw/layerexp.cxx b/xmloff/source/draw/layerexp.cxx index 1b68a7f2705d..64d0536f2805 100644 --- a/xmloff/source/draw/layerexp.cxx +++ b/xmloff/source/draw/layerexp.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/drawing/XLayerSupplier.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmlexp.hxx> diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx index 220f1f618d23..c17c7cbebc6b 100644 --- a/xmloff/source/draw/layerimp.cxx +++ b/xmloff/source/draw/layerimp.cxx @@ -22,6 +22,7 @@ #include <sal/log.hxx> #include <com/sun/star/drawing/XLayerManager.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/drawing/XLayerSupplier.hpp> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index b89c7a8d6415..11a3dff5b95d 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -33,6 +33,7 @@ #include <xmloff/DocumentSettingsContext.hxx> #include <com/sun/star/awt/Rectangle.hpp> #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/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index c265ef36e519..0d86c861964e 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.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 <com/sun/star/geometry/RealPoint2D.hpp> #include <com/sun/star/text/XTextCursor.hpp> #include <com/sun/star/util/DateTime.hpp> diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx index a971bda8b535..26c98a8a7b4c 100644 --- a/xmloff/source/draw/ximpshow.cxx +++ b/xmloff/source/draw/ximpshow.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/util/Duration.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index b093c5e3d90b..4666e897e816 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -29,7 +29,7 @@ #include <tools/debug.hxx> #include <osl/diagnose.h> #include <sal/log.hxx> - +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/presentation/XPresentationPage.hpp> diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx index c6d4500e991b..e5516d64cfea 100644 --- a/xmloff/source/forms/layerexport.cxx +++ b/xmloff/source/forms/layerexport.cxx @@ -32,6 +32,7 @@ #include "controlpropertymap.hxx" #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/form/XFormsSupplier2.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/xforms/XFormsSupplier.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx index c3fd44b49b0a..c234efdac2a0 100644 --- a/xmloff/source/forms/officeforms.cxx +++ b/xmloff/source/forms/officeforms.cxx @@ -26,6 +26,7 @@ #include <xmloff/xmlexp.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <comphelper/extract.hxx> #include <tools/diagnose_ex.h> #include "strings.hxx" diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx index 6fcbe9270518..0e622258977b 100644 --- a/xmloff/source/style/PageMasterImportContext.cxx +++ b/xmloff/source/style/PageMasterImportContext.cxx @@ -26,6 +26,7 @@ #include "PagePropertySetContext.hxx" #include "PageHeaderFooterContext.hxx" #include <PageMasterStyleMap.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <osl/diagnose.h> diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx index 76a6a4d2bf33..1d03c73709d7 100644 --- a/xmloff/source/style/XMLFontAutoStylePool.cxx +++ b/xmloff/source/style/XMLFontAutoStylePool.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/embed/XStorage.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/style/XStyle.hpp> diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx index 286b1d20a100..7db579e23608 100644 --- a/xmloff/source/style/XMLPageExport.cxx +++ b/xmloff/source/style/XMLPageExport.cxx @@ -22,6 +22,7 @@ #include <sal/log.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index c23207d0cbcd..ce40f755e8c9 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -26,6 +26,7 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlprcon.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/style/XAutoStyleFamily.hpp> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx index e5334873c82c..127526346695 100644 --- a/xmloff/source/style/styleexp.cxx +++ b/xmloff/source/style/styleexp.cxx @@ -24,6 +24,7 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlexppr.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/style/XStyle.hpp> diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx index 0f5a45dc40da..eede84316e92 100644 --- a/xmloff/source/style/xmlnume.cxx +++ b/xmloff/source/style/xmlnume.cxx @@ -17,7 +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 <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/style/NumberingType.hpp> #include <com/sun/star/style/XStyle.hpp> diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index f724caaddf4b..a8924c5a7828 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -20,6 +20,8 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/Size.hpp> +#include <com/sun/star/frame/XModel.hpp> +#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp> diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index cba7ac8a37d4..9c396efba82e 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.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 <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx index a7d719ff1d75..846793f03414 100644 --- a/xmloff/source/table/XMLTableExport.cxx +++ b/xmloff/source/table/XMLTableExport.cxx @@ -24,7 +24,7 @@ #include <osl/diagnose.h> #include <rtl/ustring.hxx> - +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/text/XText.hpp> #include <com/sun/star/table/XCellRange.hpp> diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx index 14d6e94bfa9f..c9442ae769f2 100644 --- a/xmloff/source/table/XMLTableImport.cxx +++ b/xmloff/source/table/XMLTableImport.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 <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/table/XTableRows.hpp> #include <com/sun/star/table/XMergeableCell.hpp> diff --git a/xmloff/source/text/XMLAutoMarkFileContext.cxx b/xmloff/source/text/XMLAutoMarkFileContext.cxx index cfbe93d4005d..870e4dddc7ad 100644 --- a/xmloff/source/text/XMLAutoMarkFileContext.cxx +++ b/xmloff/source/text/XMLAutoMarkFileContext.cxx @@ -23,6 +23,7 @@ #include <xmloff/nmspmap.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx index 9bbe6c4d0039..21655d97bc30 100644 --- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx @@ -33,6 +33,7 @@ #include <xmloff/families.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlimp.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/text/XFootnotesSupplier.hpp> diff --git a/xmloff/source/text/XMLFootnoteImportContext.cxx b/xmloff/source/text/XMLFootnoteImportContext.cxx index e4e222ddf6e7..95ed67de8268 100644 --- a/xmloff/source/text/XMLFootnoteImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteImportContext.cxx @@ -28,6 +28,7 @@ #include "XMLFootnoteBodyImportContext.hxx" +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/text/XTextContent.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx index 96c844af32f5..8f249e50e02f 100644 --- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx @@ -29,6 +29,7 @@ #include <sax/tools/converter.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/sequence.hxx> diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx index a39e864d731e..727801fb828e 100644 --- a/xmloff/source/text/XMLIndexTOCContext.cxx +++ b/xmloff/source/text/XMLIndexTOCContext.cxx @@ -18,6 +18,7 @@ */ #include "XMLIndexTOCContext.hxx" +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/uno/XInterface.hpp> diff --git a/xmloff/source/text/XMLLineNumberingExport.cxx b/xmloff/source/text/XMLLineNumberingExport.cxx index 49ca6d1671e7..1b39593bb0ab 100644 --- a/xmloff/source/text/XMLLineNumberingExport.cxx +++ b/xmloff/source/text/XMLLineNumberingExport.cxx @@ -19,6 +19,7 @@ #include "XMLLineNumberingExport.hxx" #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/text/XLineNumberingProperties.hpp> #include <com/sun/star/style/LineNumberPosition.hpp> #include <o3tl/any.hxx> diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx index 6207df4e48cf..69784ae6c37b 100644 --- a/xmloff/source/text/XMLLineNumberingImportContext.cxx +++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx @@ -20,6 +20,7 @@ #include <XMLLineNumberingImportContext.hxx> #include "XMLLineNumberingSeparatorImportContext.hxx" #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/text/XLineNumberingProperties.hpp> #include <com/sun/star/style/LineNumberPosition.hpp> #include <com/sun/star/style/NumberingType.hpp> diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx index 9b925830d59a..a17d10423c3b 100644 --- a/xmloff/source/text/XMLRedlineExport.cxx +++ b/xmloff/source/text/XMLRedlineExport.cxx @@ -24,6 +24,7 @@ #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/UnknownPropertyException.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx index 76f352b4b8fb..ff084a9185b0 100644 --- a/xmloff/source/text/XMLSectionExport.cxx +++ b/xmloff/source/text/XMLSectionExport.cxx @@ -22,8 +22,7 @@ #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> - - +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/container/XIndexReplace.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx index 9f0b0eb50e80..7a77e3104131 100644 --- a/xmloff/source/text/XMLSectionImportContext.cxx +++ b/xmloff/source/text/XMLSectionImportContext.cxx @@ -30,6 +30,7 @@ #include <xmloff/prstylei.hxx> #include <sax/tools/converter.hxx> #include <com/sun/star/container/XNamed.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/text/XTextContent.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx index 622e1f38957d..2bd4f6f33a8f 100644 --- a/xmloff/source/text/XMLTextColumnsContext.cxx +++ b/xmloff/source/text/XMLTextColumnsContext.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 <com/sun/star/text/XTextColumns.hpp> #include <com/sun/star/text/TextColumn.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index 5efc4c0a085f..408a28bbcf95 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -21,6 +21,7 @@ #include <sal/log.hxx> #include <tools/diagnose_ex.h> #include <comphelper/base64.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx index 5f4e7320c323..2779e41d6ba9 100644 --- a/xmloff/source/text/XMLTextListAutoStylePool.cxx +++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx @@ -21,6 +21,7 @@ #include <tools/solar.h> #include <o3tl/sorted_vector.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/ucb/XAnyCompareFactory.hpp> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/container/XIndexReplace.hpp> diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index 099eab945a2f..838f258a8947 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -30,6 +30,7 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/odffields.hxx> #include <xmloff/xmlement.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/text/ControlCharacter.hpp> #include <com/sun/star/text/XTextContent.hpp> diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx index c29f45ff5178..cec7788ea1b0 100644 --- a/xmloff/source/text/XMLTextMasterPageContext.cxx +++ b/xmloff/source/text/XMLTextMasterPageContext.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 <com/sun/star/style/XStyle.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/XMultiPropertyStates.hpp> diff --git a/xmloff/source/text/XMLTextNumRuleInfo.cxx b/xmloff/source/text/XMLTextNumRuleInfo.cxx index 841711a46e27..b982d4d6dd4b 100644 --- a/xmloff/source/text/XMLTextNumRuleInfo.cxx +++ b/xmloff/source/text/XMLTextNumRuleInfo.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XIndexReplace.hpp> #include <com/sun/star/style/NumberingType.hpp> +#include <com/sun/star/text/XTextContent.hpp> #include <com/sun/star/container/XNamed.hpp> #include "XMLTextNumRuleInfo.hxx" #include <xmloff/XMLTextListAutoStylePool.hxx> diff --git a/xmloff/source/text/XMLTextShapeImportHelper.cxx b/xmloff/source/text/XMLTextShapeImportHelper.cxx index 89aefdb50a4f..57749b0b74d0 100644 --- a/xmloff/source/text/XMLTextShapeImportHelper.cxx +++ b/xmloff/source/text/XMLTextShapeImportHelper.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> #include <com/sun/star/drawing/XShapes.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <xmloff/XMLTextShapeImportHelper.hxx> diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx index a30177eccf54..558bf80651d1 100644 --- a/xmloff/source/text/XMLTextShapeStyleContext.cxx +++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx @@ -20,6 +20,7 @@ #include <tools/debug.hxx> #include <com/sun/star/document/XEventsSupplier.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/style/XStyle.hpp> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlimp.hxx> diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx index f246d78cd6f6..3ab5f8456801 100644 --- a/xmloff/source/text/txtexppr.cxx +++ b/xmloff/source/text/txtexppr.cxx @@ -21,6 +21,7 @@ #include "txtexppr.hxx" +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/text/SizeType.hpp> #include <com/sun/star/text/WrapTextMode.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index d69ae5bc6e40..ca4cc01901d5 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -35,7 +35,7 @@ #include "XMLTextCharStyleNamesElementExport.hxx" #include <sax/tools/converter.hxx> - +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/text/UserDataPart.hpp> diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 6baf95ee1b18..62dd48c768cb 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -34,6 +34,7 @@ #include <xmloff/xmlement.hxx> #include <XMLStringBufferImportContext.hxx> #include <xmloff/XMLEventsImportContext.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/text/UserDataPart.hpp> #include <com/sun/star/style/NumberingType.hpp> diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index ebdb30ef7f7a..01221de09fbf 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -22,6 +22,7 @@ #include <vector> #include <com/sun/star/container/XEnumerationAccess.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/text/ReferenceFieldSource.hpp> diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index 9e51b647cf98..2de0e5d66a1b 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -26,7 +26,7 @@ #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <tools/diagnose_ex.h> - +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/text/XTextFrame.hpp> #include <com/sun/star/text/XTextCursor.hpp> diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx index 163d1485f4a5..6a2d8e4450ad 100644 --- a/xmloff/source/text/txtstyle.cxx +++ b/xmloff/source/text/txtstyle.cxx @@ -17,7 +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 <com/sun/star/style/ParagraphStyleCategory.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx index a5422a01e4e9..4bf3ba743397 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/document/XEventsSupplier.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/style/ParagraphStyleCategory.hpp> #include <com/sun/star/style/XStyle.hpp> diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index 24d5d8dfebc9..a5cee8919af3 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -31,6 +31,7 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlement.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/text/SetVariableType.hpp> #include <com/sun/star/text/XDependentTextField.hpp> #include <com/sun/star/text/XTextFieldsSupplier.hpp> diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx index 7f56fc1f3f3b..80e80ebd7f2a 100644 --- a/xmloff/source/xforms/xformsapi.cxx +++ b/xmloff/source/xforms/xformsapi.cxx @@ -20,6 +20,7 @@ #include "xformsapi.hxx" +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx index fad78c46a438..f3356c938d07 100644 --- a/xmloff/source/xforms/xformsexport.cxx +++ b/xmloff/source/xforms/xformsexport.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/document/NamedPropertyValues.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/xml/dom/XDocument.hpp> #include <com/sun/star/form/binding/XBindableValue.hpp> #include <com/sun/star/form/binding/XListEntrySink.hpp> diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx index 413facd87652..392793ce4d67 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/awt/LineEndFormat.hpp> #include <com/sun/star/awt/PushButtonType.hpp> #include <com/sun/star/awt/VisualEffect.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/Time.hpp> #include <tools/date.hxx> diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx index 5aa953cd6562..cb3550a3abff 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/awt/LineEndFormat.hpp> #include <com/sun/star/awt/PushButtonType.hpp> #include <com/sun/star/awt/VisualEffect.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/style/VerticalAlignment.hpp> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/Time.hpp> diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx b/xmlsecurity/source/helper/documentsignaturemanager.cxx index a0e674c3bd1b..79d2cdf26b61 100644 --- a/xmlsecurity/source/helper/documentsignaturemanager.cxx +++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/packages/manifest/ManifestReader.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> +#include <com/sun/star/xml/sax/XWriter.hpp> #include <comphelper/base64.hxx> #include <comphelper/storagehelper.hxx> diff --git a/xmlsecurity/source/helper/ooxmlsecexporter.cxx b/xmlsecurity/source/helper/ooxmlsecexporter.cxx index cf87d6e1ad17..6f5f0f6a93b7 100644 --- a/xmlsecurity/source/helper/ooxmlsecexporter.cxx +++ b/xmlsecurity/source/helper/ooxmlsecexporter.cxx @@ -14,6 +14,7 @@ #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/XHierarchicalStorageAccess.hpp> +#include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/beans/StringPair.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> |