diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2020-05-01 23:04:37 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-05-05 09:27:33 +0200 |
| commit | 0db4cc8e0910b7e09787b6f7a7ef3b124a2cbf57 (patch) | |
| tree | d3d7fb6854296b4f01e96f26d22503d06147d2ac | |
| parent | 778a81c114187b193140ebe816eec0805f40b6ab (diff) | |
tdf#42949 Fix IWYU warnings in reportdesign/*/*cxx
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: Ica1a10a8f8fff7c3780adcc30b2c8d0e385b1326
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93307
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
79 files changed, 50 insertions, 423 deletions
diff --git a/reportdesign/IwyuFilter_reportdesign.yaml b/reportdesign/IwyuFilter_reportdesign.yaml index b62ac641b545..14c071aa4e4a 100644 --- a/reportdesign/IwyuFilter_reportdesign.yaml +++ b/reportdesign/IwyuFilter_reportdesign.yaml @@ -4,3 +4,32 @@ blacklist: reportdesign/inc/RptDef.hxx: # Needed for macro define - svx/fmglob.hxx + reportdesign/source/core/api/FormatCondition.cxx: + # Needed for COL_TRANSPARENT in REPORTCONTROLFORMAT_IMPL + - tools/color.hxx + reportdesign/source/core/api/FixedText.cxx: + # Needed for COL_TRANSPARENT in REPORTCONTROLFORMAT_IMPL + - tools/color.hxx + reportdesign/source/core/api/FormattedField.cxx: + # Needed for COL_TRANSPARENT in REPORTCONTROLFORMAT_IMPL + - tools/color.hxx + # Needed for template parameter + - com/sun/star/sdbc/XDataSource.hpp + reportdesign/source/filter/xml/dbloader2.cxx: + # Needed for template parameter + - com/sun/star/embed/XStorage.hpp + reportdesign/source/filter/xml/xmlControlProperty.cxx: + # Needed for rtl::math::round + - rtl/math.hxx + reportdesign/source/ui/inspection/metadata.cxx: + # Actually used + - com/sun/star/inspection/XPropertyHandler.hpp + reportdesign/source/ui/misc/statusbarcontroller.cxx: + # Needed for template parameter + - com/sun/star/awt/XWindow.hpp + reportdesign/source/ui/misc/RptUndo.cxx: + # Actually used + - com/sun/star/report/XSection.hpp + reportdesign/source/ui/report/ReportController.cxx: + # Needed for template parameter + - com/sun/star/ui/dialogs/XFilePicker3.hpp diff --git a/reportdesign/qa/unit/reportdesign-dialogs-test.cxx b/reportdesign/qa/unit/reportdesign-dialogs-test.cxx index 6b3f81a6dd23..aef61b008425 100644 --- a/reportdesign/qa/unit/reportdesign-dialogs-test.cxx +++ b/reportdesign/qa/unit/reportdesign-dialogs-test.cxx @@ -9,9 +9,6 @@ #include <sal/config.h> #include <test/screenshot_test.hxx> -#include <rtl/strbuf.hxx> -#include <osl/file.hxx> -#include <sfx2/app.hxx> #include <vcl/abstdlg.hxx> using namespace ::com::sun::star; diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx index 69703fb5fa49..b868febe7cdc 100644 --- a/reportdesign/source/core/api/FixedLine.cxx +++ b/reportdesign/source/core/api/FixedLine.cxx @@ -17,15 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <FixedLine.hxx> -#include <com/sun/star/beans/PropertyAttribute.hpp> #include <strings.hxx> #include <strings.hrc> #include <core_resource.hxx> #include <cppuhelper/supportsservice.hxx> #include <Tools.hxx> #include <FormatCondition.hxx> -#include <com/sun/star/beans/XPropertyState.hpp> -#include <com/sun/star/text/ParagraphVertAlign.hpp> #include <ReportHelperImpl.hxx> #define MIN_WIDTH 80 diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx index 8a9edda56c89..5beaa5481667 100644 --- a/reportdesign/source/core/api/FixedText.cxx +++ b/reportdesign/source/core/api/FixedText.cxx @@ -17,16 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <FixedText.hxx> -#include <com/sun/star/beans/PropertyAttribute.hpp> #include <strings.hxx> -#include <com/sun/star/beans/XPropertyState.hpp> #include <strings.hrc> #include <core_resource.hxx> #include <Tools.hxx> #include <tools/color.hxx> #include <cppuhelper/supportsservice.hxx> #include <FormatCondition.hxx> -#include <com/sun/star/text/ParagraphVertAlign.hpp> #include <ReportHelperImpl.hxx> namespace reportdesign diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx index eb36f66de549..04558f710ed9 100644 --- a/reportdesign/source/core/api/FormatCondition.cxx +++ b/reportdesign/source/core/api/FormatCondition.cxx @@ -17,13 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <FormatCondition.hxx> -#include <com/sun/star/beans/PropertyAttribute.hpp> #include <strings.hxx> #include <tools/color.hxx> -#include <connectivity/dbtools.hxx> #include <cppuhelper/supportsservice.hxx> -#include <Tools.hxx> -#include <com/sun/star/text/ParagraphVertAlign.hpp> #include <ReportHelperImpl.hxx> namespace reportdesign diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx index 28993e861411..9414e87e6424 100644 --- a/reportdesign/source/core/api/FormattedField.cxx +++ b/reportdesign/source/core/api/FormattedField.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #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> @@ -29,7 +27,6 @@ #include <cppuhelper/supportsservice.hxx> #include <Tools.hxx> #include <FormatCondition.hxx> -#include <com/sun/star/text/ParagraphVertAlign.hpp> #include <ReportHelperImpl.hxx> namespace reportdesign diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx index 182590865ef7..55150a992bf3 100644 --- a/reportdesign/source/core/api/Function.cxx +++ b/reportdesign/source/core/api/Function.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <Function.hxx> -#include <com/sun/star/beans/PropertyAttribute.hpp> #include <strings.hxx> -#include <connectivity/dbtools.hxx> #include <cppuhelper/supportsservice.hxx> -#include <Tools.hxx> namespace reportdesign { diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx index 9c75d7490c86..c7a92f6b6f42 100644 --- a/reportdesign/source/core/api/Functions.cxx +++ b/reportdesign/source/core/api/Functions.cxx @@ -22,7 +22,6 @@ #include <strings.hrc> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/NoSupportException.hpp> -#include <algorithm> namespace reportdesign { diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx index d55e503d8234..5a60997d5bf0 100644 --- a/reportdesign/source/core/api/Group.cxx +++ b/reportdesign/source/core/api/Group.cxx @@ -18,7 +18,6 @@ */ #include <Group.hxx> #include <Section.hxx> -#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/report/GroupOn.hpp> #include <com/sun/star/report/KeepTogether.hpp> diff --git a/reportdesign/source/core/api/Groups.cxx b/reportdesign/source/core/api/Groups.cxx index 96270e5d3f19..9cc410760a3f 100644 --- a/reportdesign/source/core/api/Groups.cxx +++ b/reportdesign/source/core/api/Groups.cxx @@ -22,7 +22,6 @@ #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <core_resource.hxx> #include <strings.hrc> -#include <algorithm> namespace reportdesign { diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx index f0d682bf3a86..7c72b84fb50e 100644 --- a/reportdesign/source/core/api/ImageControl.cxx +++ b/reportdesign/source/core/api/ImageControl.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <ImageControl.hxx> -#include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/beans/XPropertyState.hpp> #include <strings.hxx> #include <strings.hrc> #include <core_resource.hxx> @@ -27,7 +25,6 @@ #include <cppuhelper/supportsservice.hxx> #include <FormatCondition.hxx> #include <com/sun/star/awt/ImageScaleMode.hpp> -#include <com/sun/star/text/ParagraphVertAlign.hpp> #include <ReportHelperImpl.hxx> namespace reportdesign diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx index 6c75433e3349..509d4600504a 100644 --- a/reportdesign/source/core/api/ReportComponent.cxx +++ b/reportdesign/source/core/api/ReportComponent.cxx @@ -18,7 +18,6 @@ */ #include <ReportComponent.hxx> -#include <strings.hxx> #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> #include <vcl/settings.hxx> @@ -27,12 +26,8 @@ #include <com/sun/star/awt/FontWeight.hpp> #include <com/sun/star/awt/FontWidth.hpp> #include <ReportControlModel.hxx> -#include <com/sun/star/reflection/XProxyFactory.hpp> -#include <com/sun/star/text/ParagraphVertAlign.hpp> #include <com/sun/star/i18n/ScriptType.hpp> #include <comphelper/uno3.hxx> -#include <editeng/unolingu.hxx> -#include <unotools/syslocale.hxx> #include <unotools/lingucfg.hxx> #include <i18nlangtag/mslangid.hxx> #include <i18nlangtag/languagetag.hxx> diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index ab6c71fc1670..fb8c4d86feb4 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -23,18 +23,13 @@ #include <ReportDefinition.hxx> -#include <FixedLine.hxx> -#include <FixedText.hxx> -#include <FormattedField.hxx> #include <Functions.hxx> #include <Groups.hxx> -#include <ImageControl.hxx> #include <ReportComponent.hxx> #include <ReportHelperImpl.hxx> #include <RptDef.hxx> #include <RptModel.hxx> #include <Section.hxx> -#include <Shape.hxx> #include <Tools.hxx> #include <UndoEnv.hxx> #include <strings.hrc> @@ -55,20 +50,16 @@ #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/EmbedMapUnits.hpp> -#include <com/sun/star/embed/EntryInitModes.hpp> -#include <com/sun/star/embed/XEmbedPersist.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/embed/StorageFactory.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/io/IOException.hpp> -#include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/report/GroupKeepTogether.hpp> #include <com/sun/star/report/ReportPrintOption.hpp> #include <com/sun/star/sdb/CommandType.hpp> -#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> #include <com/sun/star/style/GraphicLocation.hpp> #include <com/sun/star/style/NumberingType.hpp> #include <com/sun/star/style/PageStyleLayout.hpp> @@ -77,9 +68,7 @@ #include <com/sun/star/table/ShadowFormat.hpp> #include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> -#include <com/sun/star/task/XStatusIndicatorFactory.hpp> #include <com/sun/star/ui/UIConfigurationManager.hpp> -#include <com/sun/star/ui/XUIConfigurationStorage.hpp> #include <com/sun/star/util/CloseVetoException.hpp> #include <com/sun/star/util/NumberFormatsSupplier.hpp> #include <com/sun/star/xml/AttributeData.hpp> @@ -101,7 +90,6 @@ #include <comphelper/storagehelper.hxx> #include <comphelper/uno3.hxx> #include <connectivity/CommonTools.hxx> -#include <connectivity/dbconversion.hxx> #include <connectivity/dbtools.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase.hxx> @@ -118,13 +106,9 @@ #include <svx/unofill.hxx> #include <svx/xmleohlp.hxx> #include <svx/xmlgrhlp.hxx> -#include <tools/debug.hxx> #include <tools/diagnose_ex.h> -#include <unotools/moduleoptions.hxx> #include <unotools/saveopt.hxx> -#include <unotools/streamwrap.hxx> #include <vcl/svapp.hxx> -#include <vcl/virdev.hxx> // page styles #define SC_UNO_PAGE_LEFTBORDER "LeftBorder" diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index f1a61fa8418d..ec92f26af23e 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -18,31 +18,23 @@ */ #include <com/sun/star/beans/PropertyValue.hpp> #include <ReportEngineJFree.hxx> -#include <comphelper/documentconstants.hxx> #include <comphelper/storagehelper.hxx> #include <connectivity/dbtools.hxx> #include <comphelper/mimeconfighelper.hxx> #include <comphelper/string.hxx> #include <cppuhelper/supportsservice.hxx> -#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> -#include <com/sun/star/sdb/XCompletedExecution.hpp> -#include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.hpp> -#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> -#include <com/sun/star/sdb/CommandType.hpp> -#include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/task/XJob.hpp> #include <unotools/useroptions.hxx> #include <unotools/tempfile.hxx> #include <unotools/sharedunocomponent.hxx> -#include <Tools.hxx> #include <strings.hxx> #include <strings.hrc> #include <core_resource.hxx> diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 761ed63e5c67..cc75f83da045 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -18,24 +18,19 @@ */ #include <Section.hxx> #include <comphelper/enumhelper.hxx> -#include <connectivity/dbtools.hxx> +#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> #include <com/sun/star/report/XReportComponent.hpp> #include <com/sun/star/report/ForceNewPage.hpp> -#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/lang/NoSupportException.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <strings.hxx> #include <Tools.hxx> #include <RptModel.hxx> #include <RptPage.hxx> +#include <ReportControlModel.hxx> #include <ReportDefinition.hxx> -#include <Shape.hxx> -#include <svx/unoshape.hxx> #include <vcl/svapp.hxx> -#include <RptObject.hxx> -#include <ReportDrawPage.hxx> namespace reportdesign { diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx index 313d180bc890..daafbd47ff0f 100644 --- a/reportdesign/source/core/api/Shape.cxx +++ b/reportdesign/source/core/api/Shape.cxx @@ -18,12 +18,7 @@ */ #include <Shape.hxx> -#include <com/sun/star/beans/NamedValue.hpp> -#include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/beans/XPropertyState.hpp> -#include <com/sun/star/text/ParagraphVertAlign.hpp> #include <cppuhelper/supportsservice.hxx> -#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <svx/unoshape.hxx> @@ -31,7 +26,6 @@ #include <strings.hrc> #include <core_resource.hxx> #include <Tools.hxx> -#include <RptObject.hxx> #include <FormatCondition.hxx> #include <ReportHelperImpl.hxx> diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx index 4393cb8d5de6..193ae41cb559 100644 --- a/reportdesign/source/core/resource/core_resource.cxx +++ b/reportdesign/source/core/resource/core_resource.cxx @@ -19,15 +19,6 @@ #include <core_resource.hxx> #include <unotools/resmgr.hxx> -// ---- needed as long as we have no contexts for components --- -#include <osl/thread.h> -#include <com/sun/star/util/XMacroExpander.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <rtl/uri.hxx> - -#include <svl/solar.hrc> - OUString RptResId(const char* pId) { return Translate::get(pId, Translate::Create("rpt")); diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx index 09beffed51e2..bf652d01f343 100644 --- a/reportdesign/source/core/sdr/PropertyForward.cxx +++ b/reportdesign/source/core/sdr/PropertyForward.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <PropertyForward.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <comphelper/property.hxx> -#include <com/sun/star/sdbcx/XAppend.hpp> -#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <strings.hxx> diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx index 00027a557a7b..e3053e57fe4c 100644 --- a/reportdesign/source/core/sdr/ReportDrawPage.cxx +++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx @@ -22,13 +22,10 @@ #include <RptDef.hxx> #include <strings.hxx> #include <comphelper/mimeconfighelper.hxx> -#include <comphelper/classids.hxx> #include <comphelper/embeddedobjectcontainer.hxx> -#include <comphelper/documentconstants.hxx> #include <editeng/outlobj.hxx> #include <svx/svdmodel.hxx> -#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <tools/diagnose_ex.h> diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx index dae631f257b6..0a636fa2f93a 100644 --- a/reportdesign/source/core/sdr/RptModel.cxx +++ b/reportdesign/source/core/sdr/RptModel.cxx @@ -20,17 +20,12 @@ #include <RptModel.hxx> #include <RptPage.hxx> #include <dbaccess/dbsubcomponentcontroller.hxx> -#include <unotools/resmgr.hxx> -#include <unotools/pathoptions.hxx> #include <vcl/svapp.hxx> -#include <UndoActions.hxx> #include <UndoEnv.hxx> #include <ReportUndoFactory.hxx> #include <ReportDefinition.hxx> -#include <svx/tbcontrl.hxx> -#include <rptui_slotid.hrc> #include <RptDef.hxx> #include <strings.hxx> #include <FixedLine.hxx> diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index 781d16cb0f34..623758dcf788 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -17,56 +17,36 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <RptObject.hxx> -#include <vector> #include <algorithm> #include <RptDef.hxx> #include <svx/unoshape.hxx> #include <RptModel.hxx> #include <RptObjectListener.hxx> -#include <toolkit/helper/convert.hxx> #include <RptPage.hxx> -#include <dbaccess/dbsubcomponentcontroller.hxx> -#include <strings.hrc> #include <strings.hxx> -#include <svx/xflclit.hxx> -#include <svx/xlnclit.hxx> -#include <svx/xlndsit.hxx> -#include <svx/xlineit0.hxx> -#include <svx/sderitm.hxx> -#include <svx/xlnwtit.hxx> -#include <svx/xlntrit.hxx> #include <svtools/embedhlp.hxx> #include <com/sun/star/style/XStyle.hpp> -#include <com/sun/star/awt/XTabControllerModel.hpp> -#include <com/sun/star/awt/XUnoControlContainer.hpp> -#include <com/sun/star/awt/XVclContainerPeer.hpp> -#include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/TextAlign.hpp> #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> #include <com/sun/star/report/XFixedLine.hpp> #include <com/sun/star/chart/ChartDataRowSource.hpp> #include <com/sun/star/chart2/data/XDataReceiver.hpp> -#include <com/sun/star/chart2/data/DatabaseDataProvider.hpp> +#include <com/sun/star/chart2/data/XDatabaseDataProvider.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/style/VerticalAlignment.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/report/XFormattedField.hpp> +#include <cppuhelper/supportsservice.hxx> +#include <comphelper/namedvaluecollection.hxx> #include <comphelper/property.hxx> +#include <svx/svdundo.hxx> #include <tools/diagnose_ex.h> #include <PropertyForward.hxx> -#include <connectivity/dbtools.hxx> -#include <connectivity/dbconversion.hxx> -#include <UndoActions.hxx> #include <UndoEnv.hxx> -#include <functional> namespace rptui { @@ -76,7 +56,6 @@ using namespace uno; using namespace beans; using namespace reportdesign; using namespace container; -using namespace script; using namespace report; sal_uInt16 OObjectBase::getObjectType(const uno::Reference< report::XReportComponent>& _xComponent) diff --git a/reportdesign/source/core/sdr/RptObjectListener.cxx b/reportdesign/source/core/sdr/RptObjectListener.cxx index 1db0df93a0d4..0cc6a42b2f35 100644 --- a/reportdesign/source/core/sdr/RptObjectListener.cxx +++ b/reportdesign/source/core/sdr/RptObjectListener.cxx @@ -18,7 +18,6 @@ */ #include <RptObjectListener.hxx> #include <RptObject.hxx> -#include <RptDef.hxx> namespace rptui { diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx index 24931fe3286f..128df5c6fd3d 100644 --- a/reportdesign/source/core/sdr/RptPage.cxx +++ b/reportdesign/source/core/sdr/RptPage.cxx @@ -20,7 +20,6 @@ #include <RptModel.hxx> #include <Section.hxx> #include <RptObject.hxx> -#include <svx/unoapi.hxx> #include <svx/unoshape.hxx> #include <ReportDrawPage.hxx> diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index edca93c9e507..84161e92bcb1 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -19,27 +19,15 @@ #include <UndoActions.hxx> #include <UndoEnv.hxx> -#include "formatnormalizer.hxx" -#include <conditionupdater.hxx> -#include <strings.hxx> -#include <rptui_slotid.hrc> -#include <RptDef.hxx> #include <core_resource.hxx> -#include <RptObject.hxx> -#include <RptPage.hxx> #include <strings.hrc> #include <RptModel.hxx> #include <com/sun/star/container/XChild.hpp> -#include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/util/XModifyBroadcaster.hpp> #include <comphelper/types.hxx> -#include <connectivity/dbtools.hxx> #include <tools/diagnose_ex.h> #include <utility> -#include <vcl/svapp.hxx> #include <dbaccess/dbsubcomponentcontroller.hxx> #include <svx/unoshape.hxx> diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index 21e2ad41edf9..c76d36556fd4 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -20,29 +20,22 @@ #include <UndoEnv.hxx> #include "formatnormalizer.hxx" #include <conditionupdater.hxx> -#include <strings.hxx> -#include <rptui_slotid.hrc> -#include <RptDef.hxx> -#include <RptObject.hxx> #include <RptPage.hxx> #include <strings.hrc> #include <RptModel.hxx> #include <com/sun/star/container/XChild.hpp> -#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/beans/theIntrospection.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/beans/XIntrospectionAccess.hpp> #include <com/sun/star/beans/XIntrospection.hpp> -#include <connectivity/dbtools.hxx> #include <svl/hint.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <vcl/svapp.hxx> #include <dbaccess/dbsubcomponentcontroller.hxx> -#include <svx/unoshape.hxx> #include <osl/mutex.hxx> #include <unordered_map> diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index 98fda0bf9490..a2a88806ccb1 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -18,15 +18,13 @@ */ #include "xmlCell.hxx" #include "xmlHelper.hxx" -#include <xmloff/xmluconv.hxx> #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> -#include <xmloff/nmspmap.hxx> +#include <xmloff/prstylei.hxx> +#include <xmloff/xmlstyle.hxx> #include <xmloff/ProgressBarHelper.hxx> #include "xmlEnums.hxx" -#include "xmlStyleImport.hxx" -#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/report/XShape.hpp> #include <com/sun/star/report/XFixedLine.hpp> diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx index a9fbb05a417b..96af38b80091 100644 --- a/reportdesign/source/filter/xml/xmlColumn.cxx +++ b/reportdesign/source/filter/xml/xmlColumn.cxx @@ -22,12 +22,12 @@ #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> -#include <xmloff/nmspmap.hxx> +#include <xmloff/xmlstyle.hxx> +#include <xmloff/prstylei.hxx> #include <xmloff/ProgressBarHelper.hxx> #include <sal/log.hxx> #include "xmlEnums.hxx" #include "xmlCell.hxx" -#include "xmlStyleImport.hxx" #include "xmlTable.hxx" #include <comphelper/genericpropertyset.hxx> #include <comphelper/propertysetinfo.hxx> diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx index 4822a9cc5228..09cd801c9a6d 100644 --- a/reportdesign/source/filter/xml/xmlComponent.cxx +++ b/reportdesign/source/filter/xml/xmlComponent.cxx @@ -20,15 +20,6 @@ #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> -#include <xmloff/xmluconv.hxx> -#include <xmloff/nmspmap.hxx> -#include "xmlEnums.hxx" -#include "xmlHelper.hxx" -#include <strings.hxx> -#include "xmlStyleImport.hxx" -#include <ucbhelper/content.hxx> -#include <com/sun/star/awt/FontDescriptor.hpp> -#include <com/sun/star/beans/PropertyAttribute.hpp> #include <sal/log.hxx> #include <osl/diagnose.h> diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx index 7c3b7967652e..abfe690e6614 100644 --- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx +++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx @@ -20,10 +20,6 @@ #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> -#include <xmloff/nmspmap.hxx> -#include "xmlEnums.hxx" -#include "xmlControlProperty.hxx" -#include "xmlComponent.hxx" #include <strings.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx index f84120f124ee..26e5a095e6d1 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.cxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx @@ -30,10 +30,9 @@ #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> -#include <xmloff/nmspmap.hxx> #include <xmloff/ProgressBarHelper.hxx> #include "xmlEnums.hxx" -#include <tools/datetime.hxx> +#include <tools/date.hxx> #include <unotools/datetime.hxx> #include <com/sun/star/util/DateTime.hpp> #include <rtl/math.hxx> diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 312ef03c5cb8..2d8a9dcc093a 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -20,41 +20,30 @@ #include <memory> #include "xmlExport.hxx" #include "xmlAutoStyle.hxx" -#include <xmloff/ProgressBarHelper.hxx> #include <xmloff/xmltoken.hxx> -#include <xmloff/txtimp.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/nmspmap.hxx> -#include <comphelper/types.hxx> -#include "xmlEnums.hxx" #include <xmloff/txtprmap.hxx> #include <xmloff/numehelp.hxx> #include "xmlHelper.hxx" #include <strings.hxx> #include "xmlPropertyHandler.hxx" -#include <sax/tools/converter.hxx> -#include <com/sun/star/awt/ImagePosition.hpp> #include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/MeasureUnit.hpp> -#include <com/sun/star/style/ParagraphAdjust.hpp> -#include <com/sun/star/awt/TextAlign.hpp> #include <com/sun/star/report/GroupOn.hpp> #include <com/sun/star/report/XFixedText.hpp> #include <com/sun/star/report/XImageControl.hpp> #include <com/sun/star/report/XShape.hpp> -#include <com/sun/star/drawing/XShape.hpp> -#include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/report/XFunction.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> -#include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/table/BorderLineStyle.hpp> #include <com/sun/star/report/XFixedLine.hpp> #include <RptDef.hxx> #include <vcl/svapp.hxx> -#include <sal/macros.h> #include <osl/diagnose.h> +#include <tools/color.hxx> #include <iterator> diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index f8c45e59e08c..ef62c87c6e36 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -20,10 +20,8 @@ #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> -#include <xmloff/nmspmap.hxx> #include <xmloff/ProgressBarHelper.hxx> #include "xmlEnums.hxx" -#include "xmlReportElement.hxx" #include "xmlCell.hxx" #include <strings.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx index e802c9c5c902..e51e5feb4c06 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx @@ -20,14 +20,7 @@ #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> -#include <xmloff/nmspmap.hxx> -#include <xmloff/xmluconv.hxx> -#include "xmlEnums.hxx" #include "xmlHelper.hxx" -#include <com/sun/star/awt/FontDescriptor.hpp> -#include <com/sun/star/beans/PropertyAttribute.hpp> -#include <strings.hxx> -#include "xmlStyleImport.hxx" #include <sal/log.hxx> #include <osl/diagnose.h> diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx index 483dbfb53768..686a892dd512 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.cxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx @@ -20,13 +20,6 @@ #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> -#include <xmloff/nmspmap.hxx> -#include "xmlEnums.hxx" -#include "xmlControlProperty.hxx" -#include "xmlHelper.hxx" -#include <xmloff/xmluconv.hxx> -#include "xmlReportElement.hxx" -#include "xmlComponent.hxx" #include <sal/log.hxx> #include <osl/diagnose.h> diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx index 96455cb2c1dd..5de873d50f9b 100644 --- a/reportdesign/source/filter/xml/xmlFunction.cxx +++ b/reportdesign/source/filter/xml/xmlFunction.cxx @@ -20,10 +20,6 @@ #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> -#include <xmloff/nmspmap.hxx> -#include "xmlHelper.hxx" -#include "xmlEnums.hxx" -#include <strings.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx index 89487dbadfaa..241c074c9366 100644 --- a/reportdesign/source/filter/xml/xmlGroup.cxx +++ b/reportdesign/source/filter/xml/xmlGroup.cxx @@ -22,12 +22,10 @@ #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> -#include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/ProgressBarHelper.hxx> #include "xmlHelper.hxx" #include "xmlEnums.hxx" -#include <ucbhelper/content.hxx> #include <com/sun/star/report/GroupOn.hpp> #include <com/sun/star/report/KeepTogether.hpp> #include <sal/log.hxx> diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx index 01ae9744f446..f4117133674d 100644 --- a/reportdesign/source/filter/xml/xmlHelper.cxx +++ b/reportdesign/source/filter/xml/xmlHelper.cxx @@ -25,20 +25,13 @@ #include <connectivity/dbtools.hxx> #include <comphelper/genericpropertyset.hxx> #include <comphelper/propertysetinfo.hxx> -#include <com/sun/star/style/ParagraphAdjust.hpp> -#include <com/sun/star/awt/TextAlign.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> -#include <com/sun/star/awt/ImagePosition.hpp> #include <com/sun/star/awt/ImageScaleMode.hpp> #include <xmloff/prstylei.hxx> #include <strings.hxx> #include "xmlEnums.hxx" -#include <xmloff/contextid.hxx> -#include <xmloff/txtprmap.hxx> -#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> #include <com/sun/star/table/BorderLine2.hpp> -#include <xmloff/XMLConstantsPropertyHandler.hxx> #include <com/sun/star/report/ForceNewPage.hpp> #include <com/sun/star/report/ReportPrintOption.hpp> #include <com/sun/star/report/KeepTogether.hpp> diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx index b315d5d4dcbb..5c9149288864 100644 --- a/reportdesign/source/filter/xml/xmlImage.cxx +++ b/reportdesign/source/filter/xml/xmlImage.cxx @@ -20,12 +20,7 @@ #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> -#include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> -#include "xmlEnums.hxx" -#include "xmlComponent.hxx" -#include "xmlReportElement.hxx" -#include "xmlControlProperty.hxx" #include "xmlHelper.hxx" #include <unotools/pathoptions.hxx> #include <sal/log.hxx> diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index 17310b206e20..b4533aa337cb 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -20,14 +20,13 @@ #include <memory> #include "xmlImportDocumentHandler.hxx" #include <com/sun/star/sdb/CommandType.hpp> -#include <com/sun/star/chart2/data/DatabaseDataProvider.hpp> +#include <com/sun/star/chart2/data/XDatabaseDataProvider.hpp> #include <com/sun/star/chart2/data/XDataReceiver.hpp> #include <com/sun/star/chart2/data/XDataSource.hpp> #include <com/sun/star/chart/XComplexDescriptionAccess.hpp> #include <com/sun/star/chart/ChartDataRowSource.hpp> #include <com/sun/star/reflection/ProxyFactory.hpp> #include <comphelper/sequenceashashmap.hxx> -#include <comphelper/documentconstants.hxx> #include <comphelper/namedvaluecollection.hxx> #include <cppuhelper/supportsservice.hxx> #include <xmloff/attrlist.hxx> @@ -41,8 +40,6 @@ #include "xmlEnums.hxx" #include "xmlExportDocumentHandler.hxx" -#include <connectivity/dbtools.hxx> - namespace rptxml { using namespace ::com::sun::star; diff --git a/reportdesign/source/filter/xml/xmlMasterFields.cxx b/reportdesign/source/filter/xml/xmlMasterFields.cxx index bfa88e4ee7d1..c42f2879931a 100644 --- a/reportdesign/source/filter/xml/xmlMasterFields.cxx +++ b/reportdesign/source/filter/xml/xmlMasterFields.cxx @@ -17,13 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include "xmlMasterFields.hxx" +#include "xmlReportElementBase.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> -#include <xmloff/nmspmap.hxx> #include <xmloff/ProgressBarHelper.hxx> #include "xmlEnums.hxx" -#include "xmlReport.hxx" #include <sal/log.hxx> diff --git a/reportdesign/source/filter/xml/xmlPropertyHandler.cxx b/reportdesign/source/filter/xml/xmlPropertyHandler.cxx index c96da30a10e9..3c49c39fa674 100644 --- a/reportdesign/source/filter/xml/xmlPropertyHandler.cxx +++ b/reportdesign/source/filter/xml/xmlPropertyHandler.cxx @@ -18,10 +18,7 @@ */ #include "xmlPropertyHandler.hxx" -#include "xmlfilter.hxx" -#include <xmloff/xmltoken.hxx> #include <xmloff/txtimp.hxx> -#include <xmloff/nmspmap.hxx> namespace rptxml @@ -29,7 +26,6 @@ namespace rptxml using namespace ::com::sun::star; using namespace xmloff; - using namespace ::com::sun::star::report; using namespace ::com::sun::star::uno; OXMLRptPropHdlFactory::OXMLRptPropHdlFactory() diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx index eff07eca1803..4b790b32632b 100644 --- a/reportdesign/source/filter/xml/xmlReport.cxx +++ b/reportdesign/source/filter/xml/xmlReport.cxx @@ -20,7 +20,6 @@ #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> -#include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/ProgressBarHelper.hxx> #include "xmlHelper.hxx" diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx index a6c22902852a..28bad6fd21ed 100644 --- a/reportdesign/source/filter/xml/xmlReportElement.cxx +++ b/reportdesign/source/filter/xml/xmlReportElement.cxx @@ -20,7 +20,6 @@ #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> -#include <xmloff/nmspmap.hxx> #include <xmloff/ProgressBarHelper.hxx> #include "xmlEnums.hxx" #include "xmlComponent.hxx" diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx index 49a38f51cfc8..57bfbd12474f 100644 --- a/reportdesign/source/filter/xml/xmlSection.cxx +++ b/reportdesign/source/filter/xml/xmlSection.cxx @@ -20,16 +20,9 @@ #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> -#include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> #include "xmlHelper.hxx" -#include "xmlEnums.hxx" -#include "xmlColumn.hxx" -#include "xmlCondPrtExpr.hxx" -#include "xmlStyleImport.hxx" -#include <connectivity/dbtools.hxx> #include <com/sun/star/report/ReportPrintOption.hpp> -#include <strings.hxx> #include "xmlTable.hxx" #include <sal/log.hxx> #include <osl/diagnose.h> diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx index b30a67cf2b43..edb20e072bfc 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.cxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx @@ -19,7 +19,6 @@ #include "xmlStyleImport.hxx" #include <xmloff/maptype.hxx> #include <xmloff/nmspmap.hxx> -#include <xmloff/xmlnmspe.hxx> #include <xmloff/xmlimppr.hxx> #include <xmloff/txtimppr.hxx> #include <xmloff/families.hxx> @@ -27,7 +26,6 @@ #include <xmloff/xmltoken.hxx> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <xmloff/xmlprcon.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/XMLGraphicsDefaultStyle.hxx> #include "xmlfilter.hxx" diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx index 89f2527d0e81..144bca623d68 100644 --- a/reportdesign/source/filter/xml/xmlSubDocument.cxx +++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx @@ -21,7 +21,6 @@ #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> -#include <xmloff/nmspmap.hxx> #include <xmloff/ProgressBarHelper.hxx> #include "xmlEnums.hxx" #include "xmlMasterFields.hxx" diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx index 460f4b4e8282..591e26fe4215 100644 --- a/reportdesign/source/filter/xml/xmlTable.cxx +++ b/reportdesign/source/filter/xml/xmlTable.cxx @@ -21,7 +21,8 @@ #include <o3tl/safeint.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> -#include <xmloff/nmspmap.hxx> +#include <xmloff/xmlstyle.hxx> +#include <xmloff/prstylei.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/ProgressBarHelper.hxx> #include <RptDef.hxx> @@ -30,9 +31,7 @@ #include "xmlColumn.hxx" #include <com/sun/star/report/ForceNewPage.hpp> #include "xmlCondPrtExpr.hxx" -#include "xmlStyleImport.hxx" #include <strings.hxx> -#include <connectivity/dbtools.hxx> #include <com/sun/star/report/XShape.hpp> #include <com/sun/star/report/XFixedLine.hpp> #include <sal/log.hxx> diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 09ad670a3570..4f32ed1aa403 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -24,14 +24,12 @@ #include <com/sun/star/packages/zip/ZipIOException.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/beans/NamedValue.hpp> -#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> #include <com/sun/star/util/MeasureUnit.hpp> #include <com/sun/star/xml/sax/Parser.hpp> #include <com/sun/star/xml/sax/SAXParseException.hpp> -#include <com/sun/star/document/GraphicStorageHandler.hpp> +#include <com/sun/star/document/XGraphicStorageHandler.hpp> #include <com/sun/star/document/XEmbeddedObjectResolver.hpp> #include "xmlfilter.hxx" -#include "xmlGroup.hxx" #include "xmlReport.hxx" #include <vcl/errinf.hxx> #include "xmlHelper.hxx" @@ -54,18 +52,15 @@ #include <xmloff/XMLTextMasterStylesContext.hxx> #include <sfx2/docfile.hxx> #include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/uno/XNamingService.hpp> #include <xmloff/DocumentSettingsContext.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlmetai.hxx> #include <tools/diagnose_ex.h> -#include <com/sun/star/util/XModifiable.hpp> #include <svtools/sfxecode.hxx> #include "xmlEnums.hxx" #include "xmlStyleImport.hxx" #include <strings.hxx> #include "xmlPropertyHandler.hxx" -#include <xmloff/txtprmap.hxx> #include <ReportDefinition.hxx> namespace rptxml diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 72cfb01f1c30..790c0d700316 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -18,19 +18,12 @@ */ #include <AddField.hxx> #include <UITools.hxx> -#include <svx/svdpagv.hxx> #include <com/sun/star/sdb/CommandType.hpp> -#include <com/sun/star/util/URL.hpp> #include <com/sun/star/sdb/XDocumentDataSource.hpp> -#include <com/sun/star/i18n/XCollator.hpp> -#include <com/sun/star/beans/XPropertyChangeListener.hpp> -#include <vcl/event.hxx> #include <vcl/svapp.hxx> -#include <vcl/settings.hxx> #include <tools/diagnose_ex.h> -#include <rptui_slotid.hrc> #include <connectivity/dbtools.hxx> #include <core_resource.hxx> @@ -38,8 +31,6 @@ #include <strings.hrc> #include <strings.hxx> -#include <comphelper/processfactory.hxx> -#include <comphelper/property.hxx> #include <comphelper/sequence.hxx> namespace rptui diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index b15e6ae3fc64..f869ca0f50a7 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -21,20 +21,14 @@ #include <strings.hxx> #include <strings.hrc> -#include <rptui_slotid.hrc> #include <core_resource.hxx> -#include <UITools.hxx> #include <ReportController.hxx> #include "Condition.hxx" -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <o3tl/safeint.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <vcl/settings.hxx> - -#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <comphelper/property.hxx> diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 129ee1c7a6f3..9f7b8bbd5ccd 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -23,30 +23,15 @@ #include <core_resource.hxx> #include <strings.hrc> #include <ReportController.hxx> -#include <ColorChanger.hxx> #include <reportformula.hxx> -#include <com/sun/star/util/URL.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/ui/XUIConfigurationManager.hpp> -#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> -#include <com/sun/star/ui/XImageManager.hpp> -#include <com/sun/star/awt/FontDescriptor.hpp> -#include <com/sun/star/ui/ImageType.hpp> #include <svx/PaletteManager.hxx> -#include <svx/tbcontrl.hxx> #include <svx/svxids.hrc> -#include <svx/xtable.hxx> -#include <svx/tbxcolorupdate.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <unotools/pathoptions.hxx> #include <vcl/svapp.hxx> -#include <vcl/bitmapaccess.hxx> #include <vcl/settings.hxx> #include <tools/diagnose_ex.h> -#include <rtl/ustrbuf.hxx> -#include <svtools/valueset.hxx> namespace rptui { diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index 30cf2aa96eac..9e5a91bbea64 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -23,15 +23,10 @@ #include <unotools/syslocale.hxx> #include <i18nlangtag/languagetag.hxx> #include <vcl/svapp.hxx> -#include <UITools.hxx> -#include <RptDef.hxx> #include <strings.hxx> #include <ReportController.hxx> -#include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/XNumberFormatPreviewer.hpp> -#include <com/sun/star/util/XNumberFormatTypes.hpp> -#include <com/sun/star/i18n/NumberFormatIndex.hpp> #include <algorithm> namespace rptui diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 8d391e92072e..3bdcb2e5b5a0 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/svapp.hxx> -#include <vcl/mnemonic.hxx> -#include <unotools/charclass.hxx> #include <unotools/viewoptions.hxx> #include <formula/formdata.hxx> #include <formula/funcutl.hxx> diff --git a/reportdesign/source/ui/dlg/GroupExchange.cxx b/reportdesign/source/ui/dlg/GroupExchange.cxx index 3465bcdd971f..44e9fa0a354d 100644 --- a/reportdesign/source/ui/dlg/GroupExchange.cxx +++ b/reportdesign/source/ui/dlg/GroupExchange.cxx @@ -18,7 +18,6 @@ */ #include "GroupExchange.hxx" #include <sot/formats.hxx> -#include <sot/storage.hxx> #include <osl/diagnose.h> namespace rptui diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 5d4bfca8a140..69ff9786cc3b 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <GroupsSorting.hxx> -#include <connectivity/dbtools.hxx> -#include <sot/exchange.hxx> #include <svtools/editbrowsebox.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <com/sun/star/beans/XPropertySet.hpp> @@ -38,15 +36,11 @@ #include <ColumnInfo.hxx> #include <cppuhelper/implbase.hxx> -#include <comphelper/property.hxx> #include <vcl/commandevent.hxx> -#include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <algorithm> -#include <cppuhelper/bootstrap.hxx> - #define HANDLE_ID 0 #define FIELD_EXPRESSION 1 #define GROUPS_START_LEN 5 diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 187b8be7d408..d8f1323ac5b5 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -23,9 +23,7 @@ #include <bitmaps.hlst> #include <ReportController.hxx> #include <UITools.hxx> -#include <RptUndo.hxx> #include <reportformula.hxx> -#include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/report/XReportDefinition.hpp> #include <com/sun/star/report/XFixedText.hpp> #include <com/sun/star/report/XFixedLine.hpp> @@ -42,14 +40,12 @@ #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <vcl/commandevent.hxx> -#include <svl/solar.hrc> #include <ReportVisitor.hxx> #include <core_resource.hxx> #include <rtl/ref.hxx> #include <svx/svxids.hrc> #include <memory> -#include <algorithm> namespace rptui { diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx index f7768e9993b4..2d18077ab569 100644 --- a/reportdesign/source/ui/dlg/PageNumber.cxx +++ b/reportdesign/source/ui/dlg/PageNumber.cxx @@ -17,16 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <PageNumber.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> #include <rptui_slotid.hrc> #include <RptDef.hxx> -#include <vcl/settings.hxx> -#include <UITools.hxx> #include <strings.hxx> #include <ReportController.hxx> #include <comphelper/propertysequence.hxx> -#include <algorithm> namespace rptui { diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index 9a8d3710dba0..1cc0b4db7a4f 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -19,15 +19,9 @@ #include <svx/dialogs.hrc> -#include <svx/svxids.hrc> -#include <svx/flagsdef.hxx> -#include <svx/svxdlg.hxx> -#include <editeng/svxenum.hxx> +#include <sfx2/sfxdlg.hxx> #include <dlgpage.hxx> -#include <strings.hrc> -#include <svl/intitem.hxx> #include <svl/cjkoptions.hxx> -#include <svl/aeitem.hxx> #include <osl/diagnose.h> namespace rptui diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 52677c9a79f7..a41703aaf4c2 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -17,25 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <DataProviderHandler.hxx> -#include <com/sun/star/lang/XInitialization.hpp> #include <comphelper/namedvaluecollection.hxx> -#include <comphelper/property.hxx> #include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <comphelper/propertysequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <strings.hxx> -#include <unotools/syslocale.hxx> #include <com/sun/star/form/inspection/FormComponentPropertyHandler.hpp> #include <com/sun/star/inspection/PropertyControlType.hpp> #include <com/sun/star/inspection/PropertyLineElement.hpp> #include <com/sun/star/lang/NullPointerException.hpp> #include <com/sun/star/chart/ChartDataRowSource.hpp> #include <com/sun/star/chart2/FormattedString.hpp> -#include <com/sun/star/chart2/XDiagram.hpp> -#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> -#include <com/sun/star/chart2/XChartTypeContainer.hpp> -#include <com/sun/star/chart2/XChartType.hpp> #include <com/sun/star/chart2/XTitled.hpp> #include <com/sun/star/chart2/XTitle.hpp> #include <com/sun/star/chart2/data/XDataReceiver.hpp> @@ -43,10 +36,7 @@ #include <com/sun/star/report/XReportDefinition.hpp> #include <com/sun/star/script/Converter.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/util/MeasureUnit.hpp> -#include <tools/fldunit.hxx> #include <metadata.hxx> -#include <vcl/svapp.hxx> #include <osl/mutex.hxx> #include <core_resource.hxx> #include <helpids.h> diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index f03277fdd555..e7346e4c3603 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -23,7 +23,6 @@ #include <core_resource.hxx> #include <helpids.h> #include <cppuhelper/supportsservice.hxx> -#include <rtl/ustrbuf.hxx> #include <tools/debug.hxx> #include <metadata.hxx> #include <tools/urlobj.hxx> diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 71b88359b66b..d5b9748e25c6 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -35,7 +35,6 @@ #include <i18nutil/searchopt.hxx> #include <unotools/textsearch.hxx> -#include <unotools/configmgr.hxx> #include <unotools/localedatawrapper.hxx> #include <toolkit/helper/vclunohelper.hxx> @@ -43,7 +42,6 @@ #include <tools/diagnose_ex.h> #include <tools/resary.hxx> #include <com/sun/star/lang/NullPointerException.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/form/inspection/FormComponentPropertyHandler.hpp> #include <com/sun/star/inspection/StringRepresentation.hpp> #include <com/sun/star/inspection/PropertyControlType.hpp> @@ -67,8 +65,8 @@ #include <com/sun/star/style/ParagraphAdjust.hpp> #include <tools/fldunit.hxx> -#include <vcl/stdtext.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld.hxx> #include <core_resource.hxx> #include <stringarray.hrc> @@ -77,32 +75,11 @@ #include <UITools.hxx> #include <connectivity/dbexception.hxx> -#include <connectivity/dbconversion.hxx> #include <connectivity/dbtools.hxx> #include <metadata.hxx> -#include <svl/itempool.hxx> -#include <svl/itemset.hxx> -#include <svx/xdef.hxx> -#include <svx/xpool.hxx> -#include <svx/xtable.hxx> -#include <svx/xlnwtit.hxx> -#include <svx/xlntrit.hxx> -#include <svx/xlnclit.hxx> -#include <svx/xlnstit.hxx> -#include <svx/xlnedit.hxx> -#include <svx/xlnstwit.hxx> -#include <svx/xlnedwit.hxx> -#include <svx/xlnstcit.hxx> -#include <svx/xlnedcit.hxx> -#include <svx/xlndsit.hxx> -#include <svx/xlineit0.hxx> -#include <svx/svxids.hrc> -#include <svx/drawitem.hxx> -#include <editeng/brushitem.hxx> #include <sfx2/docfilt.hxx> -#include <dlgpage.hxx> #include <helpids.h> #include <toolkit/helper/convert.hxx> #include <o3tl/functional.hxx> diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx index 9ebc6f01b789..ece8e8d23865 100644 --- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx +++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx @@ -19,15 +19,10 @@ #include <ReportComponentHandler.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/NullPointerException.hpp> -#include <com/sun/star/lang/XInitialization.hpp> -#include <strings.hxx> #include <comphelper/types.hxx> #include <cppuhelper/supportsservice.hxx> -#include <unotools/syslocale.hxx> #include <com/sun/star/form/inspection/FormComponentPropertyHandler.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/util/MeasureUnit.hpp> -#include <tools/fldunit.hxx> #include <metadata.hxx> diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index ce4ba4c4c950..5ac23ff0c4e2 100644 --- a/reportdesign/source/ui/misc/RptUndo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -33,7 +33,6 @@ #include <svx/unoshape.hxx> #include <utility> #include <tools/diagnose_ex.h> -#include <vcl/settings.hxx> #include <functional> diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 00c1d33c8a74..940250a6fc63 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -41,8 +41,6 @@ #include <svx/svdpool.hxx> #include <editeng/charscaleitem.hxx> -#include <svx/algitem.hxx> -#include <svx/svdpagv.hxx> #include <editeng/brushitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/emphasismarkitem.hxx> @@ -72,15 +70,12 @@ #include <svx/xgrscit.hxx> #include <svx/svditer.hxx> #include <svx/xtable.hxx> -#include <svx/dialogs.hrc> #include <svx/svdview.hxx> #include <svx/svdpage.hxx> #include <svx/svxdlg.hxx> -#include <svx/unomid.hxx> #include <svx/unoprov.hxx> #include <svx/svxids.hrc> -#include <unotools/pathoptions.hxx> #include <unotools/charclass.hxx> #include <svtools/ctrltool.hxx> #include <svl/itempool.hxx> @@ -91,17 +86,14 @@ #include <comphelper/namedvaluecollection.hxx> #include <connectivity/dbexception.hxx> -#include <connectivity/dbconversion.hxx> #include <connectivity/dbtools.hxx> -#include <com/sun/star/awt/TextAlign.hpp> #include <com/sun/star/style/VerticalAlignment.hpp> #include <com/sun/star/report/XShape.hpp> #include <com/sun/star/sdb/XParametersSupplier.hpp> #include <com/sun/star/sdb/SQLContext.hpp> #include <i18nlangtag/languagetag.hxx> #include <dlgpage.hxx> -#include <rptui_slotid.hrc> #include <strings.hxx> #include <core_resource.hxx> #include <RptObject.hxx> diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index dbec63a37101..9cca16c45616 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -20,18 +20,15 @@ #include <DesignView.hxx> #include <ReportController.hxx> #include <svtools/acceleratorexecute.hxx> -#include <unotools/syslocale.hxx> #include <unotools/viewoptions.hxx> #include <RptDef.hxx> #include <UITools.hxx> #include <RptObject.hxx> #include <propbrw.hxx> -#include <toolkit/helper/convert.hxx> #include <helpids.h> #include <SectionView.hxx> #include <ReportSection.hxx> #include <rptui_slotid.hrc> -#include <svx/svxids.hrc> #include <AddField.hxx> #include <ScrollHelper.hxx> #include <Navigator.hxx> diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx index 75d59b8cfea7..92894cfcb3eb 100644 --- a/reportdesign/source/ui/report/FixedTextColor.cxx +++ b/reportdesign/source/ui/report/FixedTextColor.cxx @@ -25,19 +25,12 @@ #include <RptObject.hxx> #include <RptModel.hxx> #include <RptPage.hxx> -#include <ViewsWindow.hxx> #include <ReportSection.hxx> #include <ReportController.hxx> #include <strings.hxx> -#include <reportformula.hxx> -#include <toolkit/helper/property.hxx> #include <tools/color.hxx> -#include <svtools/extcolorcfg.hxx> -#include <unotools/confignode.hxx> -// DBG_* -#include <tools/debug.hxx> // DBG_UNHANDLED_EXCEPTION #include <tools/diagnose_ex.h> diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx index 329b57014b53..6ebc21915ccd 100644 --- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx +++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx @@ -26,18 +26,13 @@ #include <RptObject.hxx> #include <RptModel.hxx> #include <RptPage.hxx> -#include <ViewsWindow.hxx> #include <ReportSection.hxx> #include <ReportController.hxx> #include <strings.hxx> #include <reportformula.hxx> -#include <toolkit/helper/property.hxx> #include <svtools/extcolorcfg.hxx> -#include <unotools/confignode.hxx> -// DBG_* -#include <tools/debug.hxx> // DBG_UNHANDLED_EXCEPTION #include <tools/diagnose_ex.h> diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index d723bfe70890..3bf9e9e072f7 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -32,55 +32,43 @@ #include <comphelper/documentconstants.hxx> #include <unotools/mediadescriptor.hxx> -#include <comphelper/property.hxx> #include <comphelper/propertysequence.hxx> #include <comphelper/sequenceashashmap.hxx> #include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> -#include <com/sun/star/view/PaperFormat.hpp> -#include <com/sun/star/style/GraphicLocation.hpp> #include <com/sun/star/style/XStyle.hpp> -#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> -#include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> -#include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/container/XChild.hpp> -#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/report/XImageControl.hpp> #include <com/sun/star/report/XFixedLine.hpp> #include <com/sun/star/report/Function.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> -#include <com/sun/star/sdb/XDocumentDataSource.hpp> #include <com/sun/star/sdb/XParametersSupplier.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> -#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> -#include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/EmbedMapUnits.hpp> #include <com/sun/star/awt/FontWeight.hpp> #include <com/sun/star/awt/FontUnderline.hpp> -#include <com/sun/star/awt/TextAlign.hpp> #include <com/sun/star/awt/FontSlant.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/status/FontHeight.hpp> #include <com/sun/star/report/ReportEngine.hpp> #include <com/sun/star/report/XFormattedField.hpp> #include <com/sun/star/sdb/SQLContext.hpp> -#include <com/sun/star/sdbc/SQLWarning.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/document/XUndoManagerSupplier.hpp> #include <vcl/svapp.hxx> +#include <i18nutil/paper.hxx> #include <svx/fmview.hxx> -#include <editeng/paperinf.hxx> #include <editeng/memberids.h> #include <svx/svxids.hrc> #include <svx/svdobj.hxx> @@ -114,8 +102,6 @@ #include <svx/flagsdef.hxx> #include <svx/svdpagv.hxx> #include <svx/svxdlg.hxx> -#include <svx/zoom_def.hxx> -#include <svx/dialogs.hrc> #include <core_resource.hxx> #include <DesignView.hxx> @@ -131,7 +117,6 @@ #include <svl/itempool.hxx> #include <svl/itemset.hxx> -#include <svl/aeitem.hxx> #include <svtools/cliplistener.hxx> #include <unotools/syslocale.hxx> #include <unotools/viewoptions.hxx> diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index d379c859d09b..79afb9c042a1 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -27,13 +27,8 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -#include <com/sun/star/awt/FontSlant.hpp> #include <FormattedFieldBeautifier.hxx> -#include <svx/unopage.hxx> - -// DBG_* -#include <tools/debug.hxx> // DBG_UNHANDLED_EXCEPTION #include <tools/diagnose_ex.h> diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 7482b51925b7..4f7eba282e59 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -39,10 +39,6 @@ #include <svx/dbaexchange.hxx> #include <svx/sdtagitm.hxx> -#include <vcl/svapp.hxx> -#include <vcl/settings.hxx> - -#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/frame/XPopupMenuController.hpp> #include <comphelper/propertyvalue.hxx> #include <toolkit/awt/vclxmenu.hxx> @@ -51,18 +47,12 @@ #include <SectionWindow.hxx> #include <helpids.h> #include <dlgedclip.hxx> -#include <UndoActions.hxx> #include <rptui_slotid.hrc> -#include <connectivity/dbtools.hxx> - #include <vcl/commandevent.hxx> -#include <vcl/lineinfo.hxx> -#include <ColorChanger.hxx> #include <svl/itempool.hxx> #include <svtools/extcolorcfg.hxx> -#include <unotools/confignode.hxx> namespace rptui diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index c96498f54b37..b0b6197015d7 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -23,21 +23,14 @@ #include <DesignView.hxx> #include <UITools.hxx> -#include <svtools/colorcfg.hxx> -#include <svl/itempool.hxx> #include <unotools/syslocale.hxx> #include <unotools/localedatawrapper.hxx> #include <vcl/settings.hxx> #include <RptDef.hxx> -#include <dlgedfunc.hxx> -#include <RptModel.hxx> #include <strings.hxx> -#include <RptPage.hxx> #include <ReportController.hxx> -#include <EndMarker.hxx> -#include <ColorChanger.hxx> #include <ScrollHelper.hxx> #include <helpids.h> diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx index 305da63c38f4..0f64f0ac1b8d 100644 --- a/reportdesign/source/ui/report/ScrollHelper.cxx +++ b/reportdesign/source/ui/report/ScrollHelper.cxx @@ -22,7 +22,6 @@ #include <ReportWindow.hxx> #include <UITools.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> -#include <toolkit/helper/convert.hxx> #include <vcl/commandevent.hxx> #include <vcl/settings.hxx> diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx index 2d35fb1e74aa..3b5694c997dd 100644 --- a/reportdesign/source/ui/report/SectionView.cxx +++ b/reportdesign/source/ui/report/SectionView.cxx @@ -21,13 +21,10 @@ #include <RptPage.hxx> #include <RptObject.hxx> #include <RptDef.hxx> -#include <svx/svxids.hrc> #include <svx/svddrgmt.hxx> -#include <vcl/scrbar.hxx> #include <ReportSection.hxx> #include <ReportWindow.hxx> #include <strings.hxx> -#include <tools/debug.hxx> #include <tools/diagnose_ex.h> namespace rptui diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index be589d307bc8..627490e62f53 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -19,10 +19,7 @@ #include <SectionWindow.hxx> #include <ReportWindow.hxx> #include <UITools.hxx> -#include <rptui_slotid.hrc> #include <ReportController.hxx> -#include <SectionView.hxx> -#include <RptDef.hxx> #include <ReportSection.hxx> #include <DesignView.hxx> #include <strings.hxx> @@ -32,14 +29,11 @@ #include <EndMarker.hxx> #include <ViewsWindow.hxx> -#include <svtools/colorcfg.hxx> #include <functional> #include <algorithm> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -#include <connectivity/dbtools.hxx> - namespace rptui { using namespace ::com::sun::star; diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index e4c82dd07a91..51204671ba5f 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -32,11 +32,9 @@ #include <strings.hxx> #include <rptui_slotid.hrc> #include <dlgedclip.hxx> -#include <ColorChanger.hxx> #include <RptObject.hxx> #include <EndMarker.hxx> #include <sal/log.hxx> -#include <svx/svdpagv.hxx> #include <svx/unoshape.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx index 03e54fa6910c..1f36563fe874 100644 --- a/reportdesign/source/ui/report/dlgedclip.cxx +++ b/reportdesign/source/ui/report/dlgedclip.cxx @@ -19,8 +19,6 @@ #include <dlgedclip.hxx> #include <osl/diagnose.h> #include <sot/exchange.hxx> -#include <com/sun/star/datatransfer/XMimeContentType.hpp> -#include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp> namespace rptui { diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx index 22af5dfb1f33..a0db6c64bc5d 100644 --- a/reportdesign/source/ui/report/dlgedfac.cxx +++ b/reportdesign/source/ui/report/dlgedfac.cxx @@ -20,12 +20,8 @@ #include <strings.hxx> #include <RptObject.hxx> #include <RptDef.hxx> -#include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/awt/ScrollBarOrientation.hpp> -#include <svx/svdoole2.hxx> + namespace rptui { using namespace ::com::sun::star; diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 3eaa42d6ab5b..1753205cdb29 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <vcl/scrbar.hxx> -#include <vcl/svapp.hxx> #include <vcl/seleng.hxx> #include <vcl/ptrstyle.hxx> #include <com/sun/star/embed/EmbedStates.hpp> @@ -26,11 +25,7 @@ #include <svx/svdview.hxx> #include <svx/svdpagv.hxx> -#include <editeng/outlobj.hxx> -#include <editeng/unolingu.hxx> #include <svx/svdetc.hxx> -#include <editeng/editstat.hxx> -#include <svx/svdoutl.hxx> #include <svx/svddrgmt.hxx> #include <svx/svdoashp.hxx> #include <svx/svxids.hrc> diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 3afeb3bb904a..3a9c00f1ee80 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -23,22 +23,16 @@ #include <cppuhelper/component_context.hxx> #include <strings.hrc> #include <rptui_slotid.hrc> -#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <com/sun/star/awt/XLayoutConstrains.hpp> -#include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/Frame.hpp> #include <com/sun/star/inspection/ObjectInspector.hpp> #include <com/sun/star/inspection/DefaultHelpProvider.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/report/inspection/DefaultComponentInspectorModel.hpp> -#include <svx/svxids.hrc> #include <vcl/stdtext.hxx> #include <vcl/weld.hxx> -#include <svx/svdview.hxx> -#include <svx/svdogrp.hxx> -#include <svx/svdpage.hxx> #include <svx/svditer.hxx> #include <toolkit/helper/vclunohelper.hxx> |