diff options
Diffstat (limited to 'reportdesign/source/filter')
23 files changed, 11 insertions, 98 deletions
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 |