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>

9 files changed, 15 insertions, 16 deletions

diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index e5d3f399d002..1a176519675e 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_use_sdk_api,svt))
 
 $(eval $(call gb_Library_set_include,svt,\
     $$(INCLUDE) \
-    -I$(SRCDIR)/include/svtools/ \
     -I$(SRCDIR)/svtools/source/inc \
     -I$(SRCDIR)/svtools/inc \
 ))
diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx
index dfd106a444bd..9b55944eaf8a 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.hxx
@@ -14,11 +14,11 @@
  also fixes all possible problems, so it's usually better to use it).
 */
 
-#include "DocumentToGraphicRenderer.hxx"
-#include "GraphicExportOptionsDialog.hxx"
-#include "PlaceEditDialog.hxx"
-#include "ServerDetailsControls.hxx"
-#include "bindablecontrolhelper.hxx"
+#include <svtools/DocumentToGraphicRenderer.hxx>
+#include <svtools/GraphicExportOptionsDialog.hxx>
+#include <svtools/PlaceEditDialog.hxx>
+#include <svtools/ServerDetailsControls.hxx>
+#include <svtools/bindablecontrolhelper.hxx>
 #include "com/sun/star/beans/XPropertySet.hpp"
 #include "com/sun/star/document/XDocumentProperties.hpp"
 #include "com/sun/star/script/Converter.hpp"
@@ -33,7 +33,7 @@
 #include "comphelper/servicedecl.hxx"
 #include "comphelper/string.hxx"
 #include "cppuhelper/implementationentry.hxx"
-#include "inetimg.hxx"
+#include <svtools/inetimg.hxx>
 #include "osl/diagnose.h"
 #include "rtl/ustring.hxx"
 #include "sal/config.h"
diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx
index 34b1e1f7f232..36d851d151af 100644
--- a/svtools/source/control/toolbarmenuimp.hxx
+++ b/svtools/source/control/toolbarmenuimp.hxx
@@ -37,7 +37,7 @@
 
 #include <vector>
 
-#include "framestatuslistener.hxx"
+#include <svtools/framestatuslistener.hxx>
 
 namespace svtools {
 
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx
index 8b51a33ef211..c2f44e936a91 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "PlaceEditDialog.hxx"
-#include "ServerDetailsControls.hxx"
+#include <svtools/PlaceEditDialog.hxx>
+#include <svtools/ServerDetailsControls.hxx>
 
 #include <officecfg/Office/Common.hxx>
 #include <svtools/svtresid.hxx>
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx
index 33803f10c0a0..f7a76390f5f2 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -20,8 +20,8 @@
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 
-#include "PlaceEditDialog.hxx"
-#include "ServerDetailsControls.hxx"
+#include <svtools/PlaceEditDialog.hxx>
+#include <svtools/ServerDetailsControls.hxx>
 
 using namespace std;
 using namespace com::sun::star::lang;
diff --git a/svtools/source/filter/DocumentToGraphicRenderer.cxx b/svtools/source/filter/DocumentToGraphicRenderer.cxx
index dd2a33001eb6..42bc0b22f65e 100644
--- a/svtools/source/filter/DocumentToGraphicRenderer.cxx
+++ b/svtools/source/filter/DocumentToGraphicRenderer.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "DocumentToGraphicRenderer.hxx"
+#include <svtools/DocumentToGraphicRenderer.hxx>
 
 #include <vcl/graphicfilter.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svtools/source/filter/GraphicExportOptionsDialog.cxx b/svtools/source/filter/GraphicExportOptionsDialog.cxx
index cf248da84c54..260b22aa5918 100644
--- a/svtools/source/filter/GraphicExportOptionsDialog.cxx
+++ b/svtools/source/filter/GraphicExportOptionsDialog.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "GraphicExportOptionsDialog.hxx"
+#include <svtools/GraphicExportOptionsDialog.hxx>
 
 using namespace css::beans;
 using namespace css::lang;
diff --git a/svtools/source/misc/bindablecontrolhelper.cxx b/svtools/source/misc/bindablecontrolhelper.cxx
index c6243c1c9169..f94a3e0a15c6 100644
--- a/svtools/source/misc/bindablecontrolhelper.cxx
+++ b/svtools/source/misc/bindablecontrolhelper.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "bindablecontrolhelper.hxx"
+#include <svtools/bindablecontrolhelper.hxx>
 #include <com/sun/star/form/binding/XBindableValue.hpp>
 #include <com/sun/star/form/binding/XValueBinding.hpp>
 #include <com/sun/star/form/binding/XListEntrySink.hpp>
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 8680134d39b2..282f594575d7 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -49,7 +49,7 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 
 #include "svl/urlbmk.hxx"
-#include "inetimg.hxx"
+#include <svtools/inetimg.hxx>
 #include <vcl/wmf.hxx>
 #include <svtools/imap.hxx>
 #include <svtools/transfer.hxx>