Move svx include files to common include directory

...that are included from various source directories.  Change done in
preparation of loplugin:includeform.

Change-Id: I9191e80aa721c376f17219e4d10eb83929e38e14

8 files changed, 13 insertions, 13 deletions

diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index 0bc3a55b39ee..4859d2e15031 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -62,7 +62,7 @@
 #include "editeng/AccessibleEditableTextPara.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdpntv.hxx>
-#include "../table/cell.hxx"
+#include "cell.hxx"
 #include "../table/accessiblecell.hxx"
 #include <editeng/editdata.hxx>
 #include <editeng/editeng.hxx>
diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.hxx b/svx/source/inc/DefaultShapesPanel.hxx
index 073e2a1ee151..3759b1d859cd 100644
--- a/svx/source/sidebar/shapes/DefaultShapesPanel.hxx
+++ b/svx/source/inc/DefaultShapesPanel.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SD_SOURCE_SIDEBAR_INSERT_DEFAULTSHAPESPANEL_HXX
-#define INCLUDED_SD_SOURCE_SIDEBAR_INSERT_DEFAULTSHAPESPANEL_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_DEFAULTSHAPESPANEL_HXX
+#define INCLUDED_SVX_SOURCE_INC_DEFAULTSHAPESPANEL_HXX
 
 #include <vcl/ctrl.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
diff --git a/svx/source/sidebar/shapes/ShapesUtil.hxx b/svx/source/inc/ShapesUtil.hxx
index 0ac33f574b45..e6385c9a69d0 100644
--- a/svx/source/sidebar/shapes/ShapesUtil.hxx
+++ b/svx/source/inc/ShapesUtil.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_SHAPES_SHAPESUTIL_HXX
-#define INCLUDED_SVX_SOURCE_SIDEBAR_SHAPES_SHAPESUTIL_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_SHAPESUTIL_HXX
+#define INCLUDED_SVX_SOURCE_INC_SHAPESUTIL_HXX
 #include <map>
 #include <rtl/ustring.hxx>
 
diff --git a/svx/source/table/cell.hxx b/svx/source/inc/cell.hxx
index 1bd063dac3f6..3a061c58475d 100644
--- a/svx/source/table/cell.hxx
+++ b/svx/source/inc/cell.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVX_SOURCE_TABLE_CELL_HXX
-#define INCLUDED_SVX_SOURCE_TABLE_CELL_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_CELL_HXX
+#define INCLUDED_SVX_SOURCE_INC_CELL_HXX
 
 #include <com/sun/star/table/XMergeableCell.hpp>
 #include <com/sun/star/awt/XLayoutConstrains.hpp>
diff --git a/svx/source/table/celltypes.hxx b/svx/source/inc/celltypes.hxx
index 2200e1661a59..6296ac42d7da 100644
--- a/svx/source/table/celltypes.hxx
+++ b/svx/source/inc/celltypes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVX_SOURCE_TABLE_CELLTYPES_HXX
-#define INCLUDED_SVX_SOURCE_TABLE_CELLTYPES_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_CELLTYPES_HXX
+#define INCLUDED_SVX_SOURCE_INC_CELLTYPES_HXX
 
 #include <rtl/ref.hxx>
 #include <vector>
diff --git a/svx/source/table/tablemodel.hxx b/svx/source/inc/tablemodel.hxx
index e5027da121fa..5c1ac7a86e6d 100644
--- a/svx/source/table/tablemodel.hxx
+++ b/svx/source/inc/tablemodel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVX_SOURCE_TABLE_TABLEMODEL_HXX
-#define INCLUDED_SVX_SOURCE_TABLE_TABLEMODEL_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_TABLEMODEL_HXX
+#define INCLUDED_SVX_SOURCE_INC_TABLEMODEL_HXX
 
 #include <sal/types.h>
 #include <com/sun/star/util/XBroadcaster.hpp>
diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx
index 2a1787e2013b..837a6ca486b1 100644
--- a/svx/source/sidebar/PanelFactory.cxx
+++ b/svx/source/sidebar/PanelFactory.cxx
@@ -25,7 +25,7 @@
 #include "graphic/GraphicPropertyPanel.hxx"
 #include "line/LinePropertyPanel.hxx"
 #include "possize/PosSizePropertyPanel.hxx"
-#include "shapes/DefaultShapesPanel.hxx"
+#include "DefaultShapesPanel.hxx"
 #include "media/MediaPlaybackPanel.hxx"
 #include "GalleryControl.hxx"
 #include "EmptyPanel.hxx"
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index cfb3cbb9499a..21a46709095f 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -47,7 +47,7 @@
 #include <com/sun/star/linguistic2/LinguServiceManager.hpp>
 #include <comphelper/processfactory.hxx>
 #include <svx/svdotable.hxx>
-#include "../table/cell.hxx"
+#include "cell.hxx"
 #include <svx/sdrpaintwindow.hxx>