sw: move swmodeltestbase.hxx to qa/extras/inc/

If we already have such an include dir, let's have all headers there.

Change-Id: I2100b5308e7fdad9d98cfde76434ff485aca20c7

9 files changed, 15 insertions, 21 deletions

diff --git a/sw/qa/extras/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index 2a7f4d68c7b2..2a7f4d68c7b2 100644
--- a/sw/qa/extras/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx
index 7964ea9a1303..7d93b3b89efa 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -25,9 +25,8 @@
  * instead of those above.
  */
 
-#include "../swmodeltestbase.hxx"
-
 #include <unotools/tempfile.hxx>
+#include <swmodeltestbase.hxx>
 
 class Test : public SwModelTestBase
 {
diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx
index 23328263fa9c..05584bfc23f0 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -25,10 +25,10 @@
  * instead of those above.
  */
 
-#include "../swmodeltestbase.hxx"
 #include <com/sun/star/table/XCell.hpp>
 #include <com/sun/star/table/BorderLine.hpp>
 #include <com/sun/star/text/XTextTable.hpp>
+#include <swmodeltestbase.hxx>
 
 typedef std::map<OUString, com::sun::star::uno::Sequence< com::sun::star::table::BorderLine> > AllBordersMap;
 typedef std::pair<OUString, com::sun::star::uno::Sequence< com::sun::star::table::BorderLine> > StringSequencePair;
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 8fe19859258f..e578be8155ea 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -25,8 +25,6 @@
  * instead of those above.
  */
 
-#include "../swmodeltestbase.hxx"
-
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/style/TabStop.hpp>
 #include <com/sun/star/view/XViewSettingsSupplier.hpp>
@@ -39,6 +37,7 @@
 #include <com/sun/star/table/BorderLine2.hpp>
 
 #include <unotools/tempfile.hxx>
+#include <swmodeltestbase.hxx>
 
 class Test : public SwModelTestBase
 {
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index a36bdb7c0260..2c98832414be 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -25,9 +25,6 @@
  * instead of those above.
  */
 
-#include "../swmodeltestbase.hxx"
-#include "bordertest.hxx"
-
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/document/XEmbeddedObjectSupplier2.hpp>
@@ -54,9 +51,11 @@
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>
 
-
 #include <vcl/svapp.hxx>
 
+#include <swmodeltestbase.hxx>
+#include <bordertest.hxx>
+
 #define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
 
 class Test : public SwModelTestBase
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx
index de5bfe6e08cb..c2d88301988f 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -25,8 +25,6 @@
  * instead of those above.
  */
 
-#include "../swmodeltestbase.hxx"
-
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
@@ -36,8 +34,7 @@
 
 #include <unotools/tempfile.hxx>
 #include <vcl/svapp.hxx>
-
-using rtl::OUStringBuffer;
+#include <swmodeltestbase.hxx>
 
 class Test : public SwModelTestBase
 {
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index c8eec60d9b4a..e114af297f05 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -25,9 +25,6 @@
  * instead of those above.
  */
 
-#include "../swmodeltestbase.hxx"
-#include "bordertest.hxx"
-
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XImporter.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
@@ -61,6 +58,9 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/streamwrap.hxx>
 
+#include <swmodeltestbase.hxx>
+#include <bordertest.hxx>
+
 #define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
 
 class Test : public SwModelTestBase
diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx
index 7a205f123dcc..679f7656834b 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -25,8 +25,6 @@
  * instead of those above.
  */
 
-#include "../swmodeltestbase.hxx"
-
 #include <com/sun/star/form/validation/XValidatableFormComponent.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/drawing/XControlShape.hpp>
@@ -35,6 +33,8 @@
 
 #include <unotools/tempfile.hxx>
 
+#include <swmodeltestbase.hxx>
+
 class Test : public SwModelTestBase
 {
 public:
diff --git a/sw/qa/extras/ww8import/ww8import.cxx b/sw/qa/extras/ww8import/ww8import.cxx
index 13fea52d7fb9..b47e525af93e 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -25,9 +25,6 @@
  * instead of those above.
  */
 
-#include "../swmodeltestbase.hxx"
-#include "bordertest.hxx"
-
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>
 #include <com/sun/star/table/TableBorder.hpp>
@@ -37,6 +34,9 @@
 
 #include <vcl/svapp.hxx>
 
+#include <swmodeltestbase.hxx>
+#include <bordertest.hxx>
+
 class Test : public SwModelTestBase
 {
 public: