remove number of -I directives in writerfilter

Windows length path limitations strike again, and this should reduce the total
argument length.

Change-Id: I76fefabc8201e51494a7003d7ca4f9fd92ffa3b9

34 files changed, 47 insertions, 52 deletions

diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index b06ee756c8c7..3644c427f260 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -38,11 +38,6 @@ $(eval $(call gb_Library_set_include,writerfilter,\
     $$(INCLUDE) \
     -I$(SRCDIR)/writerfilter/inc \
     -I$(SRCDIR)/writerfilter/source \
-    -I$(SRCDIR)/writerfilter/source/dmapper \
-    -I$(SRCDIR)/writerfilter/source/doctok \
-    -I$(SRCDIR)/writerfilter/source/ooxml \
-    -I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \
-    -I$(WORKDIR)/CustomTarget/writerfilter/source/ooxml \
 ))
 
 $(eval $(call gb_Library_use_api,writerfilter,\
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx
index 62445ab0e0fb..0f46606f2598 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -25,7 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <PropertyIds.hxx>
+#include "PropertyIds.hxx"
 #include <rtl/ustring.hxx>
 #include <map>
 
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 5c455ddbd297..ba5e1ab90c42 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/uno/Any.h>
-#include <PropertyIds.hxx>
+#include "PropertyIds.hxx"
 #include <boost/shared_ptr.hpp>
 #include <map>
 #include <vector>
diff --git a/writerfilter/source/doctok/Dff.cxx b/writerfilter/source/doctok/Dff.cxx
index 8ec8f456f839..41a948255470 100644
--- a/writerfilter/source/doctok/Dff.cxx
+++ b/writerfilter/source/doctok/Dff.cxx
@@ -30,7 +30,7 @@
 #include "Dff.hxx"
 #include <doctok/resourceids.hxx>
 #include <resourcemodel/WW8ResourceModel.hxx>
-#include "resources.hxx"
+#include "doctok/resources.hxx"
 
 namespace writerfilter {
 namespace doctok {
diff --git a/writerfilter/source/doctok/Dff.hxx b/writerfilter/source/doctok/Dff.hxx
index c987e5252186..3a1f18ce49e0 100644
--- a/writerfilter/source/doctok/Dff.hxx
+++ b/writerfilter/source/doctok/Dff.hxx
@@ -30,8 +30,8 @@
 #define INCLUDED_DFF_HXX
 
 #include <vector>
-#include <WW8StructBase.hxx>
-#include <WW8ResourceModelImpl.hxx>
+#include "WW8StructBase.hxx"
+#include "WW8ResourceModelImpl.hxx"
 
 namespace writerfilter {
 namespace doctok
diff --git a/writerfilter/source/doctok/DffImpl.cxx b/writerfilter/source/doctok/DffImpl.cxx
index 25f9b72b11e5..23edf62b1378 100644
--- a/writerfilter/source/doctok/DffImpl.cxx
+++ b/writerfilter/source/doctok/DffImpl.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "resources.hxx"
+#include "doctok/resources.hxx"
 #include "WW8DocumentImpl.hxx"
 
 namespace writerfilter {
diff --git a/writerfilter/source/doctok/PLCF.hxx b/writerfilter/source/doctok/PLCF.hxx
index 802e149e3f9e..2ad8d0078d95 100644
--- a/writerfilter/source/doctok/PLCF.hxx
+++ b/writerfilter/source/doctok/PLCF.hxx
@@ -30,7 +30,7 @@
 #define INCLUDED_PLCF_HXX
 
 #include <boost/shared_ptr.hpp>
-#include <WW8StructBase.hxx>
+#include "WW8StructBase.hxx"
 
 namespace writerfilter {
 namespace doctok
diff --git a/writerfilter/source/doctok/WW8Annotation.cxx b/writerfilter/source/doctok/WW8Annotation.cxx
index 4f209584c215..a6b22a141fcc 100644
--- a/writerfilter/source/doctok/WW8Annotation.cxx
+++ b/writerfilter/source/doctok/WW8Annotation.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include <resources.hxx>
+#include <doctok/resources.hxx>
 
 namespace writerfilter {
 namespace doctok
diff --git a/writerfilter/source/doctok/WW8Clx.cxx b/writerfilter/source/doctok/WW8Clx.cxx
index c373dc8324b6..225fb430dea5 100644
--- a/writerfilter/source/doctok/WW8Clx.cxx
+++ b/writerfilter/source/doctok/WW8Clx.cxx
@@ -28,7 +28,7 @@
 
 #include <com/sun/star/io/XSeekable.hpp>
 #include <WW8Clx.hxx>
-#include <resources.hxx>
+#include <doctok/resources.hxx>
 
 namespace writerfilter {
 namespace doctok
diff --git a/writerfilter/source/doctok/WW8Clx.hxx b/writerfilter/source/doctok/WW8Clx.hxx
index 23492a1aa90e..0a7830e2c2af 100644
--- a/writerfilter/source/doctok/WW8Clx.hxx
+++ b/writerfilter/source/doctok/WW8Clx.hxx
@@ -29,9 +29,9 @@
 #ifndef INCLUDED_WW8_CLX_HXX
 #define INCLUDED_WW8_CLX_HXX
 
-#include <resources.hxx>
+#include <doctok/resources.hxx>
 
-#include <WW8OutputWithDepth.hxx>
+#include "WW8OutputWithDepth.hxx"
 
 namespace writerfilter {
 namespace doctok
diff --git a/writerfilter/source/doctok/WW8DocumentImpl.hxx b/writerfilter/source/doctok/WW8DocumentImpl.hxx
index 0a50fc6d9edd..9d0ec6176b49 100644
--- a/writerfilter/source/doctok/WW8DocumentImpl.hxx
+++ b/writerfilter/source/doctok/WW8DocumentImpl.hxx
@@ -32,7 +32,7 @@
 #include <set>
 #include <WW8PieceTable.hxx>
 #include <WW8BinTable.hxx>
-#include <resources.hxx>
+#include <doctok/resources.hxx>
 #include <resourcemodel/WW8ResourceModel.hxx>
 #include <PLCF.hxx>
 #include <WW8Sttbf.hxx>
diff --git a/writerfilter/source/doctok/WW8FKP.hxx b/writerfilter/source/doctok/WW8FKP.hxx
index 4ece2673f843..b58fdc870458 100644
--- a/writerfilter/source/doctok/WW8FKP.hxx
+++ b/writerfilter/source/doctok/WW8FKP.hxx
@@ -30,7 +30,7 @@
 #define INCLUDED_WW8_FKP_HXX
 
 #include <WW8CpAndFc.hxx>
-#include <WW8StructBase.hxx>
+#include "WW8StructBase.hxx"
 
 namespace writerfilter {
 namespace doctok
diff --git a/writerfilter/source/doctok/WW8FontTable.cxx b/writerfilter/source/doctok/WW8FontTable.cxx
index c1b14646bdf0..260635aa1114 100644
--- a/writerfilter/source/doctok/WW8FontTable.cxx
+++ b/writerfilter/source/doctok/WW8FontTable.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include <resources.hxx>
+#include <doctok/resources.hxx>
 
 namespace writerfilter {
 namespace doctok {
diff --git a/writerfilter/source/doctok/WW8LFOTable.cxx b/writerfilter/source/doctok/WW8LFOTable.cxx
index 4b1a7a91dc9a..9a4d635a9d14 100644
--- a/writerfilter/source/doctok/WW8LFOTable.cxx
+++ b/writerfilter/source/doctok/WW8LFOTable.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "resources.hxx"
+#include "doctok/resources.hxx"
 
 namespace writerfilter {
 namespace doctok {
diff --git a/writerfilter/source/doctok/WW8ListTable.cxx b/writerfilter/source/doctok/WW8ListTable.cxx
index 79c4cecdcb34..794be91032bc 100644
--- a/writerfilter/source/doctok/WW8ListTable.cxx
+++ b/writerfilter/source/doctok/WW8ListTable.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include <resources.hxx>
+#include <doctok/resources.hxx>
 #include <WW8ResourceModelImpl.hxx>
 
 namespace writerfilter {
diff --git a/writerfilter/source/doctok/WW8Picture.cxx b/writerfilter/source/doctok/WW8Picture.cxx
index ec733ea02216..c9fbccf58312 100644
--- a/writerfilter/source/doctok/WW8Picture.cxx
+++ b/writerfilter/source/doctok/WW8Picture.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include <resources.hxx>
+#include <doctok/resources.hxx>
 #include <WW8DocumentImpl.hxx>
 
 namespace writerfilter {
diff --git a/writerfilter/source/doctok/WW8PropertySetImpl.hxx b/writerfilter/source/doctok/WW8PropertySetImpl.hxx
index 2c2590068bd5..8edd6fb6122f 100644
--- a/writerfilter/source/doctok/WW8PropertySetImpl.hxx
+++ b/writerfilter/source/doctok/WW8PropertySetImpl.hxx
@@ -31,8 +31,8 @@
 
 #include <resourcemodel/WW8ResourceModel.hxx>
 #include <doctok/WW8Document.hxx>
-#include <WW8StructBase.hxx>
-#include <WW8OutputWithDepth.hxx>
+#include "WW8StructBase.hxx"
+#include "WW8OutputWithDepth.hxx"
 
 #include <map>
 
diff --git a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx b/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
index 9c33f52f5c70..60eff4586c2e 100644
--- a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
+++ b/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
@@ -26,9 +26,9 @@
  *
  ************************************************************************/
 
-#include <WW8ResourceModelImpl.hxx>
-#include <resources.hxx>
-#include <WW8OutputWithDepth.hxx>
+#include "WW8ResourceModelImpl.hxx"
+#include <doctok/resources.hxx>
+#include "WW8OutputWithDepth.hxx"
 #include <resourcemodel/TableManager.hxx>
 #include <rtl/string.hxx>
 #include <resourcemodel/QNameToString.hxx>
diff --git a/writerfilter/source/doctok/WW8ResourceModelImpl.hxx b/writerfilter/source/doctok/WW8ResourceModelImpl.hxx
index 40f0da8c6a85..cb8fbd1105e9 100644
--- a/writerfilter/source/doctok/WW8ResourceModelImpl.hxx
+++ b/writerfilter/source/doctok/WW8ResourceModelImpl.hxx
@@ -32,7 +32,7 @@
 #include <doctok/WW8Document.hxx>
 
 #include <resourcemodel/WW8ResourceModel.hxx>
-#include <WW8StructBase.hxx>
+#include "WW8StructBase.hxx"
 
 #include <resourcemodel/OutputWithDepth.hxx>
 
diff --git a/writerfilter/source/doctok/WW8StructBase.cxx b/writerfilter/source/doctok/WW8StructBase.cxx
index 918002092f28..bb6c6c8ab819 100644
--- a/writerfilter/source/doctok/WW8StructBase.cxx
+++ b/writerfilter/source/doctok/WW8StructBase.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include <WW8StructBase.hxx>
+#include "WW8StructBase.hxx"
 
 namespace writerfilter {
 namespace doctok {
diff --git a/writerfilter/source/doctok/WW8Sttbf.cxx b/writerfilter/source/doctok/WW8Sttbf.cxx
index 0989962f3a80..835d29386e7a 100644
--- a/writerfilter/source/doctok/WW8Sttbf.cxx
+++ b/writerfilter/source/doctok/WW8Sttbf.cxx
@@ -27,7 +27,7 @@
  ************************************************************************/
 
 #include <WW8Sttbf.hxx>
-#include <resources.hxx>
+#include <doctok/resources.hxx>
 
 namespace writerfilter {
 namespace doctok
diff --git a/writerfilter/source/doctok/WW8Sttbf.hxx b/writerfilter/source/doctok/WW8Sttbf.hxx
index 07f9ff45cf47..4c66b0ae3507 100644
--- a/writerfilter/source/doctok/WW8Sttbf.hxx
+++ b/writerfilter/source/doctok/WW8Sttbf.hxx
@@ -29,8 +29,8 @@
 #ifndef INCLUDED_WW8_STTBF_HXX
 #define INCLUDED_WW8_STTBF_HXX
 
-#include <WW8StructBase.hxx>
-#include <WW8ResourceModelImpl.hxx>
+#include "WW8StructBase.hxx"
+#include "WW8ResourceModelImpl.hxx"
 
 #include <boost/shared_ptr.hpp>
 #include <vector>
diff --git a/writerfilter/source/doctok/WW8StyleSheet.cxx b/writerfilter/source/doctok/WW8StyleSheet.cxx
index 494149e72491..d308bd449915 100644
--- a/writerfilter/source/doctok/WW8StyleSheet.cxx
+++ b/writerfilter/source/doctok/WW8StyleSheet.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include <resources.hxx>
+#include <doctok/resources.hxx>
 
 namespace writerfilter {
 namespace doctok {
diff --git a/writerfilter/source/doctok/WW8Table.cxx b/writerfilter/source/doctok/WW8Table.cxx
index f369471fd725..9547403ed4d7 100644
--- a/writerfilter/source/doctok/WW8Table.cxx
+++ b/writerfilter/source/doctok/WW8Table.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include <resources.hxx>
+#include <doctok/resources.hxx>
 
 namespace writerfilter {
 namespace doctok {
diff --git a/writerfilter/source/doctok/WW8Text.cxx b/writerfilter/source/doctok/WW8Text.cxx
index ec1396ef91ba..bbe8aaef8e56 100644
--- a/writerfilter/source/doctok/WW8Text.cxx
+++ b/writerfilter/source/doctok/WW8Text.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include <resources.hxx>
+#include <doctok/resources.hxx>
 
 namespace writerfilter {
 namespace doctok {
diff --git a/writerfilter/source/doctok/resources.xsl b/writerfilter/source/doctok/resources.xsl
index 5ff0efe0edd1..a00561126729 100644
--- a/writerfilter/source/doctok/resources.xsl
+++ b/writerfilter/source/doctok/resources.xsl
@@ -80,19 +80,19 @@
 #endif
 
 #ifndef INCLUDED_WW8_STRUCT_BASE_HXX
-#include &lt;WW8StructBase.hxx&gt;
+#include &lt;doctok/WW8StructBase.hxx&gt;
 #endif
 
 #ifndef INCLUDED_WW8_RESOURCE_MODEL_IMPL_HXX
-#include &lt;WW8ResourceModelImpl.hxx&gt;
+#include &lt;doctok/WW8ResourceModelImpl.hxx&gt;
 #endif
 
 #ifndef INCLUDED_WW8_PROPERTY_SET_IMPL_HXX
-#include &lt;WW8PropertySetImpl.hxx&gt;
+#include &lt;doctok/WW8PropertySetImpl.hxx&gt;
 #endif
 
 #ifndef INCLUDED_DFF_HXX
-#include &lt;Dff.hxx&gt;
+#include &lt;doctok/Dff.hxx&gt;
 #endif
 
 namespace writerfilter {
diff --git a/writerfilter/source/doctok/resourcesimpl.xsl b/writerfilter/source/doctok/resourcesimpl.xsl
index 256ac2b3ced0..39fe4e9dc1fb 100644
--- a/writerfilter/source/doctok/resourcesimpl.xsl
+++ b/writerfilter/source/doctok/resourcesimpl.xsl
@@ -36,14 +36,14 @@
 <xsl:template match="/">
   <xsl:call-template name="licenseheader"/>
   <xsl:text>
-#include &lt;resources.hxx&gt;
+#include &lt;doctok/resources.hxx&gt;
 
 #ifndef WW8_OUTPUT_WITH_DEPTH
-#include &lt;WW8OutputWithDepth.hxx&gt;
+#include &lt;doctok/WW8OutputWithDepth.hxx&gt;
 #endif
 
 #ifndef INCLUDED_SPRMIDS_HXX
-#include &lt;sprmids.hxx&gt;
+#include &lt;doctok/sprmids.hxx&gt;
 #endif
 
 namespace writerfilter {
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index f693319d8776..4a4a076cd522 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -38,7 +38,7 @@
 #include <doctok/sprmids.hxx>
 #include <ooxml/OOXMLnamespaceids.hxx>
 #include <dmapper/DomainMapper.hxx>
-#include <GraphicHelpers.hxx>
+#include <dmapper/GraphicHelpers.hxx>
 #include <comphelper/embeddedobjectcontainer.hxx>
 #include <tools/globname.hxx>
 #include <comphelper/classids.hxx>
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
index fa9f45d6849d..abf62ca0b115 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
@@ -34,7 +34,7 @@
 #endif
 #include "OOXMLFastDocumentHandler.hxx"
 #include "OOXMLFastContextHandler.hxx"
-#include "OOXMLFastTokens.hxx"
+#include "ooxml/OOXMLFastTokens.hxx"
 #include "OOXMLFactory.hxx"
 
 namespace writerfilter {
diff --git a/writerfilter/source/ooxml/factory.xsl b/writerfilter/source/ooxml/factory.xsl
index 108ff78c08de..9074090c4d87 100644
--- a/writerfilter/source/ooxml/factory.xsl
+++ b/writerfilter/source/ooxml/factory.xsl
@@ -65,7 +65,7 @@
 
   <xsl:template match="/">
     <xsl:text>    
-#include "OOXMLFactory.hxx"</xsl:text>
+#include "ooxml/OOXMLFactory.hxx"</xsl:text>
     <xsl:call-template name="factoryincludes"/>
     <xsl:text>
 namespace writerfilter {
diff --git a/writerfilter/source/ooxml/factory_ns.xsl b/writerfilter/source/ooxml/factory_ns.xsl
index 5cdf7827aa49..555dd30f0965 100644
--- a/writerfilter/source/ooxml/factory_ns.xsl
+++ b/writerfilter/source/ooxml/factory_ns.xsl
@@ -136,9 +136,9 @@ protected:
 #define </xsl:text>
     <xsl:value-of select="$incguard"/>
     <xsl:text>
-#include "OOXMLFactory.hxx"
+#include "ooxml/OOXMLFactory.hxx"
 #include "OOXMLFactory_generated.hxx"
-#include "OOXMLnamespaceids.hxx"
+#include "ooxml/OOXMLnamespaceids.hxx"
 #include "ooxml/resourceids.hxx"
 
 namespace writerfilter {
diff --git a/writerfilter/source/ooxml/factoryimpl.xsl b/writerfilter/source/ooxml/factoryimpl.xsl
index e555ae1b7d6f..39317d75f613 100644
--- a/writerfilter/source/ooxml/factoryimpl.xsl
+++ b/writerfilter/source/ooxml/factoryimpl.xsl
@@ -360,9 +360,9 @@ uno::Reference &lt; xml::sax::XFastParser &gt; OOXMLStreamImpl::getFastParser()
 
   <xsl:template match="/">
     <xsl:text>    
-#include "OOXMLFactory.hxx"
-#include "OOXMLFastHelper.hxx"
-#include "OOXMLStreamImpl.hxx"
+#include "ooxml/OOXMLFactory.hxx"
+#include "ooxml/OOXMLFastHelper.hxx"
+#include "ooxml/OOXMLStreamImpl.hxx"
 #include "doctok/sprmids.hxx"
 #include "doctok/resourceids.hxx"
 </xsl:text>
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.xsl b/writerfilter/source/ooxml/factoryimpl_ns.xsl
index 584ca83d6d60..e33132cb6ddf 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.xsl
+++ b/writerfilter/source/ooxml/factoryimpl_ns.xsl
@@ -923,7 +923,7 @@ string </xsl:text>
 #include "OOXMLFactory_</xsl:text>
     <xsl:value-of select="$ns"/>
     <xsl:text>.hxx"
-#include "OOXMLFastHelper.hxx"
+#include "ooxml/OOXMLFastHelper.hxx"
     
 #ifdef _MSC_VER
 #pragma warning(disable:4065) // switch statement contains 'default' but no 'case' labels
diff --git a/writerfilter/source/ooxml/gperffasttokenhandler.xsl b/writerfilter/source/ooxml/gperffasttokenhandler.xsl
index 648342d57a33..6505ba209ea1 100644
--- a/writerfilter/source/ooxml/gperffasttokenhandler.xsl
+++ b/writerfilter/source/ooxml/gperffasttokenhandler.xsl
@@ -71,7 +71,7 @@
   <xsl:template name="gperfinputfasttokenhandler">
     <xsl:text>
 %{
-#include "OOXMLFastTokens.hxx"
+#include "ooxml/OOXMLFastTokens.hxx"
 
 namespace writerfilter { namespace ooxml { namespace tokenmap {
 %}