diff options
Diffstat (limited to 'xmloff/source')
255 files changed, 296 insertions, 1704 deletions
diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx index 79a59ab6910f..8ba1d5a6a510 100644 --- a/xmloff/source/chart/PropertyMap.hxx +++ b/xmloff/source/chart/PropertyMap.hxx @@ -28,7 +28,7 @@ #define _PROPERTYMAP_HXX_ #include <xmloff/maptype.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmltypes.hxx> #include <xmloff/contextid.hxx> diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx index f66fd3fd8561..ff3a9a08379b 100755 --- a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx +++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx @@ -32,7 +32,7 @@ #include <com/sun/star/util/DateTime.hpp> #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index e9e3771eb0d7..9df601407199 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -40,7 +40,7 @@ #include <tools/debug.hxx> // header for class ByteString #include <tools/string.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlement.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index e6f6fc6d9340..358cb023199c 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -42,7 +42,7 @@ #include <sot/clsids.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/families.hxx> #include <xmloff/xmlaustp.hxx> diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx index 587070202c9c..338b9c23a004 100644 --- a/xmloff/source/chart/SchXMLImport.cxx +++ b/xmloff/source/chart/SchXMLImport.cxx @@ -39,7 +39,7 @@ // header for class ByteString #include <tools/string.hxx> #include <comphelper/processfactory.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/chart/SchXMLParagraphContext.cxx b/xmloff/source/chart/SchXMLParagraphContext.cxx index 972bc9016d4f..bcd201153b7f 100644 --- a/xmloff/source/chart/SchXMLParagraphContext.cxx +++ b/xmloff/source/chart/SchXMLParagraphContext.cxx @@ -31,7 +31,7 @@ #include "SchXMLImport.hxx" #include "SchXMLParagraphContext.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index 9b6731f78da3..ef1544b4a280 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -38,7 +38,7 @@ #endif #include <comphelper/processfactory.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlement.hxx> #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index 86e9693ee225..b3b322568ea6 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -52,7 +52,7 @@ // header for define DBG_ERROR1 #include <tools/debug.hxx> #include <rtl/ustrbuf.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlimp.hxx> #ifndef _XMLOFF_NMSPMAP_HX #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx index bc1b50a908a2..cc01a7d1c050 100644 --- a/xmloff/source/chart/SchXMLTableContext.cxx +++ b/xmloff/source/chart/SchXMLTableContext.cxx @@ -37,7 +37,7 @@ #include "XMLStringBufferImportContext.hxx" #include <tools/debug.hxx> #include <rtl/math.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/chart/SchXMLTextListContext.cxx b/xmloff/source/chart/SchXMLTextListContext.cxx index 884acb473108..5a4dd73f03e6 100755 --- a/xmloff/source/chart/SchXMLTextListContext.cxx +++ b/xmloff/source/chart/SchXMLTextListContext.cxx @@ -32,7 +32,7 @@ #include "SchXMLTextListContext.hxx" #include "SchXMLParagraphContext.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index b2a90e534771..674a8ba3accb 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -49,7 +49,7 @@ // header for class XMLPropertySetMapper #include <xmloff/xmlprmap.hxx> #include <xmloff/xmlexp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlmetai.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx index 87adea123ab4..f97a9da192f0 100644 --- a/xmloff/source/chart/XMLChartStyleContext.cxx +++ b/xmloff/source/chart/XMLChartStyleContext.cxx @@ -29,7 +29,7 @@ #include "precompiled_xmloff.hxx" #include "XMLChartStyleContext.hxx" #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlnumfi.hxx> #include <xmloff/families.hxx> diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.cxx b/xmloff/source/chart/XMLLabelSeparatorContext.cxx index dfebf77050f1..27ac6bd82b23 100644 --- a/xmloff/source/chart/XMLLabelSeparatorContext.cxx +++ b/xmloff/source/chart/XMLLabelSeparatorContext.cxx @@ -32,7 +32,7 @@ #include "SchXMLParagraphContext.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmltkmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/chart/XMLSymbolImageContext.cxx b/xmloff/source/chart/XMLSymbolImageContext.cxx index 99ce619be43f..1d7421ebc22f 100644 --- a/xmloff/source/chart/XMLSymbolImageContext.cxx +++ b/xmloff/source/chart/XMLSymbolImageContext.cxx @@ -30,7 +30,7 @@ #include "XMLSymbolImageContext.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmltkmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/XMLBase64ImportContext.hxx> diff --git a/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx index 8d9ba3b7ff26..8ac78f9eb0b5 100644 --- a/xmloff/source/chart/contexts.cxx +++ b/xmloff/source/chart/contexts.cxx @@ -29,7 +29,7 @@ #include "precompiled_xmloff.hxx" #include <tools/debug.hxx> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlmetai.hxx> #include <xmloff/xmlstyle.hxx> #include "SchXMLImport.hxx" diff --git a/xmloff/source/chart/makefile.mk b/xmloff/source/chart/makefile.mk deleted file mode 100644 index bfdc9aeb5e22..000000000000 --- a/xmloff/source/chart/makefile.mk +++ /dev/null @@ -1,70 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ = ..$/.. -PRJNAME = xmloff -TARGET = chart -AUTOSEG = true -ENABLE_EXCEPTIONS = TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = $(SLO)$/ColorPropertySet.obj \ - $(SLO)$/SchXMLTools.obj \ - $(SLO)$/SchXMLExport.obj \ - $(SLO)$/SchXMLImport.obj \ - $(SLO)$/contexts.obj \ - $(SLO)$/SchXMLTableContext.obj \ - $(SLO)$/SchXMLChartContext.obj \ - $(SLO)$/SchXMLPlotAreaContext.obj \ - $(SLO)$/SchXMLParagraphContext.obj \ - $(SLO)$/SchXMLTextListContext.obj \ - $(SLO)$/SchXMLSeriesHelper.obj \ - $(SLO)$/SchXMLSeries2Context.obj \ - $(SLO)$/PropertyMaps.obj \ - $(SLO)$/XMLChartStyleContext.obj \ - $(SLO)$/XMLErrorIndicatorPropertyHdl.obj \ - $(SLO)$/XMLErrorBarStylePropertyHdl.obj \ - $(SLO)$/SchXMLAutoStylePoolP.obj \ - $(SLO)$/XMLChartPropertyContext.obj \ - $(SLO)$/XMLSymbolImageContext.obj \ - $(SLO)$/XMLLabelSeparatorContext.obj \ - $(SLO)$/XMLTextOrientationHdl.obj \ - $(SLO)$/XMLSymbolTypePropertyHdl.obj \ - $(SLO)$/XMLAxisPositionPropertyHdl.obj \ - $(SLO)$/SchXMLCalculationSettingsContext.obj \ - $(SLO)$/transporttypes.obj - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx index b64f3c2a2e1f..0c90a23ae519 100644 --- a/xmloff/source/core/DocumentSettingsContext.cxx +++ b/xmloff/source/core/DocumentSettingsContext.cxx @@ -33,7 +33,7 @@ #include <xmloff/DocumentSettingsContext.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> #include <tools/debug.hxx> diff --git a/xmloff/source/core/DomBuilderContext.cxx b/xmloff/source/core/DomBuilderContext.cxx index 158c1a2d8743..317818c6562f 100644 --- a/xmloff/source/core/DomBuilderContext.cxx +++ b/xmloff/source/core/DomBuilderContext.cxx @@ -32,7 +32,7 @@ #include <xmloff/nmspmap.hxx> #include <xmloff/xmlimp.hxx> -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/Reference.hxx> diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx index 64131115e3f3..2936951ac091 100644 --- a/xmloff/source/core/DomExport.cxx +++ b/xmloff/source/core/DomExport.cxx @@ -32,7 +32,7 @@ #include <xmloff/nmspmap.hxx> #include <xmloff/xmlexp.hxx> -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/Reference.hxx> diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx index f603d21258fd..1fbcc506e7ed 100644 --- a/xmloff/source/core/RDFaExportHelper.cxx +++ b/xmloff/source/core/RDFaExportHelper.cxx @@ -29,7 +29,7 @@ #include "RDFaExportHelper.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlexp.hxx> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx index 90e1ba583dd5..7541feb38999 100644 --- a/xmloff/source/core/SettingsExportHelper.cxx +++ b/xmloff/source/core/SettingsExportHelper.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include <xmloff/SettingsExportHelper.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include <tools/debug.hxx> diff --git a/xmloff/source/core/XMLBase64Export.cxx b/xmloff/source/core/XMLBase64Export.cxx index 9e76298f59a4..3833e9924153 100644 --- a/xmloff/source/core/XMLBase64Export.cxx +++ b/xmloff/source/core/XMLBase64Export.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/io/XInputStream.hpp> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlexp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "XMLBase64Export.hxx" using namespace ::com::sun::star::uno; diff --git a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx index 03b52828d5b4..a55b6505981f 100644 --- a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "XMLEmbeddedObjectExportFilter.hxx" +#include "xmloff/XMLEmbeddedObjectExportFilter.hxx" using ::rtl::OUString; diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx index 9bffe192ad75..e7b3a8b48d19 100644 --- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx @@ -42,11 +42,11 @@ #include <sot/clsids.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmlimp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" #include <xmloff/attrlist.hxx> -#include "XMLFilterServiceNames.h" +#include "xmloff/XMLFilterServiceNames.h" #include "XMLEmbeddedObjectImportContext.hxx" using ::rtl::OUString; diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index 4556e21e8152..5dd1aac9fe12 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -40,7 +40,7 @@ #include <cppuhelper/factory.hxx> #include <uno/lbnames.h> -#include "xmlreg.hxx" +#include "xmloff/xmlreg.hxx" using namespace rtl; using namespace com::sun::star; diff --git a/xmloff/source/core/i18nmap.cxx b/xmloff/source/core/i18nmap.cxx index 8bf892820d77..b17a27e03693 100644 --- a/xmloff/source/core/i18nmap.cxx +++ b/xmloff/source/core/i18nmap.cxx @@ -30,7 +30,7 @@ #include <rtl/ustring.hxx> #include <tools/debug.hxx> #include <svl/svarray.hxx> -#include "i18nmap.hxx" +#include "xmloff/i18nmap.hxx" using namespace rtl; diff --git a/xmloff/source/core/makefile.mk b/xmloff/source/core/makefile.mk deleted file mode 100644 index 4d663d3218d8..000000000000 --- a/xmloff/source/core/makefile.mk +++ /dev/null @@ -1,76 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=xmloff -TARGET=core -AUTOSEG=true - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/unointerfacetouniqueidentifiermapper.obj \ - $(SLO)$/facreg.obj \ - $(SLO)$/xmlcnitm.obj \ - $(SLO)$/attrlist.obj \ - $(SLO)$/i18nmap.obj \ - $(SLO)$/nmspmap.obj \ - $(SLO)$/unoatrcn.obj \ - $(SLO)$/xmlehelp.obj \ - $(SLO)$/xmlerror.obj \ - $(SLO)$/xmlexp.obj \ - $(SLO)$/xmlictxt.obj \ - $(SLO)$/xmlimp.obj \ - $(SLO)$/xmltkmap.obj \ - $(SLO)$/xmltoken.obj \ - $(SLO)$/xmluconv.obj \ - $(SLO)$/DomBuilderContext.obj \ - $(SLO)$/DomExport.obj \ - $(SLO)$/ProgressBarHelper.obj \ - $(SLO)$/PropertySetMerger.obj \ - $(SLO)$/SettingsExportHelper.obj \ - $(SLO)$/DocumentSettingsContext.obj \ - $(SLO)$/XMLEmbeddedObjectExportFilter.obj \ - $(SLO)$/XMLEmbeddedObjectImportContext.obj \ - $(SLO)$/XMLBase64Export.obj \ - $(SLO)$/XMLBase64ImportContext.obj \ - $(SLO)$/XMLBasicExportFilter.obj \ - $(SLO)$/RDFaImportHelper.obj \ - $(SLO)$/RDFaExportHelper.obj \ - - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx index b541fd2c3057..22e145bc5180 100644 --- a/xmloff/source/core/nmspmap.cxx +++ b/xmloff/source/core/nmspmap.cxx @@ -36,7 +36,7 @@ #endif #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" using ::rtl::OUString; diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx index a26915b938eb..9b5ca4106c46 100644 --- a/xmloff/source/core/unoatrcn.cxx +++ b/xmloff/source/core/unoatrcn.cxx @@ -35,7 +35,7 @@ #include <xmloff/xmlcnimp.hxx> -#include "unoatrcn.hxx" +#include "xmloff/unoatrcn.hxx" using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/xmloff/source/core/xmlcnitm.cxx b/xmloff/source/core/xmlcnitm.cxx index f4bd0b55121d..53ed405fa454 100644 --- a/xmloff/source/core/xmlcnitm.cxx +++ b/xmloff/source/core/xmlcnitm.cxx @@ -32,7 +32,7 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <xmloff/xmlcnimp.hxx> -#include "unoatrcn.hxx" +#include "xmloff/unoatrcn.hxx" using namespace rtl; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx index 9bfa151adbbd..7581739aae13 100644 --- a/xmloff/source/core/xmlerror.cxx +++ b/xmloff/source/core/xmlerror.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" #include <tools/debug.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/xml/sax/XLocator.hpp> diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index ac46c740ee97..50e0447d4a9d 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -48,7 +48,7 @@ #include <xmloff/attrlist.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/xmlnumfe.hxx> @@ -63,20 +63,20 @@ #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/document/XEventsSupplier.hpp> #include <com/sun/star/document/XViewDataSupplier.hpp> -#include <GradientStyle.hxx> -#include <HatchStyle.hxx> -#include <ImageStyle.hxx> +#include <xmloff/GradientStyle.hxx> +#include <xmloff/HatchStyle.hxx> +#include <xmloff/ImageStyle.hxx> #include <TransGradientStyle.hxx> -#include <MarkerStyle.hxx> -#include <DashStyle.hxx> +#include <xmloff/MarkerStyle.hxx> +#include <xmloff/DashStyle.hxx> #include <xmloff/XMLFontAutoStylePool.hxx> #include "XMLImageMapExport.hxx" #include "XMLBase64Export.hxx" -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" #include <com/sun/star/lang/ServiceNotRegisteredException.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include "XMLFilterServiceNames.h" -#include "XMLEmbeddedObjectExportFilter.hxx" +#include "xmloff/XMLFilterServiceNames.h" +#include "xmloff/XMLEmbeddedObjectExportFilter.hxx" #include "XMLBasicExportFilter.hxx" #include <vos/mutex.hxx> #include <rtl/logfile.hxx> @@ -85,7 +85,7 @@ #include "PropertySetMerger.hxx" #include "svl/urihelper.hxx" -#include "xformsexport.hxx" +#include "xmloff/xformsexport.hxx" #include <unotools/docinfohelper.hxx> #include <unotools/bootstrap.hxx> diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index c791fe4077d4..f75eec83dbd3 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -37,7 +37,7 @@ #include "unointerfacetouniqueidentifiermapper.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/XMLFontStylesContext.hxx> #include <xmloff/xmlictxt.hxx> @@ -49,7 +49,7 @@ #include "StyleMap.hxx" #include <xmloff/ProgressBarHelper.hxx> #include <xmloff/xmltoken.hxx> -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/ServiceNotRegisteredException.hpp> #include <com/sun/star/io/XOutputStream.hpp> diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx index af3a0ce941e5..13ab9f4fd62f 100644 --- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx +++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx @@ -31,7 +31,7 @@ #include <tools/debug.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #ifndef _XMLOFF_FAMILIES_HXX diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx index 81c962b1be9e..b550477ac30c 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -46,11 +46,11 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/xmltkmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> #include "xexptran.hxx" -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" #include <xmloff/XMLEventsImportContext.hxx> #include "XMLStringBufferImportContext.hxx" #include <tools/debug.hxx> diff --git a/xmloff/source/draw/XMLImageMapExport.cxx b/xmloff/source/draw/XMLImageMapExport.cxx index 01d14ecab54e..6114f51acfdc 100644 --- a/xmloff/source/draw/XMLImageMapExport.cxx +++ b/xmloff/source/draw/XMLImageMapExport.cxx @@ -45,7 +45,7 @@ #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/drawing/PointSequence.hpp> #include <xmloff/xmlexp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/XMLEventExport.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx index dcd26e616e6f..9ad048c758ac 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -30,7 +30,7 @@ #include <tools/debug.hxx> #include <XMLNumberStylesExport.hxx> #include <XMLNumberStylesImport.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/draw/XMLReplacementImageContext.cxx b/xmloff/source/draw/XMLReplacementImageContext.cxx index 4eb607e0403b..d1591a10448e 100644 --- a/xmloff/source/draw/XMLReplacementImageContext.cxx +++ b/xmloff/source/draw/XMLReplacementImageContext.cxx @@ -32,7 +32,7 @@ #include <com/sun/star/io/XOutputStream.hpp> #include <xmloff/xmlimp.hxx> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/XMLBase64ImportContext.hxx> #include "XMLReplacementImageContext.hxx" diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx index 15211495f18d..c9862d1b29ae 100644 --- a/xmloff/source/draw/XMLShapeStyleContext.cxx +++ b/xmloff/source/draw/XMLShapeStyleContext.cxx @@ -37,9 +37,9 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <xmloff/xmlimp.hxx> #include <xmloff/xmlnumi.hxx> -#include <xmlnmspe.hxx> +#include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" #include <xmloff/maptype.hxx> #include "sdpropls.hxx" diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx index eaf83444114c..f4dfb71a2de4 100644 --- a/xmloff/source/draw/animationexport.cxx +++ b/xmloff/source/draw/animationexport.cxx @@ -67,7 +67,7 @@ #include "sdxmlexp_impl.hxx" #include "sdpropls.hxx" #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmluconv.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/xmlement.hxx> diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index 17bba5170c79..0920ef4f0992 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -67,7 +67,7 @@ #include "sdpropls.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlimp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmluconv.hxx> #include <osl/mutex.hxx> #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx index 600ab5c7144f..b2611dbc1e8f 100644 --- a/xmloff/source/draw/animexp.cxx +++ b/xmloff/source/draw/animexp.cxx @@ -37,7 +37,7 @@ #include <comphelper/extract.hxx> #include <tools/color.hxx> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmluconv.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/xmlement.hxx> diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx index fb7abfa4f94a..c3dbd86fbe41 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -41,7 +41,7 @@ #include <comphelper/extract.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlimp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmluconv.hxx> /* #include <xmloff/xmlement.hxx> diff --git a/xmloff/source/draw/descriptionimp.cxx b/xmloff/source/draw/descriptionimp.cxx index 7d17de3a7471..1abc297e6b33 100644 --- a/xmloff/source/draw/descriptionimp.cxx +++ b/xmloff/source/draw/descriptionimp.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlimp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include "descriptionimp.hxx" diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index ad559bc0bf45..3f8fb3bb88be 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -39,7 +39,7 @@ #include <comphelper/extract.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlimp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmluconv.hxx> #include <xmloff/nmspmap.hxx> #include "eventimp.hxx" diff --git a/xmloff/source/draw/layerexp.cxx b/xmloff/source/draw/layerexp.cxx index e5393279a0fa..b7d58258e204 100644 --- a/xmloff/source/draw/layerexp.cxx +++ b/xmloff/source/draw/layerexp.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlexp.hxx> #include <xmloff/xmlement.hxx> #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx index 960ff3ea1871..26113c1ce156 100644 --- a/xmloff/source/draw/layerimp.cxx +++ b/xmloff/source/draw/layerimp.cxx @@ -36,7 +36,7 @@ #include <comphelper/extract.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlimp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmluconv.hxx> #include <xmloff/nmspmap.hxx> #include "layerimp.hxx" diff --git a/xmloff/source/draw/makefile.mk b/xmloff/source/draw/makefile.mk deleted file mode 100644 index 3c9f7ae024f9..000000000000 --- a/xmloff/source/draw/makefile.mk +++ /dev/null @@ -1,85 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=xmloff -TARGET=draw -AUTOSEG=true -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/animationexport.obj\ - $(SLO)$/animationimport.obj\ - $(SLO)$/XMLNumberStyles.obj\ - $(SLO)$/XMLGraphicsDefaultStyle.obj\ - $(SLO)$/viewcontext.obj\ - $(SLO)$/eventimp.obj\ - $(SLO)$/layerexp.obj\ - $(SLO)$/layerimp.obj\ - $(SLO)$/ximpshow.obj\ - $(SLO)$/animimp.obj\ - $(SLO)$/animexp.obj\ - $(SLO)$/numithdl.obj\ - $(SLO)$/sdxmlimp.obj \ - $(SLO)$/sdxmlexp.obj \ - $(SLO)$/ximpstyl.obj \ - $(SLO)$/ximpbody.obj \ - $(SLO)$/ximpshap.obj \ - $(SLO)$/ximpgrp.obj \ - $(SLO)$/ximp3dscene.obj \ - $(SLO)$/ximp3dobject.obj \ - $(SLO)$/ximpnote.obj \ - $(SLO)$/sdpropls.obj \ - $(SLO)$/propimp0.obj \ - $(SLO)$/xexptran.obj \ - $(SLO)$/shapeexport.obj \ - $(SLO)$/shapeexport2.obj \ - $(SLO)$/shapeexport3.obj \ - $(SLO)$/shapeexport4.obj \ - $(SLO)$/shapeimport.obj \ - $(SLO)$/XMLImageMapExport.obj \ - $(SLO)$/XMLImageMapContext.obj \ - $(SLO)$/XMLShapePropertySetContext.obj \ - $(SLO)$/XMLShapeStyleContext.obj \ - $(SLO)$/ximppage.obj \ - $(SLO)$/ximpcustomshape.obj \ - $(SLO)$/EnhancedCustomShapeToken.obj \ - $(SLO)$/XMLReplacementImageContext.obj \ - $(SLO)$/descriptionimp.obj \ - $(SLO)$/ximplink.obj - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 9dac5b4cd469..b2dae2f23274 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -62,7 +62,7 @@ #include "sdpropls.hxx" #include "propimp0.hxx" #include <xmloff/xmlexp.hxx> -#include <xmlnmspe.hxx> +#include <xmloff/xmlnmspe.hxx> #include <com/sun/star/drawing/NormalsKind.hpp> #include <com/sun/star/drawing/TextureProjectionMode.hpp> #include <com/sun/star/drawing/TextureKind.hpp> diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx index e56379c0781f..6beb7a6fcc14 100644 --- a/xmloff/source/draw/sdpropls.hxx +++ b/xmloff/source/draw/sdpropls.hxx @@ -35,7 +35,7 @@ #include <xmloff/xmlement.hxx> #include <xmloff/prhdlfac.hxx> #include <xmloff/xmlprmap.hxx> -#include "XMLTextListAutoStylePool.hxx" +#include "xmloff/XMLTextListAutoStylePool.hxx" #include <xmloff/xmlexppr.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 149829f0f440..10692cda1d54 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -29,7 +29,7 @@ #include "precompiled_xmloff.hxx" #include "unointerfacetouniqueidentifiermapper.hxx" #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmluconv.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlmetae.hxx> @@ -77,7 +77,7 @@ #include "layerexp.hxx" -#include "VisAreaExport.hxx" +#include "xmloff/VisAreaExport.hxx" #include "XMLNumberStylesExport.hxx" #include <tools/list.hxx> #include <tools/string.hxx> diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index 1290d545c6b3..4b2e2141c8d0 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -40,7 +40,7 @@ #include <xmloff/xmlmetai.hxx> #endif #include "ximpstyl.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/DocumentSettingsContext.hxx> @@ -51,7 +51,7 @@ #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include "sdpropls.hxx" #include <xmloff/xmlexppr.hxx> -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" #include <tools/debug.hxx> #include <com/sun/star/style/XStyle.hpp> diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index d3dd99967ae9..e76d5bf9b9c9 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -63,7 +63,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/drawing/XCustomShapeEngine.hpp> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx index d13b5e24e2db..1295da204db9 100644 --- a/xmloff/source/draw/shapeexport2.cxx +++ b/xmloff/source/draw/shapeexport2.cxx @@ -55,7 +55,7 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/tuple/b2dtuple.hxx> diff --git a/xmloff/source/draw/shapeexport3.cxx b/xmloff/source/draw/shapeexport3.cxx index f51302b64156..d5c06d7a8ead 100644 --- a/xmloff/source/draw/shapeexport3.cxx +++ b/xmloff/source/draw/shapeexport3.cxx @@ -49,7 +49,7 @@ #include <xmloff/xmltoken.hxx> #include <basegfx/vector/b3dvector.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/xmloff/source/draw/shapeexport4.cxx b/xmloff/source/draw/shapeexport4.cxx index 238fdebefa55..a57823cd8867 100644 --- a/xmloff/source/draw/shapeexport4.cxx +++ b/xmloff/source/draw/shapeexport4.cxx @@ -72,7 +72,7 @@ #include <tools/string.hxx> #include <basegfx/vector/b3dvector.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "XMLBase64Export.hxx" using ::rtl::OUString; diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 903b7d99809a..45411162a183 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -41,7 +41,7 @@ #include <xmloff/shapeimport.hxx> #endif #include <xmloff/xmltkmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include "ximpstyl.hxx" #include "ximpshap.hxx" diff --git a/xmloff/source/draw/viewcontext.cxx b/xmloff/source/draw/viewcontext.cxx index 0953cb7536ce..43f12382d420 100644 --- a/xmloff/source/draw/viewcontext.cxx +++ b/xmloff/source/draw/viewcontext.cxx @@ -30,9 +30,9 @@ #include "viewcontext.hxx" #include "sdxmlimp_impl.hxx" #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> -#include "VisAreaContext.hxx" +#include "xmloff/VisAreaContext.hxx" using namespace com::sun::star; using namespace rtl; diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx index 2f3c90278b6f..dd041daddec8 100644 --- a/xmloff/source/draw/ximp3dscene.cxx +++ b/xmloff/source/draw/ximp3dscene.cxx @@ -31,7 +31,7 @@ #include <xmloff/xmluconv.hxx> #include "xexptran.hxx" #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <com/sun/star/drawing/Direction3D.hpp> #include <com/sun/star/drawing/CameraGeometry.hpp> #include "eventimp.hxx" diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index 6f9710392e2a..424593d830ac 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -41,11 +41,11 @@ #include "EnhancedCustomShapeToken.hxx" #include <xmloff/xmlimp.hxx> #include <xmloff/xmltkmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> #include "xexptran.hxx" -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" #include <tools/debug.hxx> #include <com/sun/star/drawing/Direction3D.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> diff --git a/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx index 8d88b77515e1..115c3b8b778c 100644 --- a/xmloff/source/draw/ximpgrp.cxx +++ b/xmloff/source/draw/ximpgrp.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include"xmlnmspe.hxx" +#include"xmloff/xmlnmspe.hxx" #include "ximpgrp.hxx" #include <xmloff/xmltoken.hxx> #include "ximpshap.hxx" diff --git a/xmloff/source/draw/ximplink.cxx b/xmloff/source/draw/ximplink.cxx index 223b320e4f79..ae657d0c32cd 100644 --- a/xmloff/source/draw/ximplink.cxx +++ b/xmloff/source/draw/ximplink.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include"xmlnmspe.hxx" +#include"xmloff/xmlnmspe.hxx" #include "ximplink.hxx" #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index 6c715b5ad77a..29aa839c2b9e 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -37,7 +37,7 @@ #include <xmloff/xmlstyle.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlstyle.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "ximppage.hxx" #include "ximpshap.hxx" #include "animimp.hxx" diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index a26806ce6c24..34590cbd95de 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -71,7 +71,7 @@ #include "PropertySetMerger.hxx" #include <xmloff/families.hxx> #include "ximpstyl.hxx" -#include"xmlnmspe.hxx" +#include"xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include "EnhancedCustomShapeToken.hxx" #include "XMLReplacementImageContext.hxx" @@ -82,7 +82,7 @@ #include "descriptionimp.hxx" #include "ximpcustomshape.hxx" #include "XMLEmbeddedObjectImportContext.hxx" -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" #include <basegfx/matrix/b2dhommatrix.hxx> #include <tools/string.hxx> #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp> diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx index f5df8c58d6ba..c81aebf41b6a 100644 --- a/xmloff/source/draw/ximpshow.cxx +++ b/xmloff/source/draw/ximpshow.cxx @@ -39,7 +39,7 @@ #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <xmloff/xmltoken.hxx> #include <comphelper/extract.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> #include "ximpshow.hxx" diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index 01f0fa0faf5c..0102ee24844a 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -31,7 +31,7 @@ #include "ximpstyl.hxx" #include <xmloff/XMLShapeStyleContext.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include "ximpnote.hxx" @@ -55,7 +55,7 @@ #include "layerimp.hxx" #include <xmloff/XMLGraphicsDefaultStyle.hxx> #include "XMLNumberStylesImport.hxx" -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/xmloff/source/forms/controlpropertymap.cxx b/xmloff/source/forms/controlpropertymap.cxx index 8e81c2a7e19c..aed0b8c4e190 100644 --- a/xmloff/source/forms/controlpropertymap.cxx +++ b/xmloff/source/forms/controlpropertymap.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/maptype.hxx> #include <xmloff/xmltypes.hxx> diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index 149965631b27..1126583f9a45 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -30,12 +30,12 @@ #include "elementexport.hxx" #include "strings.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "eventexport.hxx" #include "formenums.hxx" #include "formcellbinding.hxx" #include "formcellbinding.hxx" -#include "xformsexport.hxx" +#include "xmloff/xformsexport.hxx" #include "property_meta_data.hxx" /** === begin UNO includes === **/ diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index eb6dd0965e76..c010b666e552 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -35,7 +35,7 @@ #include "strings.hxx" #include "callbacks.hxx" #include "attriblistmerge.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "eventimport.hxx" #include "xmloff/txtstyli.hxx" #include "formenums.hxx" diff --git a/xmloff/source/forms/form_handler_factory.hxx b/xmloff/source/forms/form_handler_factory.hxx deleted file mode 100755 index 62bf94f74aa8..000000000000 --- a/xmloff/source/forms/form_handler_factory.hxx +++ /dev/null @@ -1,50 +0,0 @@ -/************************************************************************* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef XMLOFF_FORM_HANDLER_FACTORY_HXX -#define XMLOFF_FORM_HANDLER_FACTORY_HXX - -#include "property_handler.hxx" - -//...................................................................................................................... -namespace xmloff -{ -//...................................................................................................................... - - //================================================================================================================== - //= FormHandlerFactory - //================================================================================================================== - class FormHandlerFactory - { - public: - static PPropertyHandler getFormPropertyHandler( const PropertyId i_propertyId ); - }; - -//...................................................................................................................... -} // namespace xmloff -//...................................................................................................................... - -#endif // XMLOFF_FORM_HANDLER_FACTORY_HXX diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx index 0e2ef69ab9f8..e27f03f01de9 100644 --- a/xmloff/source/forms/formattributes.cxx +++ b/xmloff/source/forms/formattributes.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include "formattributes.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmluconv.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/logfile.hxx> diff --git a/xmloff/source/forms/formevents.cxx b/xmloff/source/forms/formevents.cxx index fcccef5065a8..5e46fbaab8d8 100644 --- a/xmloff/source/forms/formevents.cxx +++ b/xmloff/source/forms/formevents.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include "formevents.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlevent.hxx> //......................................................................... diff --git a/xmloff/source/forms/formlayerexport.cxx b/xmloff/source/forms/formlayerexport.cxx index ad5ff7eb4dae..50245fad1d2a 100644 --- a/xmloff/source/forms/formlayerexport.cxx +++ b/xmloff/source/forms/formlayerexport.cxx @@ -32,7 +32,7 @@ #include <xmloff/formlayerexport.hxx> #include "strings.hxx" #include "elementexport.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlexp.hxx> #include "layerexport.hxx" #include "propertyexport.hxx" diff --git a/xmloff/source/forms/formsimp.cxx b/xmloff/source/forms/formsimp.cxx index 00a745660710..bc0baaba551e 100644 --- a/xmloff/source/forms/formsimp.cxx +++ b/xmloff/source/forms/formsimp.cxx @@ -29,7 +29,7 @@ #include "precompiled_xmloff.hxx" #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <xmloff/xmlimp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #ifndef _XMLOFF_ANIMIMP_HXX diff --git a/xmloff/source/forms/handler/form_handler_factory.cxx b/xmloff/source/forms/handler/form_handler_factory.cxx index ccf829d4201f..72a9edf38f42 100755..100644 --- a/xmloff/source/forms/handler/form_handler_factory.cxx +++ b/xmloff/source/forms/handler/form_handler_factory.cxx @@ -26,7 +26,7 @@ #include "precompiled_xmloff.hxx" -#include "form_handler_factory.hxx" +#include "forms/form_handler_factory.hxx" #include "vcl_date_handler.hxx" #include "vcl_time_handler.hxx" diff --git a/xmloff/source/forms/handler/makefile.mk b/xmloff/source/forms/handler/makefile.mk deleted file mode 100755 index 574537ffd474..000000000000 --- a/xmloff/source/forms/handler/makefile.mk +++ /dev/null @@ -1,55 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=../../.. - -PRJNAME=xmloff -TARGET=form_handlers - -INCEXT=.. - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)/util/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)/form_handler_factory.obj \ - $(SLO)/property_handler_base.obj \ - $(SLO)/vcl_date_handler.obj \ - $(SLO)/vcl_time_handler.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - -test: - echo $(INCLUDE)
\ No newline at end of file diff --git a/xmloff/source/forms/handler/property_handler_base.hxx b/xmloff/source/forms/handler/property_handler_base.hxx index 10adceaa52aa..01f2a9e843f6 100755..100644 --- a/xmloff/source/forms/handler/property_handler_base.hxx +++ b/xmloff/source/forms/handler/property_handler_base.hxx @@ -27,7 +27,7 @@ #ifndef XMLOFF_PROPERTY_HANDLER_BASE_HXX #define XMLOFF_PROPERTY_HANDLER_BASE_HXX -#include "property_handler.hxx" +#include "forms/property_handler.hxx" #include <osl/interlck.h> diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx index 9d024a3e2c2e..d4f0e86534ab 100644 --- a/xmloff/source/forms/layerexport.cxx +++ b/xmloff/source/forms/layerexport.cxx @@ -33,7 +33,7 @@ #include "strings.hxx" #include <xmloff/xmlexp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmluconv.hxx> #include <xmloff/xmlprmap.hxx> #include <xmloff/prhdlfac.hxx> @@ -54,7 +54,7 @@ #include <xmloff/XMLEventExport.hxx> #include "formevents.hxx" #include <xmloff/xmlnumfe.hxx> -#include "xformsexport.hxx" +#include "xmloff/xformsexport.hxx" /** === begin UNO includes === **/ #include <com/sun/star/text/XText.hpp> diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx index 77d60f83ee49..cf5155f6a9a1 100644 --- a/xmloff/source/forms/layerimport.cxx +++ b/xmloff/source/forms/layerimport.cxx @@ -58,9 +58,9 @@ #include "controlpropertymap.hxx" #include "formevents.hxx" #include "formcellbinding.hxx" -#include "xformsimport.hxx" +#include "xmloff/xformsimport.hxx" #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <rtl/logfile.hxx> #include <algorithm> diff --git a/xmloff/source/forms/makefile.mk b/xmloff/source/forms/makefile.mk deleted file mode 100644 index fa2a6ea7d235..000000000000 --- a/xmloff/source/forms/makefile.mk +++ /dev/null @@ -1,72 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=xmloff -TARGET=forms - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/officeforms.obj \ - $(SLO)$/formevents.obj \ - $(SLO)$/eventimport.obj \ - $(SLO)$/eventexport.obj \ - $(SLO)$/controlpropertyhdl.obj \ - $(SLO)$/controlpropertymap.obj \ - $(SLO)$/valueproperties.obj \ - $(SLO)$/attriblistmerge.obj \ - $(SLO)$/controlelement.obj \ - $(SLO)$/formlayerexport.obj \ - $(SLO)$/layerexport.obj \ - $(SLO)$/elementexport.obj \ - $(SLO)$/propertyexport.obj \ - $(SLO)$/elementimport.obj \ - $(SLO)$/layerimport.obj \ - $(SLO)$/propertyimport.obj \ - $(SLO)$/formlayerimport.obj \ - $(SLO)$/formattributes.obj \ - $(SLO)$/formenums.obj \ - $(SLO)$/formsimp.obj \ - $(SLO)$/strings.obj \ - $(SLO)$/logging.obj \ - $(SLO)$/formcellbinding.obj \ - $(SLO)$/gridcolumnproptranslator.obj \ - \ - $(SLO)/property_meta_data.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx index d434d7a9addf..0de7b04b70d3 100644 --- a/xmloff/source/forms/officeforms.cxx +++ b/xmloff/source/forms/officeforms.cxx @@ -30,7 +30,7 @@ #include "officeforms.hxx" #include <xmloff/xmluconv.hxx> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlexp.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/forms/property_description.hxx b/xmloff/source/forms/property_description.hxx index 8e9aa9cb616e..4edab2e649f7 100755..100644 --- a/xmloff/source/forms/property_description.hxx +++ b/xmloff/source/forms/property_description.hxx @@ -27,7 +27,7 @@ #ifndef XMLOFF_PROPERTY_DESCRIPTION_HXX #define XMLOFF_PROPERTY_DESCRIPTION_HXX -#include "property_handler.hxx" +#include "forms/property_handler.hxx" #include "property_group.hxx" #include "xmloff/xmltoken.hxx" diff --git a/xmloff/source/forms/property_handler.hxx b/xmloff/source/forms/property_handler.hxx deleted file mode 100755 index 247b4f17f798..000000000000 --- a/xmloff/source/forms/property_handler.hxx +++ /dev/null @@ -1,84 +0,0 @@ -/************************************************************************* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef XMLOFF_PROPERTY_HANDLER_HXX -#define XMLOFF_PROPERTY_HANDLER_HXX - -#include "property_ids.hxx" - -#include <com/sun/star/uno/Any.hxx> - -#include <rtl/ref.hxx> - -#include <map> -#include <vector> - -//...................................................................................................................... -namespace xmloff -{ -//...................................................................................................................... - - typedef ::std::map< PropertyId, ::com::sun::star::uno::Any > PropertyValues; - - //================================================================================================================== - //= IPropertyHandler - //================================================================================================================== - class IPropertyHandler : public ::rtl::IReference - { - public: - /** retrieves the XML attribute value for the given property values - */ - virtual ::rtl::OUString - getAttributeValue( const PropertyValues& i_propertyValues ) const = 0; - - /** is a convenience method for XML attributes whose value comprises of only one UNO API property - */ - virtual ::rtl::OUString - getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const = 0; - - /** retrieves the values of the properties controlled by an XML attributed, described by a given attribute value - */ - virtual bool - getPropertyValues( const ::rtl::OUString i_attributeValue, PropertyValues& o_propertyValues ) const = 0; - - virtual ~IPropertyHandler() { } - }; - - //================================================================================================================== - //= PPropertyHandler - //================================================================================================================== - typedef ::rtl::Reference< IPropertyHandler > PPropertyHandler; - - //================================================================================================================== - //= PropertyHandlerFactory - //================================================================================================================== - typedef PPropertyHandler (*PropertyHandlerFactory)( const PropertyId i_propertyId ); - -//...................................................................................................................... -} // namespace xmloff -//...................................................................................................................... - -#endif // XMLOFF_PROPERTY_HANDLER_HXX diff --git a/xmloff/source/forms/property_ids.hxx b/xmloff/source/forms/property_ids.hxx deleted file mode 100755 index 31004f2d9ff2..000000000000 --- a/xmloff/source/forms/property_ids.hxx +++ /dev/null @@ -1,56 +0,0 @@ -/************************************************************************* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef XMLOFF_PROPERTY_IDS_HXX -#define XMLOFF_PROPERTY_IDS_HXX - -//...................................................................................................................... -namespace xmloff -{ -//...................................................................................................................... - - //================================================================================================================== - //= PropertyId - //================================================================================================================== - enum PropertyId - { - PID_DATE_MIN, - PID_DATE_MAX, - PID_DEFAULT_DATE, - PID_DATE, - PID_TIME_MIN, - PID_TIME_MAX, - PID_DEFAULT_TIME, - PID_TIME, - - PID_INVALID - }; - -//...................................................................................................................... -} // namespace xmloff -//...................................................................................................................... - -#endif // XMLOFF_PROPERTY_IDS_HXX diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx index 7f058d14b9b7..5930d123578c 100755..100644 --- a/xmloff/source/forms/property_meta_data.cxx +++ b/xmloff/source/forms/property_meta_data.cxx @@ -27,10 +27,10 @@ #include "precompiled_xmloff.hxx" #include "property_description.hxx" -#include "form_handler_factory.hxx" +#include "forms/form_handler_factory.hxx" #include "strings.hxx" #include "xmloff/xmltoken.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <tools/diagnose_ex.h> #include <tools/debug.hxx> diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx index 7d84e5a60a1f..bab88b47a82f 100644 --- a/xmloff/source/forms/propertyexport.cxx +++ b/xmloff/source/forms/propertyexport.cxx @@ -32,7 +32,7 @@ #include "propertyexport.hxx" #include <xmloff/xmlexp.hxx> #include "strings.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmluconv.hxx> #include <xmloff/families.hxx> #include <osl/diagnose.h> diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index de57eadb69ae..1fdb85067f3d 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -34,7 +34,7 @@ #include <osl/diagnose.h> #include <comphelper/extract.hxx> #include "callbacks.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <tools/date.hxx> #include <tools/time.hxx> #include <tools/datetime.hxx> diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index 772d5907bd91..66717ae3aaf8 100644 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -45,7 +45,7 @@ //#endif #include <comphelper/genericpropertyset.hxx> #include <rtl/ustrbuf.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlmetae.hxx> diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx index b61e8d113042..d27d2c33b239 100644 --- a/xmloff/source/meta/MetaImportComponent.cxx +++ b/xmloff/source/meta/MetaImportComponent.cxx @@ -29,7 +29,7 @@ #include "precompiled_xmloff.hxx" #include "MetaImportComponent.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlmetai.hxx> diff --git a/xmloff/source/meta/makefile.mk b/xmloff/source/meta/makefile.mk deleted file mode 100644 index 5efb538c9856..000000000000 --- a/xmloff/source/meta/makefile.mk +++ /dev/null @@ -1,53 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=xmloff -TARGET=meta -AUTOSEG=true - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/xmlmetae.obj \ - $(SLO)$/xmlmetai.obj \ - $(SLO)$/MetaExportComponent.obj \ - $(SLO)$/MetaImportComponent.obj \ - $(SLO)$/xmlversion.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx index aab4686339ba..55e7cd97f810 100644 --- a/xmloff/source/meta/xmlmetae.cxx +++ b/xmloff/source/meta/xmlmetae.cxx @@ -39,7 +39,7 @@ #include <xmloff/xmlexp.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <com/sun/star/beans/XPropertyAccess.hpp> #include <com/sun/star/beans/StringPair.hpp> diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx index 35dab510210a..83b9625279b9 100644 --- a/xmloff/source/meta/xmlmetai.cxx +++ b/xmloff/source/meta/xmlmetai.cxx @@ -39,7 +39,7 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" using ::rtl::OUString; diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx index f126fd566e94..2675ecb4b98f 100644 --- a/xmloff/source/script/XMLEventExport.cxx +++ b/xmloff/source/script/XMLEventExport.cxx @@ -43,7 +43,7 @@ #include <tools/debug.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/script/XMLEventImportHelper.cxx b/xmloff/source/script/XMLEventImportHelper.cxx index cdd2906760a0..3dfbab60952f 100644 --- a/xmloff/source/script/XMLEventImportHelper.cxx +++ b/xmloff/source/script/XMLEventImportHelper.cxx @@ -34,8 +34,8 @@ #include <tools/debug.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" -#include "xmlerror.hxx" +#include "xmloff/xmlnmspe.hxx" +#include "xmloff/xmlerror.hxx" using ::rtl::OUString; using ::com::sun::star::xml::sax::XAttributeList; diff --git a/xmloff/source/script/XMLEventsImportContext.cxx b/xmloff/source/script/XMLEventsImportContext.cxx index b22cd6262558..301bef53856d 100644 --- a/xmloff/source/script/XMLEventsImportContext.cxx +++ b/xmloff/source/script/XMLEventsImportContext.cxx @@ -39,9 +39,9 @@ #include <tools/debug.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" using namespace ::com::sun::star::uno; using namespace ::xmloff::token; diff --git a/xmloff/source/script/XMLScriptContextFactory.cxx b/xmloff/source/script/XMLScriptContextFactory.cxx index 0baf71cb8b96..60e08a208f72 100644 --- a/xmloff/source/script/XMLScriptContextFactory.cxx +++ b/xmloff/source/script/XMLScriptContextFactory.cxx @@ -32,7 +32,7 @@ #include <tools/debug.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/script/XMLScriptExportHandler.cxx b/xmloff/source/script/XMLScriptExportHandler.cxx index e04467d1e491..9cfc7211f3b9 100644 --- a/xmloff/source/script/XMLScriptExportHandler.cxx +++ b/xmloff/source/script/XMLScriptExportHandler.cxx @@ -36,7 +36,7 @@ #include <xmloff/xmlexp.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" using namespace ::com::sun::star::uno; diff --git a/xmloff/source/script/XMLStarBasicContextFactory.cxx b/xmloff/source/script/XMLStarBasicContextFactory.cxx index 94a794675d01..a957b4bd060f 100644 --- a/xmloff/source/script/XMLStarBasicContextFactory.cxx +++ b/xmloff/source/script/XMLStarBasicContextFactory.cxx @@ -32,7 +32,7 @@ #include <tools/debug.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/script/XMLStarBasicExportHandler.cxx b/xmloff/source/script/XMLStarBasicExportHandler.cxx index ee945f4a74cc..13d6948ba98e 100644 --- a/xmloff/source/script/XMLStarBasicExportHandler.cxx +++ b/xmloff/source/script/XMLStarBasicExportHandler.cxx @@ -36,7 +36,7 @@ #include <xmloff/xmlexp.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" using namespace ::com::sun::star::uno; diff --git a/xmloff/source/script/makefile.mk b/xmloff/source/script/makefile.mk deleted file mode 100644 index 4109ae6fc554..000000000000 --- a/xmloff/source/script/makefile.mk +++ /dev/null @@ -1,56 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=xmloff -TARGET=script - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/XMLEventExport.obj \ - $(SLO)$/XMLEventImportHelper.obj \ - $(SLO)$/XMLEventsImportContext.obj \ - $(SLO)$/XMLScriptContextFactory.obj \ - $(SLO)$/XMLScriptExportHandler.obj \ - $(SLO)$/XMLStarBasicContextFactory.obj \ - $(SLO)$/XMLStarBasicExportHandler.obj \ - $(SLO)$/xmlscripti.obj \ - $(SLO)$/xmlbasici.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/xmloff/source/script/xmlscripti.cxx b/xmloff/source/script/xmlscripti.cxx index ff88d802b2c6..d64c872d3638 100644 --- a/xmloff/source/script/xmlscripti.cxx +++ b/xmloff/source/script/xmlscripti.cxx @@ -29,7 +29,7 @@ #include "precompiled_xmloff.hxx" #include <xmloff/xmlscripti.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx index 49ff7e5a2cbc..9ac798381e0c 100644 --- a/xmloff/source/style/DashStyle.cxx +++ b/xmloff/source/style/DashStyle.cxx @@ -29,11 +29,11 @@ #include "precompiled_xmloff.hxx" #include <com/sun/star/drawing/DashStyle.hpp> #include <com/sun/star/drawing/LineDash.hpp> -#include "DashStyle.hxx" +#include "xmloff/DashStyle.hxx" #include <xmloff/attrlist.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/xmlimp.hxx> diff --git a/xmloff/source/style/FillStyleContext.cxx b/xmloff/source/style/FillStyleContext.cxx index 311448fe96bb..4ddd5ef64a82 100644 --- a/xmloff/source/style/FillStyleContext.cxx +++ b/xmloff/source/style/FillStyleContext.cxx @@ -30,15 +30,15 @@ #include <com/sun/star/container/XNameContainer.hpp> #include "FillStyleContext.hxx" #include <xmloff/xmlimp.hxx> -#include "GradientStyle.hxx" -#include "HatchStyle.hxx" -#include "ImageStyle.hxx" +#include "xmloff/GradientStyle.hxx" +#include "xmloff/HatchStyle.hxx" +#include "xmloff/ImageStyle.hxx" #include "TransGradientStyle.hxx" -#include "MarkerStyle.hxx" -#include "DashStyle.hxx" +#include "xmloff/MarkerStyle.hxx" +#include "xmloff/DashStyle.hxx" #include <xmloff/families.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/XMLBase64ImportContext.hxx> using namespace ::com::sun::star; diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx index 30da28ac5465..6e3921593644 100644 --- a/xmloff/source/style/GradientStyle.cxx +++ b/xmloff/source/style/GradientStyle.cxx @@ -27,12 +27,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "GradientStyle.hxx" +#include "xmloff/GradientStyle.hxx" #include <com/sun/star/awt/Gradient.hpp> #include <xmloff/attrlist.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx index 5351c345c16e..7785d70f2596 100644 --- a/xmloff/source/style/HatchStyle.cxx +++ b/xmloff/source/style/HatchStyle.cxx @@ -27,11 +27,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "HatchStyle.hxx" +#include "xmloff/HatchStyle.hxx" #include <com/sun/star/drawing/Hatch.hpp> #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/xmlimp.hxx> diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx index 509b925198c4..f6716bfbcfd4 100644 --- a/xmloff/source/style/ImageStyle.cxx +++ b/xmloff/source/style/ImageStyle.cxx @@ -27,12 +27,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "ImageStyle.hxx" +#include "xmloff/ImageStyle.hxx" #include <com/sun/star/awt/XBitmap.hpp> #include <xmloff/attrlist.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> -#include"xmlnmspe.hxx" +#include"xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/xmlimp.hxx> diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx index 7f134bd65176..f0f32bb18c25 100644 --- a/xmloff/source/style/MarkerStyle.cxx +++ b/xmloff/source/style/MarkerStyle.cxx @@ -27,12 +27,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "MarkerStyle.hxx" +#include "xmloff/MarkerStyle.hxx" #include "xexptran.hxx" #include <xmloff/attrlist.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/xmlimp.hxx> diff --git a/xmloff/source/style/PageHeaderFooterContext.cxx b/xmloff/source/style/PageHeaderFooterContext.cxx index 571c001d00de..9c6aa14c80ff 100644 --- a/xmloff/source/style/PageHeaderFooterContext.cxx +++ b/xmloff/source/style/PageHeaderFooterContext.cxx @@ -36,7 +36,7 @@ #ifndef _XMLOFF_PAGEPHEADERFOOTERCONTEXT_HXX #include "PageHeaderFooterContext.hxx" #endif -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include "PagePropertySetContext.hxx" diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx index e784e4f5085f..bcbb05012fec 100644 --- a/xmloff/source/style/PageMasterImportContext.cxx +++ b/xmloff/source/style/PageMasterImportContext.cxx @@ -30,7 +30,7 @@ #include "PageMasterImportContext.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include "PageMasterPropHdl.hxx" #include "PagePropertySetContext.hxx" diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx index 99065c9d3481..6dbda70f5125 100644 --- a/xmloff/source/style/PageMasterStyleMap.cxx +++ b/xmloff/source/style/PageMasterStyleMap.cxx @@ -31,7 +31,7 @@ #ifndef _XMLOFF_PAGEMASTERSTYLEMAP_HXX #include <xmloff/PageMasterStyleMap.hxx> #endif -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> using namespace ::xmloff::token; diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx index 7e0456e5db25..58c99ef7abbd 100644 --- a/xmloff/source/style/TransGradientStyle.cxx +++ b/xmloff/source/style/TransGradientStyle.cxx @@ -32,7 +32,7 @@ #include <xmloff/attrlist.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> #include <tools/debug.hxx> diff --git a/xmloff/source/style/VisAreaContext.cxx b/xmloff/source/style/VisAreaContext.cxx index 9d9b34c2159c..cc4722d10216 100644 --- a/xmloff/source/style/VisAreaContext.cxx +++ b/xmloff/source/style/VisAreaContext.cxx @@ -32,9 +32,9 @@ // INCLUDE --------------------------------------------------------------- -#include "VisAreaContext.hxx" +#include "xmloff/VisAreaContext.hxx" #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlimp.hxx> diff --git a/xmloff/source/style/VisAreaExport.cxx b/xmloff/source/style/VisAreaExport.cxx index a45b63f50242..6bdcb18c7f43 100644 --- a/xmloff/source/style/VisAreaExport.cxx +++ b/xmloff/source/style/VisAreaExport.cxx @@ -28,9 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include <com/sun/star/awt/Rectangle.hpp> -#include "VisAreaExport.hxx" +#include "xmloff/VisAreaExport.hxx" #include <xmloff/xmlexp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx index 9d48f2ce531b..d8f84b1d9840 100644 --- a/xmloff/source/style/XMLBackgroundImageContext.cxx +++ b/xmloff/source/style/XMLBackgroundImageContext.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/io/XOutputStream.hpp> #include <xmloff/xmltkmap.hxx> #include <xmloff/xmluconv.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/style/XMLBackgroundImageExport.cxx b/xmloff/source/style/XMLBackgroundImageExport.cxx index dd61d4f3feb5..45039f348603 100644 --- a/xmloff/source/style/XMLBackgroundImageExport.cxx +++ b/xmloff/source/style/XMLBackgroundImageExport.cxx @@ -29,7 +29,7 @@ #include "precompiled_xmloff.hxx" #include <com/sun/star/style/GraphicLocation.hpp> -#include <xmlnmspe.hxx> +#include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> #include <rtl/ustrbuf.hxx> #include <xmloff/xmlexp.hxx> diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx index dcc81ccf9f89..f9e5e298460d 100644 --- a/xmloff/source/style/XMLFontAutoStylePool.cxx +++ b/xmloff/source/style/XMLFontAutoStylePool.cxx @@ -27,12 +27,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" - #include <tools/debug.hxx> #include <svl/cntnrsrt.hxx> #include <tools/fontenum.hxx> - -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include "fonthdl.hxx" diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx index 49dd6ddac91e..c36fd4c55fab 100644 --- a/xmloff/source/style/XMLFontStylesContext.cxx +++ b/xmloff/source/style/XMLFontStylesContext.cxx @@ -34,7 +34,7 @@ #include <rtl/logfile.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include "fonthdl.hxx" #include <xmloff/xmlimp.hxx> diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx index 42d4e2cec221..b576c697732c 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx @@ -30,7 +30,7 @@ #include "XMLFootnoteSeparatorExport.hxx" #include <tools/debug.hxx> #include <xmloff/xmlexp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmluconv.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlprmap.hxx> diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx index 33fb40fbfc3a..7293c1198cea 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx @@ -39,7 +39,7 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlprmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/maptype.hxx> diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx index bc5bdaf6d69f..915b2291461f 100644 --- a/xmloff/source/style/XMLPageExport.cxx +++ b/xmloff/source/style/XMLPageExport.cxx @@ -29,7 +29,7 @@ #include "precompiled_xmloff.hxx" #include <xmloff/XMLPageExport.hxx> #include <tools/debug.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/style/XStyle.hpp> diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx index af3f36d8b4d1..63860130e1a5 100644 --- a/xmloff/source/style/impastp4.cxx +++ b/xmloff/source/style/impastp4.cxx @@ -31,7 +31,7 @@ #include <xmloff/xmlaustp.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/attrlist.hxx> #include "impastpl.hxx" #include <xmloff/xmlexppr.hxx> diff --git a/xmloff/source/style/makefile.mk b/xmloff/source/style/makefile.mk deleted file mode 100644 index 3436b33b654b..000000000000 --- a/xmloff/source/style/makefile.mk +++ /dev/null @@ -1,219 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=xmloff -TARGET=style - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -CXXFILES = \ - XMLPercentOrMeasurePropertyHandler.cxx \ - XMLIsPercentagePropertyHandler.cxx \ - XMLRectangleMembersHandler.cxx \ - adjushdl.cxx \ - backhdl.cxx \ - bordrhdl.cxx \ - breakhdl.cxx \ - cdouthdl.cxx \ - chrhghdl.cxx \ - chrlohdl.cxx \ - csmaphdl.cxx \ - escphdl.cxx \ - fonthdl.cxx \ - impastp1.cxx \ - impastp2.cxx \ - impastp3.cxx \ - impastp4.cxx \ - kernihdl.cxx \ - lspachdl.cxx \ - numehelp.cxx \ - opaquhdl.cxx \ - postuhdl.cxx \ - prhdlfac.cxx \ - prstylei.cxx \ - shadwhdl.cxx \ - shdwdhdl.cxx \ - styleexp.cxx \ - tabsthdl.cxx \ - undlihdl.cxx \ - uniref.cxx \ - weighhdl.cxx \ - xmlaustp.cxx \ - xmlbahdl.cxx \ - xmlexppr.cxx \ - xmlimppr.cxx \ - xmlnume.cxx \ - xmlnumfe.cxx \ - xmlnumfi.cxx \ - xmlnumi.cxx \ - xmlprcon.cxx \ - xmlprhdl.cxx \ - xmlprmap.cxx \ - xmlstyle.cxx \ - xmltabe.cxx \ - xmltabi.cxx \ - DashStyle.cxx \ - EnumPropertyHdl.cxx \ - FillStyleContext.cxx \ - GradientStyle.cxx \ - HatchStyle.cxx \ - ImageStyle.cxx \ - MarkerStyle.cxx \ - MultiPropertySetHelper.cxx \ - SinglePropertySetInfoCache.cxx \ - DashStyle.cxx \ - AttributeContainerHandler.cxx \ - NamedBoolPropertyHdl.cxx \ - TransGradientStyle.cxx \ - XMLBackgroundImageContext.cxx \ - XMLBackgroundImageExport.cxx \ - XMLClipPropertyHandler.cxx \ - XMLConstantsPropertyHandler.cxx \ - XMLElementPropertyContext.cxx \ - XMLFootnoteSeparatorExport.cxx \ - XMLFootnoteSeparatorImport.cxx \ - XMLFontAutoStylePool.cxx \ - XMLFontStylesContext.cxx \ - XMLPageExport.cxx \ - PageMasterPropHdl.cxx \ - PageMasterPropHdlFactory.cxx \ - PageMasterStyleMap.cxx \ - PageMasterPropMapper.cxx \ - PageMasterExportPropMapper.cxx \ - PageMasterImportPropMapper.cxx \ - PageMasterImportContext.cxx \ - PagePropertySetContext.cxx \ - PageHeaderFooterContext.cxx \ - StyleMap.cxx \ - XMLBitmapRepeatOffsetPropertyHandler.cxx \ - XMLFillBitmapSizePropertyHandler.cxx \ - XMLBitmapLogicalSizePropertyHandler.cxx \ - durationhdl.cxx \ - VisAreaExport.cxx \ - VisAreaContext.cxx \ - DrawAspectHdl.cxx - - -SLOFILES = \ - $(SLO)$/XMLPercentOrMeasurePropertyHandler.obj \ - $(SLO)$/XMLIsPercentagePropertyHandler.obj \ - $(SLO)$/XMLRectangleMembersHandler.obj \ - $(SLO)$/adjushdl.obj \ - $(SLO)$/backhdl.obj \ - $(SLO)$/bordrhdl.obj \ - $(SLO)$/breakhdl.obj \ - $(SLO)$/cdouthdl.obj \ - $(SLO)$/chrhghdl.obj \ - $(SLO)$/chrlohdl.obj \ - $(SLO)$/csmaphdl.obj \ - $(SLO)$/escphdl.obj \ - $(SLO)$/fonthdl.obj \ - $(SLO)$/impastp1.obj \ - $(SLO)$/impastp2.obj \ - $(SLO)$/impastp3.obj \ - $(SLO)$/impastp4.obj \ - $(SLO)$/kernihdl.obj \ - $(SLO)$/lspachdl.obj \ - $(SLO)$/numehelp.obj \ - $(SLO)$/opaquhdl.obj \ - $(SLO)$/postuhdl.obj \ - $(SLO)$/prhdlfac.obj \ - $(SLO)$/prstylei.obj \ - $(SLO)$/shadwhdl.obj \ - $(SLO)$/shdwdhdl.obj \ - $(SLO)$/styleexp.obj \ - $(SLO)$/tabsthdl.obj \ - $(SLO)$/undlihdl.obj \ - $(SLO)$/uniref.obj \ - $(SLO)$/weighhdl.obj \ - $(SLO)$/xmlaustp.obj \ - $(SLO)$/xmlbahdl.obj \ - $(SLO)$/xmlexppr.obj \ - $(SLO)$/xmlimppr.obj \ - $(SLO)$/xmlnume.obj \ - $(SLO)$/xmlnumfe.obj \ - $(SLO)$/xmlnumfi.obj \ - $(SLO)$/xmlnumi.obj \ - $(SLO)$/xmlprcon.obj \ - $(SLO)$/xmlprhdl.obj \ - $(SLO)$/xmlprmap.obj \ - $(SLO)$/xmlstyle.obj \ - $(SLO)$/xmltabe.obj \ - $(SLO)$/xmltabi.obj \ - $(SLO)$/DashStyle.obj \ - $(SLO)$/EnumPropertyHdl.obj \ - $(SLO)$/FillStyleContext.obj \ - $(SLO)$/GradientStyle.obj \ - $(SLO)$/HatchStyle.obj \ - $(SLO)$/ImageStyle.obj \ - $(SLO)$/MarkerStyle.obj \ - $(SLO)$/MultiPropertySetHelper.obj \ - $(SLO)$/SinglePropertySetInfoCache.obj \ - $(SLO)$/NamedBoolPropertyHdl.obj \ - $(SLO)$/TransGradientStyle.obj \ - $(SLO)$/XMLBackgroundImageContext.obj \ - $(SLO)$/XMLBackgroundImageExport.obj \ - $(SLO)$/XMLClipPropertyHandler.obj \ - $(SLO)$/XMLConstantsPropertyHandler.obj \ - $(SLO)$/AttributeContainerHandler.obj \ - $(SLO)$/XMLElementPropertyContext.obj \ - $(SLO)$/XMLFootnoteSeparatorExport.obj \ - $(SLO)$/XMLFootnoteSeparatorImport.obj \ - $(SLO)$/XMLFontAutoStylePool.obj \ - $(SLO)$/XMLFontStylesContext.obj \ - $(SLO)$/XMLPageExport.obj \ - $(SLO)$/PageMasterPropHdl.obj \ - $(SLO)$/PageMasterPropHdlFactory.obj \ - $(SLO)$/PageMasterStyleMap.obj \ - $(SLO)$/PageMasterPropMapper.obj \ - $(SLO)$/PageMasterExportPropMapper.obj \ - $(SLO)$/PageMasterImportPropMapper.obj \ - $(SLO)$/PageMasterImportContext.obj \ - $(SLO)$/PagePropertySetContext.obj \ - $(SLO)$/PageHeaderFooterContext.obj \ - $(SLO)$/StyleMap.obj \ - $(SLO)$/WordWrapPropertyHdl.obj \ - $(SLO)$/XMLBitmapRepeatOffsetPropertyHandler.obj \ - $(SLO)$/XMLFillBitmapSizePropertyHandler.obj \ - $(SLO)$/XMLBitmapLogicalSizePropertyHandler.obj \ - $(SLO)$/durationhdl.obj \ - $(SLO)$/VisAreaExport.obj \ - $(SLO)$/VisAreaContext.obj \ - $(SLO)$/DrawAspectHdl.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx index 8d333f82a156..be98184a41dc 100644 --- a/xmloff/source/style/numehelp.cxx +++ b/xmloff/source/style/numehelp.cxx @@ -28,10 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "numehelp.hxx" +#include "xmloff/numehelp.hxx" #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmluconv.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlexp.hxx> diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index 3eb2ddb71a8d..9c736bf8f226 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -33,7 +33,7 @@ #ifndef __SGI_STL_SET #include <set> #endif -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlprcon.hxx> #include <com/sun/star/style/XStyle.hpp> @@ -49,7 +49,7 @@ #include <xmloff/prstylei.hxx> #endif #include <xmloff/attrlist.hxx> -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx index cb666d899fb7..99bf9ce1476e 100644 --- a/xmloff/source/style/styleexp.cxx +++ b/xmloff/source/style/styleexp.cxx @@ -33,7 +33,7 @@ #include <svl/svstdarr.hxx> #endif #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #ifndef _XMLOFF_XMLITMAP_HXX //#include "xmlitmap.hxx" diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx index c30f7c631a71..c9ff7b92dade 100644 --- a/xmloff/source/style/xmlaustp.cxx +++ b/xmloff/source/style/xmlaustp.cxx @@ -34,10 +34,10 @@ #include "impastpl.hxx" #include <xmloff/xmlaustp.hxx> #include <xmloff/families.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlexp.hxx> -#include "XMLTextListAutoStylePool.hxx" +#include "xmloff/XMLTextListAutoStylePool.hxx" #ifndef _XMLOFF_PAGEMASTERSTYLEMAP_HXX #include <xmloff/PageMasterStyleMap.hxx> diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index 94898b89ca04..23c55cc4ef04 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -43,7 +43,7 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/attrlist.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlexp.hxx> #include <xmloff/xmlprmap.hxx> #include <xmloff/PropertySetInfoHash.hxx> diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx index 812071ff1b03..1757e48560b9 100644 --- a/xmloff/source/style/xmlimppr.cxx +++ b/xmloff/source/style/xmlimppr.cxx @@ -40,10 +40,10 @@ #include <xmloff/xmlimppr.hxx> #include <xmloff/xmlimp.hxx> -#include "unoatrcn.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/unoatrcn.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" #include <tools/debug.hxx> #include "xmloff/contextid.hxx" diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx index 5bc581c7af0b..448547f44717 100644 --- a/xmloff/source/style/xmlnume.cxx +++ b/xmloff/source/style/xmlnume.cxx @@ -50,11 +50,11 @@ #include <tools/debug.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include "fonthdl.hxx" -#include "XMLTextListAutoStylePool.hxx" +#include "xmloff/XMLTextListAutoStylePool.hxx" #include <xmloff/xmlnume.hxx> #include <xmloff/xmlexp.hxx> #include <tools/fontenum.hxx> diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 93355e914759..7562bfa3a9e3 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -49,7 +49,7 @@ #include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp> #include <xmloff/xmlnumfe.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmluconv.hxx> #include <xmloff/attrlist.hxx> #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index a192baa2216b..7ba79b221e79 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -45,7 +45,7 @@ #include <xmloff/xmlnumfi.hxx> #include <xmloff/xmltkmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index 72efeabaaca4..0d45fdc289d0 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -51,12 +51,12 @@ #include <xmloff/xmltkmap.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlimp.hxx> #include <xmloff/XMLBase64ImportContext.hxx> #include <xmloff/xmltoken.hxx> -#include "i18nmap.hxx" +#include <xmloff/i18nmap.hxx> #include <xmloff/xmluconv.hxx> #include "fonthdl.hxx" #include <xmloff/XMLFontStylesContext.hxx> diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index 48779f48f583..c6f89c650e54 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -46,7 +46,7 @@ #include <svl/cntnrsrt.hxx> #include <svl/itemset.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #ifndef _XMLOFF_FAMILIES_HXX diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx index 43390b58f006..64c294c3da2f 100644 --- a/xmloff/source/style/xmltabe.cxx +++ b/xmloff/source/style/xmltabe.cxx @@ -33,11 +33,11 @@ #include <com/sun/star/style/TabAlign.hpp> #include <rtl/ustrbuf.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlexp.hxx> -#include "xmltabe.hxx" +#include "xmloff/xmltabe.hxx" using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx index 72f5e6f1f2e5..24402e61c240 100644 --- a/xmloff/source/style/xmltabi.cxx +++ b/xmloff/source/style/xmltabi.cxx @@ -31,11 +31,11 @@ #include <rtl/ustrbuf.hxx> #include <xmloff/xmltkmap.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlimp.hxx> #include <com/sun/star/style/TabStop.hpp> #include <xmloff/xmltoken.hxx> -#include "i18nmap.hxx" +#include "xmloff/i18nmap.hxx" #include <xmloff/xmluconv.hxx> #include "xmltabi.hxx" diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx index ad3a1f96752f..6a31d7a7cc35 100644 --- a/xmloff/source/table/XMLTableExport.cxx +++ b/xmloff/source/table/XMLTableExport.cxx @@ -47,7 +47,7 @@ #include <com/sun/star/beans/XPropertySetInfo.hpp> #include "xmloff/table/XMLTableExport.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlprmap.hxx> #include <xmloff/xmlexppr.hxx> #include <xmloff/xmlexp.hxx> diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx index 875c17aa91fc..0695d8643bfa 100644 --- a/xmloff/source/table/XMLTableImport.cxx +++ b/xmloff/source/table/XMLTableImport.cxx @@ -48,7 +48,7 @@ #include "xmloff/prstylei.hxx" #include "xmloff/xmlimp.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "table.hxx" #include <boost/shared_ptr.hpp> diff --git a/xmloff/source/table/makefile.mk b/xmloff/source/table/makefile.mk deleted file mode 100644 index 6f8c8efab7b6..000000000000 --- a/xmloff/source/table/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=xmloff -TARGET=table -AUTOSEG=true -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/XMLTableExport.obj\ - $(SLO)$/XMLTableImport.obj - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/xmloff/source/table/tabledesignsimporter.cxx b/xmloff/source/table/tabledesignsimporter.cxx deleted file mode 100644 index 7c4002df3013..000000000000 --- a/xmloff/source/table/tabledesignsimporter.cxx +++ /dev/null @@ -1,103 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_xmloff.hxx" - -#include <com/sun/star/style/XStyleFamiliesSupplier.hpp> -#include <com/sun/star/table/XTableRows.hpp> -#include <com/sun/star/table/XMergeableCell.hpp> -#include <com/sun/star/table/XMergeableCellRange.hpp> -#include <com/sun/star/table/XTable.hpp> -#include <com/sun/star/text/XText.hpp> -#include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> - -#include "xmloff/table/XMLTableImport.hxx" -#include "xmloff/xmltkmap.hxx" -#include "xmloff/maptype.hxx" -#include "xmloff/xmlprmap.hxx" -#include "xmloff/txtimp.hxx" -#include "xmloff/xmlimp.hxx" -#include "xmloff/nmspmap.hxx" -#include "xmloff/xmlstyle.hxx" -#include "xmloff/prstylei.hxx" -#include "xmloff/xmlimp.hxx" - -#include "xmlnmspe.hxx" -#include "table.hxx" - -#include <boost/shared_ptr.hpp> - -// -------------------------------------------------------------------- - -using ::rtl::OUString; -using namespace ::xmloff::token; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::table; -using namespace ::com::sun::star::xml::sax; -using namespace ::com::sun::star::text; -using namespace ::com::sun::star::style; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::container; - -// -------------------------------------------------------------------- - -class TabelDesignsImporter : public SvXMLImport -{ - TabelDesignsImporter( const Reference< XMultiServiceFactory > & rSMgr ); - ~TabelDesignsImporter() throw (); - - SvXMLImportContext* CreateContext(USHORT nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& xAttrList); -} - -// -------------------------------------------------------------------- - -TabelDesignsImporter::TabelDesignsImporter( const Reference< XMultiServiceFactory > & rSMgr ) -: SvXMLImport( rSMgr, true ) -{ - // add namespaces - GetNamespaceMap().Add( - GetXMLToken(XML_NP_PRESENTATION), - GetXMLToken(XML_N_PRESENTATION), - XML_NAMESPACE_PRESENTATION); -} - -// -------------------------------------------------------------------- - -TabelDesignsImporter::~TabelDesignsImporter() -{ -} - -// -------------------------------------------------------------------- - -SvXMLImportContext* TabelDesignsImporter::CreateContext(USHORT nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& xAttrList) -{ -} - -// -------------------------------------------------------------------- diff --git a/xmloff/source/text/XMLAutoMarkFileContext.cxx b/xmloff/source/text/XMLAutoMarkFileContext.cxx index c0688c4b2259..505a7e6b0281 100644 --- a/xmloff/source/text/XMLAutoMarkFileContext.cxx +++ b/xmloff/source/text/XMLAutoMarkFileContext.cxx @@ -31,7 +31,7 @@ #include <xmloff/xmlimp.hxx> #include <rtl/ustring.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/xml/sax/XAttributeList.hpp> diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx index 1aad5a8a149b..6d14bd5ddc26 100644 --- a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx +++ b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx @@ -32,7 +32,7 @@ #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/container/XNameReplace.hpp> #include <xmloff/xmlimp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/XMLEventsImportContext.hxx> diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx index 125d0a63c43c..dcef23ba5734 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.cxx +++ b/xmloff/source/text/XMLAutoTextEventExport.cxx @@ -46,7 +46,7 @@ //#include <comphelper/processfactory.hxx> //#endif #include <rtl/ustrbuf.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/XMLEventExport.hxx> diff --git a/xmloff/source/text/XMLAutoTextEventImport.cxx b/xmloff/source/text/XMLAutoTextEventImport.cxx index 9833376eea5c..ffd7f2985070 100644 --- a/xmloff/source/text/XMLAutoTextEventImport.cxx +++ b/xmloff/source/text/XMLAutoTextEventImport.cxx @@ -34,7 +34,7 @@ #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include "XMLAutoTextContainerEventImport.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <tools/debug.hxx> diff --git a/xmloff/source/text/XMLCalculationSettingsContext.cxx b/xmloff/source/text/XMLCalculationSettingsContext.cxx index 03ed535d2785..af1b2b0cf7c4 100644 --- a/xmloff/source/text/XMLCalculationSettingsContext.cxx +++ b/xmloff/source/text/XMLCalculationSettingsContext.cxx @@ -32,7 +32,7 @@ #include <com/sun/star/text/XTextDocument.hpp> #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/text/XMLChangeElementImportContext.cxx b/xmloff/source/text/XMLChangeElementImportContext.cxx index 49780ad5c91a..061a9a1f9172 100644 --- a/xmloff/source/text/XMLChangeElementImportContext.cxx +++ b/xmloff/source/text/XMLChangeElementImportContext.cxx @@ -32,7 +32,7 @@ #include "XMLChangeInfoContext.hxx" #include <com/sun/star/uno/Reference.h> #include <xmloff/xmlimp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/text/XMLChangeImportContext.cxx b/xmloff/source/text/XMLChangeImportContext.cxx index b30291b736be..9aee1c843369 100644 --- a/xmloff/source/text/XMLChangeImportContext.cxx +++ b/xmloff/source/text/XMLChangeImportContext.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/text/XTextRange.hpp> #include <tools/debug.hxx> #include <xmloff/xmlimp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/text/XMLChangeInfoContext.cxx b/xmloff/source/text/XMLChangeInfoContext.cxx index 21cf7993328d..506ead5789a4 100644 --- a/xmloff/source/text/XMLChangeInfoContext.cxx +++ b/xmloff/source/text/XMLChangeInfoContext.cxx @@ -31,7 +31,7 @@ #include "XMLChangedRegionImportContext.hxx" #include "XMLStringBufferImportContext.hxx" #include <com/sun/star/uno/Reference.h> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlimp.hxx> diff --git a/xmloff/source/text/XMLChangedRegionImportContext.cxx b/xmloff/source/text/XMLChangedRegionImportContext.cxx index 52e4ccc8e048..9560a8159a0e 100644 --- a/xmloff/source/text/XMLChangedRegionImportContext.cxx +++ b/xmloff/source/text/XMLChangedRegionImportContext.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/text/XTextCursor.hpp> #include <xmloff/xmlimp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx index bfd436652253..5f48619c3946 100644 --- a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx @@ -36,7 +36,7 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/txtimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <com/sun/star/xml/sax/XAttributeList.hpp> using ::rtl::OUString; diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx index 9f2877fd9e12..9f0658dc84da 100644 --- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx @@ -35,7 +35,7 @@ #include <rtl/ustrbuf.hxx> #include <tools/debug.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #ifndef _XMLOFF_FAMILIES_HXX diff --git a/xmloff/source/text/XMLFootnoteImportContext.cxx b/xmloff/source/text/XMLFootnoteImportContext.cxx index 9a015e20a55c..5f7389a7b799 100644 --- a/xmloff/source/text/XMLFootnoteImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteImportContext.cxx @@ -36,7 +36,7 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/txtimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include "XMLFootnoteBodyImportContext.hxx" diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx index aaebd7a27dca..52147bc8caf2 100644 --- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx +++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx @@ -38,7 +38,7 @@ #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/txtimp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx index cbd959b65084..23e11530d73f 100644 --- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx @@ -35,7 +35,7 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/txtimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include <tools/debug.hxx> diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx index f17bcd4dedf1..2fafdf44c10f 100644 --- a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx @@ -35,7 +35,7 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/txtimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include <com/sun/star/text/BibliographyDataField.hpp> diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx index dae235996d10..a617c150fd4e 100644 --- a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx @@ -38,7 +38,7 @@ #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/txtimp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx index 0c0e815870be..bc5cb36ecb81 100644 --- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx +++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx @@ -35,7 +35,7 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/txtimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include <com/sun/star/text/ChapterFormat.hpp> diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx index 8f9af9f5243b..40c32701d50a 100644 --- a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx +++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx @@ -35,7 +35,7 @@ #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/txtimp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/text/XMLIndexMarkExport.cxx b/xmloff/source/text/XMLIndexMarkExport.cxx index c7b3d9e3c135..325e7a66f83f 100644 --- a/xmloff/source/text/XMLIndexMarkExport.cxx +++ b/xmloff/source/text/XMLIndexMarkExport.cxx @@ -34,7 +34,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlexp.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.cxx b/xmloff/source/text/XMLIndexObjectSourceContext.cxx index f44154193e33..15301ffb2fe6 100644 --- a/xmloff/source/text/XMLIndexObjectSourceContext.cxx +++ b/xmloff/source/text/XMLIndexObjectSourceContext.cxx @@ -38,7 +38,7 @@ #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/txtimp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx index b043c0b83dea..4284eabe3571 100644 --- a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx +++ b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx @@ -35,7 +35,7 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/txtimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx index 3ee80500d21f..f9e04bd0a488 100644 --- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx +++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx @@ -38,7 +38,7 @@ #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/txtimp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx index ad9f7ce10d7a..2699111ab47a 100644 --- a/xmloff/source/text/XMLIndexTOCContext.cxx +++ b/xmloff/source/text/XMLIndexTOCContext.cxx @@ -49,10 +49,10 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/txtimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/prstylei.hxx> -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" #include <xmloff/xmluconv.hxx> #include <rtl/ustring.hxx> diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.cxx b/xmloff/source/text/XMLIndexTOCSourceContext.cxx index c52a3f1ee2ab..84296ff24241 100644 --- a/xmloff/source/text/XMLIndexTOCSourceContext.cxx +++ b/xmloff/source/text/XMLIndexTOCSourceContext.cxx @@ -38,7 +38,7 @@ #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/txtimp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.cxx b/xmloff/source/text/XMLIndexTOCStylesContext.cxx index 0a7e010e59fb..755bd280a539 100644 --- a/xmloff/source/text/XMLIndexTOCStylesContext.cxx +++ b/xmloff/source/text/XMLIndexTOCStylesContext.cxx @@ -35,7 +35,7 @@ #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/txtimp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx index f2702a81ed20..301e7af3f96d 100644 --- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx +++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx @@ -35,7 +35,7 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/txtimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include <rtl/ustring.hxx> diff --git a/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx index 240e702d2b2a..b87514c79eda 100644 --- a/xmloff/source/text/XMLIndexTableSourceContext.cxx +++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx @@ -42,7 +42,7 @@ #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/txtimp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx index cb94747c68a5..05bf7f5495da 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTemplateContext.cxx @@ -39,7 +39,7 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/txtimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include <tools/debug.hxx> diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx index 029660b0ccd5..333c141f8843 100644 --- a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx @@ -31,7 +31,7 @@ #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/text/XMLIndexUserSourceContext.cxx b/xmloff/source/text/XMLIndexUserSourceContext.cxx index 2554229781b0..b87551307d73 100644 --- a/xmloff/source/text/XMLIndexUserSourceContext.cxx +++ b/xmloff/source/text/XMLIndexUserSourceContext.cxx @@ -38,7 +38,7 @@ #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/txtimp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/text/XMLLineNumberingExport.cxx b/xmloff/source/text/XMLLineNumberingExport.cxx index 637cdf0b781e..dd0386d48aab 100644 --- a/xmloff/source/text/XMLLineNumberingExport.cxx +++ b/xmloff/source/text/XMLLineNumberingExport.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/style/LineNumberPosition.hpp> #include <xmloff/xmlexp.hxx> #include <xmloff/xmluconv.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnume.hxx> diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx index 55dc9db9b254..cc1e11389750 100644 --- a/xmloff/source/text/XMLLineNumberingImportContext.cxx +++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx @@ -35,7 +35,7 @@ #include <com/sun/star/style/NumberingType.hpp> #include <xmloff/xmlimp.hxx> #include <xmloff/xmluconv.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnumi.hxx> diff --git a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx index c07b1e64e14c..4c2b62c5ec35 100644 --- a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx +++ b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx @@ -31,7 +31,7 @@ #include "XMLLineNumberingImportContext.hxx" #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx index 67970330f3ef..7dee1ba94069 100644 --- a/xmloff/source/text/XMLRedlineExport.cxx +++ b/xmloff/source/text/XMLRedlineExport.cxx @@ -42,7 +42,7 @@ #include <com/sun/star/text/XTextSection.hpp> #include <com/sun/star/util/DateTime.hpp> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlexp.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx index 7cf96abea2e2..aee5f991b48e 100644 --- a/xmloff/source/text/XMLSectionExport.cxx +++ b/xmloff/source/text/XMLSectionExport.cxx @@ -53,7 +53,7 @@ #include <com/sun/star/text/XChapterNumberingSupplier.hpp> #include <com/sun/star/text/ChapterFormat.hpp> //i90246 #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/families.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx index 9ec1adfb75eb..ce702d714857 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx @@ -37,7 +37,7 @@ #include <xmloff/txtprmap.hxx> #endif #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmluconv.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnume.hxx> diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx index 838c113a590f..24e87dfde17a 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx @@ -39,7 +39,7 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlprmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/maptype.hxx> #include <xmloff/xmlnumi.hxx> diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx index 4b9b94b1ced7..890c55140ee4 100644 --- a/xmloff/source/text/XMLSectionImportContext.cxx +++ b/xmloff/source/text/XMLSectionImportContext.cxx @@ -34,7 +34,7 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/txtimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/prstylei.hxx> diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx index de61e78e564b..25f456a5d584 100644 --- a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx +++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx @@ -34,7 +34,7 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/txtimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include <com/sun/star/uno/Reference.h> diff --git a/xmloff/source/text/XMLSectionSourceImportContext.cxx b/xmloff/source/text/XMLSectionSourceImportContext.cxx index 53a56da11be7..7c2023228c2b 100644 --- a/xmloff/source/text/XMLSectionSourceImportContext.cxx +++ b/xmloff/source/text/XMLSectionSourceImportContext.cxx @@ -34,7 +34,7 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/txtimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/xmloff/source/text/XMLStringBufferImportContext.cxx b/xmloff/source/text/XMLStringBufferImportContext.cxx index b714ff064ffd..2d9df7ef1ef1 100644 --- a/xmloff/source/text/XMLStringBufferImportContext.cxx +++ b/xmloff/source/text/XMLStringBufferImportContext.cxx @@ -29,7 +29,7 @@ #include "precompiled_xmloff.hxx" #include "XMLStringBufferImportContext.hxx" #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" using ::rtl::OUString; diff --git a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx index fd891e447c60..e4ed313d70de 100644 --- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx +++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include "XMLTextCharStyleNamesElementExport.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmlexp.hxx> diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx index 55f3426cf200..48175ae33e4f 100644 --- a/xmloff/source/text/XMLTextColumnsContext.cxx +++ b/xmloff/source/text/XMLTextColumnsContext.cxx @@ -35,7 +35,7 @@ #include <xmloff/xmltkmap.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlimp.hxx> #include <xmloff/xmltoken.hxx> #include "XMLTextColumnsContext.hxx" diff --git a/xmloff/source/text/XMLTextColumnsExport.cxx b/xmloff/source/text/XMLTextColumnsExport.cxx index 9e99c98e5df8..695bdf47578f 100644 --- a/xmloff/source/text/XMLTextColumnsExport.cxx +++ b/xmloff/source/text/XMLTextColumnsExport.cxx @@ -38,7 +38,7 @@ #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmluconv.hxx> #include <xmloff/xmlexp.hxx> #include "XMLTextColumnsExport.hxx" diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index accaa49d5ea4..3216c6f05618 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -42,7 +42,7 @@ #include <com/sun/star/text/VertOrientation.hpp> #include <xmloff/xmlimp.hxx> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> #include "XMLAnchorTypePropHdl.hxx" @@ -50,7 +50,7 @@ #include <xmloff/XMLBase64ImportContext.hxx> #include "XMLReplacementImageContext.hxx" #include <xmloff/prstylei.hxx> -#include "i18nmap.hxx" +#include "xmloff/i18nmap.hxx" #include "xexptran.hxx" #include <xmloff/shapeimport.hxx> #include <xmloff/XMLEventsImportContext.hxx> diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx index 6ded2b4d5cbd..15cc68c9e675 100644 --- a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx +++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx @@ -29,7 +29,7 @@ #include "precompiled_xmloff.hxx" #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include "XMLTextFrameContext.hxx" diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx index 9fcd63290e10..de74248f787b 100644 --- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx +++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx @@ -30,7 +30,7 @@ #include <com/sun/star/text/XText.hpp> #include <com/sun/star/text/XRelativeTextContentRemove.hpp> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "XMLTextHeaderFooterContext.hxx" #ifndef _XMLOFF_TEXTTABLECONTEXT_HXX_ #include <xmloff/XMLTextTableContext.hxx> diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx index f7cbe73acd1b..4422241d822f 100644 --- a/xmloff/source/text/XMLTextListAutoStylePool.cxx +++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx @@ -34,7 +34,7 @@ #include <com/sun/star/container/XIndexReplace.hpp> #include <rtl/ustrbuf.hxx> #include <xmloff/xmlnume.hxx> -#include "XMLTextListAutoStylePool.hxx" +#include "xmloff/XMLTextListAutoStylePool.hxx" #include <xmloff/xmlexp.hxx> using ::rtl::OUString; diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx index fd2cb58b257f..25b0ba3078ea 100644 --- a/xmloff/source/text/XMLTextListBlockContext.cxx +++ b/xmloff/source/text/XMLTextListBlockContext.cxx @@ -35,7 +35,7 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/xmlnumi.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include "XMLTextListItemContext.hxx" #include "XMLTextListBlockContext.hxx" diff --git a/xmloff/source/text/XMLTextListItemContext.cxx b/xmloff/source/text/XMLTextListItemContext.cxx index b9a6dc1915e5..d8effc0180de 100644 --- a/xmloff/source/text/XMLTextListItemContext.cxx +++ b/xmloff/source/text/XMLTextListItemContext.cxx @@ -30,7 +30,7 @@ #include <tools/debug.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include "txtparai.hxx" #include "txtlists.hxx" diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index 922777808734..4ac42d4abebd 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -38,8 +38,8 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> +#include "xmloff/xmlnmspe.hxx" #include <xmloff/odffields.hxx> -#include "xmlnmspe.hxx" #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/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx index fc18e17fefd3..ba097f542098 100644 --- a/xmloff/source/text/XMLTextMasterPageContext.cxx +++ b/xmloff/source/text/XMLTextMasterPageContext.cxx @@ -32,7 +32,7 @@ #include <com/sun/star/style/PageStyleLayout.hpp> #include <com/sun/star/beans/XMultiPropertyStates.hpp> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/XMLTextMasterPageContext.hxx> #include "XMLTextHeaderFooterContext.hxx" diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx b/xmloff/source/text/XMLTextMasterPageExport.cxx index fba75ca74e1a..dbffabc3d920 100644 --- a/xmloff/source/text/XMLTextMasterPageExport.cxx +++ b/xmloff/source/text/XMLTextMasterPageExport.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include <tools/debug.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <com/sun/star/text/XText.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/xmloff/source/text/XMLTextMasterStylesContext.cxx b/xmloff/source/text/XMLTextMasterStylesContext.cxx index f66f5df75d37..38428dabb8d1 100644 --- a/xmloff/source/text/XMLTextMasterStylesContext.cxx +++ b/xmloff/source/text/XMLTextMasterStylesContext.cxx @@ -31,7 +31,7 @@ #include <xmloff/xmlimp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/text/XMLTextNumRuleInfo.cxx b/xmloff/source/text/XMLTextNumRuleInfo.cxx index 482d94d05889..cbb0d976a836 100644 --- a/xmloff/source/text/XMLTextNumRuleInfo.cxx +++ b/xmloff/source/text/XMLTextNumRuleInfo.cxx @@ -36,7 +36,7 @@ #include <com/sun/star/container/XNamed.hpp> #include "XMLTextNumRuleInfo.hxx" // --> OD 2008-04-25 #refactorlists# -#include "XMLTextListAutoStylePool.hxx" +#include "xmloff/XMLTextListAutoStylePool.hxx" // <-- using ::rtl::OUString; diff --git a/xmloff/source/text/XMLTextShapeImportHelper.cxx b/xmloff/source/text/XMLTextShapeImportHelper.cxx index e398effbf44c..3c5df81cb597 100644 --- a/xmloff/source/text/XMLTextShapeImportHelper.cxx +++ b/xmloff/source/text/XMLTextShapeImportHelper.cxx @@ -41,7 +41,7 @@ #include "XMLAnchorTypePropHdl.hxx" #include <com/sun/star/drawing/XDrawPageSupplier.hpp> #include <com/sun/star/drawing/XShapes.hpp> -#include "XMLTextShapeImportHelper.hxx" +#include "xmloff/XMLTextShapeImportHelper.hxx" using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/xmloff/source/text/XMLTextShapeImportHelper.hxx b/xmloff/source/text/XMLTextShapeImportHelper.hxx deleted file mode 100644 index 96c17334dfcd..000000000000 --- a/xmloff/source/text/XMLTextShapeImportHelper.hxx +++ /dev/null @@ -1,57 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _XMLTEXTSHAPEIMPORTHELPER_HXX -#define _XMLTEXTSHAPEIMPORTHELPER_HXX - -#include "sal/config.h" -#include "xmloff/dllapi.h" -#include <xmloff/shapeimport.hxx> - -class XMLOFF_DLLPUBLIC XMLTextShapeImportHelper : public XMLShapeImportHelper -{ - SvXMLImport& rImport; - - const ::rtl::OUString sAnchorType; - const ::rtl::OUString sAnchorPageNo; - const ::rtl::OUString sVertOrientPosition; - -public: - - XMLTextShapeImportHelper( SvXMLImport& rImp ); - ~XMLTextShapeImportHelper(); - - virtual void addShape( - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& rShape, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList, - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& rShapes ); -}; - -#endif diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx index 092f8720c6ec..46aac523b55a 100644 --- a/xmloff/source/text/XMLTextShapeStyleContext.cxx +++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx @@ -31,7 +31,7 @@ #ifndef _COM_SUN_STAR_DOCUMENT_XEVENTSSUPPLIER_HPP #include <com/sun/star/document/XEventsSupplier.hpp> #endif -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include "XMLTextPropertySetContext.hxx" #include <xmloff/xmlimp.hxx> diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.cxx b/xmloff/source/text/XMLTrackedChangesImportContext.cxx index ed207fed6c37..9fc143bf4330 100644 --- a/xmloff/source/text/XMLTrackedChangesImportContext.cxx +++ b/xmloff/source/text/XMLTrackedChangesImportContext.cxx @@ -32,7 +32,7 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Sequence.h> #include <xmloff/xmlimp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/text/makefile.mk b/xmloff/source/text/makefile.mk deleted file mode 100644 index 658de220445f..000000000000 --- a/xmloff/source/text/makefile.mk +++ /dev/null @@ -1,127 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=xmloff -TARGET=text - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - - -SLOFILES = \ - $(SLO)$/txtdrope.obj \ - $(SLO)$/txtdropi.obj \ - $(SLO)$/txtexppr.obj \ - $(SLO)$/txtflde.obj \ - $(SLO)$/txtfldi.obj \ - $(SLO)$/txtftne.obj \ - $(SLO)$/txtimp.obj \ - $(SLO)$/txtimppr.obj \ - $(SLO)$/txtlists.obj \ - $(SLO)$/txtparae.obj \ - $(SLO)$/txtparai.obj \ - $(SLO)$/txtprhdl.obj \ - $(SLO)$/txtprmap.obj \ - $(SLO)$/txtsecte.obj \ - $(SLO)$/txtstyle.obj \ - $(SLO)$/txtstyli.obj \ - $(SLO)$/txtvfldi.obj \ - $(SLO)$/XMLAutoMarkFileContext.obj \ - $(SLO)$/XMLAutoTextEventExport.obj \ - $(SLO)$/XMLAutoTextEventImport.obj \ - $(SLO)$/XMLAutoTextContainerEventImport.obj \ - $(SLO)$/XMLChangedRegionImportContext.obj \ - $(SLO)$/XMLChangeElementImportContext.obj \ - $(SLO)$/XMLChangeInfoContext.obj \ - $(SLO)$/XMLFootnoteBodyImportContext.obj \ - $(SLO)$/XMLFootnoteConfigurationImportContext.obj \ - $(SLO)$/XMLFootnoteImportContext.obj \ - $(SLO)$/XMLIndexAlphabeticalSourceContext.obj \ - $(SLO)$/XMLIndexBodyContext.obj \ - $(SLO)$/XMLIndexBibliographyConfigurationContext.obj \ - $(SLO)$/XMLIndexBibliographyEntryContext.obj \ - $(SLO)$/XMLIndexBibliographySourceContext.obj \ - $(SLO)$/XMLIndexChapterInfoEntryContext.obj \ - $(SLO)$/XMLIndexIllustrationSourceContext.obj \ - $(SLO)$/XMLIndexMarkExport.obj \ - $(SLO)$/XMLIndexObjectSourceContext.obj \ - $(SLO)$/XMLIndexSimpleEntryContext.obj \ - $(SLO)$/XMLIndexSpanEntryContext.obj \ - $(SLO)$/XMLIndexSourceBaseContext.obj \ - $(SLO)$/XMLIndexTOCContext.obj \ - $(SLO)$/XMLIndexTOCSourceContext.obj \ - $(SLO)$/XMLIndexTOCStylesContext.obj \ - $(SLO)$/XMLIndexTableSourceContext.obj \ - $(SLO)$/XMLIndexTabStopEntryContext.obj \ - $(SLO)$/XMLIndexTemplateContext.obj \ - $(SLO)$/XMLIndexTitleTemplateContext.obj \ - $(SLO)$/XMLIndexUserSourceContext.obj \ - $(SLO)$/XMLLineNumberingExport.obj \ - $(SLO)$/XMLLineNumberingImportContext.obj \ - $(SLO)$/XMLLineNumberingSeparatorImportContext.obj \ - $(SLO)$/XMLPropertyBackpatcher.obj \ - $(SLO)$/XMLRedlineExport.obj \ - $(SLO)$/XMLSectionExport.obj \ - $(SLO)$/XMLSectionFootnoteConfigExport.obj \ - $(SLO)$/XMLSectionFootnoteConfigImport.obj \ - $(SLO)$/XMLSectionImportContext.obj \ - $(SLO)$/XMLSectionSourceDDEImportContext.obj \ - $(SLO)$/XMLSectionSourceImportContext.obj \ - $(SLO)$/XMLTextCharStyleNamesElementExport.obj \ - $(SLO)$/XMLTextColumnsContext.obj \ - $(SLO)$/XMLTextColumnsExport.obj \ - $(SLO)$/XMLTextFrameContext.obj \ - $(SLO)$/XMLTextFrameHyperlinkContext.obj \ - $(SLO)$/XMLTextHeaderFooterContext.obj \ - $(SLO)$/XMLTextListAutoStylePool.obj \ - $(SLO)$/XMLTextListBlockContext.obj \ - $(SLO)$/XMLTextListItemContext.obj \ - $(SLO)$/XMLTextMarkImportContext.obj \ - $(SLO)$/XMLTextMasterPageContext.obj \ - $(SLO)$/XMLTextMasterPageExport.obj \ - $(SLO)$/XMLTextMasterStylesContext.obj \ - $(SLO)$/XMLTextNumRuleInfo.obj \ - $(SLO)$/XMLTextPropertySetContext.obj \ - $(SLO)$/XMLTextShapeImportHelper.obj \ - $(SLO)$/XMLTextShapeStyleContext.obj \ - $(SLO)$/XMLTextTableContext.obj \ - $(SLO)$/XMLChangeImportContext.obj \ - $(SLO)$/XMLStringBufferImportContext.obj \ - $(SLO)$/XMLTrackedChangesImportContext.obj \ - $(SLO)$/XMLCalculationSettingsContext.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/xmloff/source/text/txtdrope.cxx b/xmloff/source/text/txtdrope.cxx index 88d633317afd..1c31ad94dd1d 100644 --- a/xmloff/source/text/txtdrope.cxx +++ b/xmloff/source/text/txtdrope.cxx @@ -33,7 +33,7 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/xmluconv.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "txtdrope.hxx" using namespace ::com::sun::star; diff --git a/xmloff/source/text/txtdropi.cxx b/xmloff/source/text/txtdropi.cxx index 759401f637ff..1968a7e7b1a0 100644 --- a/xmloff/source/text/txtdropi.cxx +++ b/xmloff/source/text/txtdropi.cxx @@ -32,7 +32,7 @@ #include <xmloff/xmltkmap.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlimp.hxx> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx index 07f0bcb52576..7b3c7e828683 100644 --- a/xmloff/source/text/txtexppr.cxx +++ b/xmloff/source/text/txtexppr.cxx @@ -32,18 +32,10 @@ #include <com/sun/star/table/BorderLine.hpp> #include <com/sun/star/text/SizeType.hpp> #include <com/sun/star/text/WrapTextMode.hpp> -#ifndef _COM_SUN_STAR_TEXT_TEXTCONTENTANCHORTYPE_HPP #include <com/sun/star/text/TextContentAnchorType.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_FONTFAMILY_HPP #include <com/sun/star/awt/FontFamily.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_FONTPITCH_HPP #include <com/sun/star/awt/FontPitch.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_FONTUNDERLINE_HPP #include <com/sun/star/awt/FontUnderline.hpp> -#endif #include <com/sun/star/text/XChapterNumberingSupplier.hpp> #include "txtexppr.hxx" #include <xmloff/xmlexp.hxx> diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx index a45057db5a5e..583727713fbf 100644 --- a/xmloff/source/text/txtexppr.hxx +++ b/xmloff/source/text/txtexppr.hxx @@ -30,7 +30,7 @@ #include <xmloff/xmlexppr.hxx> #include "txtdrope.hxx" -#include "xmltabe.hxx" +#include "xmloff/xmltabe.hxx" #include "XMLTextColumnsExport.hxx" #ifndef _XMLOFF_XMLBACKGROUNDIMAGEEXPORT_HXX #include "XMLBackgroundImageExport.hxx" diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 694d4599f4bb..173c2f780162 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -39,7 +39,7 @@ #include <xmloff/xmlement.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlnume.hxx> -#include "numehelp.hxx" +#include "xmloff/numehelp.hxx" #include <xmloff/families.hxx> #include <xmloff/XMLEventExport.hxx> diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 579ad91ddfe9..3a4d6e6b7749 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -38,7 +38,7 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/xmlnumi.hxx> #include <xmloff/txtimp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/text/txtftne.cxx b/xmloff/source/text/txtftne.cxx index 9940046b81c1..df9a03f25fdd 100644 --- a/xmloff/source/text/txtftne.cxx +++ b/xmloff/source/text/txtftne.cxx @@ -51,7 +51,7 @@ #include <com/sun/star/text/FootnoteNumbering.hpp> #include <com/sun/star/container/XNameReplace.hpp> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlnumfe.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 87710d310d76..d3591ece238c 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -58,7 +58,7 @@ #include <com/sun/star/ucb/XAnyCompareFactory.hpp> #include <com/sun/star/container/XNamed.hpp> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/txtstyli.hxx> #include <xmloff/families.hxx> #include <xmloff/xmlnumfi.hxx> @@ -69,10 +69,10 @@ #include "txtparai.hxx" #include <xmloff/txtimp.hxx> #include <xmloff/txtprmap.hxx> -#include "txtimppr.hxx" +#include "xmloff/txtimppr.hxx" #include <xmloff/xmlimp.hxx> #include "txtvfldi.hxx" -#include "i18nmap.hxx" +#include "xmloff/i18nmap.hxx" #include "XMLTextListItemContext.hxx" #include "XMLTextListBlockContext.hxx" #include "XMLTextFrameContext.hxx" diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx index 4a338c6cf832..dceac7a26890 100644 --- a/xmloff/source/text/txtimppr.cxx +++ b/xmloff/source/text/txtimppr.cxx @@ -37,7 +37,7 @@ #include <xmloff/XMLFontStylesContext.hxx> #include <xmloff/txtprmap.hxx> #include <xmloff/xmlimp.hxx> -#include "txtimppr.hxx" +#include "xmloff/txtimppr.hxx" #define XML_LINE_LEFT 0 #define XML_LINE_RIGHT 1 diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 4b6eba9a5f43..89b5c5c1ee48 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -90,7 +90,7 @@ #include <com/sun/star/text/XEndnotesSupplier.hpp> #include <com/sun/star/drawing/XControlShape.hpp> #include <com/sun/star/util/DateTime.hpp> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlaustp.hxx> #include <xmloff/families.hxx> #include "txtexppr.hxx" @@ -106,7 +106,7 @@ #include <xmloff/txtprmap.hxx> #include "XMLImageMapExport.hxx" #include "XMLTextNumRuleInfo.hxx" -#include "XMLTextListAutoStylePool.hxx" +#include "xmloff/XMLTextListAutoStylePool.hxx" #include <xmloff/txtparae.hxx> #include "XMLSectionExport.hxx" #include "XMLIndexMarkExport.hxx" diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index 566c94ed166a..697d3e6cd069 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -49,7 +49,7 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/txtimp.hxx> #include "txtparai.hxx" #include "txtfldi.hxx" diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx index a14b64e05d90..fbc53ef3e16e 100644 --- a/xmloff/source/text/txtprmap.cxx +++ b/xmloff/source/text/txtprmap.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include <tools/debug.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #ifndef _XMLOFF_TXTPRHDL_HXX #include "txtprhdl.hxx" diff --git a/xmloff/source/text/txtsecte.cxx b/xmloff/source/text/txtsecte.cxx index 74e6fc706f6b..b18d3fab086d 100644 --- a/xmloff/source/text/txtsecte.cxx +++ b/xmloff/source/text/txtsecte.cxx @@ -50,7 +50,7 @@ #include <com/sun/star/text/SectionFileLink.hpp> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/text/XDocumentIndex.hpp> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/families.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx index eb4e59f2dd16..b771a3ea17a2 100644 --- a/xmloff/source/text/txtstyle.cxx +++ b/xmloff/source/text/txtstyle.cxx @@ -28,47 +28,21 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#ifndef _TOOLS_DEBUG_HXX -//#include <tools/debug.hxx> -#endif #include <com/sun/star/style/ParagraphStyleCategory.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/style/XStyle.hpp> - - #include <xmloff/xmltoken.hxx> - -#ifndef _XMLOFF_PROPERTYSETMAPPER_HXX -//#include <xmloff/xmlprmap.hxx> -#endif -#ifndef _XMLOFF_XMLSMSPE_HXX -#include "xmlnmspe.hxx" -#endif -#ifndef _XMLOFF_FAMILIES_HXX +#include "xmloff/xmlnmspe.hxx" #include <xmloff/families.hxx> -#endif -#ifndef _XMLOFF_TXTPRMAP_HXX -//#include <xmloff/txtprmap.hxx> -#endif -#ifndef _XMLOFF_TXTPARAE_HXX #include <xmloff/txtparae.hxx> -#endif #include <xmloff/xmlnume.hxx> #include <xmloff/xmlexp.hxx> -#ifndef _XMLOFF_XMLSECTIONEXPORT_HXX #include "XMLSectionExport.hxx" -#endif #include "XMLLineNumberingExport.hxx" #include "txtexppr.hxx" -#ifndef _XMLOFF_TXTPRMAP_HXX #include <xmloff/txtprmap.hxx> -#endif - -#ifndef _XMLOFF_STYLEEXP_HXX -//#include <xmloff/styleexp.hxx> -#endif using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx index 0be1b25a42be..601bef9cdf63 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -29,7 +29,7 @@ #include "precompiled_xmloff.hxx" #include "XMLTextPropertySetContext.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "xmloff/XMLEventsImportContext.hxx" #include "xmloff/attrlist.hxx" #include "xmloff/families.hxx" diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index fb0a957f6c86..64a8b37a3539 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -36,9 +36,9 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/txtimp.hxx> #include <xmloff/xmlnumi.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> -#include "i18nmap.hxx" +#include "xmloff/i18nmap.hxx" #include <xmloff/xmlimp.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlement.hxx> diff --git a/xmloff/source/transform/ChartOASISTContext.cxx b/xmloff/source/transform/ChartOASISTContext.cxx index a294ee6e9388..26a07e1920d4 100644 --- a/xmloff/source/transform/ChartOASISTContext.cxx +++ b/xmloff/source/transform/ChartOASISTContext.cxx @@ -29,7 +29,7 @@ #include "precompiled_xmloff.hxx" #include "ChartOASISTContext.hxx" #include "MutableAttrList.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "ActionMapTypesOASIS.hxx" #include "AttrTransformerAction.hxx" #include "TransformerActions.hxx" diff --git a/xmloff/source/transform/ChartOOoTContext.cxx b/xmloff/source/transform/ChartOOoTContext.cxx index 832cd1e216a1..5e5420002d7d 100644 --- a/xmloff/source/transform/ChartOOoTContext.cxx +++ b/xmloff/source/transform/ChartOOoTContext.cxx @@ -29,7 +29,7 @@ #include "precompiled_xmloff.hxx" #include "ChartOOoTContext.hxx" #include "MutableAttrList.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #ifndef _XMLOFF_ACTIONMAPTYPESOOo_HXX #include "ActionMapTypesOOo.hxx" #endif diff --git a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx index fa33d0c45b54..d1fea38db7f8 100644 --- a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx +++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx @@ -30,7 +30,7 @@ #include "ChartPlotAreaOASISTContext.hxx" #include "TransformerBase.hxx" #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include "DeepTContext.hxx" #include "ActionMapTypesOASIS.hxx" diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx index b920d3fd7868..19c4fa580e3a 100644 --- a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx +++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx @@ -30,7 +30,7 @@ #include "ChartPlotAreaOOoTContext.hxx" #include "TransformerBase.hxx" #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include "DeepTContext.hxx" #include "ActionMapTypesOOo.hxx" diff --git a/xmloff/source/transform/ControlOASISTContext.cxx b/xmloff/source/transform/ControlOASISTContext.cxx index 8cf8e0df7815..4b87cb4fe80b 100644 --- a/xmloff/source/transform/ControlOASISTContext.cxx +++ b/xmloff/source/transform/ControlOASISTContext.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include "MutableAttrList.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include "ActionMapTypesOASIS.hxx" #include "AttrTransformerAction.hxx" diff --git a/xmloff/source/transform/ControlOOoTContext.cxx b/xmloff/source/transform/ControlOOoTContext.cxx index 94d6ae1862b6..2317cf52cf50 100644 --- a/xmloff/source/transform/ControlOOoTContext.cxx +++ b/xmloff/source/transform/ControlOOoTContext.cxx @@ -30,7 +30,7 @@ #include "ControlOOoTContext.hxx" #include "IgnoreTContext.hxx" #include "MutableAttrList.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "ActionMapTypesOOo.hxx" #include "ElemTransformerAction.hxx" #include "TransformerActions.hxx" diff --git a/xmloff/source/transform/DlgOASISTContext.cxx b/xmloff/source/transform/DlgOASISTContext.cxx index 08d6682a7491..bfe62162847a 100644 --- a/xmloff/source/transform/DlgOASISTContext.cxx +++ b/xmloff/source/transform/DlgOASISTContext.cxx @@ -29,7 +29,7 @@ #include "precompiled_xmloff.hxx" #include "DlgOASISTContext.hxx" #include "MutableAttrList.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "ActionMapTypesOASIS.hxx" #include "AttrTransformerAction.hxx" #include "TransformerActions.hxx" diff --git a/xmloff/source/transform/DocumentTContext.cxx b/xmloff/source/transform/DocumentTContext.cxx index 33b5b2c5dd24..5e4d749826ac 100644 --- a/xmloff/source/transform/DocumentTContext.cxx +++ b/xmloff/source/transform/DocumentTContext.cxx @@ -34,7 +34,7 @@ #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #ifndef _XMLOFF_TRANSFOERMERBASE_HXX #include "TransformerBase.hxx" diff --git a/xmloff/source/transform/EventMap.cxx b/xmloff/source/transform/EventMap.cxx index c8bb7694bc6b..6c18e8e559ba 100644 --- a/xmloff/source/transform/EventMap.cxx +++ b/xmloff/source/transform/EventMap.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include "EventMap.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" XMLTransformerEventMapEntry aTransformerEventMap[] = diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx index 23e4d699c349..f2122ec3e0da 100644 --- a/xmloff/source/transform/EventOASISTContext.cxx +++ b/xmloff/source/transform/EventOASISTContext.cxx @@ -30,7 +30,7 @@ #include "EventOASISTContext.hxx" #include "EventMap.hxx" #include "MutableAttrList.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "ActionMapTypesOASIS.hxx" #include "AttrTransformerAction.hxx" #include "TransformerActions.hxx" diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx index 8f90bc66e475..3b63935817c8 100644 --- a/xmloff/source/transform/EventOOoTContext.cxx +++ b/xmloff/source/transform/EventOOoTContext.cxx @@ -30,7 +30,7 @@ #include "EventOOoTContext.hxx" #include "EventMap.hxx" #include "MutableAttrList.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #ifndef _XMLOFF_ACTIONMAPTYPESOOo_HXX #include "ActionMapTypesOOo.hxx" #endif diff --git a/xmloff/source/transform/FormPropOASISTContext.cxx b/xmloff/source/transform/FormPropOASISTContext.cxx index 57ec2b33cf20..518618f4059d 100644 --- a/xmloff/source/transform/FormPropOASISTContext.cxx +++ b/xmloff/source/transform/FormPropOASISTContext.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include "MutableAttrList.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include "ActionMapTypesOASIS.hxx" #include "AttrTransformerAction.hxx" diff --git a/xmloff/source/transform/FormPropOOoTContext.cxx b/xmloff/source/transform/FormPropOOoTContext.cxx index bbe70d7789de..54682b3e0c03 100644 --- a/xmloff/source/transform/FormPropOOoTContext.cxx +++ b/xmloff/source/transform/FormPropOOoTContext.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include "MutableAttrList.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include "IgnoreTContext.hxx" #ifndef _XMLOFF_ACTIONMAPTYPESOOo_HXX diff --git a/xmloff/source/transform/FrameOASISTContext.cxx b/xmloff/source/transform/FrameOASISTContext.cxx index 084af4ab595c..3c9439111aec 100644 --- a/xmloff/source/transform/FrameOASISTContext.cxx +++ b/xmloff/source/transform/FrameOASISTContext.cxx @@ -30,7 +30,7 @@ #include "FrameOASISTContext.hxx" #include "IgnoreTContext.hxx" #include "MutableAttrList.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "ActionMapTypesOASIS.hxx" #include "ElemTransformerAction.hxx" #include "TransformerActions.hxx" diff --git a/xmloff/source/transform/FrameOOoTContext.cxx b/xmloff/source/transform/FrameOOoTContext.cxx index bda9526e366d..b36d0c29f258 100644 --- a/xmloff/source/transform/FrameOOoTContext.cxx +++ b/xmloff/source/transform/FrameOOoTContext.cxx @@ -30,7 +30,7 @@ #include "FrameOOoTContext.hxx" #include "IgnoreTContext.hxx" #include "MutableAttrList.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include "ActionMapTypesOOo.hxx" #include "AttrTransformerAction.hxx" diff --git a/xmloff/source/transform/MergeElemTContext.cxx b/xmloff/source/transform/MergeElemTContext.cxx index 337bce70e32a..a88194952499 100644 --- a/xmloff/source/transform/MergeElemTContext.cxx +++ b/xmloff/source/transform/MergeElemTContext.cxx @@ -36,7 +36,7 @@ #include "AttrTransformerAction.hxx" #include "ElemTransformerAction.hxx" #include "IgnoreTContext.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" using ::rtl::OUString; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/transform/MetaTContext.cxx b/xmloff/source/transform/MetaTContext.cxx index 3ee3d6f082d6..e05312cb3413 100644 --- a/xmloff/source/transform/MetaTContext.cxx +++ b/xmloff/source/transform/MetaTContext.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #ifndef _XMLOFF_TRANSFOERMERBASE_HXX #include "TransformerBase.hxx" diff --git a/xmloff/source/transform/MetaTContext.hxx b/xmloff/source/transform/MetaTContext.hxx index b2a0317175ed..5af650cb50b7 100644 --- a/xmloff/source/transform/MetaTContext.hxx +++ b/xmloff/source/transform/MetaTContext.hxx @@ -29,7 +29,7 @@ #define _XMLOFF_METATCONTEXT_HXX #include <rtl/ref.hxx> -#include "functional.hxx" +#include "xmloff/functional.hxx" #include <map> diff --git a/xmloff/source/transform/NotesTContext.cxx b/xmloff/source/transform/NotesTContext.cxx index 31457e3ce229..31ccbdf48c5b 100644 --- a/xmloff/source/transform/NotesTContext.cxx +++ b/xmloff/source/transform/NotesTContext.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #ifndef _XMLOFF_TRANSFOERMERBASE_HXX #include "TransformerBase.hxx" diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 4afa5a40c2ca..103202c48866 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -31,7 +31,7 @@ #include <rtl/ustrbuf.hxx> #include <comphelper/processfactory.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include "MutableAttrList.hxx" #include "DeepTContext.hxx" diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index 5292c931a609..4f0bd1303afb 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -31,7 +31,7 @@ #include <rtl/uuid.h> #include <rtl/ustrbuf.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include "DeepTContext.hxx" #include "MetaTContext.hxx" diff --git a/xmloff/source/transform/PropertyActionsOASIS.cxx b/xmloff/source/transform/PropertyActionsOASIS.cxx index e544836a043c..3abafaa5a13e 100644 --- a/xmloff/source/transform/PropertyActionsOASIS.cxx +++ b/xmloff/source/transform/PropertyActionsOASIS.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "PropType.hxx" #include "FamilyType.hxx" #include "PropertyActionsOASIS.hxx" diff --git a/xmloff/source/transform/PropertyActionsOOo.cxx b/xmloff/source/transform/PropertyActionsOOo.cxx index bb3e66ff13b6..bc91561de206 100644 --- a/xmloff/source/transform/PropertyActionsOOo.cxx +++ b/xmloff/source/transform/PropertyActionsOOo.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "PropType.hxx" #include "PropertyActionsOOo.hxx" diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx index 6c0aba3bb798..ca444e176a0b 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -34,7 +34,7 @@ #include <rtl/ustrbuf.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "PropType.hxx" #include "DeepTContext.hxx" #include "ProcAttrTContext.hxx" diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx index d3a5af703812..dc0cfb75a100 100644 --- a/xmloff/source/transform/StyleOOoTContext.cxx +++ b/xmloff/source/transform/StyleOOoTContext.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "PropType.hxx" #include "DeepTContext.hxx" #include "RenameElemTContext.hxx" diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index d8b6a51ebc00..eef93b17e7fd 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/i18n/UnicodeType.hpp> #include <comphelper/processfactory.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "IgnoreTContext.hxx" #include "RenameElemTContext.hxx" #include "ProcAttrTContext.hxx" diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx index 50e14db40e5d..f201474015fc 100644 --- a/xmloff/source/transform/XMLFilterRegistration.cxx +++ b/xmloff/source/transform/XMLFilterRegistration.cxx @@ -141,12 +141,12 @@ extern "C" { #endif -void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = NULL; if( pServiceManager ) diff --git a/xmloff/source/transform/makefile.mk b/xmloff/source/transform/makefile.mk deleted file mode 100644 index 031549fcb39b..000000000000 --- a/xmloff/source/transform/makefile.mk +++ /dev/null @@ -1,103 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ := ..$/.. -PRJNAME := xmloff -TARGET := xof -LIBTARGET=NO -ENABLE_EXCEPTIONS := TRUE - -.INCLUDE: settings.mk - -SHL1TARGET = $(TARGET)$(DLLPOSTFIX) -SHL1OBJS = \ - $(SLO)$/ChartOASISTContext.obj \ - $(SLO)$/ChartOOoTContext.obj \ - $(SLO)$/ChartPlotAreaOASISTContext.obj \ - $(SLO)$/ChartPlotAreaOOoTContext.obj \ - $(SLO)$/ControlOASISTContext.obj \ - $(SLO)$/ControlOOoTContext.obj \ - $(SLO)$/CreateElemTContext.obj \ - $(SLO)$/DeepTContext.obj \ - $(SLO)$/DlgOASISTContext.obj \ - $(SLO)$/DocumentTContext.obj \ - $(SLO)$/EventMap.obj \ - $(SLO)$/EventOASISTContext.obj \ - $(SLO)$/EventOOoTContext.obj \ - $(SLO)$/FlatTContext.obj \ - $(SLO)$/FormPropOASISTContext.obj \ - $(SLO)$/FormPropOOoTContext.obj \ - $(SLO)$/FrameOASISTContext.obj \ - $(SLO)$/FrameOOoTContext.obj \ - $(SLO)$/IgnoreTContext.obj \ - $(SLO)$/MergeElemTContext.obj \ - $(SLO)$/MetaTContext.obj \ - $(SLO)$/MutableAttrList.obj \ - $(SLO)$/NotesTContext.obj \ - $(SLO)$/OOo2Oasis.obj \ - $(SLO)$/Oasis2OOo.obj \ - $(SLO)$/PersAttrListTContext.obj \ - $(SLO)$/PersMixedContentTContext.obj \ - $(SLO)$/ProcAddAttrTContext.obj \ - $(SLO)$/ProcAttrTContext.obj \ - $(SLO)$/PropertyActionsOASIS.obj \ - $(SLO)$/PropertyActionsOOo.obj \ - $(SLO)$/RenameElemTContext.obj \ - $(SLO)$/StyleOASISTContext.obj \ - $(SLO)$/StyleOOoTContext.obj \ - $(SLO)$/TransformerActions.obj \ - $(SLO)$/TransformerBase.obj \ - $(SLO)$/TransformerContext.obj \ - $(SLO)$/TransformerTokenMap.obj \ - $(SLO)$/XMLFilterRegistration.obj - -SHL1STDLIBS = \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALHELPERLIB) \ - $(SALLIB) -.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" - SHL1STDLIBS += -lxo$(DLLPOSTFIX) -.ELSE - SHL1STDLIBS += ixo.lib -.ENDIF -SHL1VERSIONMAP = $(SOLARENV)/src/component.map -SHL1IMPLIB = i$(SHL1TARGET) -DEF1NAME = $(SHL1TARGET) - -SLOFILES = $(SHL1OBJS) - -.INCLUDE: target.mk - -ALLTAR : $(MISC)/xof.component - -$(MISC)/xof.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - xof.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt xof.component diff --git a/xmloff/source/xforms/SchemaContext.cxx b/xmloff/source/xforms/SchemaContext.cxx index be41e3a991e6..8e4c6d9de48e 100644 --- a/xmloff/source/xforms/SchemaContext.cxx +++ b/xmloff/source/xforms/SchemaContext.cxx @@ -34,7 +34,7 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/nmspmap.hxx> -#include <xmlnmspe.hxx> +#include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltkmap.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx index 9a9c892a0bce..0c975b347bfc 100644 --- a/xmloff/source/xforms/SchemaRestrictionContext.cxx +++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx @@ -33,7 +33,7 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/nmspmap.hxx> -#include <xmlnmspe.hxx> +#include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltkmap.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlimp.hxx> diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx index 0bfe22bc40ac..bd327fd61ddd 100644 --- a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx +++ b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx @@ -33,7 +33,7 @@ #include "SchemaRestrictionContext.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/nmspmap.hxx> -#include <xmlnmspe.hxx> +#include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltkmap.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/xforms/TokenContext.cxx b/xmloff/source/xforms/TokenContext.cxx index 62c2deea889d..74c1e01d3433 100644 --- a/xmloff/source/xforms/TokenContext.cxx +++ b/xmloff/source/xforms/TokenContext.cxx @@ -31,7 +31,7 @@ #include <xmloff/xmltkmap.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" #include <tools/debug.hxx> diff --git a/xmloff/source/xforms/XFormsBindContext.cxx b/xmloff/source/xforms/XFormsBindContext.cxx index 6dd7768d3a99..51de4f2007fc 100644 --- a/xmloff/source/xforms/XFormsBindContext.cxx +++ b/xmloff/source/xforms/XFormsBindContext.cxx @@ -33,10 +33,10 @@ #include "xformsapi.hxx" #include <xmloff/xmlimp.hxx> -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmltkmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/xmloff/source/xforms/XFormsInstanceContext.cxx b/xmloff/source/xforms/XFormsInstanceContext.cxx index 7914034a8cc8..ce0573461081 100644 --- a/xmloff/source/xforms/XFormsInstanceContext.cxx +++ b/xmloff/source/xforms/XFormsInstanceContext.cxx @@ -41,10 +41,10 @@ #include <com/sun/star/xforms/XModel.hpp> #include <tools/debug.hxx> -#include <xmlnmspe.hxx> +#include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlimp.hxx> -#include <xmlerror.hxx> +#include <xmloff/xmlerror.hxx> #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/xforms/XFormsModelContext.cxx b/xmloff/source/xforms/XFormsModelContext.cxx index 7baf83b77fbb..2bc3e13aaf62 100644 --- a/xmloff/source/xforms/XFormsModelContext.cxx +++ b/xmloff/source/xforms/XFormsModelContext.cxx @@ -37,10 +37,10 @@ #include "xformsapi.hxx" #include <xmloff/xmlimp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/xml/dom/XDocument.hpp> diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx index 594b3a871fe6..9f0bfa55bca3 100644 --- a/xmloff/source/xforms/XFormsSubmissionContext.cxx +++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx @@ -33,10 +33,10 @@ #include "xformsapi.hxx" #include <xmloff/xmlimp.hxx> -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmltkmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/xforms/makefile.mk b/xmloff/source/xforms/makefile.mk deleted file mode 100644 index f1238a6036bb..000000000000 --- a/xmloff/source/xforms/makefile.mk +++ /dev/null @@ -1,58 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=xmloff -TARGET=xforms -AUTOSEG=true - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/xformsapi.obj \ - $(SLO)$/XFormsBindContext.obj \ - $(SLO)$/xformsimport.obj \ - $(SLO)$/XFormsModelContext.obj \ - $(SLO)$/XFormsInstanceContext.obj \ - $(SLO)$/XFormsSubmissionContext.obj \ - $(SLO)$/SchemaContext.obj \ - $(SLO)$/SchemaRestrictionContext.obj \ - $(SLO)$/SchemaSimpleTypeContext.obj \ - $(SLO)$/TokenContext.obj \ - $(SLO)$/xformsexport.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx index 085418608359..794798c5366a 100644 --- a/xmloff/source/xforms/xformsapi.cxx +++ b/xmloff/source/xforms/xformsapi.cxx @@ -45,7 +45,7 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/nmspmap.hxx> -#include <xmlnmspe.hxx> +#include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltkmap.hxx> using rtl::OUString; diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx index 572b312505b0..3d90170f11f4 100644 --- a/xmloff/source/xforms/xformsexport.cxx +++ b/xmloff/source/xforms/xformsexport.cxx @@ -28,14 +28,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "xformsexport.hxx" +#include "xmloff/xformsexport.hxx" #include "XFormsModelExport.hxx" #include "xformsapi.hxx" #include <xmloff/xmlexp.hxx> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include "DomExport.hxx" #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/xforms/xformsimport.cxx b/xmloff/source/xforms/xformsimport.cxx index e222e974ba7b..750444c62165 100644 --- a/xmloff/source/xforms/xformsimport.cxx +++ b/xmloff/source/xforms/xformsimport.cxx @@ -31,7 +31,7 @@ #include "XFormsModelContext.hxx" #include <vector> #include <utility> -#include "xformsimport.hxx" +#include "xmloff/xformsimport.hxx" #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/form/binding/XValueBinding.hpp> |