Revert "fdo#63926 - remove extra include paths in svtools/ and sfx2/"

This reverts commit 389bdc162415abff78971b1ce7c5d47482e1d37b.

Sadly this was going in the wrong direction...

9 files changed, 23 insertions, 23 deletions

diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx
index 534c3d1f1f22..8b51a33ef211 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -11,7 +11,7 @@
 #include "ServerDetailsControls.hxx"
 
 #include <officecfg/Office/Common.hxx>
-#include <svtresid.hxx>
+#include <svtools/svtresid.hxx>
 #include <vcl/msgbox.hxx>
 
 using namespace boost;
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 427a09ee1ea5..b85eecf59c03 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -19,11 +19,11 @@
 
 
 #include <stdio.h>
-#include <addresstemplate.hxx>
+#include <svtools/addresstemplate.hxx>
 #include "addresstemplate.hrc"
-#include <svtools.hrc>
-#include <helpid.hrc>
-#include <svtresid.hxx>
+#include <svtools/svtools.hrc>
+#include <svtools/helpid.hrc>
+#include <svtools/svtresid.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/interaction.hxx>
@@ -47,7 +47,7 @@
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
-#include <localresaccess.hxx>
+#include <svtools/localresaccess.hxx>
 #include "svl/filenotation.hxx"
 #include <tools/urlobj.hxx>
 #include <algorithm>
diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx
index 51b1b743c25f..21a70661dd11 100644
--- a/svtools/source/dialogs/colrdlg.cxx
+++ b/svtools/source/dialogs/colrdlg.cxx
@@ -28,7 +28,7 @@
 
 #include <toolkit/helper/vclunohelper.hxx>
 
-#include <colrdlg.hxx>
+#include <svtools/colrdlg.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index 2490b0751db8..10b1fdaf42d6 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <insdlg.hxx>
-#include <sores.hxx>
-#include <svtresid.hxx>
+#include <svtools/insdlg.hxx>
+#include <svtools/sores.hxx>
+#include <svtools/svtresid.hxx>
 
 #include <unotools/configmgr.hxx>
 #include <comphelper/classids.hxx>
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index 498680e43aee..4e2889d7f4b9 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <prnsetup.hxx>
-#include <svtools.hrc>
-#include <svtresid.hxx>
+#include <svtools/prnsetup.hxx>
+#include <svtools/svtools.hrc>
+#include <svtools/svtresid.hxx>
 #include <vcl/print.hxx>
 
 // =======================================================================
diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx
index e17b932a8d14..81655a5dc8c3 100644
--- a/svtools/source/dialogs/restartdialog.cxx
+++ b/svtools/source/dialogs/restartdialog.cxx
@@ -15,7 +15,7 @@
 #include "com/sun/star/task/XInteractionHandler.hpp"
 #include "com/sun/star/uno/Reference.hxx"
 #include "com/sun/star/uno/XComponentContext.hpp"
-#include "restartdialog.hxx"
+#include "svtools/restartdialog.hxx"
 #include "tools/link.hxx"
 #include "vcl/button.hxx"
 #include "vcl/dialog.hxx"
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index 12ab9887d47c..8687e3d46305 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -18,10 +18,10 @@
  */
 
 
-#include <roadmapwizard.hxx>
-#include <svtools.hrc>
-#include <svtresid.hxx>
-#include <roadmap.hxx>
+#include <svtools/roadmapwizard.hxx>
+#include <svtools/svtools.hrc>
+#include <svtools/svtresid.hxx>
+#include <svtools/roadmap.hxx>
 #include <tools/debug.hxx>
 
 #include <stdarg.h>
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index af1522c64588..2e2112bac3e5 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <wizardmachine.hxx>
-#include <helpid.hrc>
+#include <svtools/wizardmachine.hxx>
+#include <svtools/helpid.hrc>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/msgbox.hxx>
-#include <svtresid.hxx>
-#include <svtools.hrc>
+#include <svtools/svtresid.hxx>
+#include <svtools/svtools.hrc>
 
 //.........................................................................
 namespace svt
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index 8a8a970cdf83..1a9191af5855 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -20,7 +20,7 @@
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
 #include <vcl/tabpage.hxx>
-#include <wizdlg.hxx>
+#include <svtools/wizdlg.hxx>
 
 // =======================================================================