[Libreoffice-commits] core.git: include/svx sd/source svx/inc svx/source
Kohei Yoshida
kohei.yoshida at collabora.com
Tue Oct 28 09:59:47 PDT 2014
include/svx/sdr/properties/attributeproperties.hxx | 96 -------------------
include/svx/sdr/properties/e3dcompoundproperties.hxx | 71 --------------
include/svx/sdr/properties/e3dproperties.hxx | 64 ------------
include/svx/sdr/properties/emptyproperties.hxx | 96 -------------------
include/svx/sdr/properties/rectangleproperties.hxx | 61 ------------
include/svx/sdr/properties/textproperties.hxx | 93 ------------------
sd/source/core/stlsheet.cxx | 1
svx/inc/sdr/properties/attributeproperties.hxx | 95 ++++++++++++++++++
svx/inc/sdr/properties/captionproperties.hxx | 2
svx/inc/sdr/properties/circleproperties.hxx | 2
svx/inc/sdr/properties/connectorproperties.hxx | 2
svx/inc/sdr/properties/customshapeproperties.hxx | 2
svx/inc/sdr/properties/e3dcompoundproperties.hxx | 71 ++++++++++++++
svx/inc/sdr/properties/e3dextrudeproperties.hxx | 5
svx/inc/sdr/properties/e3dlatheproperties.hxx | 5
svx/inc/sdr/properties/e3dproperties.hxx | 63 ++++++++++++
svx/inc/sdr/properties/e3dsceneproperties.hxx | 2
svx/inc/sdr/properties/e3dsphereproperties.hxx | 2
svx/inc/sdr/properties/emptyproperties.hxx | 95 ++++++++++++++++++
svx/inc/sdr/properties/graphicproperties.hxx | 2
svx/inc/sdr/properties/measureproperties.hxx | 2
svx/inc/sdr/properties/oleproperties.hxx | 2
svx/inc/sdr/properties/pageproperties.hxx | 2
svx/inc/sdr/properties/rectangleproperties.hxx | 60 +++++++++++
svx/inc/sdr/properties/textproperties.hxx | 92 ++++++++++++++++++
svx/source/engine3d/obj3d.cxx | 4
svx/source/sdr/properties/attributeproperties.cxx | 2
svx/source/sdr/properties/e3dcompoundproperties.cxx | 2
svx/source/sdr/properties/e3dproperties.cxx | 2
svx/source/sdr/properties/emptyproperties.cxx | 2
svx/source/sdr/properties/rectangleproperties.cxx | 2
svx/source/sdr/properties/textproperties.cxx | 2
svx/source/svdraw/svdoattr.cxx | 2
svx/source/svdraw/svdobj.cxx | 2
svx/source/svdraw/svdorect.cxx | 2
svx/source/svdraw/svdotext.cxx | 2
svx/source/table/cell.cxx | 2
svx/source/table/svdotable.cxx | 2
svx/source/table/tableundo.cxx | 2
39 files changed, 505 insertions(+), 513 deletions(-)
New commits:
commit 8c5f640308b618ec330e83527019a4baa982f902
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Tue Oct 28 12:03:34 2014 -0400
Move these headers from include to svx; they are not used outside svx.
Change-Id: I8685b451a39e890250a3309ddb70346bac4084b2
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index f960506..2bfd870 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -34,7 +34,6 @@
#include <svl/smplhint.hxx>
#include <svl/itemset.hxx>
-#include <svx/sdr/properties/attributeproperties.hxx>
#include <svx/xflbmtit.hxx>
#include <svx/xflbstit.hxx>
#include <editeng/bulletitem.hxx>
diff --git a/include/svx/sdr/properties/attributeproperties.hxx b/svx/inc/sdr/properties/attributeproperties.hxx
similarity index 96%
rename from include/svx/sdr/properties/attributeproperties.hxx
rename to svx/inc/sdr/properties/attributeproperties.hxx
index a14b634..4dbb800 100644
--- a/include/svx/sdr/properties/attributeproperties.hxx
+++ b/svx/inc/sdr/properties/attributeproperties.hxx
@@ -23,7 +23,6 @@
#include <svl/lstner.hxx>
#include <svl/stylesheetuser.hxx>
#include <svx/sdr/properties/defaultproperties.hxx>
-#include <svx/svxdllapi.h>
@@ -31,7 +30,7 @@ namespace sdr
{
namespace properties
{
- class SVX_DLLPUBLIC AttributeProperties : public DefaultProperties, public SfxListener, public svl::StyleSheetUser
+ class AttributeProperties : public DefaultProperties, public SfxListener, public svl::StyleSheetUser
{
// add style sheet, do all the necessary handling
void ImpAddStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
diff --git a/svx/inc/sdr/properties/captionproperties.hxx b/svx/inc/sdr/properties/captionproperties.hxx
index e4c88d2..9ac7f2a 100644
--- a/svx/inc/sdr/properties/captionproperties.hxx
+++ b/svx/inc/sdr/properties/captionproperties.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_CAPTIONPROPERTIES_HXX
#define INCLUDED_SVX_INC_SDR_PROPERTIES_CAPTIONPROPERTIES_HXX
-#include <svx/sdr/properties/rectangleproperties.hxx>
+#include <sdr/properties/rectangleproperties.hxx>
diff --git a/svx/inc/sdr/properties/circleproperties.hxx b/svx/inc/sdr/properties/circleproperties.hxx
index 980ad87..14e44da 100644
--- a/svx/inc/sdr/properties/circleproperties.hxx
+++ b/svx/inc/sdr/properties/circleproperties.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_CIRCLEPROPERTIES_HXX
#define INCLUDED_SVX_INC_SDR_PROPERTIES_CIRCLEPROPERTIES_HXX
-#include <svx/sdr/properties/rectangleproperties.hxx>
+#include <sdr/properties/rectangleproperties.hxx>
diff --git a/svx/inc/sdr/properties/connectorproperties.hxx b/svx/inc/sdr/properties/connectorproperties.hxx
index 2553fb5..b5441d9 100644
--- a/svx/inc/sdr/properties/connectorproperties.hxx
+++ b/svx/inc/sdr/properties/connectorproperties.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_CONNECTORPROPERTIES_HXX
#define INCLUDED_SVX_INC_SDR_PROPERTIES_CONNECTORPROPERTIES_HXX
-#include <svx/sdr/properties/textproperties.hxx>
+#include <sdr/properties/textproperties.hxx>
diff --git a/svx/inc/sdr/properties/customshapeproperties.hxx b/svx/inc/sdr/properties/customshapeproperties.hxx
index ac58b4e..904abe5 100644
--- a/svx/inc/sdr/properties/customshapeproperties.hxx
+++ b/svx/inc/sdr/properties/customshapeproperties.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_CUSTOMSHAPEPROPERTIES_HXX
#define INCLUDED_SVX_INC_SDR_PROPERTIES_CUSTOMSHAPEPROPERTIES_HXX
-#include <svx/sdr/properties/textproperties.hxx>
+#include <sdr/properties/textproperties.hxx>
diff --git a/include/svx/sdr/properties/e3dcompoundproperties.hxx b/svx/inc/sdr/properties/e3dcompoundproperties.hxx
similarity index 95%
rename from include/svx/sdr/properties/e3dcompoundproperties.hxx
rename to svx/inc/sdr/properties/e3dcompoundproperties.hxx
index 8a17ab1..fa62dd6 100644
--- a/include/svx/sdr/properties/e3dcompoundproperties.hxx
+++ b/svx/inc/sdr/properties/e3dcompoundproperties.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVX_SDR_PROPERTIES_E3DCOMPOUNDPROPERTIES_HXX
#define INCLUDED_SVX_SDR_PROPERTIES_E3DCOMPOUNDPROPERTIES_HXX
-#include <svx/sdr/properties/e3dproperties.hxx>
+#include <sdr/properties/e3dproperties.hxx>
#include <svx/svxdllapi.h>
@@ -29,7 +29,7 @@ namespace sdr
{
namespace properties
{
- class SVX_DLLPUBLIC E3dCompoundProperties : public E3dProperties
+ class E3dCompoundProperties : public E3dProperties
{
protected:
// Called after ItemChange() is done for all items.
diff --git a/svx/inc/sdr/properties/e3dextrudeproperties.hxx b/svx/inc/sdr/properties/e3dextrudeproperties.hxx
index ba1f7ea..5b2f76b 100644
--- a/svx/inc/sdr/properties/e3dextrudeproperties.hxx
+++ b/svx/inc/sdr/properties/e3dextrudeproperties.hxx
@@ -20,8 +20,7 @@
#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_E3DEXTRUDEPROPERTIES_HXX
#define INCLUDED_SVX_INC_SDR_PROPERTIES_E3DEXTRUDEPROPERTIES_HXX
-#include <svx/sdr/properties/e3dcompoundproperties.hxx>
-#include <svx/svxdllapi.h>
+#include <sdr/properties/e3dcompoundproperties.hxx>
@@ -29,7 +28,7 @@ namespace sdr
{
namespace properties
{
- class SVX_DLLPUBLIC E3dExtrudeProperties : public E3dCompoundProperties
+ class E3dExtrudeProperties : public E3dCompoundProperties
{
protected:
// Called after ItemChange() is done for all items.
diff --git a/svx/inc/sdr/properties/e3dlatheproperties.hxx b/svx/inc/sdr/properties/e3dlatheproperties.hxx
index f1e965e..3812464 100644
--- a/svx/inc/sdr/properties/e3dlatheproperties.hxx
+++ b/svx/inc/sdr/properties/e3dlatheproperties.hxx
@@ -20,8 +20,7 @@
#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_E3DLATHEPROPERTIES_HXX
#define INCLUDED_SVX_INC_SDR_PROPERTIES_E3DLATHEPROPERTIES_HXX
-#include <svx/sdr/properties/e3dcompoundproperties.hxx>
-#include <svx/svxdllapi.h>
+#include <sdr/properties/e3dcompoundproperties.hxx>
@@ -29,7 +28,7 @@ namespace sdr
{
namespace properties
{
- class SVX_DLLPUBLIC E3dLatheProperties : public E3dCompoundProperties
+ class E3dLatheProperties : public E3dCompoundProperties
{
protected:
// Called after ItemChange() is done for all items.
diff --git a/include/svx/sdr/properties/e3dproperties.hxx b/svx/inc/sdr/properties/e3dproperties.hxx
similarity index 93%
rename from include/svx/sdr/properties/e3dproperties.hxx
rename to svx/inc/sdr/properties/e3dproperties.hxx
index 39e1023..241ca60 100644
--- a/include/svx/sdr/properties/e3dproperties.hxx
+++ b/svx/inc/sdr/properties/e3dproperties.hxx
@@ -20,8 +20,7 @@
#ifndef INCLUDED_SVX_SDR_PROPERTIES_E3DPROPERTIES_HXX
#define INCLUDED_SVX_SDR_PROPERTIES_E3DPROPERTIES_HXX
-#include <svx/sdr/properties/attributeproperties.hxx>
-#include <svx/svxdllapi.h>
+#include <sdr/properties/attributeproperties.hxx>
@@ -29,7 +28,7 @@ namespace sdr
{
namespace properties
{
- class SVX_DLLPUBLIC E3dProperties : public AttributeProperties
+ class E3dProperties : public AttributeProperties
{
protected:
// create a new itemset
diff --git a/svx/inc/sdr/properties/e3dsceneproperties.hxx b/svx/inc/sdr/properties/e3dsceneproperties.hxx
index d1ba00a..9e26c37 100644
--- a/svx/inc/sdr/properties/e3dsceneproperties.hxx
+++ b/svx/inc/sdr/properties/e3dsceneproperties.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_E3DSCENEPROPERTIES_HXX
#define INCLUDED_SVX_INC_SDR_PROPERTIES_E3DSCENEPROPERTIES_HXX
-#include <svx/sdr/properties/e3dproperties.hxx>
+#include <sdr/properties/e3dproperties.hxx>
diff --git a/svx/inc/sdr/properties/e3dsphereproperties.hxx b/svx/inc/sdr/properties/e3dsphereproperties.hxx
index cd381eb..29eba79 100644
--- a/svx/inc/sdr/properties/e3dsphereproperties.hxx
+++ b/svx/inc/sdr/properties/e3dsphereproperties.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_E3DSPHEREPROPERTIES_HXX
#define INCLUDED_SVX_INC_SDR_PROPERTIES_E3DSPHEREPROPERTIES_HXX
-#include <svx/sdr/properties/e3dcompoundproperties.hxx>
+#include <sdr/properties/e3dcompoundproperties.hxx>
diff --git a/include/svx/sdr/properties/emptyproperties.hxx b/svx/inc/sdr/properties/emptyproperties.hxx
similarity index 97%
rename from include/svx/sdr/properties/emptyproperties.hxx
rename to svx/inc/sdr/properties/emptyproperties.hxx
index 1c7f025..8728a07 100644
--- a/include/svx/sdr/properties/emptyproperties.hxx
+++ b/svx/inc/sdr/properties/emptyproperties.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVX_SDR_PROPERTIES_EMPTYPROPERTIES_HXX
#include <svx/sdr/properties/properties.hxx>
-#include <svx/svxdllapi.h>
@@ -29,7 +28,7 @@ namespace sdr
{
namespace properties
{
- class SVX_DLLPUBLIC EmptyProperties : public BaseProperties
+ class EmptyProperties : public BaseProperties
{
protected:
// the to be used ItemSet
diff --git a/svx/inc/sdr/properties/graphicproperties.hxx b/svx/inc/sdr/properties/graphicproperties.hxx
index 8a55e28..1501c1e 100644
--- a/svx/inc/sdr/properties/graphicproperties.hxx
+++ b/svx/inc/sdr/properties/graphicproperties.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_GRAPHICPROPERTIES_HXX
#define INCLUDED_SVX_INC_SDR_PROPERTIES_GRAPHICPROPERTIES_HXX
-#include <svx/sdr/properties/rectangleproperties.hxx>
+#include <sdr/properties/rectangleproperties.hxx>
diff --git a/svx/inc/sdr/properties/measureproperties.hxx b/svx/inc/sdr/properties/measureproperties.hxx
index 3eeca28a..953d7a4 100644
--- a/svx/inc/sdr/properties/measureproperties.hxx
+++ b/svx/inc/sdr/properties/measureproperties.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_MEASUREPROPERTIES_HXX
#define INCLUDED_SVX_INC_SDR_PROPERTIES_MEASUREPROPERTIES_HXX
-#include <svx/sdr/properties/textproperties.hxx>
+#include <sdr/properties/textproperties.hxx>
diff --git a/svx/inc/sdr/properties/oleproperties.hxx b/svx/inc/sdr/properties/oleproperties.hxx
index 8d3e9c2..8f608bc 100644
--- a/svx/inc/sdr/properties/oleproperties.hxx
+++ b/svx/inc/sdr/properties/oleproperties.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_OLEPROPERTIES_HXX
#define INCLUDED_SVX_INC_SDR_PROPERTIES_OLEPROPERTIES_HXX
-#include <svx/sdr/properties/rectangleproperties.hxx>
+#include <sdr/properties/rectangleproperties.hxx>
diff --git a/svx/inc/sdr/properties/pageproperties.hxx b/svx/inc/sdr/properties/pageproperties.hxx
index e221c0c..b024f10 100644
--- a/svx/inc/sdr/properties/pageproperties.hxx
+++ b/svx/inc/sdr/properties/pageproperties.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_PAGEPROPERTIES_HXX
#define INCLUDED_SVX_INC_SDR_PROPERTIES_PAGEPROPERTIES_HXX
-#include <svx/sdr/properties/emptyproperties.hxx>
+#include <sdr/properties/emptyproperties.hxx>
diff --git a/include/svx/sdr/properties/rectangleproperties.hxx b/svx/inc/sdr/properties/rectangleproperties.hxx
similarity index 93%
rename from include/svx/sdr/properties/rectangleproperties.hxx
rename to svx/inc/sdr/properties/rectangleproperties.hxx
index c78becd..caf56be 100644
--- a/include/svx/sdr/properties/rectangleproperties.hxx
+++ b/svx/inc/sdr/properties/rectangleproperties.hxx
@@ -20,8 +20,7 @@
#ifndef INCLUDED_SVX_SDR_PROPERTIES_RECTANGLEPROPERTIES_HXX
#define INCLUDED_SVX_SDR_PROPERTIES_RECTANGLEPROPERTIES_HXX
-#include <svx/sdr/properties/textproperties.hxx>
-#include <svx/svxdllapi.h>
+#include <sdr/properties/textproperties.hxx>
@@ -29,7 +28,7 @@ namespace sdr
{
namespace properties
{
- class SVX_DLLPUBLIC RectangleProperties : public TextProperties
+ class RectangleProperties : public TextProperties
{
protected:
// react on ItemSet changes
diff --git a/include/svx/sdr/properties/textproperties.hxx b/svx/inc/sdr/properties/textproperties.hxx
similarity index 95%
rename from include/svx/sdr/properties/textproperties.hxx
rename to svx/inc/sdr/properties/textproperties.hxx
index 3a6a5c6..b23ebac 100644
--- a/include/svx/sdr/properties/textproperties.hxx
+++ b/svx/inc/sdr/properties/textproperties.hxx
@@ -21,8 +21,7 @@
#define INCLUDED_SVX_SDR_PROPERTIES_TEXTPROPERTIES_HXX
#include <svx/itextprovider.hxx>
-#include <svx/sdr/properties/attributeproperties.hxx>
-#include <svx/svxdllapi.h>
+#include <sdr/properties/attributeproperties.hxx>
@@ -30,7 +29,7 @@ namespace sdr
{
namespace properties
{
- class SVX_DLLPUBLIC TextProperties : public AttributeProperties
+ class TextProperties : public AttributeProperties
{
private:
// #i101556# versioning support
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 06eac9c..831b7c2 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -58,8 +58,8 @@
#include <svtools/colorcfg.hxx>
#include <editeng/eeitem.hxx>
#include <svx/xgrscit.hxx>
-#include <svx/sdr/properties/e3dproperties.hxx>
-#include <svx/sdr/properties/e3dcompoundproperties.hxx>
+#include <sdr/properties/e3dproperties.hxx>
+#include <sdr/properties/e3dcompoundproperties.hxx>
#include <basegfx/polygon/b3dpolypolygontools.hxx>
#include <basegfx/point/b3dpoint.hxx>
#include <basegfx/vector/b3dvector.hxx>
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index 31e0711..98d10aa 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svx/sdr/properties/attributeproperties.hxx>
+#include <sdr/properties/attributeproperties.hxx>
#include <sdr/properties/itemsettools.hxx>
#include <tools/debug.hxx>
#include <svl/itemset.hxx>
diff --git a/svx/source/sdr/properties/e3dcompoundproperties.cxx b/svx/source/sdr/properties/e3dcompoundproperties.cxx
index 5965798..31369a7 100644
--- a/svx/source/sdr/properties/e3dcompoundproperties.cxx
+++ b/svx/source/sdr/properties/e3dcompoundproperties.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svx/sdr/properties/e3dcompoundproperties.hxx>
+#include <sdr/properties/e3dcompoundproperties.hxx>
#include <svl/itemset.hxx>
#include <svx/obj3d.hxx>
#include <svx/scene3d.hxx>
diff --git a/svx/source/sdr/properties/e3dproperties.cxx b/svx/source/sdr/properties/e3dproperties.cxx
index 922e2c7..73dbbd5 100644
--- a/svx/source/sdr/properties/e3dproperties.cxx
+++ b/svx/source/sdr/properties/e3dproperties.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svx/sdr/properties/e3dproperties.hxx>
+#include <sdr/properties/e3dproperties.hxx>
#include <svl/itemset.hxx>
#include <svx/svddef.hxx>
#include <svx/obj3d.hxx>
diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx
index a13036c..350abd7 100644
--- a/svx/source/sdr/properties/emptyproperties.cxx
+++ b/svx/source/sdr/properties/emptyproperties.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svx/sdr/properties/emptyproperties.hxx>
+#include <sdr/properties/emptyproperties.hxx>
#include <tools/debug.hxx>
#include <svl/itemset.hxx>
#include <svx/svddef.hxx>
diff --git a/svx/source/sdr/properties/rectangleproperties.cxx b/svx/source/sdr/properties/rectangleproperties.cxx
index 52babb7..bf93438 100644
--- a/svx/source/sdr/properties/rectangleproperties.cxx
+++ b/svx/source/sdr/properties/rectangleproperties.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svx/sdr/properties/rectangleproperties.hxx>
+#include <sdr/properties/rectangleproperties.hxx>
#include <svx/svdorect.hxx>
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index eeb7991..d28b388 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svx/sdr/properties/textproperties.hxx>
+#include <sdr/properties/textproperties.hxx>
#include <svl/itemset.hxx>
#include <svl/style.hxx>
#include <svl/itemiter.hxx>
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index 4047372..568322f 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -68,7 +68,7 @@
#include <svx/xflftrit.hxx>
#include <svx/xflhtit.hxx>
#include <svx/xlnstit.hxx>
-#include <svx/sdr/properties/attributeproperties.hxx>
+#include <sdr/properties/attributeproperties.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include "svx/xlinjoit.hxx"
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 4a3792d..84c99fc 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -63,7 +63,7 @@
#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
#include <sdr/contact/viewcontactofgraphic.hxx>
#include <svx/sdr/contact/viewcontactofsdrobj.hxx>
-#include <svx/sdr/properties/emptyproperties.hxx>
+#include <sdr/properties/emptyproperties.hxx>
#include <svx/sdrhittesthelper.hxx>
#include <svx/sdrobjectfilter.hxx>
#include <svx/svddrag.hxx>
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 473e38c..01634d8 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -39,7 +39,7 @@
#include <svx/xflclit.hxx>
#include <svx/xlnclit.hxx>
#include <svx/xlnwtit.hxx>
-#include <svx/sdr/properties/rectangleproperties.hxx>
+#include <sdr/properties/rectangleproperties.hxx>
#include <svx/sdr/contact/viewcontactofsdrrectobj.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index cd75e66..3be6f28 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -49,7 +49,7 @@
#include <svl/style.hxx>
#include <editeng/editeng.hxx>
#include <svl/itemiter.hxx>
-#include <svx/sdr/properties/textproperties.hxx>
+#include <sdr/properties/textproperties.hxx>
#include <vcl/metaact.hxx>
#include <svx/sdr/contact/viewcontactoftextobj.hxx>
#include <basegfx/tuple/b2dtuple.hxx>
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 78dfb9c..d681cb3 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -34,7 +34,7 @@
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
-#include "svx/sdr/properties/textproperties.hxx"
+#include "sdr/properties/textproperties.hxx"
#include "editeng/outlobj.hxx"
#include "editeng/writingmodeitem.hxx"
#include "svx/svdotable.hxx"
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index e41c2cb..77cdc42 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -32,7 +32,7 @@
#include "editeng/editstat.hxx"
#include "editeng/outlobj.hxx"
#include "svx/svdview.hxx"
-#include "svx/sdr/properties/textproperties.hxx"
+#include "sdr/properties/textproperties.hxx"
#include "svx/svdotable.hxx"
#include "svx/svdhdl.hxx"
#include "viewcontactoftableobj.hxx"
diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx
index 358691c..8e1358b 100644
--- a/svx/source/table/tableundo.cxx
+++ b/svx/source/table/tableundo.cxx
@@ -18,7 +18,7 @@
*/
-#include "svx/sdr/properties/textproperties.hxx"
+#include "sdr/properties/textproperties.hxx"
#include "editeng/outlobj.hxx"
#include "cell.hxx"
More information about the Libreoffice-commits
mailing list