INTEGRATION: CWS vgbugs07 (1.5.124); FILE MERGED

2007/06/04 13:23:47 vg 1.5.124.1: #i76605# Remove -I .../inc/module hack introduced by hedaburemove01

4 files changed, 23 insertions, 23 deletions

diff --git a/xmloff/source/xforms/XFormsBindContext.cxx b/xmloff/source/xforms/XFormsBindContext.cxx
index 5cad39ad1205..13a6f70e0b92 100644
--- a/xmloff/source/xforms/XFormsBindContext.cxx
+++ b/xmloff/source/xforms/XFormsBindContext.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XFormsBindContext.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 11:30:57 $
+ *  last change: $Author: hr $ $Date: 2007-06-27 16:27:53 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -40,12 +40,12 @@
 
 #include "xformsapi.hxx"
 
-#include "xmlimp.hxx"
+#include <xmloff/xmlimp.hxx>
 #include "xmlerror.hxx"
-#include "xmltoken.hxx"
-#include "xmltkmap.hxx"
+#include <xmloff/xmltoken.hxx>
+#include <xmloff/xmltkmap.hxx>
 #include "xmlnmspe.hxx"
-#include "nmspmap.hxx"
+#include <xmloff/nmspmap.hxx>
 
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/xforms/XModel.hpp>
diff --git a/xmloff/source/xforms/XFormsInstanceContext.cxx b/xmloff/source/xforms/XFormsInstanceContext.cxx
index cc5dfdfd8d62..d6abd666adb7 100644
--- a/xmloff/source/xforms/XFormsInstanceContext.cxx
+++ b/xmloff/source/xforms/XFormsInstanceContext.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XFormsInstanceContext.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 11:31:12 $
+ *  last change: $Author: hr $ $Date: 2007-06-27 16:28:07 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -50,10 +50,10 @@
 #include <tools/debug.hxx>
 
 #include <xmlnmspe.hxx>
-#include <xmltoken.hxx>
-#include <xmlimp.hxx>
+#include <xmloff/xmltoken.hxx>
+#include <xmloff/xmlimp.hxx>
 #include <xmlerror.hxx>
-#include <nmspmap.hxx>
+#include <xmloff/nmspmap.hxx>
 
 
 using rtl::OUString;
diff --git a/xmloff/source/xforms/XFormsModelContext.cxx b/xmloff/source/xforms/XFormsModelContext.cxx
index 88486b91af04..0c2fc237f26e 100644
--- a/xmloff/source/xforms/XFormsModelContext.cxx
+++ b/xmloff/source/xforms/XFormsModelContext.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XFormsModelContext.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 11:31:26 $
+ *  last change: $Author: hr $ $Date: 2007-06-27 16:28:22 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -44,10 +44,10 @@
 #include "SchemaContext.hxx"
 #include "xformsapi.hxx"
 
-#include "xmlimp.hxx"
+#include <xmloff/xmlimp.hxx>
 #include "xmlnmspe.hxx"
-#include "nmspmap.hxx"
-#include "xmltoken.hxx"
+#include <xmloff/nmspmap.hxx>
+#include <xmloff/xmltoken.hxx>
 #include "xmlerror.hxx"
 
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx
index 09859923e5a1..97e93fdd3131 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.cxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XFormsSubmissionContext.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 11:31:41 $
+ *  last change: $Author: hr $ $Date: 2007-06-27 16:28:37 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -40,13 +40,13 @@
 
 #include "xformsapi.hxx"
 
-#include "xmlimp.hxx"
+#include <xmloff/xmlimp.hxx>
 #include "xmlerror.hxx"
-#include "xmltoken.hxx"
-#include "xmltkmap.hxx"
+#include <xmloff/xmltoken.hxx>
+#include <xmloff/xmltkmap.hxx>
 #include "xmlnmspe.hxx"
-#include "nmspmap.hxx"
-#include "xmluconv.hxx"
+#include <xmloff/nmspmap.hxx>
+#include <xmloff/xmluconv.hxx>
 
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/xforms/XModel.hpp>