fdo#63926: remove extra include paths in svtools/ and sfx2/

Change-Id: I0b47849ba0fa0dfaf4a481779a5ece09be496c1e
Reviewed-on: https://gerrit.libreoffice.org/5973
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

16 files changed, 23 insertions, 26 deletions

diff --git a/sfx2/Library_qstart_gtk.mk b/sfx2/Library_qstart_gtk.mk
index 2090658710e0..a16dbd3faf75 100644
--- a/sfx2/Library_qstart_gtk.mk
+++ b/sfx2/Library_qstart_gtk.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_Library_Library,qstart_gtk))
 $(eval $(call gb_Library_set_include,qstart_gtk,\
     $$(INCLUDE) \
     -I$(SRCDIR)/sfx2/inc \
-    -I$(SRCDIR)/include/sfx2/ \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,qstart_gtk))
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index a95e2b7644ec..46ed25d449e2 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_use_sdk_api,sfx))
 
 $(eval $(call gb_Library_set_include,sfx,\
     -I$(SRCDIR)/sfx2/inc \
-    -I$(SRCDIR)/include/sfx2/ \
     -I$(SRCDIR)/sfx2/source/inc \
     -I$(WORKDIR)/SdiTarget/sfx2/sdi \
     $$(INCLUDE) \
@@ -306,7 +305,6 @@ $(eval $(call gb_SdiTarget_SdiTarget,sfx2/sdi/sfxslots,sfx2/sdi/sfx))
 
 $(eval $(call gb_SdiTarget_set_include,sfx2/sdi/sfxslots,\
     $$(INCLUDE) \
-    -I$(SRCDIR)/include/sfx2/ \
     -I$(SRCDIR)/sfx2/inc \
     -I$(SRCDIR)/sfx2/sdi \
 ))
diff --git a/sfx2/inc/bluthsndapi.hxx b/sfx2/inc/bluthsndapi.hxx
index abd9e42e2515..6a190d2b0d41 100644
--- a/sfx2/inc/bluthsndapi.hxx
+++ b/sfx2/inc/bluthsndapi.hxx
@@ -16,7 +16,7 @@
 #include <rtl/ustring.hxx>
 #include <tools/link.hxx>
 #include "sfx2/dllapi.h"
-#include "mailmodelapi.hxx"
+#include <sfx2/mailmodelapi.hxx>
 
 
 // class SfxBluetoothModel_Impl -----------------------------------------------
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index ac79cc32d548..7d293f12c26b 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -76,9 +76,9 @@
 #include "cppuhelper/factory.hxx"
 #include "cppuhelper/implementationentry.hxx"
 #include "cppuhelper/interfacecontainer.hxx"
-#include "dinfedt.hxx"
+#include <sfx2/dinfedt.hxx>
 #include "i18nlangtag/languagetag.hxx"
-#include "imagemgr.hxx"
+#include <sfx2/imagemgr.hxx>
 #include "officecfg/Office/Common.hxx"
 #include "osl/diagnose.h"
 #include "osl/mutex.hxx"
@@ -88,15 +88,15 @@
 #include "sal/config.h"
 #include "sal/types.h"
 #include "sax/tools/converter.hxx"
-#include "sfxresid.hxx"
-#include "sidebar/ControlFactory.hxx"
-#include "sidebar/ControllerItem.hxx"
-#include "sidebar/EnumContext.hxx"
+#include <sfx2/sfxresid.hxx>
+#include <sfx2/sidebar/ControlFactory.hxx>
+#include <sfx2/sidebar/ControllerItem.hxx>
+#include <sfx2/sidebar/EnumContext.hxx>
 #include "sot/storage.hxx"
 #include "svl/urihelper.hxx"
 #include "svtools/htmlkywd.hxx"
 #include "svtools/treelistentry.hxx"
-#include "thumbnailview.hxx"
+#include <sfx2/thumbnailview.hxx>
 #include "toolkit/awt/vclxdevice.hxx"
 #include "tools/datetime.hxx"
 #include "tools/debug.hxx"
@@ -613,7 +613,7 @@
 #include <map>
 #include <math.h>
 #include <memory>
-#include <objsh.hxx>
+#include <sfx2/objsh.hxx>
 #include <officecfg/Inet.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <officecfg/Office/ProtocolHandler.hxx>
diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx
index b8b4bd33bd60..b2beb6dc786d 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -19,7 +19,7 @@
 
 #include <sfx2/thumbnailviewitem.hxx>
 
-#include "thumbnailview.hxx"
+#include <sfx2/thumbnailview.hxx>
 #include "thumbnailviewacc.hxx"
 
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 28de74fabcf3..ffaf425da32e 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -50,8 +50,8 @@
 #include <vcl/timer.hxx>
 #include "sfx2/dinfdlg.hxx"
 #include "sfx2/securitypage.hxx"
-#include "sfxresid.hxx"
-#include "dinfedt.hxx"
+#include <sfx2/sfxresid.hxx>
+#include <sfx2/dinfedt.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/request.hxx>
diff --git a/sfx2/source/dialog/documentfontsdialog.cxx b/sfx2/source/dialog/documentfontsdialog.cxx
index 46094fbd4fd4..3320121ce64a 100644
--- a/sfx2/source/dialog/documentfontsdialog.cxx
+++ b/sfx2/source/dialog/documentfontsdialog.cxx
@@ -19,7 +19,7 @@
 
 #include "documentfontsdialog.hxx"
 
-#include <objsh.hxx>
+#include <sfx2/objsh.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index f4fc05444781..e8130f44e062 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -20,7 +20,7 @@
 
 #include "sfx2/securitypage.hxx"
 
-#include "sfxresid.hxx"
+#include <sfx2/sfxresid.hxx>
 
 #include <sfx2/sfx.hrc>
 #include <sfx2/sfxsids.hrc>
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index eaf831f84194..98d7ca768007 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -19,11 +19,11 @@
 
 
 #include "sfx2/taskpane.hxx"
-#include "imagemgr.hxx"
+#include <sfx2/imagemgr.hxx>
 #include "sfx2/sfxsids.hrc"
 #include "sfx2/bindings.hxx"
 #include "sfx2/dispatch.hxx"
-#include "sfxresid.hxx"
+#include <sfx2/sfxresid.hxx>
 #include "sfxlocal.hrc"
 #include "helpid.hrc"
 
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index 6d33c3933036..255e1fc5edf9 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -22,7 +22,7 @@
 #include "sfx2/bindings.hxx"
 #include "sfx2/dispatch.hxx"
 #include "sfxlocal.hrc"
-#include "sfxresid.hxx"
+#include <sfx2/sfxresid.hxx>
 
 #include <svl/eitem.hxx>
 
diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx
index c6a40f94e2f6..e5520c7d767d 100644
--- a/sfx2/source/doc/zoomitem.cxx
+++ b/sfx2/source/doc/zoomitem.cxx
@@ -23,7 +23,7 @@
 #include <sfx2/zoomitem.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include "sfx.hrc"
+#include <sfx2/sfx.hrc>
 // -----------------------------------------------------------------------
 
 TYPEINIT1_FACTORY(SvxZoomItem,SfxUInt16Item, new SvxZoomItem);
diff --git a/sfx2/source/sidebar/ControlFactory.cxx b/sfx2/source/sidebar/ControlFactory.cxx
index fa73d347419b..936357ab93f1 100644
--- a/sfx2/source/sidebar/ControlFactory.cxx
+++ b/sfx2/source/sidebar/ControlFactory.cxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "sidebar/ControlFactory.hxx"
+#include <sfx2/sidebar/ControlFactory.hxx>
 
 #include "MenuButton.hxx"
 #include "TabItem.hxx"
diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx
index 439f9b3ac55a..88ec38b0a917 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "sidebar/ControllerItem.hxx"
+#include <sfx2/sidebar/ControllerItem.hxx>
 
 #include <sfx2/msgpool.hxx>
 #include <sfx2/viewsh.hxx>
diff --git a/sfx2/source/sidebar/EnumContext.cxx b/sfx2/source/sidebar/EnumContext.cxx
index 2b0c3cea3184..5ba6957f5c86 100644
--- a/sfx2/source/sidebar/EnumContext.cxx
+++ b/sfx2/source/sidebar/EnumContext.cxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "sidebar/EnumContext.hxx"
+#include <sfx2/sidebar/EnumContext.hxx>
 
 #include <map>
 
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index fc2aa5378a56..224295a4cce0 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -30,7 +30,7 @@
 #include "SidebarDockingWindow.hxx"
 #include "Context.hxx"
 
-#include "sfxresid.hxx"
+#include <sfx2/sfxresid.hxx>
 #include "sfx2/sfxsids.hrc"
 #include "sfx2/titledockwin.hxx"
 #include "sfxlocal.hrc"
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 167a74e5a6cb..8c5a1a557290 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -19,7 +19,7 @@
 
 #include "TabBar.hxx"
 #include "TabItem.hxx"
-#include "sidebar/ControlFactory.hxx"
+#include <sfx2/sidebar/ControlFactory.hxx>
 #include "DeckDescriptor.hxx"
 #include "Paint.hxx"
 #include "sfx2/sidebar/Theme.hxx"