diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-04-16 23:04:00 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-04-16 23:04:00 +0200 |
| commit | 99bd6b538cc0d68f19eb41887d6aa5fe28265c11 (patch) | |
| tree | 4f1b300618df9268cd0a3fa902b4f2b3d46874cc | |
| parent | c6cc85eee4a8920fe03582fd9ee57ad8be01a3dd (diff) | |
CWS gnumake2: move delivered header files from xmloff/inc to xmloff/inc/xmloff; removed unused code
267 files changed, 335 insertions, 560 deletions
diff --git a/xmloff/inc/TransGradientStyle.hxx b/xmloff/inc/TransGradientStyle.hxx index d6420a6100..9e4424ec0f 100644 --- a/xmloff/inc/TransGradientStyle.hxx +++ b/xmloff/inc/TransGradientStyle.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: TransGradientStyle.hxx,v $ + * $RCSfile: Transxmloff/GradientStyle.hxx,v $ * $Revision: 1.5 $ * * This file is part of OpenOffice.org. diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx index b5931bbfe4..fc8d01620b 100644 --- a/xmloff/inc/txtflde.hxx +++ b/xmloff/inc/txtflde.hxx @@ -36,7 +36,7 @@ #define _XMLOFF_TXTFLDE_HXX #include <com/sun/star/uno/Reference.h> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <rtl/ustring.hxx> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/inc/DashStyle.hxx b/xmloff/inc/xmloff/DashStyle.hxx index b65b34a55b..dc264c998f 100644 --- a/xmloff/inc/DashStyle.hxx +++ b/xmloff/inc/xmloff/DashStyle.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: DashStyle.hxx,v $ + * $RCSfile: xmloff/DashStyle.hxx,v $ * $Revision: 1.6 $ * * This file is part of OpenOffice.org. diff --git a/xmloff/inc/GradientStyle.hxx b/xmloff/inc/xmloff/GradientStyle.hxx index efbe9ff83c..2efeb19ad3 100644 --- a/xmloff/inc/GradientStyle.hxx +++ b/xmloff/inc/xmloff/GradientStyle.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: GradientStyle.hxx,v $ + * $RCSfile: xmloff/GradientStyle.hxx,v $ * $Revision: 1.6 $ * * This file is part of OpenOffice.org. diff --git a/xmloff/inc/HatchStyle.hxx b/xmloff/inc/xmloff/HatchStyle.hxx index 985df46161..d141739a83 100644 --- a/xmloff/inc/HatchStyle.hxx +++ b/xmloff/inc/xmloff/HatchStyle.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: HatchStyle.hxx,v $ + * $RCSfile: xmloff/HatchStyle.hxx,v $ * $Revision: 1.6 $ * * This file is part of OpenOffice.org. diff --git a/xmloff/inc/ImageStyle.hxx b/xmloff/inc/xmloff/ImageStyle.hxx index 3427922430..b8bd70e5f0 100644 --- a/xmloff/inc/ImageStyle.hxx +++ b/xmloff/inc/xmloff/ImageStyle.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ImageStyle.hxx,v $ + * $RCSfile: xmloff/ImageStyle.hxx,v $ * $Revision: 1.5 $ * * This file is part of OpenOffice.org. diff --git a/xmloff/inc/MarkerStyle.hxx b/xmloff/inc/xmloff/MarkerStyle.hxx index f51a7a4c96..a4a33174d6 100644 --- a/xmloff/inc/MarkerStyle.hxx +++ b/xmloff/inc/xmloff/MarkerStyle.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: MarkerStyle.hxx,v $ + * $RCSfile: xmloff/MarkerStyle.hxx,v $ * $Revision: 1.6 $ * * This file is part of OpenOffice.org. diff --git a/xmloff/inc/VisAreaContext.hxx b/xmloff/inc/xmloff/VisAreaContext.hxx index 5ac403c109..5b9d608a6b 100644 --- a/xmloff/inc/VisAreaContext.hxx +++ b/xmloff/inc/xmloff/VisAreaContext.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: VisAreaContext.hxx,v $ + * $RCSfile: xmloff/VisAreaContext.hxx,v $ * $Revision: 1.7 $ * * This file is part of OpenOffice.org. diff --git a/xmloff/inc/VisAreaExport.hxx b/xmloff/inc/xmloff/VisAreaExport.hxx index 857e0bae62..b62e42da5a 100644 --- a/xmloff/inc/VisAreaExport.hxx +++ b/xmloff/inc/xmloff/VisAreaExport.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: VisAreaExport.hxx,v $ + * $RCSfile: xmloff/VisAreaExport.hxx,v $ * $Revision: 1.4 $ * * This file is part of OpenOffice.org. diff --git a/xmloff/inc/XMLEmbeddedObjectExportFilter.hxx b/xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx index 64892550cf..37667e0a1c 100644 --- a/xmloff/inc/XMLEmbeddedObjectExportFilter.hxx +++ b/xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: XMLEmbeddedObjectExportFilter.hxx,v $ + * $RCSfile: xmloff/XMLEmbeddedObjectExportFilter.hxx,v $ * $Revision: 1.3 $ * * This file is part of OpenOffice.org. diff --git a/xmloff/inc/XMLFilterServiceNames.h b/xmloff/inc/xmloff/XMLFilterServiceNames.h index f626b3d1ea..c9e46c0a89 100644 --- a/xmloff/inc/XMLFilterServiceNames.h +++ b/xmloff/inc/xmloff/XMLFilterServiceNames.h @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: XMLFilterServiceNames.h,v $ + * $RCSfile: xmloff/XMLFilterServiceNames.h,v $ * $Revision: 1.4 $ * * This file is part of OpenOffice.org. diff --git a/xmloff/inc/XMLTextListAutoStylePool.hxx b/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx index a01a2d3c6b..4caeb969f2 100644 --- a/xmloff/inc/XMLTextListAutoStylePool.hxx +++ b/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: XMLTextListAutoStylePool.hxx,v $ + * $RCSfile: xmloff/XMLTextListAutoStylePool.hxx,v $ * $Revision: 1.7 $ * * This file is part of OpenOffice.org. diff --git a/xmloff/source/text/XMLTextShapeImportHelper.hxx b/xmloff/inc/xmloff/XMLTextShapeImportHelper.hxx index 35d474b6ed..7856b545f3 100644 --- a/xmloff/source/text/XMLTextShapeImportHelper.hxx +++ b/xmloff/inc/xmloff/XMLTextShapeImportHelper.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: XMLTextShapeImportHelper.hxx,v $ + * $RCSfile: xmloff/XMLTextShapeImportHelper.hxx,v $ * $Revision: 1.6 $ * * This file is part of OpenOffice.org. diff --git a/xmloff/inc/functional.hxx b/xmloff/inc/xmloff/functional.hxx index 1842a7139a..1842a7139a 100644 --- a/xmloff/inc/functional.hxx +++ b/xmloff/inc/xmloff/functional.hxx diff --git a/xmloff/inc/i18nmap.hxx b/xmloff/inc/xmloff/i18nmap.hxx index 1eb3880d5d..40963e3023 100644 --- a/xmloff/inc/i18nmap.hxx +++ b/xmloff/inc/xmloff/i18nmap.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: i18nmap.hxx,v $ + * $RCSfile: xmloff/i18nmap.hxx,v $ * $Revision: 1.5 $ * * This file is part of OpenOffice.org. diff --git a/xmloff/inc/numehelp.hxx b/xmloff/inc/xmloff/numehelp.hxx index 60cc27698a..59f0484c5d 100644 --- a/xmloff/inc/numehelp.hxx +++ b/xmloff/inc/xmloff/numehelp.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: numehelp.hxx,v $ + * $RCSfile: xmloff/numehelp.hxx,v $ * $Revision: 1.12 $ * * This file is part of OpenOffice.org. diff --git a/xmloff/inc/xmloff/txtimp.hxx b/xmloff/inc/xmloff/txtimp.hxx index 381973917d..59f735328c 100644 --- a/xmloff/inc/xmloff/txtimp.hxx +++ b/xmloff/inc/xmloff/txtimp.hxx @@ -45,7 +45,7 @@ #include <xmloff/xmlimppr.hxx> #include <xmloff/xmltkmap.hxx> -// functional.hxx is obsolete and should be replaced by its comphelper +// xmloff/functional.hxx is obsolete and should be replaced by its comphelper // counterpart #include <comphelper/stl_types.hxx> #include <xmloff/uniref.hxx> diff --git a/xmloff/inc/txtimppr.hxx b/xmloff/inc/xmloff/txtimppr.hxx index 19cccdaf16..f254895453 100644 --- a/xmloff/inc/txtimppr.hxx +++ b/xmloff/inc/xmloff/txtimppr.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: txtimppr.hxx,v $ + * $RCSfile: xmloff/txtimppr.hxx,v $ * $Revision: 1.4 $ * * This file is part of OpenOffice.org. diff --git a/xmloff/inc/unoatrcn.hxx b/xmloff/inc/xmloff/unoatrcn.hxx index f409792efb..5f8d3a7f67 100644 --- a/xmloff/inc/unoatrcn.hxx +++ b/xmloff/inc/xmloff/unoatrcn.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: unoatrcn.hxx,v $ + * $RCSfile: xmloff/unoatrcn.hxx,v $ * $Revision: 1.5 $ * * This file is part of OpenOffice.org. diff --git a/xmloff/inc/xformsexport.hxx b/xmloff/inc/xmloff/xformsexport.hxx index 0de23b2221..d679b5b3ae 100644 --- a/xmloff/inc/xformsexport.hxx +++ b/xmloff/inc/xmloff/xformsexport.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xformsexport.hxx,v $ + * $RCSfile: xmloff/xformsexport.hxx,v $ * $Revision: 1.7 $ * * This file is part of OpenOffice.org. diff --git a/xmloff/inc/xformsimport.hxx b/xmloff/inc/xmloff/xformsimport.hxx index 19159ae630..d75d73d765 100644 --- a/xmloff/inc/xformsimport.hxx +++ b/xmloff/inc/xmloff/xformsimport.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xformsimport.hxx,v $ + * $RCSfile: xmloff/xformsimport.hxx,v $ * $Revision: 1.7 $ * * This file is part of OpenOffice.org. diff --git a/xmloff/inc/xmlcnitm.hxx b/xmloff/inc/xmloff/xmlcnitm.hxx index b63697781a..b63697781a 100644 --- a/xmloff/inc/xmlcnitm.hxx +++ b/xmloff/inc/xmloff/xmlcnitm.hxx diff --git a/xmloff/inc/xmlerror.hxx b/xmloff/inc/xmloff/xmlerror.hxx index 239207ffad..3275906a88 100644 --- a/xmloff/inc/xmlerror.hxx +++ b/xmloff/inc/xmloff/xmlerror.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xmlerror.hxx,v $ + * $RCSfile: xmloff/xmlerror.hxx,v $ * $Revision: 1.13 $ * * This file is part of OpenOffice.org. diff --git a/xmloff/inc/xmlkywd.hxx b/xmloff/inc/xmloff/xmlkywd.hxx index fbc8165cfc..2071eab8e9 100644 --- a/xmloff/inc/xmlkywd.hxx +++ b/xmloff/inc/xmloff/xmlkywd.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xmlkywd.hxx,v $ + * $RCSfile: xmloff/xmlkywd.hxx,v $ * $Revision: 1.176 $ * * This file is part of OpenOffice.org. diff --git a/xmloff/inc/xmlnmspe.hxx b/xmloff/inc/xmloff/xmlnmspe.hxx index c2447dd7b6..26a566e8d2 100644 --- a/xmloff/inc/xmlnmspe.hxx +++ b/xmloff/inc/xmloff/xmlnmspe.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xmlnmspe.hxx,v $ + * $RCSfile: xmloff/xmlnmspe.hxx,v $ * $Revision: 1.22 $ * * This file is part of OpenOffice.org. diff --git a/xmloff/inc/xmlreg.hxx b/xmloff/inc/xmloff/xmlreg.hxx index 5606c74021..0afe6fad3d 100644 --- a/xmloff/inc/xmlreg.hxx +++ b/xmloff/inc/xmloff/xmlreg.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xmlreg.hxx,v $ + * $RCSfile: xmloff/xmlreg.hxx,v $ * $Revision: 1.3 $ * * This file is part of OpenOffice.org. diff --git a/xmloff/inc/xmltabe.hxx b/xmloff/inc/xmloff/xmltabe.hxx index c26b75b445..3f2102af69 100644 --- a/xmloff/inc/xmltabe.hxx +++ b/xmloff/inc/xmloff/xmltabe.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xmltabe.hxx,v $ + * $RCSfile: xmloff/xmltabe.hxx,v $ * $Revision: 1.6 $ * * This file is part of OpenOffice.org. diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx index 0a4950d96a..278d560b8e 100644 --- a/xmloff/inc/xmlversion.hxx +++ b/xmloff/inc/xmlversion.hxx @@ -40,7 +40,7 @@ #include <xmloff/xmlexp.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> -#include <xmlnmspe.hxx> +#include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> // ------------------------------------------------------------------------ diff --git a/xmloff/prj/d.lst b/xmloff/prj/d.lst index 686b4b70a0..e39549d4aa 100644 --- a/xmloff/prj/d.lst +++ b/xmloff/prj/d.lst @@ -10,75 +10,16 @@ mkdir: %_DEST%\inc%_EXT%\xmloff ..\dtd\* %_DEST%\bin%_EXT% -..\inc\xmloff\dllapi.h %_DEST%\inc%_EXT%\xmloff\dllapi.h -..\inc\xmloff\attrlist.hxx %_DEST%\inc%_EXT%\xmloff\attrlist.hxx ..\inc\i18nmap.hxx %_DEST%\inc%_EXT%\xmloff\i18nmap.hxx -..\inc\xmloff\nmspmap.hxx %_DEST%\inc%_EXT%\xmloff\nmspmap.hxx ..\inc\unoatrcn.hxx %_DEST%\inc%_EXT%\xmloff\unoatrcn.hxx -..\inc\xmloff\xmlcnimp.hxx %_DEST%\inc%_EXT%\xmloff\xmlcnimp.hxx -..\inc\xmlcnitm.hxx %_DEST%\inc%_EXT%\xmloff\xmlcnitm.hxx -..\inc\xmloff\xmlement.hxx %_DEST%\inc%_EXT%\xmloff\xmlement.hxx -..\inc\xmloff\xmlictxt.hxx %_DEST%\inc%_EXT%\xmloff\xmlictxt.hxx -..\inc\xmloff\xmlimp.hxx %_DEST%\inc%_EXT%\xmloff\xmlimp.hxx ..\inc\xmlkywd.hxx %_DEST%\inc%_EXT%\xmloff\xmlkywd.hxx -..\inc\xmloff\xmlmetae.hxx %_DEST%\inc%_EXT%\xmloff\xmlmetae.hxx -..\inc\xmloff\xmlmetai.hxx %_DEST%\inc%_EXT%\xmloff\xmlmetai.hxx -..\inc\xmloff\xmlscripti.hxx %_DEST%\inc%_EXT%\xmloff\xmlscripti.hxx -..\inc\xmloff\xmlstyle.hxx %_DEST%\inc%_EXT%\xmloff\xmlstyle.hxx -..\inc\xmloff\xmltkmap.hxx %_DEST%\inc%_EXT%\xmloff\xmltkmap.hxx -..\inc\xmloff\xmluconv.hxx %_DEST%\inc%_EXT%\xmloff\xmluconv.hxx +..\inc\xmlcnitm.hxx %_DEST%\inc%_EXT%\xmloff\xmlcnitm.hxx ..\inc\xmlnmspe.hxx %_DEST%\inc%_EXT%\xmloff\xmlnmspe.hxx -..\inc\xmloff\xmlnumfi.hxx %_DEST%\inc%_EXT%\xmloff\xmlnumfi.hxx -..\inc\xmloff\xmlnumfe.hxx %_DEST%\inc%_EXT%\xmloff\xmlnumfe.hxx -..\inc\xmloff\xmlexp.hxx %_DEST%\inc%_EXT%\xmloff\xmlexp.hxx ..\inc\xmlreg.hxx %_DEST%\inc%_EXT%\xmloff\xmlreg.hxx -..\inc\xmloff\xmlnumi.hxx %_DEST%\inc%_EXT%\xmloff\xmlnumi.hxx -..\inc\xmloff\xmlnume.hxx %_DEST%\inc%_EXT%\xmloff\xmlnume.hxx ..\inc\xmltabe.hxx %_DEST%\inc%_EXT%\xmloff\xmltabe.hxx -..\inc\xmloff\maptype.hxx %_DEST%\inc%_EXT%\xmloff\maptype.hxx -..\inc\xmloff\uniref.hxx %_DEST%\inc%_EXT%\xmloff\uniref.hxx -..\inc\xmloff\xmlaustp.hxx %_DEST%\inc%_EXT%\xmloff\xmlaustp.hxx -..\inc\xmloff\xmlexppr.hxx %_DEST%\inc%_EXT%\xmloff\xmlexppr.hxx -..\inc\xmloff\xmlimppr.hxx %_DEST%\inc%_EXT%\xmloff\xmlimppr.hxx -..\inc\xmloff\xmlprcon.hxx %_DEST%\inc%_EXT%\xmloff\xmlprcon.hxx -..\inc\xmloff\xmlprhdl.hxx %_DEST%\inc%_EXT%\xmloff\xmlprhdl.hxx -..\inc\xmloff\xmlprmap.hxx %_DEST%\inc%_EXT%\xmloff\xmlprmap.hxx -..\inc\xmloff\xmltypes.hxx %_DEST%\inc%_EXT%\xmloff\xmltypes.hxx -..\inc\xmloff\families.hxx %_DEST%\inc%_EXT%\xmloff\families.hxx -..\inc\xmloff\styleexp.hxx %_DEST%\inc%_EXT%\xmloff\styleexp.hxx -..\inc\xmloff\txtstyle.hxx %_DEST%\inc%_EXT%\xmloff\txtstyle.hxx -..\inc\xmloff\prstylei.hxx %_DEST%\inc%_EXT%\xmloff\prstylei.hxx -..\inc\xmloff\txtstyli.hxx %_DEST%\inc%_EXT%\xmloff\txtstyli.hxx -..\inc\xmloff\txtprmap.hxx %_DEST%\inc%_EXT%\xmloff\txtprmap.hxx -..\inc\xmloff\txtparae.hxx %_DEST%\inc%_EXT%\xmloff\txtparae.hxx -..\inc\xmloff\txtimp.hxx %_DEST%\inc%_EXT%\xmloff\txtimp.hxx -..\inc\xmloff\prhdlfac.hxx %_DEST%\inc%_EXT%\xmloff\prhdlfac.hxx -..\inc\xmloff\EnumPropertyHdl.hxx %_DEST%\inc%_EXT%\xmloff\EnumPropertyHdl.hxx -..\inc\xmloff\NamedBoolPropertyHdl.hxx %_DEST%\inc%_EXT%\xmloff\NamedBoolPropertyHdl.hxx ..\inc\numehelp.hxx %_DEST%\inc%_EXT%\xmloff\numehelp.hxx ..\inc\XMLTextListAutoStylePool.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextListAutoStylePool.hxx -..\inc\xmloff\shapeexport.hxx %_DEST%\inc%_EXT%\xmloff\shapeexport.hxx -..\inc\xmloff\shapeimport.hxx %_DEST%\inc%_EXT%\xmloff\shapeimport.hxx -..\inc\xmloff\SchXMLExportHelper.hxx %_DEST%\inc%_EXT%\xmloff\SchXMLExportHelper.hxx -..\inc\xmloff\SchXMLImportHelper.hxx %_DEST%\inc%_EXT%\xmloff\SchXMLImportHelper.hxx ..\inc\functional.hxx %_DEST%\inc%_EXT%\xmloff\functional.hxx -..\inc\xmloff\XMLPageExport.hxx %_DEST%\inc%_EXT%\xmloff\XMLPageExport.hxx -..\inc\xmloff\PageMasterStyleMap.hxx %_DEST%\inc%_EXT%\xmloff\PageMasterStyleMap.hxx -..\inc\xmloff\XMLTextMasterPageExport.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextMasterPageExport.hxx -..\inc\xmloff\XMLTextMasterStylesContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextMasterStylesContext.hxx -..\inc\xmloff\XMLTextMasterPageContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextMasterPageContext.hxx -..\inc\xmloff\XMLTextTableContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextTableContext.hxx -..\source\text\XMLTextShapeImportHelper.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextShapeImportHelper.hxx -..\inc\xmloff\XMLShapeStyleContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLShapeStyleContext.hxx -..\inc\xmloff\XMLTextShapeStyleContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextShapeStyleContext.hxx -..\inc\xmloff\XMLFontAutoStylePool.hxx %_DEST%\inc%_EXT%\xmloff\XMLFontAutoStylePool.hxx -..\inc\xmloff\XMLFontStylesContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLFontStylesContext.hxx -..\inc\xmloff\ProgressBarHelper.hxx %_DEST%\inc%_EXT%\xmloff\ProgressBarHelper.hxx -..\inc\xmloff\formlayerexport.hxx %_DEST%\inc%_EXT%\xmloff\formlayerexport.hxx -..\inc\xmloff\formlayerimport.hxx %_DEST%\inc%_EXT%\xmloff\formlayerimport.hxx -..\inc\xmloff\animexp.hxx %_DEST%\inc%_EXT%\xmloff\animexp.hxx -..\inc\xmloff\contextid.hxx %_DEST%\inc%_EXT%\xmloff\contextid.hxx -..\inc\xmloff\formsimp.hxx %_DEST%\inc%_EXT%\xmloff\formsimp.hxx ..\inc\VisAreaExport.hxx %_DEST%\inc%_EXT%\xmloff\VisAreaExport.hxx ..\inc\VisAreaContext.hxx %_DEST%\inc%_EXT%\xmloff\VisAreaContext.hxx ..\inc\DashStyle.hxx %_DEST%\inc%_EXT%\xmloff\DashStyle.hxx @@ -86,28 +27,17 @@ mkdir: %_DEST%\inc%_EXT%\xmloff ..\inc\MarkerStyle.hxx %_DEST%\inc%_EXT%\xmloff\MarkerStyle.hxx ..\inc\HatchStyle.hxx %_DEST%\inc%_EXT%\xmloff\HatchStyle.hxx ..\inc\ImageStyle.hxx %_DEST%\inc%_EXT%\xmloff\ImageStyle.hxx -..\inc\xmloff\SettingsExportHelper.hxx %_DEST%\inc%_EXT%\xmloff\SettingsExportHelper.hxx -..\inc\xmloff\DocumentSettingsContext.hxx %_DEST%\inc%_EXT%\xmloff\DocumentSettingsContext.hxx -..\inc\xmloff\XMLGraphicsDefaultStyle.hxx %_DEST%\inc%_EXT%\xmloff\XMLGraphicsDefaultStyle.hxx +..\source\text\XMLTextShapeImportHelper.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextShapeImportHelper.hxx ..\inc\XMLEmbeddedObjectExportFilter.hxx %_DEST%\inc%_EXT%\xmloff\XMLEmbeddedObjectExportFilter.hxx ..\inc\XMLFilterServiceNames.h %_DEST%\inc%_EXT%\xmloff\XMLFilterServiceNames.h -..\inc\xmloff\XMLBase64ImportContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLBase64ImportContext.hxx -..\inc\xmloff\xmltoken.hxx %_DEST%\inc%_EXT%\xmloff\xmltoken.hxx -..\inc\xmloff\XMLEventExport.hxx %_DEST%\inc%_EXT%\xmloff\XMLEventExport.hxx -..\inc\xmloff\xmlevent.hxx %_DEST%\inc%_EXT%\xmloff\xmlevent.hxx -..\inc\xmloff\XMLEventsImportContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLEventsImportContext.hxx ..\inc\xmlerror.hxx %_DEST%\inc%_EXT%\xmloff\xmlerror.hxx -..\inc\xmloff\SinglePropertySetInfoCache.hxx %_DEST%\inc%_EXT%\xmloff\SinglePropertySetInfoCache.hxx -..\inc\xmloff\PropertySetInfoHash.hxx %_DEST%\inc%_EXT%\xmloff\PropertySetInfoHash.hxx -..\inc\xmloff\PropertySetInfoKey.hxx %_DEST%\inc%_EXT%\xmloff\PropertySetInfoKey.hxx ..\inc\xformsimport.hxx %_DEST%\inc%_EXT%\xmloff\xformsimport.hxx ..\inc\xformsexport.hxx %_DEST%\inc%_EXT%\xmloff\xformsexport.hxx -..\inc\xmloff\controlpropertyhdl.hxx %_DEST%\inc%_EXT%\xmloff\controlpropertyhdl.hxx -..\inc\xmloff\ControlBorderHandler.hxx %_DEST%\inc%_EXT%\xmloff\ControlBorderHandler.hxx -..\inc\xmloff\XMLConstantsPropertyHandler.hxx %_DEST%\inc%_EXT%\xmloff\XMLConstantsPropertyHandler.hxx -..\inc\xmloff\XMLStringVector.hxx %_DEST%\inc%_EXT%\xmloff\XMLStringVector.hxx ..\inc\txtimppr.hxx %_DEST%\inc%_EXT%\xmloff\txtimppr.hxx -..\inc\xmloff\XMLCharContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLCharContext.hxx + +..\inc\xmloff\*.hxx %_DEST%\inc%_EXT%\xmloff\*.hxx +..\inc\xmloff\*.h %_DEST%\inc%_EXT%\xmloff\*.h + ..\xml\components.xml %_DEST%\xml%_EXT%\components.xml mkdir: %_DEST%\inc%_EXT%\xmloff\table diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx index f801d630fe..a91780f3bf 100644 --- a/xmloff/source/chart/PropertyMap.hxx +++ b/xmloff/source/chart/PropertyMap.hxx @@ -31,7 +31,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 c59aab85f1..3917662ad5 100755 --- a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx +++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx @@ -35,7 +35,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 5125a37610..cd5f9cbed5 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -43,7 +43,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 56daa7b05c..052307667d 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -47,7 +47,7 @@ #ifndef _SVTOOLS_NMSPMAP_HXX #include <xmloff/nmspmap.hxx> #endif -#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 9a8779630c..283c95660b 100644 --- a/xmloff/source/chart/SchXMLImport.cxx +++ b/xmloff/source/chart/SchXMLImport.cxx @@ -42,7 +42,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 45f29e5325..28c468f7e8 100644 --- a/xmloff/source/chart/SchXMLParagraphContext.cxx +++ b/xmloff/source/chart/SchXMLParagraphContext.cxx @@ -34,7 +34,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 3d8a8495f4..f529ab40ba 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -41,7 +41,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 82a8973408..3290f3aa5f 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -56,7 +56,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 2e0aad2997..657f496602 100644 --- a/xmloff/source/chart/SchXMLTableContext.cxx +++ b/xmloff/source/chart/SchXMLTableContext.cxx @@ -38,7 +38,7 @@ #include "transporttypes.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/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index 6a600a44e1..4f4ddcd970 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -52,7 +52,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 c234c0e181..959aee3504 100644 --- a/xmloff/source/chart/XMLChartStyleContext.cxx +++ b/xmloff/source/chart/XMLChartStyleContext.cxx @@ -32,7 +32,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 804bb96cc8..f5e83b8cf5 100644 --- a/xmloff/source/chart/XMLLabelSeparatorContext.cxx +++ b/xmloff/source/chart/XMLLabelSeparatorContext.cxx @@ -35,7 +35,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 ee16507fc4..f1d5d69818 100644 --- a/xmloff/source/chart/XMLSymbolImageContext.cxx +++ b/xmloff/source/chart/XMLSymbolImageContext.cxx @@ -33,7 +33,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 48cdf9a683..d4831ae237 100644 --- a/xmloff/source/chart/contexts.cxx +++ b/xmloff/source/chart/contexts.cxx @@ -32,7 +32,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/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx index a2077a00ce..57b24b7b8c 100644 --- a/xmloff/source/core/DocumentSettingsContext.cxx +++ b/xmloff/source/core/DocumentSettingsContext.cxx @@ -36,7 +36,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 d086580c2a..f17e4d1e17 100644 --- a/xmloff/source/core/DomBuilderContext.cxx +++ b/xmloff/source/core/DomBuilderContext.cxx @@ -35,7 +35,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 ff512474c8..a69eb37809 100644 --- a/xmloff/source/core/DomExport.cxx +++ b/xmloff/source/core/DomExport.cxx @@ -35,7 +35,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 e803c7dc1c..fe251d0999 100644 --- a/xmloff/source/core/RDFaExportHelper.cxx +++ b/xmloff/source/core/RDFaExportHelper.cxx @@ -32,7 +32,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 33db74dd13..80b750031a 100644 --- a/xmloff/source/core/SettingsExportHelper.cxx +++ b/xmloff/source/core/SettingsExportHelper.cxx @@ -31,7 +31,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 cae9b456d1..2d9189691b 100644 --- a/xmloff/source/core/XMLBase64Export.cxx +++ b/xmloff/source/core/XMLBase64Export.cxx @@ -34,7 +34,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 a9a189382d..fa9bb280a6 100644 --- a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx @@ -30,7 +30,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 1b44a8cfe5..7d5694f1be 100644 --- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx @@ -45,11 +45,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 f39d2b8f47..9dcf287092 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -43,7 +43,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 89cb16c9c2..e8ac2de730 100644 --- a/xmloff/source/core/i18nmap.cxx +++ b/xmloff/source/core/i18nmap.cxx @@ -33,7 +33,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/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx index e33a2ae108..091096cd5e 100644 --- a/xmloff/source/core/nmspmap.cxx +++ b/xmloff/source/core/nmspmap.cxx @@ -39,7 +39,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 1ae7ed7ab3..f44abb2db9 100644 --- a/xmloff/source/core/unoatrcn.cxx +++ b/xmloff/source/core/unoatrcn.cxx @@ -38,7 +38,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 d7d3035bc9..a589581e05 100644 --- a/xmloff/source/core/xmlcnitm.cxx +++ b/xmloff/source/core/xmlcnitm.cxx @@ -35,7 +35,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 0325048ca4..ab5bf3bbd3 100644 --- a/xmloff/source/core/xmlerror.cxx +++ b/xmloff/source/core/xmlerror.cxx @@ -30,7 +30,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 26ce46ee60..c3dbcd486c 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -51,7 +51,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> @@ -65,20 +65,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> @@ -87,7 +87,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 a53bfec75e..c7d4910bfd 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -40,8 +40,8 @@ #include "unointerfacetouniqueidentifiermapper.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> -#include "xmlnmspe.hxx" -#include "xmlkywd.hxx" +#include "xmloff/xmlnmspe.hxx" +#include "xmloff/xmlkywd.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/XMLFontStylesContext.hxx> #include <xmloff/xmlictxt.hxx> @@ -53,7 +53,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/core/xmlkywd.cxx b/xmloff/source/core/xmlkywd.cxx index 644bbc4457..14b94ed41e 100644 --- a/xmloff/source/core/xmlkywd.cxx +++ b/xmloff/source/core/xmlkywd.cxx @@ -33,7 +33,7 @@ #ifndef _XMLOFF_XMLKYWD_HXX #define XML_DEFINE_KEYWORDS -#include "xmlkywd.hxx" +#include "xmloff/xmlkywd.hxx" #undef XML_DEFINE_KEYWORDS #endif diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx index 284737ff73..496828bb21 100644 --- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx +++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx @@ -34,7 +34,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 1066e37766..99250854ae 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -49,11 +49,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 297531c613..a1cf415c7a 100644 --- a/xmloff/source/draw/XMLImageMapExport.cxx +++ b/xmloff/source/draw/XMLImageMapExport.cxx @@ -48,7 +48,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 34b89764fd..5a2ce0051e 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -33,7 +33,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 609c5441b8..3a63ec938e 100644 --- a/xmloff/source/draw/XMLReplacementImageContext.cxx +++ b/xmloff/source/draw/XMLReplacementImageContext.cxx @@ -35,8 +35,8 @@ #include <com/sun/star/io/XOutputStream.hpp> #include <xmloff/xmlimp.hxx> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" -#include "xmlkywd.hxx" +#include "xmloff/xmlnmspe.hxx" +#include "xmloff/xmlkywd.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 395817015c..d6581fdea0 100644 --- a/xmloff/source/draw/XMLShapeStyleContext.cxx +++ b/xmloff/source/draw/XMLShapeStyleContext.cxx @@ -40,9 +40,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 fcb7384113..5fcd979d4e 100644 --- a/xmloff/source/draw/animationexport.cxx +++ b/xmloff/source/draw/animationexport.cxx @@ -87,7 +87,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 b3f3e07771..06b35f8700 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -74,7 +74,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 a374770a8a..aa0913207d 100644 --- a/xmloff/source/draw/animexp.cxx +++ b/xmloff/source/draw/animexp.cxx @@ -40,7 +40,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 e3cbe88163..7243630773 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -44,7 +44,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 b6770014ea..0de291cd49 100644 --- a/xmloff/source/draw/descriptionimp.cxx +++ b/xmloff/source/draw/descriptionimp.cxx @@ -36,7 +36,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 5efceb59a3..03fa27849a 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -42,7 +42,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 8755ba272d..1d94ed4488 100644 --- a/xmloff/source/draw/layerexp.cxx +++ b/xmloff/source/draw/layerexp.cxx @@ -36,7 +36,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 cf737b2080..fe442bc93d 100644 --- a/xmloff/source/draw/layerimp.cxx +++ b/xmloff/source/draw/layerimp.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 "layerimp.hxx" diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index fb440dc11e..39bf4d0b4d 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -65,7 +65,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 569340c8c3..2a85602f50 100644 --- a/xmloff/source/draw/sdpropls.hxx +++ b/xmloff/source/draw/sdpropls.hxx @@ -38,7 +38,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 f75107c6e2..6140a38341 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -32,7 +32,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> @@ -80,7 +80,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 538dd65384..c212545e3d 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -43,7 +43,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> @@ -54,7 +54,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 7415fed326..0c244c32b8 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -64,7 +64,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 ba90886a3e..60b6bf4e57 100644 --- a/xmloff/source/draw/shapeexport2.cxx +++ b/xmloff/source/draw/shapeexport2.cxx @@ -59,7 +59,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 2786e82fc9..0d5b2d9178 100644 --- a/xmloff/source/draw/shapeexport3.cxx +++ b/xmloff/source/draw/shapeexport3.cxx @@ -52,7 +52,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 a8587489d5..7969b4aa96 100644 --- a/xmloff/source/draw/shapeexport4.cxx +++ b/xmloff/source/draw/shapeexport4.cxx @@ -75,7 +75,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 e30a96065b..728e0d0f39 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -44,7 +44,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 f8e057d53b..7e44eea3e8 100644 --- a/xmloff/source/draw/viewcontext.cxx +++ b/xmloff/source/draw/viewcontext.cxx @@ -33,9 +33,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 7330904a1f..5eb44f6977 100644 --- a/xmloff/source/draw/ximp3dscene.cxx +++ b/xmloff/source/draw/ximp3dscene.cxx @@ -34,7 +34,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 d491b1bab6..c4f0ee53dc 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -44,11 +44,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 89e2a4e3a6..c9c69684eb 100644 --- a/xmloff/source/draw/ximpgrp.cxx +++ b/xmloff/source/draw/ximpgrp.cxx @@ -30,7 +30,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 04d7ec3d9e..182a189217 100644 --- a/xmloff/source/draw/ximplink.cxx +++ b/xmloff/source/draw/ximplink.cxx @@ -30,7 +30,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 1008691682..c1db2be4fe 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -40,7 +40,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 6b6aedbfa9..b8dbc7bc29 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -74,7 +74,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" @@ -85,7 +85,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 3bea281dcf..e995c0867d 100644 --- a/xmloff/source/draw/ximpshow.cxx +++ b/xmloff/source/draw/ximpshow.cxx @@ -42,7 +42,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 0254d6ddf1..0e1cb52a01 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -34,7 +34,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" @@ -58,7 +58,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 a40421864c..7380633ff2 100644 --- a/xmloff/source/forms/controlpropertymap.cxx +++ b/xmloff/source/forms/controlpropertymap.cxx @@ -30,7 +30,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 3314e27400..ff1d31c1ed 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -33,12 +33,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" /** === begin UNO includes === **/ #include <com/sun/star/text/XText.hpp> diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index e25eef33db..70de97954a 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -39,7 +39,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/formattributes.cxx b/xmloff/source/forms/formattributes.cxx index 75a44b1ffe..d47f478e30 100644 --- a/xmloff/source/forms/formattributes.cxx +++ b/xmloff/source/forms/formattributes.cxx @@ -31,7 +31,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 2d83b9bc5c..59ebb0283d 100644 --- a/xmloff/source/forms/formevents.cxx +++ b/xmloff/source/forms/formevents.cxx @@ -31,7 +31,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 867624fbaa..2786c52c42 100644 --- a/xmloff/source/forms/formlayerexport.cxx +++ b/xmloff/source/forms/formlayerexport.cxx @@ -35,7 +35,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 42acd6d339..39cd0ba5c7 100644 --- a/xmloff/source/forms/formsimp.cxx +++ b/xmloff/source/forms/formsimp.cxx @@ -32,7 +32,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/layerexport.cxx b/xmloff/source/forms/layerexport.cxx index eb8c56b610..744b60ab8b 100644 --- a/xmloff/source/forms/layerexport.cxx +++ b/xmloff/source/forms/layerexport.cxx @@ -36,7 +36,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> @@ -57,7 +57,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 81a1276708..3c53187f53 100644 --- a/xmloff/source/forms/layerimport.cxx +++ b/xmloff/source/forms/layerimport.cxx @@ -61,9 +61,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/officeforms.cxx b/xmloff/source/forms/officeforms.cxx index 0a65cbafe4..ab4a63a4b8 100644 --- a/xmloff/source/forms/officeforms.cxx +++ b/xmloff/source/forms/officeforms.cxx @@ -33,7 +33,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/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx index 5a265d4ac6..d7fdc2648c 100644 --- a/xmloff/source/forms/propertyexport.cxx +++ b/xmloff/source/forms/propertyexport.cxx @@ -35,7 +35,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 3d88b29271..6e5d95f9fc 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -37,7 +37,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 9ad2b841cf..e49928aace 100644 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -48,7 +48,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 f371054f6f..b19215b4c6 100644 --- a/xmloff/source/meta/MetaImportComponent.cxx +++ b/xmloff/source/meta/MetaImportComponent.cxx @@ -32,7 +32,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/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx index fb2893201f..94d66b1884 100644 --- a/xmloff/source/meta/xmlmetae.cxx +++ b/xmloff/source/meta/xmlmetae.cxx @@ -42,7 +42,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 26a96378a1..dea29ca71d 100644 --- a/xmloff/source/meta/xmlmetai.cxx +++ b/xmloff/source/meta/xmlmetai.cxx @@ -42,7 +42,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 917673d06d..edbe13bed0 100644 --- a/xmloff/source/script/XMLEventExport.cxx +++ b/xmloff/source/script/XMLEventExport.cxx @@ -46,7 +46,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 d1697d92a9..ad8fe57ae6 100644 --- a/xmloff/source/script/XMLEventImportHelper.cxx +++ b/xmloff/source/script/XMLEventImportHelper.cxx @@ -37,8 +37,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 b1881b609f..064403b7ea 100644 --- a/xmloff/source/script/XMLEventsImportContext.cxx +++ b/xmloff/source/script/XMLEventsImportContext.cxx @@ -42,9 +42,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 58928e3be7..3702d8a9c3 100644 --- a/xmloff/source/script/XMLScriptContextFactory.cxx +++ b/xmloff/source/script/XMLScriptContextFactory.cxx @@ -35,7 +35,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 92e4e70cd7..962f1c71d9 100644 --- a/xmloff/source/script/XMLScriptExportHandler.cxx +++ b/xmloff/source/script/XMLScriptExportHandler.cxx @@ -39,7 +39,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 26eb08813a..490acad1c5 100644 --- a/xmloff/source/script/XMLStarBasicContextFactory.cxx +++ b/xmloff/source/script/XMLStarBasicContextFactory.cxx @@ -35,7 +35,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 863db4fc34..8037f60ec0 100644 --- a/xmloff/source/script/XMLStarBasicExportHandler.cxx +++ b/xmloff/source/script/XMLStarBasicExportHandler.cxx @@ -39,7 +39,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/xmlscripti.cxx b/xmloff/source/script/xmlscripti.cxx index 96dbd6cf39..aeb4ea1b82 100644 --- a/xmloff/source/script/xmlscripti.cxx +++ b/xmloff/source/script/xmlscripti.cxx @@ -32,7 +32,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 072f6c3f4e..949dcd9d19 100644 --- a/xmloff/source/style/DashStyle.cxx +++ b/xmloff/source/style/DashStyle.cxx @@ -32,11 +32,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 55556433d4..528e286c7a 100644 --- a/xmloff/source/style/FillStyleContext.cxx +++ b/xmloff/source/style/FillStyleContext.cxx @@ -33,15 +33,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 ac8dff99e3..35149654a6 100644 --- a/xmloff/source/style/GradientStyle.cxx +++ b/xmloff/source/style/GradientStyle.cxx @@ -30,12 +30,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 a7d1c97871..6e4dcf53f5 100644 --- a/xmloff/source/style/HatchStyle.cxx +++ b/xmloff/source/style/HatchStyle.cxx @@ -30,11 +30,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 c53ce82061..f896aa1c0b 100644 --- a/xmloff/source/style/ImageStyle.cxx +++ b/xmloff/source/style/ImageStyle.cxx @@ -30,12 +30,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 86c78cbd6a..6b3e394a8d 100644 --- a/xmloff/source/style/MarkerStyle.cxx +++ b/xmloff/source/style/MarkerStyle.cxx @@ -30,12 +30,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 dd4aa73b00..9b72cdb093 100644 --- a/xmloff/source/style/PageHeaderFooterContext.cxx +++ b/xmloff/source/style/PageHeaderFooterContext.cxx @@ -39,7 +39,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 1f26064a4a..91c4e75086 100644 --- a/xmloff/source/style/PageMasterImportContext.cxx +++ b/xmloff/source/style/PageMasterImportContext.cxx @@ -33,7 +33,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 5968a600f8..f0780c9f96 100644 --- a/xmloff/source/style/PageMasterStyleMap.cxx +++ b/xmloff/source/style/PageMasterStyleMap.cxx @@ -34,7 +34,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 68a5597133..565376797d 100644 --- a/xmloff/source/style/TransGradientStyle.cxx +++ b/xmloff/source/style/TransGradientStyle.cxx @@ -35,7 +35,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 66a20cc868..b50b794e47 100644 --- a/xmloff/source/style/VisAreaContext.cxx +++ b/xmloff/source/style/VisAreaContext.cxx @@ -35,9 +35,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 18bfa89987..49fd6d777e 100644 --- a/xmloff/source/style/VisAreaExport.cxx +++ b/xmloff/source/style/VisAreaExport.cxx @@ -31,9 +31,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/WordWrapPropertyHdl.cxx b/xmloff/source/style/WordWrapPropertyHdl.cxx index eec884771f..73da1af4d3 100644 --- a/xmloff/source/style/WordWrapPropertyHdl.cxx +++ b/xmloff/source/style/WordWrapPropertyHdl.cxx @@ -32,7 +32,7 @@ #include "precompiled_xmloff.hxx" #include <xmloff/xmlimp.hxx> #include <xmloff/WordWrapPropertyHdl.hxx> -#include "xmlkywd.hxx" +#include "xmloff/xmlkywd.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include <comphelper/extract.hxx> diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx index 5e7e5534c2..44a5d78cb3 100644 --- a/xmloff/source/style/XMLBackgroundImageContext.cxx +++ b/xmloff/source/style/XMLBackgroundImageContext.cxx @@ -34,7 +34,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 9bb32a935c..bc2a043b53 100644 --- a/xmloff/source/style/XMLBackgroundImageExport.cxx +++ b/xmloff/source/style/XMLBackgroundImageExport.cxx @@ -32,7 +32,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/XMLClipPropertyHandler.cxx b/xmloff/source/style/XMLClipPropertyHandler.cxx index 016ce350cc..7aa036b5db 100644 --- a/xmloff/source/style/XMLClipPropertyHandler.cxx +++ b/xmloff/source/style/XMLClipPropertyHandler.cxx @@ -35,7 +35,7 @@ #include <rtl/ustrbuf.hxx> #include <com/sun/star/text/GraphicCrop.hpp> #include <xmloff/xmluconv.hxx> -#include <xmlkywd.hxx> +#include <xmloff/xmlkywd.hxx> #include <xmloff/xmltoken.hxx> using ::rtl::OUString; diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx index cbd6a5de0f..827dc5d6cd 100644 --- a/xmloff/source/style/XMLFontAutoStylePool.cxx +++ b/xmloff/source/style/XMLFontAutoStylePool.cxx @@ -33,7 +33,7 @@ #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> #ifndef _XMLOFF_PROPERTYHANDLER_FONTTYPES_HXX diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx index 3bb6d98785..5958422834 100644 --- a/xmloff/source/style/XMLFontStylesContext.cxx +++ b/xmloff/source/style/XMLFontStylesContext.cxx @@ -38,7 +38,7 @@ #include <com/sun/star/awt/FontPitch.hpp> #endif #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #ifndef _XMLOFF_PROPERTYHANDLER_FONTTYPES_HXX #include "fonthdl.hxx" diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx index 2f44af15ca..e8595b91c4 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx @@ -33,7 +33,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 cd07088eb1..cc95170910 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx @@ -42,7 +42,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 3e1bc7e9b6..ecdd94c254 100644 --- a/xmloff/source/style/XMLPageExport.cxx +++ b/xmloff/source/style/XMLPageExport.cxx @@ -32,7 +32,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 daec835a1f..0a922dd52c 100644 --- a/xmloff/source/style/impastp4.cxx +++ b/xmloff/source/style/impastp4.cxx @@ -34,7 +34,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/numehelp.cxx b/xmloff/source/style/numehelp.cxx index d7ed9b35d7..7e4e6758a6 100644 --- a/xmloff/source/style/numehelp.cxx +++ b/xmloff/source/style/numehelp.cxx @@ -31,10 +31,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 4f666b4fc3..cfd4fdd610 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -36,7 +36,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> @@ -52,7 +52,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 4317107268..71f3d82fdf 100644 --- a/xmloff/source/style/styleexp.cxx +++ b/xmloff/source/style/styleexp.cxx @@ -36,13 +36,13 @@ #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" #endif #include <xmloff/xmluconv.hxx> -#include "xmlkywd.hxx" +#include "xmloff/xmlkywd.hxx" #include <xmloff/attrlist.hxx> #include <xmloff/xmlprmap.hxx> #include <xmloff/xmlexppr.hxx> diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx index 4ed59fd092..5aa917c488 100644 --- a/xmloff/source/style/xmlaustp.cxx +++ b/xmloff/source/style/xmlaustp.cxx @@ -37,10 +37,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 caf36c88c3..0276227e11 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -46,7 +46,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 29f89db36b..34276440f8 100644 --- a/xmloff/source/style/xmlimppr.cxx +++ b/xmloff/source/style/xmlimppr.cxx @@ -43,11 +43,11 @@ #include <xmloff/xmlimppr.hxx> #include <xmloff/xmlimp.hxx> -#include "xmlkywd.hxx" -#include "unoatrcn.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlkywd.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 37bfa76d3e..5f496ac422 100644 --- a/xmloff/source/style/xmlnume.cxx +++ b/xmloff/source/style/xmlnume.cxx @@ -33,7 +33,7 @@ #include <rtl/ustrbuf.hxx> #include <tools/debug.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #ifndef _XMLOFF_PROPERTYHANDLER_FONTTYPES_HXX @@ -55,7 +55,7 @@ // <-- #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#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 61c1617bb1..18c0bc5ac1 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -52,7 +52,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 b8ccfdf909..5768ca20ba 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -48,7 +48,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 312017ffda..b10c57be46 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -37,7 +37,7 @@ #include <xmloff/xmltkmap.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlimp.hxx> #include <xmloff/XMLBase64ImportContext.hxx> #include <com/sun/star/beans/PropertyValue.hpp> @@ -56,7 +56,7 @@ #include <com/sun/star/io/XOutputStream.hpp> #include <xmloff/xmltoken.hxx> -#include "i18nmap.hxx" +#include "xmloff/i18nmap.hxx" #include <xmloff/xmluconv.hxx> #ifndef _XMLOFF_PROPERTYHANDLER_FONTTYPES_HXX #include "fonthdl.hxx" diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index 21ecbb0ea0..e74ec02a9a 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -49,7 +49,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 b59c8167e1..6ee71b1a07 100644 --- a/xmloff/source/style/xmltabe.cxx +++ b/xmloff/source/style/xmltabe.cxx @@ -36,11 +36,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 35508f7909..36cccd8148 100644 --- a/xmloff/source/style/xmltabi.cxx +++ b/xmloff/source/style/xmltabi.cxx @@ -34,11 +34,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 7c8d3c5c2a..140f702332 100644 --- a/xmloff/source/table/XMLTableExport.cxx +++ b/xmloff/source/table/XMLTableExport.cxx @@ -50,7 +50,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 dbbb7bdbb9..91624b26ee 100644 --- a/xmloff/source/table/XMLTableImport.cxx +++ b/xmloff/source/table/XMLTableImport.cxx @@ -51,7 +51,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/tabledesignsimporter.cxx b/xmloff/source/table/tabledesignsimporter.cxx deleted file mode 100644 index 986a1d9585..0000000000 --- a/xmloff/source/table/tabledesignsimporter.cxx +++ /dev/null @@ -1,106 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: tabledesignsimporter.cxx,v $ - * $Revision: 1.3 $ - * - * 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 7871b03434..9f4ac25cd0 100644 --- a/xmloff/source/text/XMLAutoMarkFileContext.cxx +++ b/xmloff/source/text/XMLAutoMarkFileContext.cxx @@ -34,7 +34,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 e350c76350..66b25854ff 100644 --- a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx +++ b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx @@ -35,7 +35,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 0a1e8527dc..dfcddebb98 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.cxx +++ b/xmloff/source/text/XMLAutoTextEventExport.cxx @@ -49,7 +49,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 97c3ad719b..e88ecfebdb 100644 --- a/xmloff/source/text/XMLAutoTextEventImport.cxx +++ b/xmloff/source/text/XMLAutoTextEventImport.cxx @@ -37,7 +37,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 cf9cbbfb5b..e21167ef97 100644 --- a/xmloff/source/text/XMLCalculationSettingsContext.cxx +++ b/xmloff/source/text/XMLCalculationSettingsContext.cxx @@ -35,7 +35,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 1202b7cd69..f4b80ab53d 100644 --- a/xmloff/source/text/XMLChangeElementImportContext.cxx +++ b/xmloff/source/text/XMLChangeElementImportContext.cxx @@ -35,7 +35,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 56cd90fb7f..46b7a83f50 100644 --- a/xmloff/source/text/XMLChangeImportContext.cxx +++ b/xmloff/source/text/XMLChangeImportContext.cxx @@ -34,7 +34,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 1e8f521b91..0eb0a4da4d 100644 --- a/xmloff/source/text/XMLChangeInfoContext.cxx +++ b/xmloff/source/text/XMLChangeInfoContext.cxx @@ -34,7 +34,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 5a0cf0bec4..1be946d2bb 100644 --- a/xmloff/source/text/XMLChangedRegionImportContext.cxx +++ b/xmloff/source/text/XMLChangedRegionImportContext.cxx @@ -36,7 +36,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 619bdd0c0d..1dc57c2c34 100644 --- a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteBodyImportContext.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 <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 0087b0fa49..c7fc0bf779 100644 --- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx @@ -38,7 +38,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 c0b0e94f77..c9223242bc 100644 --- a/xmloff/source/text/XMLFootnoteImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteImportContext.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 "XMLFootnoteBodyImportContext.hxx" diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx index ea71a83da3..543c66c788 100644 --- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx +++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx @@ -41,7 +41,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 967e69f8ca..a11a09530b 100644 --- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx @@ -38,7 +38,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 41ecbc32f0..b6adc5b18d 100644 --- a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx @@ -38,7 +38,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 d30499a2b2..c8d84a2f0a 100644 --- a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx @@ -41,7 +41,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 ca75b6fc69..ba57516a63 100644 --- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx +++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx @@ -38,7 +38,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 a82fc88aed..8e85952980 100644 --- a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx +++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.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/XMLIndexMarkExport.cxx b/xmloff/source/text/XMLIndexMarkExport.cxx index 1c3a200dae..56c830e99a 100644 --- a/xmloff/source/text/XMLIndexMarkExport.cxx +++ b/xmloff/source/text/XMLIndexMarkExport.cxx @@ -37,7 +37,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 d72b41104f..a56e060b9c 100644 --- a/xmloff/source/text/XMLIndexObjectSourceContext.cxx +++ b/xmloff/source/text/XMLIndexObjectSourceContext.cxx @@ -41,7 +41,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 78715d4f65..6f94fde210 100644 --- a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx +++ b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx @@ -38,7 +38,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 6314f348d8..09893caeec 100644 --- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx +++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx @@ -41,7 +41,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 e3b796d44e..91eaf970a2 100644 --- a/xmloff/source/text/XMLIndexTOCContext.cxx +++ b/xmloff/source/text/XMLIndexTOCContext.cxx @@ -52,11 +52,11 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/txtimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" -#include "xmlkywd.hxx" +#include "xmloff/xmlnmspe.hxx" +#include "xmloff/xmlkywd.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/prstylei.hxx> -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" #include <xmloff/xmluconv.hxx> #include <tools/debug.hxx> #include <rtl/ustring.hxx> diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.cxx b/xmloff/source/text/XMLIndexTOCSourceContext.cxx index e1ad1b9975..d80b06913b 100644 --- a/xmloff/source/text/XMLIndexTOCSourceContext.cxx +++ b/xmloff/source/text/XMLIndexTOCSourceContext.cxx @@ -41,7 +41,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 ae43e705fb..485ee72721 100644 --- a/xmloff/source/text/XMLIndexTOCStylesContext.cxx +++ b/xmloff/source/text/XMLIndexTOCStylesContext.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/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx index 681b2c4256..3bf5d27b16 100644 --- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx +++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx @@ -38,7 +38,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 e79f6e8dc8..fb78ae095d 100644 --- a/xmloff/source/text/XMLIndexTableSourceContext.cxx +++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx @@ -45,7 +45,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 5376a4ed9e..f6c6166223 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTemplateContext.cxx @@ -42,7 +42,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 a65730d2f7..f93972f9a7 100644 --- a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx @@ -34,7 +34,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 6713a049f4..a3513b1cd7 100644 --- a/xmloff/source/text/XMLIndexUserSourceContext.cxx +++ b/xmloff/source/text/XMLIndexUserSourceContext.cxx @@ -41,7 +41,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 02177ddc19..d9bf9d5897 100644 --- a/xmloff/source/text/XMLLineNumberingExport.cxx +++ b/xmloff/source/text/XMLLineNumberingExport.cxx @@ -36,7 +36,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 139e123f4f..3e9ad7fab2 100644 --- a/xmloff/source/text/XMLLineNumberingImportContext.cxx +++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx @@ -38,7 +38,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 5b192ee961..a6722c1579 100644 --- a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx +++ b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx @@ -34,7 +34,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 2a3da1c569..6f6643a898 100644 --- a/xmloff/source/text/XMLRedlineExport.cxx +++ b/xmloff/source/text/XMLRedlineExport.cxx @@ -45,7 +45,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 d87e33765f..ac45adf3c9 100644 --- a/xmloff/source/text/XMLSectionExport.cxx +++ b/xmloff/source/text/XMLSectionExport.cxx @@ -56,9 +56,9 @@ #include <com/sun/star/text/XTextFieldsSupplier.hpp> #include <com/sun/star/text/XChapterNumberingSupplier.hpp> #include <com/sun/star/text/ChapterFormat.hpp> //i90246 -#include "xmlkywd.hxx" +#include "xmloff/xmlkywd.hxx" #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 e3b54fa3ec..783be28fe0 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx @@ -40,7 +40,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 ac696f9d1e..573c3e1ede 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx @@ -42,7 +42,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 62f49620fb..50d6c996d4 100644 --- a/xmloff/source/text/XMLSectionImportContext.cxx +++ b/xmloff/source/text/XMLSectionImportContext.cxx @@ -37,7 +37,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 a3c99c477d..3e5ca28439 100644 --- a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx +++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx @@ -37,7 +37,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 206d765f96..2d90b7a1b1 100644 --- a/xmloff/source/text/XMLSectionSourceImportContext.cxx +++ b/xmloff/source/text/XMLSectionSourceImportContext.cxx @@ -37,7 +37,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 1db837573e..7d33d3be5e 100644 --- a/xmloff/source/text/XMLStringBufferImportContext.cxx +++ b/xmloff/source/text/XMLStringBufferImportContext.cxx @@ -32,7 +32,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 2e2a21bd1f..3a968cd302 100644 --- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx +++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx @@ -31,7 +31,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 7a9a62c2f3..7108ea8541 100644 --- a/xmloff/source/text/XMLTextColumnsContext.cxx +++ b/xmloff/source/text/XMLTextColumnsContext.cxx @@ -38,7 +38,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 9c33e46465..8b55676f4f 100644 --- a/xmloff/source/text/XMLTextColumnsExport.cxx +++ b/xmloff/source/text/XMLTextColumnsExport.cxx @@ -41,7 +41,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 14776996b7..9b2446ba34 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -45,8 +45,8 @@ #include <com/sun/star/text/VertOrientation.hpp> #include <xmloff/xmlimp.hxx> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" -#include "xmlkywd.hxx" +#include "xmloff/xmlnmspe.hxx" +#include "xmloff/xmlkywd.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> #include "XMLAnchorTypePropHdl.hxx" @@ -54,7 +54,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 9fae363ea5..a922c38392 100644 --- a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx +++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx @@ -32,7 +32,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 44588316e8..104edf396c 100644 --- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx +++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx @@ -33,7 +33,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 a0a62cab85..31fe60b474 100644 --- a/xmloff/source/text/XMLTextListAutoStylePool.cxx +++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx @@ -37,7 +37,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 208725f08e..1c37e2bf00 100644 --- a/xmloff/source/text/XMLTextListBlockContext.cxx +++ b/xmloff/source/text/XMLTextListBlockContext.cxx @@ -38,7 +38,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 2acb8da650..f960d8de61 100644 --- a/xmloff/source/text/XMLTextListItemContext.cxx +++ b/xmloff/source/text/XMLTextListItemContext.cxx @@ -33,7 +33,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 52384b0a40..6fd79110c3 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -41,7 +41,7 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/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 214b2e3fde..0905e05004 100644 --- a/xmloff/source/text/XMLTextMasterPageContext.cxx +++ b/xmloff/source/text/XMLTextMasterPageContext.cxx @@ -35,7 +35,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 7271afc935..500184ee7f 100644 --- a/xmloff/source/text/XMLTextMasterPageExport.cxx +++ b/xmloff/source/text/XMLTextMasterPageExport.cxx @@ -31,7 +31,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 8d64c280d4..b476832f4e 100644 --- a/xmloff/source/text/XMLTextMasterStylesContext.cxx +++ b/xmloff/source/text/XMLTextMasterStylesContext.cxx @@ -34,7 +34,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 30895a5edc..e823c6f339 100644 --- a/xmloff/source/text/XMLTextNumRuleInfo.cxx +++ b/xmloff/source/text/XMLTextNumRuleInfo.cxx @@ -39,7 +39,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 0c587ed23e..7387e6cf49 100644 --- a/xmloff/source/text/XMLTextShapeImportHelper.cxx +++ b/xmloff/source/text/XMLTextShapeImportHelper.cxx @@ -44,7 +44,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/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx index d04fc57e52..77adf0fb45 100644 --- a/xmloff/source/text/XMLTextShapeStyleContext.cxx +++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx @@ -34,7 +34,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 2ca1cfbb21..255a1a151d 100644 --- a/xmloff/source/text/XMLTrackedChangesImportContext.cxx +++ b/xmloff/source/text/XMLTrackedChangesImportContext.cxx @@ -35,7 +35,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/txtdrope.cxx b/xmloff/source/text/txtdrope.cxx index 3a6cfa71f9..2d8a5e0ef6 100644 --- a/xmloff/source/text/txtdrope.cxx +++ b/xmloff/source/text/txtdrope.cxx @@ -36,7 +36,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 f3b73ec30c..5ad14cbc2c 100644 --- a/xmloff/source/text/txtdropi.cxx +++ b/xmloff/source/text/txtdropi.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> diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx index 8b267bba18..d357f637f6 100644 --- a/xmloff/source/text/txtexppr.cxx +++ b/xmloff/source/text/txtexppr.cxx @@ -35,18 +35,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 dc47a82de6..807eb90278 100644 --- a/xmloff/source/text/txtexppr.hxx +++ b/xmloff/source/text/txtexppr.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: txtexppr.hxx,v $ + * $RCSfile: xmloff/txtexppr.hxx,v $ * $Revision: 1.8 $ * * This file is part of OpenOffice.org. @@ -33,7 +33,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 08aeb7828d..f206f6f8b7 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -42,7 +42,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 d47e813c34..7fbaeec354 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -41,7 +41,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 c8b2b0158c..ce342f5ca8 100644 --- a/xmloff/source/text/txtftne.cxx +++ b/xmloff/source/text/txtftne.cxx @@ -54,7 +54,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 51af4f954f..8a73a1c965 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -54,7 +54,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> @@ -63,10 +63,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 218f2fa793..c4c01db9a0 100644 --- a/xmloff/source/text/txtimppr.cxx +++ b/xmloff/source/text/txtimppr.cxx @@ -40,7 +40,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 c204881859..dd7f9e1703 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -93,8 +93,8 @@ #include <com/sun/star/text/XEndnotesSupplier.hpp> #include <com/sun/star/drawing/XControlShape.hpp> #include <com/sun/star/util/DateTime.hpp> -#include "xmlkywd.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlkywd.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlaustp.hxx> #include <xmloff/families.hxx> #include "txtexppr.hxx" @@ -110,7 +110,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 ceeb676e8b..7a7b724561 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -52,7 +52,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 e68469f561..cb77a5e2d4 100644 --- a/xmloff/source/text/txtprmap.cxx +++ b/xmloff/source/text/txtprmap.cxx @@ -31,7 +31,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 bd05aa4ba2..dc473be281 100644 --- a/xmloff/source/text/txtsecte.cxx +++ b/xmloff/source/text/txtsecte.cxx @@ -53,7 +53,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 d9e061be84..7e264fecf2 100644 --- a/xmloff/source/text/txtstyle.cxx +++ b/xmloff/source/text/txtstyle.cxx @@ -31,47 +31,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 9b82d3ce3b..38f8508705 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -32,7 +32,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 c419ee0383..f190c8e987 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -39,9 +39,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 2937f77400..4f5287d790 100644 --- a/xmloff/source/transform/ChartOASISTContext.cxx +++ b/xmloff/source/transform/ChartOASISTContext.cxx @@ -32,7 +32,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 dea76f27b2..c211a21737 100644 --- a/xmloff/source/transform/ChartOOoTContext.cxx +++ b/xmloff/source/transform/ChartOOoTContext.cxx @@ -32,7 +32,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 796adf506d..4be4d346fb 100644 --- a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx +++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx @@ -33,7 +33,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 03fd9429c9..f9855bb859 100644 --- a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx +++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx @@ -33,7 +33,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 bcb5bb8729..f79d63f0d3 100644 --- a/xmloff/source/transform/ControlOASISTContext.cxx +++ b/xmloff/source/transform/ControlOASISTContext.cxx @@ -31,7 +31,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 783b312565..b01e76e1ff 100644 --- a/xmloff/source/transform/ControlOOoTContext.cxx +++ b/xmloff/source/transform/ControlOOoTContext.cxx @@ -33,7 +33,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 6a4816e0b3..bc97e1d1fe 100644 --- a/xmloff/source/transform/DlgOASISTContext.cxx +++ b/xmloff/source/transform/DlgOASISTContext.cxx @@ -32,7 +32,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 89675428cc..f2d6bb99d4 100644 --- a/xmloff/source/transform/DocumentTContext.cxx +++ b/xmloff/source/transform/DocumentTContext.cxx @@ -37,7 +37,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 d65c6cc0df..f8fbb7e7a8 100644 --- a/xmloff/source/transform/EventMap.cxx +++ b/xmloff/source/transform/EventMap.cxx @@ -31,7 +31,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 96acba4e50..49e65be096 100644 --- a/xmloff/source/transform/EventOASISTContext.cxx +++ b/xmloff/source/transform/EventOASISTContext.cxx @@ -33,7 +33,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 cc5e796f06..1ff5047b8a 100644 --- a/xmloff/source/transform/EventOOoTContext.cxx +++ b/xmloff/source/transform/EventOOoTContext.cxx @@ -33,7 +33,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 3646f5f2e8..dbc4d9429b 100644 --- a/xmloff/source/transform/FormPropOASISTContext.cxx +++ b/xmloff/source/transform/FormPropOASISTContext.cxx @@ -31,7 +31,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 af214f874a..a8c792878c 100644 --- a/xmloff/source/transform/FormPropOOoTContext.cxx +++ b/xmloff/source/transform/FormPropOOoTContext.cxx @@ -31,7 +31,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 f1ed44dd05..83884cfca7 100644 --- a/xmloff/source/transform/FrameOASISTContext.cxx +++ b/xmloff/source/transform/FrameOASISTContext.cxx @@ -33,7 +33,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 6c5a2b0b21..a1f2059f81 100644 --- a/xmloff/source/transform/FrameOOoTContext.cxx +++ b/xmloff/source/transform/FrameOOoTContext.cxx @@ -33,7 +33,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 e6fc9e9cfd..f41dd33120 100644 --- a/xmloff/source/transform/MergeElemTContext.cxx +++ b/xmloff/source/transform/MergeElemTContext.cxx @@ -39,7 +39,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 20f591a192..5b668549b5 100644 --- a/xmloff/source/transform/MetaTContext.cxx +++ b/xmloff/source/transform/MetaTContext.cxx @@ -36,7 +36,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 52d0797691..f7fc07fffc 100644 --- a/xmloff/source/transform/MetaTContext.hxx +++ b/xmloff/source/transform/MetaTContext.hxx @@ -32,7 +32,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 3106703967..ac3d531fc1 100644 --- a/xmloff/source/transform/NotesTContext.cxx +++ b/xmloff/source/transform/NotesTContext.cxx @@ -36,7 +36,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 8d4cf844a1..d831961ef8 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -34,7 +34,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 22fcdc2719..e6bf6be3a0 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -34,7 +34,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 1a054e86ff..432ae49fd6 100644 --- a/xmloff/source/transform/PropertyActionsOASIS.cxx +++ b/xmloff/source/transform/PropertyActionsOASIS.cxx @@ -30,7 +30,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 50f75af995..fff27da323 100644 --- a/xmloff/source/transform/PropertyActionsOOo.cxx +++ b/xmloff/source/transform/PropertyActionsOOo.cxx @@ -30,7 +30,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 2dd8552b98..a63b498b8d 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -37,7 +37,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 243b94f338..a5373c7fb9 100644 --- a/xmloff/source/transform/StyleOOoTContext.cxx +++ b/xmloff/source/transform/StyleOOoTContext.cxx @@ -36,7 +36,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 95df970b58..c2d399302a 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -36,7 +36,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 912b19afd0..3abd168025 100644 --- a/xmloff/source/transform/XMLFilterRegistration.cxx +++ b/xmloff/source/transform/XMLFilterRegistration.cxx @@ -144,12 +144,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; } -sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey ) +SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey ) { if( pRegistryKey ) { @@ -182,7 +182,7 @@ sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegis return sal_True; } -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/xforms/SchemaContext.cxx b/xmloff/source/xforms/SchemaContext.cxx index f037a1b021..b93b6519ee 100644 --- a/xmloff/source/xforms/SchemaContext.cxx +++ b/xmloff/source/xforms/SchemaContext.cxx @@ -37,7 +37,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 f48101288f..f70c18f057 100644 --- a/xmloff/source/xforms/SchemaRestrictionContext.cxx +++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx @@ -36,7 +36,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 f64853886c..d340547d8a 100644 --- a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx +++ b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx @@ -36,7 +36,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 8fd91b12d5..7709fd16c1 100644 --- a/xmloff/source/xforms/TokenContext.cxx +++ b/xmloff/source/xforms/TokenContext.cxx @@ -34,7 +34,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 0f8b6a61f3..22a4511195 100644 --- a/xmloff/source/xforms/XFormsBindContext.cxx +++ b/xmloff/source/xforms/XFormsBindContext.cxx @@ -36,10 +36,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 e40e540b2f..a916da132b 100644 --- a/xmloff/source/xforms/XFormsInstanceContext.cxx +++ b/xmloff/source/xforms/XFormsInstanceContext.cxx @@ -44,10 +44,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 91941bdb69..a81f3cebd7 100644 --- a/xmloff/source/xforms/XFormsModelContext.cxx +++ b/xmloff/source/xforms/XFormsModelContext.cxx @@ -40,10 +40,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 1c4be38f8c..ac2a44148f 100644 --- a/xmloff/source/xforms/XFormsSubmissionContext.cxx +++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx @@ -36,10 +36,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/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx index b7df909679..388fc91b4b 100644 --- a/xmloff/source/xforms/xformsapi.cxx +++ b/xmloff/source/xforms/xformsapi.cxx @@ -48,7 +48,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 d89906ffd8..8b2b1e95d1 100644 --- a/xmloff/source/xforms/xformsexport.cxx +++ b/xmloff/source/xforms/xformsexport.cxx @@ -31,14 +31,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 dbe575e1d3..a2c6432646 100644 --- a/xmloff/source/xforms/xformsimport.cxx +++ b/xmloff/source/xforms/xformsimport.cxx @@ -34,7 +34,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> diff --git a/xmloff/util/makefile.mk b/xmloff/util/makefile.mk index bc93c1d429..58cdc44dbb 100644 --- a/xmloff/util/makefile.mk +++ b/xmloff/util/makefile.mk @@ -90,21 +90,6 @@ SHL1STDLIBS+=-licg617mxp SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1LIBS= $(LIB1TARGET) - -SHL5STDLIBS= \ - $(TOOLSLIB) \ - $(SALLIB) \ - $(SALHELPERLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(COMPHELPERLIB) - -.IF "$(GUI)"=="UNX" || "$(COM)"=="GCC" - SHL5STDLIBS += -lxo$(DLLPOSTFIX) -.ELSE - SHL5STDLIBS += ixo.lib -.ENDIF - # --- Def-File --------------------------------------------------------- DEF1NAME =$(SHL1TARGET) |