diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-05-06 14:52:33 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-05-06 14:52:33 +0300 |
commit | aa8abbe736b0c8ad54f208916b0eca2d04ebd396 (patch) | |
tree | 612d9104ef2baf0f1ac5e5dd62e59056fe151b34 | |
parent | WaE: 'bPrependCurrencySymbol' may be used uninitialized in this function (diff) | |
download | core-aa8abbe736b0c8ad54f208916b0eca2d04ebd396.tar.gz core-aa8abbe736b0c8ad54f208916b0eca2d04ebd396.zip |
Move headers included only in svx from include/svx/sdr/* to svx/inc/sdr/*
Change-Id: I084cbab30dfb0a7d567d1b172a79320687d20a06
185 files changed, 177 insertions, 177 deletions
diff --git a/include/svx/sdr/attribute/sdrfilltextattribute.hxx b/svx/inc/sdr/attribute/sdrfilltextattribute.hxx index 1f398abdd65c..1f398abdd65c 100644 --- a/include/svx/sdr/attribute/sdrfilltextattribute.hxx +++ b/svx/inc/sdr/attribute/sdrfilltextattribute.hxx diff --git a/include/svx/sdr/attribute/sdrformtextoutlineattribute.hxx b/svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx index 03b58180ceb1..03b58180ceb1 100644 --- a/include/svx/sdr/attribute/sdrformtextoutlineattribute.hxx +++ b/svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx diff --git a/include/svx/sdr/contact/objectcontactofpageview.hxx b/svx/inc/sdr/contact/objectcontactofpageview.hxx index 0b1bf34a384d..0b1bf34a384d 100644 --- a/include/svx/sdr/contact/objectcontactofpageview.hxx +++ b/svx/inc/sdr/contact/objectcontactofpageview.hxx diff --git a/include/svx/sdr/contact/viewcontactofe3dcube.hxx b/svx/inc/sdr/contact/viewcontactofe3dcube.hxx index 323df6d10a00..323df6d10a00 100644 --- a/include/svx/sdr/contact/viewcontactofe3dcube.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dcube.hxx diff --git a/include/svx/sdr/contact/viewcontactofe3dextrude.hxx b/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx index 4e7647167a92..4e7647167a92 100644 --- a/include/svx/sdr/contact/viewcontactofe3dextrude.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx diff --git a/include/svx/sdr/contact/viewcontactofe3dlathe.hxx b/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx index 572837f069e0..572837f069e0 100644 --- a/include/svx/sdr/contact/viewcontactofe3dlathe.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx diff --git a/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx b/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx index e0ee21118602..e0ee21118602 100644 --- a/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx diff --git a/include/svx/sdr/contact/viewcontactofe3dsphere.hxx b/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx index 01e0d4204948..01e0d4204948 100644 --- a/include/svx/sdr/contact/viewcontactofe3dsphere.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx diff --git a/include/svx/sdr/contact/viewcontactofgraphic.hxx b/svx/inc/sdr/contact/viewcontactofgraphic.hxx index b6f25e0650b3..b6f25e0650b3 100644 --- a/include/svx/sdr/contact/viewcontactofgraphic.hxx +++ b/svx/inc/sdr/contact/viewcontactofgraphic.hxx diff --git a/include/svx/sdr/contact/viewcontactofgroup.hxx b/svx/inc/sdr/contact/viewcontactofgroup.hxx index 4ed308ca4eb0..4ed308ca4eb0 100644 --- a/include/svx/sdr/contact/viewcontactofgroup.hxx +++ b/svx/inc/sdr/contact/viewcontactofgroup.hxx diff --git a/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx b/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx index e2f62c4b50e3..e2f62c4b50e3 100644 --- a/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx +++ b/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx diff --git a/include/svx/sdr/contact/viewcontactofopenglobj.hxx b/svx/inc/sdr/contact/viewcontactofopenglobj.hxx index aceb6e80da24..aceb6e80da24 100644 --- a/include/svx/sdr/contact/viewcontactofopenglobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofopenglobj.hxx diff --git a/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx index d201b8957fb5..d201b8957fb5 100644 --- a/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx diff --git a/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx index 919b438436e6..919b438436e6 100644 --- a/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx diff --git a/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx b/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx index 496f34a99450..496f34a99450 100644 --- a/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx diff --git a/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx index 4981e1970945..4981e1970945 100644 --- a/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx diff --git a/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx b/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx index 60142ff65db7..60142ff65db7 100644 --- a/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx diff --git a/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx b/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx index cd8e2903dec8..cd8e2903dec8 100644 --- a/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx diff --git a/include/svx/sdr/contact/viewcontactofsdrpage.hxx b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx index 3be8aec6952b..3be8aec6952b 100644 --- a/include/svx/sdr/contact/viewcontactofsdrpage.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx diff --git a/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx index daa37db432ee..daa37db432ee 100644 --- a/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx diff --git a/include/svx/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx index 84378f2ce8cc..84378f2ce8cc 100644 --- a/include/svx/sdr/contact/viewcontactofunocontrol.hxx +++ b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx diff --git a/include/svx/sdr/contact/viewobjectcontactofe3d.hxx b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx index 306798bcc416..306798bcc416 100644 --- a/include/svx/sdr/contact/viewobjectcontactofe3d.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx diff --git a/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx b/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx index b25e161dd613..b25e161dd613 100644 --- a/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx diff --git a/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx b/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx index 7c1a6709f9c8..7c1a6709f9c8 100644 --- a/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx diff --git a/include/svx/sdr/contact/viewobjectcontactofgroup.hxx b/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx index 556aa37e12cc..556aa37e12cc 100644 --- a/include/svx/sdr/contact/viewobjectcontactofgroup.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx diff --git a/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx b/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx index 2cae0aa7833a..2cae0aa7833a 100644 --- a/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx diff --git a/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx b/svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx index 2abae09a3c43..2abae09a3c43 100644 --- a/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx index f770a341fcc0..f770a341fcc0 100644 --- a/include/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx index 01acfabbb507..01acfabbb507 100644 --- a/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx index 59ffc2b513d0..59ffc2b513d0 100644 --- a/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx diff --git a/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx index a1ade08cd65f..a1ade08cd65f 100644 --- a/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx diff --git a/include/svx/sdr/overlay/overlaycrosshair.hxx b/svx/inc/sdr/overlay/overlaycrosshair.hxx index e9a70a7e234d..e9a70a7e234d 100644 --- a/include/svx/sdr/overlay/overlaycrosshair.hxx +++ b/svx/inc/sdr/overlay/overlaycrosshair.hxx diff --git a/include/svx/sdr/overlay/overlayhatchrect.hxx b/svx/inc/sdr/overlay/overlayhatchrect.hxx index e69c61b87849..e69c61b87849 100644 --- a/include/svx/sdr/overlay/overlayhatchrect.hxx +++ b/svx/inc/sdr/overlay/overlayhatchrect.hxx diff --git a/include/svx/sdr/overlay/overlayhelpline.hxx b/svx/inc/sdr/overlay/overlayhelpline.hxx index 2e3bc1640ae7..2e3bc1640ae7 100644 --- a/include/svx/sdr/overlay/overlayhelpline.hxx +++ b/svx/inc/sdr/overlay/overlayhelpline.hxx diff --git a/include/svx/sdr/overlay/overlayline.hxx b/svx/inc/sdr/overlay/overlayline.hxx index 65b7bb58fc54..65b7bb58fc54 100644 --- a/include/svx/sdr/overlay/overlayline.hxx +++ b/svx/inc/sdr/overlay/overlayline.hxx diff --git a/include/svx/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx index 2db2cf1da96f..2db2cf1da96f 100644 --- a/include/svx/sdr/overlay/overlaymanagerbuffered.hxx +++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx diff --git a/include/svx/sdr/overlay/overlayrectangle.hxx b/svx/inc/sdr/overlay/overlayrectangle.hxx index 7279a11bea0e..7279a11bea0e 100644 --- a/include/svx/sdr/overlay/overlayrectangle.hxx +++ b/svx/inc/sdr/overlay/overlayrectangle.hxx diff --git a/include/svx/sdr/overlay/overlayrollingrectangle.hxx b/svx/inc/sdr/overlay/overlayrollingrectangle.hxx index 2d7748e8d013..2d7748e8d013 100644 --- a/include/svx/sdr/overlay/overlayrollingrectangle.hxx +++ b/svx/inc/sdr/overlay/overlayrollingrectangle.hxx diff --git a/include/svx/sdr/overlay/overlaytools.hxx b/svx/inc/sdr/overlay/overlaytools.hxx index 3dab6a607f75..3dab6a607f75 100644 --- a/include/svx/sdr/overlay/overlaytools.hxx +++ b/svx/inc/sdr/overlay/overlaytools.hxx diff --git a/include/svx/sdr/overlay/overlaytriangle.hxx b/svx/inc/sdr/overlay/overlaytriangle.hxx index 30b7dd02b4e7..30b7dd02b4e7 100644 --- a/include/svx/sdr/overlay/overlaytriangle.hxx +++ b/svx/inc/sdr/overlay/overlaytriangle.hxx diff --git a/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx index 02d11c4ebf72..02d11c4ebf72 100644 --- a/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx diff --git a/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx index 36591ed8bde7..36591ed8bde7 100644 --- a/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx diff --git a/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx index ccdc4a2c9265..ccdc4a2c9265 100644 --- a/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx diff --git a/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx index 39f7c16bfd58..39f7c16bfd58 100644 --- a/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx diff --git a/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx index b1a9bd564236..b1a9bd564236 100644 --- a/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx diff --git a/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx index 67177c7c814d..67177c7c814d 100644 --- a/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx diff --git a/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx b/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx index 888d1c770d80..888d1c770d80 100644 --- a/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx diff --git a/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx index c2394e827e83..c2394e827e83 100644 --- a/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx diff --git a/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx index ce8bd26de582..ce8bd26de582 100644 --- a/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx diff --git a/include/svx/sdr/primitive2d/sdrprimitivetools.hxx b/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx index a81aa0b12d7d..a81aa0b12d7d 100644 --- a/include/svx/sdr/primitive2d/sdrprimitivetools.hxx +++ b/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx diff --git a/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx index 0c7453377d81..0c7453377d81 100644 --- a/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx diff --git a/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx index 650002181201..650002181201 100644 --- a/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx diff --git a/include/svx/sdr/primitive3d/sdrattributecreator3d.hxx b/svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx index 4a7270690a1f..4a7270690a1f 100644 --- a/include/svx/sdr/primitive3d/sdrattributecreator3d.hxx +++ b/svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx diff --git a/include/svx/sdr/properties/captionproperties.hxx b/svx/inc/sdr/properties/captionproperties.hxx index b93653b36cf7..b93653b36cf7 100644 --- a/include/svx/sdr/properties/captionproperties.hxx +++ b/svx/inc/sdr/properties/captionproperties.hxx diff --git a/include/svx/sdr/properties/circleproperties.hxx b/svx/inc/sdr/properties/circleproperties.hxx index 4a8087d81d55..4a8087d81d55 100644 --- a/include/svx/sdr/properties/circleproperties.hxx +++ b/svx/inc/sdr/properties/circleproperties.hxx diff --git a/include/svx/sdr/properties/connectorproperties.hxx b/svx/inc/sdr/properties/connectorproperties.hxx index d05391aebb7b..d05391aebb7b 100644 --- a/include/svx/sdr/properties/connectorproperties.hxx +++ b/svx/inc/sdr/properties/connectorproperties.hxx diff --git a/include/svx/sdr/properties/customshapeproperties.hxx b/svx/inc/sdr/properties/customshapeproperties.hxx index 95d725ec647e..95d725ec647e 100644 --- a/include/svx/sdr/properties/customshapeproperties.hxx +++ b/svx/inc/sdr/properties/customshapeproperties.hxx diff --git a/include/svx/sdr/properties/e3dextrudeproperties.hxx b/svx/inc/sdr/properties/e3dextrudeproperties.hxx index dac3f8e173ea..dac3f8e173ea 100644 --- a/include/svx/sdr/properties/e3dextrudeproperties.hxx +++ b/svx/inc/sdr/properties/e3dextrudeproperties.hxx diff --git a/include/svx/sdr/properties/e3dlatheproperties.hxx b/svx/inc/sdr/properties/e3dlatheproperties.hxx index 4a5b56559cbc..4a5b56559cbc 100644 --- a/include/svx/sdr/properties/e3dlatheproperties.hxx +++ b/svx/inc/sdr/properties/e3dlatheproperties.hxx diff --git a/include/svx/sdr/properties/e3dsceneproperties.hxx b/svx/inc/sdr/properties/e3dsceneproperties.hxx index a92296d23bba..a92296d23bba 100644 --- a/include/svx/sdr/properties/e3dsceneproperties.hxx +++ b/svx/inc/sdr/properties/e3dsceneproperties.hxx diff --git a/include/svx/sdr/properties/e3dsphereproperties.hxx b/svx/inc/sdr/properties/e3dsphereproperties.hxx index a92596b6661f..a92596b6661f 100644 --- a/include/svx/sdr/properties/e3dsphereproperties.hxx +++ b/svx/inc/sdr/properties/e3dsphereproperties.hxx diff --git a/include/svx/sdr/properties/graphicproperties.hxx b/svx/inc/sdr/properties/graphicproperties.hxx index 8299f5a2955d..8299f5a2955d 100644 --- a/include/svx/sdr/properties/graphicproperties.hxx +++ b/svx/inc/sdr/properties/graphicproperties.hxx diff --git a/include/svx/sdr/properties/groupproperties.hxx b/svx/inc/sdr/properties/groupproperties.hxx index 41a08c45168b..41a08c45168b 100644 --- a/include/svx/sdr/properties/groupproperties.hxx +++ b/svx/inc/sdr/properties/groupproperties.hxx diff --git a/include/svx/sdr/properties/itemsettools.hxx b/svx/inc/sdr/properties/itemsettools.hxx index 6c4ce0e59d20..6c4ce0e59d20 100644 --- a/include/svx/sdr/properties/itemsettools.hxx +++ b/svx/inc/sdr/properties/itemsettools.hxx diff --git a/include/svx/sdr/properties/measureproperties.hxx b/svx/inc/sdr/properties/measureproperties.hxx index 0d4c0f1343e9..0d4c0f1343e9 100644 --- a/include/svx/sdr/properties/measureproperties.hxx +++ b/svx/inc/sdr/properties/measureproperties.hxx diff --git a/include/svx/sdr/properties/oleproperties.hxx b/svx/inc/sdr/properties/oleproperties.hxx index 9a78025acd77..9a78025acd77 100644 --- a/include/svx/sdr/properties/oleproperties.hxx +++ b/svx/inc/sdr/properties/oleproperties.hxx diff --git a/include/svx/sdr/properties/pageproperties.hxx b/svx/inc/sdr/properties/pageproperties.hxx index 6af7debda17a..6af7debda17a 100644 --- a/include/svx/sdr/properties/pageproperties.hxx +++ b/svx/inc/sdr/properties/pageproperties.hxx diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx index 2a827c756dea..4677662f7539 100644 --- a/svx/source/engine3d/cube3d.cxx +++ b/svx/source/engine3d/cube3d.cxx @@ -24,7 +24,7 @@ #include "svx/globl3d.hxx" #include <basegfx/point/b3dpoint.hxx> #include <basegfx/polygon/b3dpolygon.hxx> -#include <svx/sdr/contact/viewcontactofe3dcube.hxx> +#include <sdr/contact/viewcontactofe3dcube.hxx> // DrawContact section diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx index 0c4a7075619d..9219be678c8d 100644 --- a/svx/source/engine3d/extrud3d.cxx +++ b/svx/source/engine3d/extrud3d.cxx @@ -30,8 +30,8 @@ #include <svx/svdopath.hxx> #include <svx/svdmodel.hxx> #include <svx/svx3ditems.hxx> -#include <svx/sdr/properties/e3dextrudeproperties.hxx> -#include <svx/sdr/contact/viewcontactofe3dextrude.hxx> +#include <sdr/properties/e3dextrudeproperties.hxx> +#include <sdr/contact/viewcontactofe3dextrude.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b3dpolygontools.hxx> diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx index c9d0f4647e24..939e947bd752 100644 --- a/svx/source/engine3d/lathe3d.cxx +++ b/svx/source/engine3d/lathe3d.cxx @@ -29,8 +29,8 @@ #include <svx/svdopath.hxx> #include <svx/svdmodel.hxx> #include <svx/svx3ditems.hxx> -#include <svx/sdr/properties/e3dlatheproperties.hxx> -#include <svx/sdr/contact/viewcontactofe3dlathe.hxx> +#include <sdr/properties/e3dlatheproperties.hxx> +#include <sdr/contact/viewcontactofe3dlathe.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx index 4d23a1399da1..dd5084252335 100644 --- a/svx/source/engine3d/polygn3d.cxx +++ b/svx/source/engine3d/polygn3d.cxx @@ -21,7 +21,7 @@ #include <svx/svdpage.hxx> #include "svx/globl3d.hxx" #include <basegfx/point/b3dpoint.hxx> -#include <svx/sdr/contact/viewcontactofe3dpolygon.hxx> +#include <sdr/contact/viewcontactofe3dpolygon.hxx> #include <basegfx/polygon/b3dpolygon.hxx> #include <basegfx/polygon/b3dpolygontools.hxx> diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 4f9829c34c7f..40e606a2738c 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -37,7 +37,7 @@ #include <svx/svx3ditems.hxx> #include <svl/whiter.hxx> #include <svx/xflftrit.hxx> -#include <svx/sdr/properties/e3dsceneproperties.hxx> +#include <sdr/properties/e3dsceneproperties.hxx> #include <svx/sdr/contact/viewcontactofe3dscene.hxx> #include <svx/svddrag.hxx> #include <helperminimaldepth3d.hxx> diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx index 07b47f9ae0de..1f9d5623e4b5 100644 --- a/svx/source/engine3d/sphere3d.cxx +++ b/svx/source/engine3d/sphere3d.cxx @@ -27,10 +27,10 @@ #include <svx/svxids.hrc> #include <svx/svx3ditems.hxx> -#include <svx/sdr/properties/e3dsphereproperties.hxx> +#include <sdr/properties/e3dsphereproperties.hxx> #include <basegfx/vector/b3dvector.hxx> #include <basegfx/point/b3dpoint.hxx> -#include <svx/sdr/contact/viewcontactofe3dsphere.hxx> +#include <sdr/contact/viewcontactofe3dsphere.hxx> #include <basegfx/polygon/b3dpolygon.hxx> diff --git a/svx/source/sdr/attribute/sdrfilltextattribute.cxx b/svx/source/sdr/attribute/sdrfilltextattribute.cxx index 7dae8201a8a6..8ecad40b6dd4 100644 --- a/svx/source/sdr/attribute/sdrfilltextattribute.cxx +++ b/svx/source/sdr/attribute/sdrfilltextattribute.cxx @@ -18,7 +18,7 @@ */ -#include <svx/sdr/attribute/sdrfilltextattribute.hxx> +#include <sdr/attribute/sdrfilltextattribute.hxx> diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx index fd1467f0b0b8..1b10633c2522 100644 --- a/svx/source/sdr/attribute/sdrformtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx @@ -42,7 +42,7 @@ #include <svx/xlndsit.hxx> #include <drawinglayer/attribute/lineattribute.hxx> #include <drawinglayer/attribute/strokeattribute.hxx> -#include <svx/sdr/attribute/sdrformtextoutlineattribute.hxx> +#include <sdr/attribute/sdrformtextoutlineattribute.hxx> #include <com/sun/star/drawing/LineCap.hpp> diff --git a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx index 659cd3ea28af..23a8bf8b44f9 100644 --- a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx +++ b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx @@ -18,7 +18,7 @@ */ -#include <svx/sdr/attribute/sdrformtextoutlineattribute.hxx> +#include <sdr/attribute/sdrformtextoutlineattribute.hxx> #include <drawinglayer/attribute/lineattribute.hxx> #include <drawinglayer/attribute/strokeattribute.hxx> diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index 09b37be1d85b..cefbd963c689 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -19,8 +19,8 @@ #include <config_features.h> -#include <svx/sdr/contact/objectcontactofpageview.hxx> -#include <svx/sdr/contact/viewobjectcontactofunocontrol.hxx> +#include <sdr/contact/objectcontactofpageview.hxx> +#include <sdr/contact/viewobjectcontactofunocontrol.hxx> #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> #include <svx/sdr/contact/displayinfo.hxx> diff --git a/svx/source/sdr/contact/sdrmediawindow.cxx b/svx/source/sdr/contact/sdrmediawindow.cxx index 4c5412ad631c..57ae8d38b8fb 100644 --- a/svx/source/sdr/contact/sdrmediawindow.cxx +++ b/svx/source/sdr/contact/sdrmediawindow.cxx @@ -21,7 +21,7 @@ #include "sdrmediawindow.hxx" #include <svtools/transfer.hxx> -#include <svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx> +#include <sdr/contact/viewobjectcontactofsdrmediaobj.hxx> #include <vcl/window.hxx> namespace sdr { namespace contact { diff --git a/svx/source/sdr/contact/viewcontact.cxx b/svx/source/sdr/contact/viewcontact.cxx index 0f9ba0dfdd21..292bfba3c2bb 100644 --- a/svx/source/sdr/contact/viewcontact.cxx +++ b/svx/source/sdr/contact/viewcontact.cxx @@ -25,7 +25,7 @@ #include <basegfx/color/bcolor.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <svx/sdr/contact/objectcontactofpageview.hxx> +#include <sdr/contact/objectcontactofpageview.hxx> #include <tools/debug.hxx> diff --git a/svx/source/sdr/contact/viewcontactofe3d.cxx b/svx/source/sdr/contact/viewcontactofe3d.cxx index f4f22b98ff67..810a9eca9496 100644 --- a/svx/source/sdr/contact/viewcontactofe3d.cxx +++ b/svx/source/sdr/contact/viewcontactofe3d.cxx @@ -19,7 +19,7 @@ #include <svx/sdr/contact/viewcontactofe3d.hxx> -#include <svx/sdr/contact/viewobjectcontactofe3d.hxx> +#include <sdr/contact/viewobjectcontactofe3d.hxx> #include <svx/obj3d.hxx> #include <drawinglayer/primitive2d/embedded3dprimitive2d.hxx> #include <svx/sdr/contact/viewcontactofe3dscene.hxx> diff --git a/svx/source/sdr/contact/viewcontactofe3dcube.cxx b/svx/source/sdr/contact/viewcontactofe3dcube.cxx index 5a99ff820009..94c9776448f7 100644 --- a/svx/source/sdr/contact/viewcontactofe3dcube.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dcube.cxx @@ -18,11 +18,11 @@ */ -#include <svx/sdr/contact/viewcontactofe3dcube.hxx> +#include <sdr/contact/viewcontactofe3dcube.hxx> #include <svx/cube3d.hxx> #include <drawinglayer/primitive3d/sdrcubeprimitive3d.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx> -#include <svx/sdr/primitive3d/sdrattributecreator3d.hxx> +#include <sdr/primitive3d/sdrattributecreator3d.hxx> #include <basegfx/range/b3drange.hxx> diff --git a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx index fd5bd0fc5ddb..f9110bc48127 100644 --- a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx @@ -18,11 +18,11 @@ */ -#include <svx/sdr/contact/viewcontactofe3dextrude.hxx> +#include <sdr/contact/viewcontactofe3dextrude.hxx> #include <svx/extrud3d.hxx> #include <drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx> -#include <svx/sdr/primitive3d/sdrattributecreator3d.hxx> +#include <sdr/primitive3d/sdrattributecreator3d.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> diff --git a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx index 6899bf77f1fa..72d290bc6131 100644 --- a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx @@ -18,11 +18,11 @@ */ -#include <svx/sdr/contact/viewcontactofe3dlathe.hxx> +#include <sdr/contact/viewcontactofe3dlathe.hxx> #include <svx/lathe3d.hxx> #include <drawinglayer/primitive3d/sdrlatheprimitive3d.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx> -#include <svx/sdr/primitive3d/sdrattributecreator3d.hxx> +#include <sdr/primitive3d/sdrattributecreator3d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> diff --git a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx index ae6bd9579f21..ca24df8fcbc0 100644 --- a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx @@ -18,11 +18,11 @@ */ -#include <svx/sdr/contact/viewcontactofe3dpolygon.hxx> +#include <sdr/contact/viewcontactofe3dpolygon.hxx> #include <polygn3d.hxx> #include <drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx> -#include <svx/sdr/primitive3d/sdrattributecreator3d.hxx> +#include <sdr/primitive3d/sdrattributecreator3d.hxx> #include <basegfx/polygon/b3dpolygon.hxx> #include <basegfx/polygon/b3dpolypolygontools.hxx> diff --git a/svx/source/sdr/contact/viewcontactofe3dscene.cxx b/svx/source/sdr/contact/viewcontactofe3dscene.cxx index e37b3a3118cb..9a80884d28ff 100644 --- a/svx/source/sdr/contact/viewcontactofe3dscene.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dscene.cxx @@ -25,7 +25,7 @@ #include <basegfx/color/bcolor.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx> -#include <svx/sdr/contact/viewobjectcontactofe3dscene.hxx> +#include <sdr/contact/viewobjectcontactofe3dscene.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/range/b3drange.hxx> #include <drawinglayer/primitive3d/baseprimitive3d.hxx> diff --git a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx index fdc5e6f11604..60fa51d6b574 100644 --- a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx @@ -18,11 +18,11 @@ */ -#include <svx/sdr/contact/viewcontactofe3dsphere.hxx> +#include <sdr/contact/viewcontactofe3dsphere.hxx> #include <svx/sphere3d.hxx> #include <drawinglayer/primitive3d/sdrsphereprimitive3d.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx> -#include <svx/sdr/primitive3d/sdrattributecreator3d.hxx> +#include <sdr/primitive3d/sdrattributecreator3d.hxx> diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index 56f0a78f258b..dfd033a86d74 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/contact/viewcontactofgraphic.hxx> -#include <svx/sdr/contact/viewobjectcontactofgraphic.hxx> +#include <sdr/contact/viewcontactofgraphic.hxx> +#include <sdr/contact/viewobjectcontactofgraphic.hxx> #include <svx/svdograf.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx> #include <svl/itemset.hxx> @@ -28,7 +28,7 @@ #include <svx/sdr/contact/viewobjectcontact.hxx> #include <svx/sdr/contact/objectcontact.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <svx/sdr/primitive2d/sdrgrafprimitive2d.hxx> +#include <sdr/primitive2d/sdrgrafprimitive2d.hxx> #include "svx/svdstr.hrc" #include <svdglob.hxx> #include <vcl/svapp.hxx> @@ -39,7 +39,7 @@ #include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <drawinglayer/primitive2d/textlayoutdevice.hxx> #include <drawinglayer/primitive2d/maskprimitive2d.hxx> -#include <svx/sdr/primitive2d/sdrtextprimitive2d.hxx> +#include <sdr/primitive2d/sdrtextprimitive2d.hxx> #include <editeng/eeitem.hxx> #include <editeng/colritem.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/svx/source/sdr/contact/viewcontactofgroup.cxx b/svx/source/sdr/contact/viewcontactofgroup.cxx index 4bed2eac6a6b..af037e58dcb3 100644 --- a/svx/source/sdr/contact/viewcontactofgroup.cxx +++ b/svx/source/sdr/contact/viewcontactofgroup.cxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/contact/viewcontactofgroup.hxx> +#include <sdr/contact/viewcontactofgroup.hxx> #include <svx/svdogrp.hxx> #include <svx/svdpage.hxx> #include <svx/sdr/contact/viewobjectcontact.hxx> -#include <svx/sdr/contact/viewobjectcontactofgroup.hxx> +#include <sdr/contact/viewobjectcontactofgroup.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/color/bcolor.hxx> diff --git a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx index 158fc78ba9ad..a9893045d222 100644 --- a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx +++ b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx> +#include <sdr/contact/viewcontactofmasterpagedescriptor.hxx> #include <svx/sdr/contact/viewobjectcontact.hxx> #include <svx/svdpage.hxx> #include <svx/sdr/contact/displayinfo.hxx> @@ -26,8 +26,8 @@ #include <vcl/timer.hxx> #include <svx/svdpagv.hxx> #include <svx/svdview.hxx> -#include <svx/sdr/contact/viewcontactofsdrpage.hxx> -#include <svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx> +#include <sdr/contact/viewcontactofsdrpage.hxx> +#include <sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/svx/source/sdr/contact/viewcontactofopenglobj.cxx b/svx/source/sdr/contact/viewcontactofopenglobj.cxx index 1b503265be60..75768ac708a5 100644 --- a/svx/source/sdr/contact/viewcontactofopenglobj.cxx +++ b/svx/source/sdr/contact/viewcontactofopenglobj.cxx @@ -8,8 +8,8 @@ */ #include <com/sun/star/drawing/XShape.hpp> -#include <svx/sdr/contact/viewcontactofopenglobj.hxx> -#include <svx/sdr/contact/viewobjectcontactofopenglobj.hxx> +#include <sdr/contact/viewcontactofopenglobj.hxx> +#include <sdr/contact/viewobjectcontactofopenglobj.hxx> #include <drawinglayer/primitive2d/openglprimitive2d.hxx> #include <svdoopengl.hxx> #include <tools/gen.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx index 0ae9f803c643..4dfdf337955b 100644 --- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx @@ -18,10 +18,10 @@ */ -#include <svx/sdr/contact/viewcontactofsdrcaptionobj.hxx> +#include <sdr/contact/viewcontactofsdrcaptionobj.hxx> #include <svx/svdocapt.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx> -#include <svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx> +#include <sdr/primitive2d/sdrcaptionprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx index 146ed9cf5505..d595917bf03c 100644 --- a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx @@ -18,10 +18,10 @@ */ -#include <svx/sdr/contact/viewcontactofsdrcircobj.hxx> +#include <sdr/contact/viewcontactofsdrcircobj.hxx> #include <svx/svdocirc.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx> -#include <svx/sdr/primitive2d/sdrellipseprimitive2d.hxx> +#include <sdr/primitive2d/sdrellipseprimitive2d.hxx> #include <svl/itemset.hxx> #include <svx/sxciaitm.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx index 47e61c0c4a7f..8ce64caa6d13 100644 --- a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx @@ -18,10 +18,10 @@ */ -#include <svx/sdr/contact/viewcontactofsdredgeobj.hxx> +#include <sdr/contact/viewcontactofsdredgeobj.hxx> #include <svx/svdoedge.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx> -#include <svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx> +#include <sdr/primitive2d/sdrconnectorprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx index 234197f075af..275e28b741d3 100644 --- a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx @@ -18,7 +18,7 @@ */ -#include <svx/sdr/contact/viewcontactofsdrmeasureobj.hxx> +#include <sdr/contact/viewcontactofsdrmeasureobj.hxx> #include <svx/svdomeas.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx> #include <svl/itemset.hxx> @@ -26,7 +26,7 @@ #include <svx/sxmlhitm.hxx> #include <svx/sxmtritm.hxx> #include <sxmtaitm.hxx> -#include <svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx> +#include <sdr/primitive2d/sdrmeasureprimitive2d.hxx> #include <svx/sxmtpitm.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx index c17d71ce97a5..75460eca4a3b 100644 --- a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx @@ -20,7 +20,7 @@ #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx> #include <svx/svdomedia.hxx> -#include <svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx> +#include <sdr/contact/viewobjectcontactofsdrmediaobj.hxx> #include <drawinglayer/primitive2d/mediaprimitive2d.hxx> #include <avmedia/mediawindow.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx index 551a09eeea28..663e876a2fa9 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx @@ -29,7 +29,7 @@ #include <basegfx/color/bcolor.hxx> #include <drawinglayer/primitive2d/markerarrayprimitive2d.hxx> #include <drawinglayer/primitive2d/objectinfoprimitive2d.hxx> -#include <svx/sdr/contact/objectcontactofpageview.hxx> +#include <sdr/contact/objectcontactofpageview.hxx> #include <svx/sdrpagewindow.hxx> #include <svx/sdrpaintwindow.hxx> #include <svx/svdhdl.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx index 372988e68049..518d30af83eb 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx> +#include <sdr/contact/viewcontactofsdrobjcustomshape.hxx> #include <svx/svdoashp.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx> #include <svx/svditer.hxx> -#include <svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx> +#include <sdr/primitive2d/sdrcustomshapeprimitive2d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx index 4f852cbdacbb..df2f0ff96245 100644 --- a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/contact/viewcontactofsdrole2obj.hxx> +#include <sdr/contact/viewcontactofsdrole2obj.hxx> #include <svx/svdoole2.hxx> -#include <svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx> +#include <sdr/contact/viewobjectcontactofsdrole2obj.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <svx/sdr/primitive2d/sdrole2primitive2d.hxx> +#include <sdr/primitive2d/sdrole2primitive2d.hxx> #include <drawinglayer/primitive2d/graphicprimitive2d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> @@ -29,7 +29,7 @@ #include <svtools/colorcfg.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx> #include <vcl/svapp.hxx> -#include <svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx> +#include <sdr/primitive2d/sdrolecontentprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <drawinglayer/primitive2d/transformprimitive2d.hxx> #include <svx/charthelper.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx index 77d19c356777..ce25218f3354 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/contact/viewcontactofsdrpage.hxx> +#include <sdr/contact/viewcontactofsdrpage.hxx> #include <svx/sdr/contact/viewobjectcontact.hxx> #include <svx/svdpage.hxx> #include <svx/sdr/contact/displayinfo.hxx> -#include <svx/sdr/contact/viewobjectcontactofsdrpage.hxx> +#include <sdr/contact/viewobjectcontactofsdrpage.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/svdpagv.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx index db0a39f15ffd..c95a47b2b60e 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx @@ -18,11 +18,11 @@ */ -#include <svx/sdr/contact/viewcontactofsdrpathobj.hxx> +#include <sdr/contact/viewcontactofsdrpathobj.hxx> #include <svx/svdopath.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> -#include <svx/sdr/primitive2d/sdrpathprimitive2d.hxx> +#include <sdr/primitive2d/sdrpathprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx index fd0e6b005bf0..8a02658711fe 100644 --- a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx @@ -21,9 +21,9 @@ #include <svx/sdr/contact/viewcontactofsdrrectobj.hxx> #include <svx/svdorect.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx> -#include <svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx> +#include <sdr/primitive2d/sdrrectangleprimitive2d.hxx> #include <svl/itemset.hxx> -#include <svx/sdr/primitive2d/sdrprimitivetools.hxx> +#include <sdr/primitive2d/sdrprimitivetools.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <svx/svdmodel.hxx> diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx index f4efab5d2601..edc551baaaff 100644 --- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx @@ -20,9 +20,9 @@ #include <sal/config.h> #include <boost/noncopyable.hpp> -#include <svx/sdr/contact/viewcontactofunocontrol.hxx> -#include <svx/sdr/contact/viewobjectcontactofunocontrol.hxx> -#include <svx/sdr/contact/objectcontactofpageview.hxx> +#include <sdr/contact/viewcontactofunocontrol.hxx> +#include <sdr/contact/viewobjectcontactofunocontrol.hxx> +#include <sdr/contact/objectcontactofpageview.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <svx/svdouno.hxx> #include <svx/svdpagv.hxx> diff --git a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx index 828b990d8cf3..85bb7762322d 100644 --- a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx @@ -18,11 +18,11 @@ */ -#include <svx/sdr/contact/viewobjectcontactofe3d.hxx> +#include <sdr/contact/viewobjectcontactofe3d.hxx> #include <svx/sdr/contact/viewcontactofe3d.hxx> #include <basegfx/color/bcolor.hxx> #include <drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx> -#include <svx/sdr/contact/viewobjectcontactofe3dscene.hxx> +#include <sdr/contact/viewobjectcontactofe3dscene.hxx> #include <drawinglayer/primitive2d/embedded3dprimitive2d.hxx> #include <svx/sdr/contact/viewcontactofe3dscene.hxx> diff --git a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx index b105137e0621..7a655486c95a 100644 --- a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx @@ -18,7 +18,7 @@ */ -#include <svx/sdr/contact/viewobjectcontactofe3dscene.hxx> +#include <sdr/contact/viewobjectcontactofe3dscene.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <svx/sdr/contact/objectcontact.hxx> #include <svx/sdr/contact/viewcontactofe3dscene.hxx> @@ -26,7 +26,7 @@ #include <drawinglayer/primitive3d/transformprimitive3d.hxx> #include <basegfx/color/bcolormodifier.hxx> #include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx> -#include <svx/sdr/contact/viewobjectcontactofe3d.hxx> +#include <sdr/contact/viewobjectcontactofe3d.hxx> #include <basegfx/tools/canvastools.hxx> diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx index 037e8c55c0b4..5649d32f0631 100644 --- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/contact/viewobjectcontactofgraphic.hxx> -#include <svx/sdr/contact/viewcontactofgraphic.hxx> +#include <sdr/contact/viewobjectcontactofgraphic.hxx> +#include <sdr/contact/viewcontactofgraphic.hxx> #include <svx/svdograf.hxx> #include <svx/sdr/contact/objectcontact.hxx> #include <svx/svdmodel.hxx> diff --git a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx index 567e4f20811b..7a145bf6e1cf 100644 --- a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx @@ -18,7 +18,7 @@ */ -#include <svx/sdr/contact/viewobjectcontactofgroup.hxx> +#include <sdr/contact/viewobjectcontactofgroup.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <svx/sdr/contact/objectcontact.hxx> #include <basegfx/numeric/ftools.hxx> diff --git a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx index 15fd691f1196..437319b6ab39 100644 --- a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx @@ -18,8 +18,8 @@ */ -#include <svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx> -#include <svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx> +#include <sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx> +#include <sdr/contact/viewcontactofmasterpagedescriptor.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <svx/sdr/contact/objectcontact.hxx> #include <svx/svdpagv.hxx> diff --git a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx index af8a63e7f65f..ff71c14bde19 100644 --- a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx @@ -9,8 +9,8 @@ #include <config_features.h> -#include <svx/sdr/contact/viewobjectcontactofopenglobj.hxx> -#include <svx/sdr/contact/viewcontactofopenglobj.hxx> +#include <sdr/contact/viewobjectcontactofopenglobj.hxx> +#include <sdr/contact/viewcontactofopenglobj.hxx> #include <svdoopengl.hxx> #include <vcl/outdev.hxx> diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx index 81ccab37f8e7..79873095ca46 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx @@ -19,7 +19,7 @@ #include <config_features.h> -#include <svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx> +#include <sdr/contact/viewobjectcontactofsdrmediaobj.hxx> #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <svx/sdr/contact/objectcontact.hxx> diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx index 2d4871a3da44..3ac4ca1e0037 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx @@ -22,7 +22,7 @@ #include <svx/sdr/contact/viewcontactofsdrobj.hxx> #include <svx/sdr/contact/objectcontact.hxx> #include <svx/sdr/contact/displayinfo.hxx> -#include <svx/sdr/contact/objectcontactofpageview.hxx> +#include <sdr/contact/objectcontactofpageview.hxx> #include <svx/sdrpagewindow.hxx> #include <svx/sdrpaintwindow.hxx> #include <svx/svdobj.hxx> diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx index d0fbbeb8ef62..38b73be52b66 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx> +#include <sdr/contact/viewobjectcontactofsdrole2obj.hxx> #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx> -#include <svx/sdr/contact/viewcontactofsdrole2obj.hxx> +#include <sdr/contact/viewcontactofsdrole2obj.hxx> #include <svx/svdoole2.hxx> #include <svx/sdr/contact/objectcontact.hxx> #include <svx/svdview.hxx> diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx index b3926af144d1..43f3f09bc850 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx @@ -18,9 +18,9 @@ */ -#include <svx/sdr/contact/viewobjectcontactofsdrpage.hxx> +#include <sdr/contact/viewobjectcontactofsdrpage.hxx> #include <svx/sdr/contact/displayinfo.hxx> -#include <svx/sdr/contact/viewcontactofsdrpage.hxx> +#include <sdr/contact/viewcontactofsdrpage.hxx> #include <svx/svdview.hxx> #include <svx/svdpage.hxx> #include <svx/sdr/contact/objectcontact.hxx> @@ -30,7 +30,7 @@ #include <drawinglayer/primitive2d/gridprimitive2d.hxx> #include <drawinglayer/primitive2d/helplineprimitive2d.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -#include <svx/sdr/primitive2d/sdrprimitivetools.hxx> +#include <sdr/primitive2d/sdrprimitivetools.hxx> diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 6628d211ea43..d236a9c55b76 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -18,11 +18,11 @@ */ -#include <svx/sdr/contact/viewobjectcontactofunocontrol.hxx> -#include <svx/sdr/contact/viewcontactofunocontrol.hxx> +#include <sdr/contact/viewobjectcontactofunocontrol.hxx> +#include <sdr/contact/viewcontactofunocontrol.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <svx/sdr/properties/properties.hxx> -#include <svx/sdr/contact/objectcontactofpageview.hxx> +#include <sdr/contact/objectcontactofpageview.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <svx/svdouno.hxx> #include <svx/svdpagv.hxx> diff --git a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx index 3e351d54818c..ea717f48529d 100644 --- a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx +++ b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx @@ -21,7 +21,7 @@ #include <vcl/outdev.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <svx/sdr/overlay/overlaytools.hxx> +#include <sdr/overlay/overlaytools.hxx> diff --git a/svx/source/sdr/overlay/overlaybitmapex.cxx b/svx/source/sdr/overlay/overlaybitmapex.cxx index 702db3a18bdc..cf24af631a97 100644 --- a/svx/source/sdr/overlay/overlaybitmapex.cxx +++ b/svx/source/sdr/overlay/overlaybitmapex.cxx @@ -21,7 +21,7 @@ #include <svx/sdr/overlay/overlaybitmapex.hxx> #include <vcl/outdev.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <svx/sdr/overlay/overlaytools.hxx> +#include <sdr/overlay/overlaytools.hxx> diff --git a/svx/source/sdr/overlay/overlaycrosshair.cxx b/svx/source/sdr/overlay/overlaycrosshair.cxx index c24de94c66d6..c3fa5189919d 100644 --- a/svx/source/sdr/overlay/overlaycrosshair.cxx +++ b/svx/source/sdr/overlay/overlaycrosshair.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/overlay/overlaycrosshair.hxx> +#include <sdr/overlay/overlaycrosshair.hxx> #include <vcl/outdev.hxx> -#include <svx/sdr/overlay/overlaytools.hxx> +#include <sdr/overlay/overlaytools.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> diff --git a/svx/source/sdr/overlay/overlayhelpline.cxx b/svx/source/sdr/overlay/overlayhelpline.cxx index f54046cbbfa6..95958b277c6e 100644 --- a/svx/source/sdr/overlay/overlayhelpline.cxx +++ b/svx/source/sdr/overlay/overlayhelpline.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/overlay/overlayhelpline.hxx> +#include <sdr/overlay/overlayhelpline.hxx> #include <vcl/outdev.hxx> #include <basegfx/vector/b2dvector.hxx> -#include <svx/sdr/overlay/overlaytools.hxx> +#include <sdr/overlay/overlaytools.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> diff --git a/svx/source/sdr/overlay/overlayline.cxx b/svx/source/sdr/overlay/overlayline.cxx index c1967d7bc825..17da890f3ce9 100644 --- a/svx/source/sdr/overlay/overlayline.cxx +++ b/svx/source/sdr/overlay/overlayline.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/overlay/overlayline.hxx> +#include <sdr/overlay/overlayline.hxx> #include <vcl/outdev.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx index dabb5cc539c0..e8ee21796624 100644 --- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx +++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/overlay/overlaymanagerbuffered.hxx> +#include <sdr/overlay/overlaymanagerbuffered.hxx> #include <svx/sdrpaintwindow.hxx> #include <vcl/outdev.hxx> #include <basegfx/point/b2dpoint.hxx> diff --git a/svx/source/sdr/overlay/overlayrectangle.cxx b/svx/source/sdr/overlay/overlayrectangle.cxx index 81fe0be629b2..0f1f6b68e245 100644 --- a/svx/source/sdr/overlay/overlayrectangle.cxx +++ b/svx/source/sdr/overlay/overlayrectangle.cxx @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/overlay/overlayrectangle.hxx> +#include <sdr/overlay/overlayrectangle.hxx> #include <vcl/outdev.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/numeric/ftools.hxx> -#include <svx/sdr/overlay/overlaytools.hxx> +#include <sdr/overlay/overlaytools.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/svx/source/sdr/overlay/overlayrollingrectangle.cxx b/svx/source/sdr/overlay/overlayrollingrectangle.cxx index 6ccaf890c95e..a633ab7f0d50 100644 --- a/svx/source/sdr/overlay/overlayrollingrectangle.cxx +++ b/svx/source/sdr/overlay/overlayrollingrectangle.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/overlay/overlayrollingrectangle.hxx> +#include <sdr/overlay/overlayrollingrectangle.hxx> #include <vcl/outdev.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <svx/sdr/overlay/overlaytools.hxx> +#include <sdr/overlay/overlaytools.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx index b63eb2cb51ea..ea0cab69899c 100644 --- a/svx/source/sdr/overlay/overlaytools.cxx +++ b/svx/source/sdr/overlay/overlaytools.cxx @@ -18,7 +18,7 @@ */ -#include <svx/sdr/overlay/overlaytools.hxx> +#include <sdr/overlay/overlaytools.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx> diff --git a/svx/source/sdr/overlay/overlaytriangle.cxx b/svx/source/sdr/overlay/overlaytriangle.cxx index 43afc3a83f21..752a73a6a933 100644 --- a/svx/source/sdr/overlay/overlaytriangle.cxx +++ b/svx/source/sdr/overlay/overlaytriangle.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/overlay/overlaytriangle.hxx> +#include <sdr/overlay/overlaytriangle.hxx> #include <tools/poly.hxx> #include <vcl/outdev.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index 4726d06bcc85..4b3315b999a1 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -73,7 +73,7 @@ #include <drawinglayer/attribute/sdrsceneattribute3d.hxx> #include <drawinglayer/attribute/sdrlightingattribute3d.hxx> #include <drawinglayer/attribute/sdrlightattribute3d.hxx> -#include <svx/sdr/attribute/sdrfilltextattribute.hxx> +#include <sdr/attribute/sdrfilltextattribute.hxx> #include <com/sun/star/drawing/LineCap.hpp> diff --git a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx index 6a8996ea7c79..33c3f37cde41 100644 --- a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx> +#include <sdr/primitive2d/sdrcaptionprimitive2d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> diff --git a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx index 069693ce90d7..b2d5c778a6f4 100644 --- a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx> +#include <sdr/primitive2d/sdrconnectorprimitive2d.hxx> #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx index c5c8271ffa94..d387520fff6d 100644 --- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx> +#include <sdr/primitive2d/sdrcustomshapeprimitive2d.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx index 686601384fea..a12ff99bd98b 100644 --- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx +++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx @@ -31,7 +31,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <drawinglayer/primitive2d/shadowprimitive2d.hxx> #include <svx/sdr/attribute/sdrtextattribute.hxx> -#include <svx/sdr/primitive2d/sdrtextprimitive2d.hxx> +#include <sdr/primitive2d/sdrtextprimitive2d.hxx> #include <svx/svdotext.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <drawinglayer/primitive2d/animatedprimitive2d.hxx> diff --git a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx index 5ec3fe86a50c..19223a0abc44 100644 --- a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/primitive2d/sdrellipseprimitive2d.hxx> +#include <sdr/primitive2d/sdrellipseprimitive2d.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx index b625f2eee7bd..f5bce280e92a 100644 --- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/primitive2d/sdrgrafprimitive2d.hxx> +#include <sdr/primitive2d/sdrgrafprimitive2d.hxx> #include <drawinglayer/primitive2d/graphicprimitive2d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> diff --git a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx index 5b2b45f0c65e..ea9ae60597b6 100644 --- a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx> +#include <sdr/primitive2d/sdrmeasureprimitive2d.hxx> #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <svx/sdr/primitive2d/sdrtextprimitive2d.hxx> +#include <sdr/primitive2d/sdrtextprimitive2d.hxx> #include <svx/sdr/attribute/sdrtextattribute.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/tools/canvastools.hxx> diff --git a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx index 26b6ed69dcb7..acc3349a2758 100644 --- a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/primitive2d/sdrole2primitive2d.hxx> +#include <sdr/primitive2d/sdrole2primitive2d.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx index 17aad02941eb..1eb4279137da 100644 --- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx> +#include <sdr/primitive2d/sdrolecontentprimitive2d.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <svx/svdoole2.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx index dd4f44358983..512098ecf514 100644 --- a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/primitive2d/sdrpathprimitive2d.hxx> +#include <sdr/primitive2d/sdrpathprimitive2d.hxx> #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> diff --git a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx index 518af371d4fe..0ffbee0ec289 100644 --- a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx +++ b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/primitive2d/sdrprimitivetools.hxx> +#include <sdr/primitive2d/sdrprimitivetools.hxx> #include <vcl/bmpacc.hxx> #include <osl/mutex.hxx> #include <vcl/lazydelete.hxx> diff --git a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx index bb9b1e49038e..0822d7cf0018 100644 --- a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx> +#include <sdr/primitive2d/sdrrectangleprimitive2d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index 18e13a0d5db7..158a0d0f500c 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/primitive2d/sdrtextprimitive2d.hxx> +#include <sdr/primitive2d/sdrtextprimitive2d.hxx> #include <svx/svdotext.hxx> #include <basegfx/color/bcolor.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> diff --git a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx index d81a89b412ed..7c996ec560d1 100644 --- a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx +++ b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/primitive3d/sdrattributecreator3d.hxx> +#include <sdr/primitive3d/sdrattributecreator3d.hxx> #include <svx/svx3ditems.hxx> #include <svl/itemset.hxx> #include <com/sun/star/drawing/NormalsKind.hpp> diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index b163ab5054cd..26754384f268 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -18,7 +18,7 @@ */ #include <svx/sdr/properties/attributeproperties.hxx> -#include <svx/sdr/properties/itemsettools.hxx> +#include <sdr/properties/itemsettools.hxx> #include <tools/debug.hxx> #include <svl/itemset.hxx> #include <svl/style.hxx> diff --git a/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx index cd80b357beed..b0900afa35a3 100644 --- a/svx/source/sdr/properties/captionproperties.cxx +++ b/svx/source/sdr/properties/captionproperties.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/properties/captionproperties.hxx> +#include <sdr/properties/captionproperties.hxx> #include <svl/itemset.hxx> #include <svl/style.hxx> #include <svx/svddef.hxx> diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx index fc3b53d1f447..701cce534c6c 100644 --- a/svx/source/sdr/properties/circleproperties.cxx +++ b/svx/source/sdr/properties/circleproperties.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/properties/circleproperties.hxx> +#include <sdr/properties/circleproperties.hxx> #include <svl/itemset.hxx> #include <svl/style.hxx> #include <svx/svddef.hxx> diff --git a/svx/source/sdr/properties/connectorproperties.cxx b/svx/source/sdr/properties/connectorproperties.cxx index 804e083d6749..a65c245ea01e 100644 --- a/svx/source/sdr/properties/connectorproperties.cxx +++ b/svx/source/sdr/properties/connectorproperties.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/properties/connectorproperties.hxx> +#include <sdr/properties/connectorproperties.hxx> #include <svl/itemset.hxx> #include <svl/style.hxx> #include <svx/svddef.hxx> diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx index 72577da11069..d36d33c7d8ad 100644 --- a/svx/source/sdr/properties/customshapeproperties.cxx +++ b/svx/source/sdr/properties/customshapeproperties.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/properties/customshapeproperties.hxx> +#include <sdr/properties/customshapeproperties.hxx> #include <svl/itemset.hxx> #include <svl/style.hxx> #include <svx/svdoashp.hxx> diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx index e8c3dc27735f..ac067fe7478c 100644 --- a/svx/source/sdr/properties/defaultproperties.cxx +++ b/svx/source/sdr/properties/defaultproperties.cxx @@ -18,7 +18,7 @@ */ #include <svx/sdr/properties/defaultproperties.hxx> -#include <svx/sdr/properties/itemsettools.hxx> +#include <sdr/properties/itemsettools.hxx> #include <svl/itemset.hxx> #include <svl/whiter.hxx> diff --git a/svx/source/sdr/properties/e3dextrudeproperties.cxx b/svx/source/sdr/properties/e3dextrudeproperties.cxx index 021df870bf61..596fabf97390 100644 --- a/svx/source/sdr/properties/e3dextrudeproperties.cxx +++ b/svx/source/sdr/properties/e3dextrudeproperties.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/properties/e3dextrudeproperties.hxx> +#include <sdr/properties/e3dextrudeproperties.hxx> #include <svl/itemset.hxx> #include <svx/extrud3d.hxx> diff --git a/svx/source/sdr/properties/e3dlatheproperties.cxx b/svx/source/sdr/properties/e3dlatheproperties.cxx index e7ec4457fe94..cf3cb9bfdff3 100644 --- a/svx/source/sdr/properties/e3dlatheproperties.cxx +++ b/svx/source/sdr/properties/e3dlatheproperties.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/properties/e3dlatheproperties.hxx> +#include <sdr/properties/e3dlatheproperties.hxx> #include <svl/itemset.hxx> #include <svx/lathe3d.hxx> diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx index da8e51f8cbb7..9339a81e389f 100644 --- a/svx/source/sdr/properties/e3dsceneproperties.cxx +++ b/svx/source/sdr/properties/e3dsceneproperties.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/properties/e3dsceneproperties.hxx> +#include <sdr/properties/e3dsceneproperties.hxx> #include <svl/itemset.hxx> #include <svl/whiter.hxx> #include <svx/svddef.hxx> diff --git a/svx/source/sdr/properties/e3dsphereproperties.cxx b/svx/source/sdr/properties/e3dsphereproperties.cxx index 81154b02a338..fa5cfdcf67b3 100644 --- a/svx/source/sdr/properties/e3dsphereproperties.cxx +++ b/svx/source/sdr/properties/e3dsphereproperties.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/properties/e3dsphereproperties.hxx> +#include <sdr/properties/e3dsphereproperties.hxx> #include <svl/itemset.hxx> #include <svx/sphere3d.hxx> diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx index f90b1a2a87ae..6300f5f95e47 100644 --- a/svx/source/sdr/properties/graphicproperties.cxx +++ b/svx/source/sdr/properties/graphicproperties.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/properties/graphicproperties.hxx> +#include <sdr/properties/graphicproperties.hxx> #include <svl/itemset.hxx> #include <svl/style.hxx> #include <svx/svddef.hxx> diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx index 9f6ff55a07c1..e4421f57c602 100644 --- a/svx/source/sdr/properties/groupproperties.cxx +++ b/svx/source/sdr/properties/groupproperties.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/properties/groupproperties.hxx> +#include <sdr/properties/groupproperties.hxx> #include <svl/itemset.hxx> #include <svl/whiter.hxx> #include <svx/svddef.hxx> diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx index 352f96780d5d..ce937b324a9e 100644 --- a/svx/source/sdr/properties/itemsettools.cxx +++ b/svx/source/sdr/properties/itemsettools.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/properties/itemsettools.hxx> +#include <sdr/properties/itemsettools.hxx> #include <tools/debug.hxx> #include <svl/itemset.hxx> #include <svl/whiter.hxx> diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx index 44a7efa68bad..d12404584002 100644 --- a/svx/source/sdr/properties/measureproperties.cxx +++ b/svx/source/sdr/properties/measureproperties.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/properties/measureproperties.hxx> +#include <sdr/properties/measureproperties.hxx> #include <svl/itemset.hxx> #include <svl/style.hxx> #include <svx/svddef.hxx> diff --git a/svx/source/sdr/properties/oleproperties.cxx b/svx/source/sdr/properties/oleproperties.cxx index 9ae5bd19c87c..585b28eb65b0 100644 --- a/svx/source/sdr/properties/oleproperties.cxx +++ b/svx/source/sdr/properties/oleproperties.cxx @@ -18,7 +18,7 @@ */ -#include <svx/sdr/properties/oleproperties.hxx> +#include <sdr/properties/oleproperties.hxx> #include <svl/itemset.hxx> #include <svx/xfillit0.hxx> #include <svx/xlineit0.hxx> diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx index 89714eacbc3a..ece177ab745e 100644 --- a/svx/source/sdr/properties/pageproperties.cxx +++ b/svx/source/sdr/properties/pageproperties.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/properties/pageproperties.hxx> +#include <sdr/properties/pageproperties.hxx> #include <svl/itemset.hxx> #include <svx/svdobj.hxx> #include <svx/svdpool.hxx> diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx index 4388deb40793..7fe8e208559b 100644 --- a/svx/source/sdr/properties/properties.cxx +++ b/svx/source/sdr/properties/properties.cxx @@ -18,7 +18,7 @@ */ #include <svx/sdr/properties/properties.hxx> -#include <svx/sdr/properties/itemsettools.hxx> +#include <sdr/properties/itemsettools.hxx> #include <svl/itemset.hxx> #include <svx/svdogrp.hxx> #include <svx/svditer.hxx> diff --git a/svx/source/svdraw/sdrmasterpagedescriptor.cxx b/svx/source/svdraw/sdrmasterpagedescriptor.cxx index 39ae2a7ab334..9b44726a31dd 100644 --- a/svx/source/svdraw/sdrmasterpagedescriptor.cxx +++ b/svx/source/svdraw/sdrmasterpagedescriptor.cxx @@ -18,7 +18,7 @@ */ #include <svx/sdrmasterpagedescriptor.hxx> -#include <svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx> +#include <sdr/contact/viewcontactofmasterpagedescriptor.hxx> #include <svx/svdpage.hxx> #include <svx/svdobj.hxx> #include <svx/xfillit0.hxx> diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index cfab3ffcd208..6e3cde95fff2 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -30,7 +30,7 @@ #include <svx/svdview.hxx> #include <svx/svdpagv.hxx> #include <svx/sdrpaintwindow.hxx> -#include <svx/sdr/contact/objectcontactofpageview.hxx> +#include <sdr/contact/objectcontactofpageview.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <osl/mutex.hxx> #include <svx/fmview.hxx> diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index 77f3d9d61577..963d7feb6a50 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -18,7 +18,7 @@ */ #include <svx/sdrpaintwindow.hxx> -#include <svx/sdr/overlay/overlaymanagerbuffered.hxx> +#include <sdr/overlay/overlaymanagerbuffered.hxx> #include <svx/svdpntv.hxx> #include <vcl/gdimtf.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index da55ea188a45..8124d7562de8 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -42,7 +42,7 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <svx/sdr/overlay/overlaypolypolygon.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -#include <svx/sdr/overlay/overlayrollingrectangle.hxx> +#include <sdr/overlay/overlayrollingrectangle.hxx> #include <svx/sdrpagewindow.hxx> #include <svx/sdrpaintwindow.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -65,7 +65,7 @@ #include <svx/svdoole2.hxx> #include <svx/svdovirt.hxx> #include <svx/svdouno.hxx> -#include <svx/sdr/primitive2d/sdrprimitivetools.hxx> +#include <sdr/primitive2d/sdrprimitivetools.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <drawinglayer/attribute/sdrlineattribute.hxx> #include <drawinglayer/attribute/sdrlinestartendattribute.hxx> diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 01b2e7803087..a0bbfa1a267e 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -57,7 +57,7 @@ #include <vcl/svapp.hxx> #include <svx/sdrpaintwindow.hxx> #include <svx/sdrundomanager.hxx> -#include <svx/sdr/overlay/overlaytools.hxx> +#include <sdr/overlay/overlaytools.hxx> #include <svx/sdr/table/tablecontroller.hxx> #include <drawinglayer/processor2d/processor2dtools.hxx> diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 754869898a6f..db6345eb7334 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -48,9 +48,9 @@ #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/sdr/overlay/overlayanimatedbitmapex.hxx> #include <svx/sdr/overlay/overlaybitmapex.hxx> -#include <svx/sdr/overlay/overlayline.hxx> -#include <svx/sdr/overlay/overlaytriangle.hxx> -#include <svx/sdr/overlay/overlayrectangle.hxx> +#include <sdr/overlay/overlayline.hxx> +#include <sdr/overlay/overlaytriangle.hxx> +#include <sdr/overlay/overlayrectangle.hxx> #include <svx/sdrpagewindow.hxx> #include <svx/sdrpaintwindow.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 73caddc55615..230cceb516bf 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -42,7 +42,7 @@ #include <svx/svdopath.hxx> #include <svx/scene3d.hxx> #include <svx/svdovirt.hxx> -#include <svx/sdr/overlay/overlayrollingrectangle.hxx> +#include <sdr/overlay/overlayrollingrectangle.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/sdrpaintwindow.hxx> #include <svx/sdrpagewindow.hxx> diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 59591d2b0536..c08039fc4070 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -64,8 +64,8 @@ #include <svx/xlnclit.hxx> #include <svx/svxids.hrc> #include <svl/whiter.hxx> -#include <svx/sdr/properties/customshapeproperties.hxx> -#include <svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx> +#include <sdr/properties/customshapeproperties.hxx> +#include <sdr/contact/viewcontactofsdrobjcustomshape.hxx> #include <svx/xlntrit.hxx> #include <svx/xfltrit.hxx> #include <svx/xflclit.hxx> diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 4693b0c0d476..ca94637feb5a 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -61,7 +61,7 @@ #include <svx/polysc3d.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> -#include <svx/sdr/contact/viewcontactofgraphic.hxx> +#include <sdr/contact/viewcontactofgraphic.hxx> #include <svx/sdr/contact/viewcontactofsdrobj.hxx> #include <svx/sdr/properties/emptyproperties.hxx> #include <svx/sdrhittesthelper.hxx> diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index c9ce50702eb3..4eaefcbed9fc 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -31,8 +31,8 @@ #include "svdglob.hxx" #include "svx/svdstr.hrc" -#include <svx/sdr/contact/viewcontactofsdrcaptionobj.hxx> -#include <svx/sdr/properties/captionproperties.hxx> +#include <sdr/contact/viewcontactofsdrcaptionobj.hxx> +#include <sdr/properties/captionproperties.hxx> #include <svx/sdrhittesthelper.hxx> #include <svx/svddrag.hxx> #include <svx/svdetc.hxx> diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index 83527e135383..1cdf8be3403b 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -29,8 +29,8 @@ #include "svdglob.hxx" #include "svx/svdstr.hrc" -#include <svx/sdr/contact/viewcontactofsdrcircobj.hxx> -#include <svx/sdr/properties/circleproperties.hxx> +#include <sdr/contact/viewcontactofsdrcircobj.hxx> +#include <sdr/properties/circleproperties.hxx> #include <svx/svdattr.hxx> #include <svx/svddrag.hxx> #include <svx/svdetc.hxx> diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 88dc8d0da641..c25513de3c6f 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -28,8 +28,8 @@ #include <svl/smplhint.hxx> #include <svl/style.hxx> -#include <svx/sdr/contact/viewcontactofsdredgeobj.hxx> -#include <svx/sdr/properties/connectorproperties.hxx> +#include <sdr/contact/viewcontactofsdredgeobj.hxx> +#include <sdr/properties/connectorproperties.hxx> #include <svx/sdrhittesthelper.hxx> #include <svx/svddrag.hxx> #include <svx/svddrgv.hxx> diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 5404f87dfa73..df6189d5d3de 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -53,8 +53,8 @@ #include "svdfmtf.hxx" #include <svx/sdgcpitm.hxx> #include <editeng/eeitem.hxx> -#include <svx/sdr/properties/graphicproperties.hxx> -#include <svx/sdr/contact/viewcontactofgraphic.hxx> +#include <sdr/properties/graphicproperties.hxx> +#include <sdr/contact/viewcontactofgraphic.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx index e583ed8cc581..3c30b4dd16da 100644 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -43,8 +43,8 @@ #include <svx/svxids.hrc> #include <svl/whiter.hxx> #include <svx/svdpool.hxx> -#include <svx/sdr/properties/groupproperties.hxx> -#include <svx/sdr/contact/viewcontactofgroup.hxx> +#include <sdr/properties/groupproperties.hxx> +#include <sdr/contact/viewcontactofgroup.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index e457ed5c6596..0ff149354218 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -37,8 +37,8 @@ #include <svl/smplhint.hxx> #include <svl/style.hxx> -#include <svx/sdr/contact/viewcontactofsdrmeasureobj.hxx> -#include <svx/sdr/properties/measureproperties.hxx> +#include <sdr/contact/viewcontactofsdrmeasureobj.hxx> +#include <sdr/properties/measureproperties.hxx> #include <svx/svddrag.hxx> #include <svx/svdhdl.hxx> #include <svx/svdmodel.hxx> diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 95d5109d3834..e01dae90f35a 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -72,9 +72,9 @@ #include <svx/svdview.hxx> #include "unomlstr.hxx" #include <svx/charthelper.hxx> -#include <svx/sdr/contact/viewcontactofsdrole2obj.hxx> +#include <sdr/contact/viewcontactofsdrole2obj.hxx> #include <svx/svdograf.hxx> -#include <svx/sdr/properties/oleproperties.hxx> +#include <sdr/properties/oleproperties.hxx> #include <svx/xlnclit.hxx> #include <svx/xbtmpit.hxx> #include <svx/xflbmtit.hxx> diff --git a/svx/source/svdraw/svdoopengl.cxx b/svx/source/svdraw/svdoopengl.cxx index 089cee3a2a46..f1e8398cf057 100644 --- a/svx/source/svdraw/svdoopengl.cxx +++ b/svx/source/svdraw/svdoopengl.cxx @@ -10,7 +10,7 @@ #include <config_features.h> #include <svdoopengl.hxx> -#include <svx/sdr/contact/viewcontactofopenglobj.hxx> +#include <sdr/contact/viewcontactofopenglobj.hxx> #include <vcl/opengl/IOpenGLRenderer.hxx> diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx index b6e3fcd3d534..409c2b16f535 100644 --- a/svx/source/svdraw/svdopage.cxx +++ b/svx/source/svdraw/svdopage.cxx @@ -29,7 +29,7 @@ #include <svx/svdoutl.hxx> #include <svtools/colorcfg.hxx> #include <svl/itemset.hxx> -#include <svx/sdr/properties/pageproperties.hxx> +#include <sdr/properties/pageproperties.hxx> #include <svx/sdr/contact/viewcontactofpageobj.hxx> diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index f001b802e765..8c96c9fcb56d 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -40,7 +40,7 @@ #include <svx/svdogrp.hxx> #include <svx/polypolygoneditor.hxx> #include <svx/xlntrit.hxx> -#include <svx/sdr/contact/viewcontactofsdrpathobj.hxx> +#include <sdr/contact/viewcontactofsdrpathobj.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include "svdconv.hxx" #include <basegfx/point/b2dpoint.hxx> diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 417cacca12ea..8767e5d74fc7 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -23,7 +23,7 @@ #include <svx/svdpage.hxx> #include <svx/svdotext.hxx> #include <basegfx/vector/b2dvector.hxx> -#include <svx/sdr/primitive2d/sdrtextprimitive2d.hxx> +#include <sdr/primitive2d/sdrtextprimitive2d.hxx> #include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx> #include <basegfx/range/b2drange.hxx> diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index 9ab93331df46..4e87e4cd7896 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -21,7 +21,7 @@ #include <svx/svdotext.hxx> #include <svx/svdoutl.hxx> #include <basegfx/vector/b2dvector.hxx> -#include <svx/sdr/primitive2d/sdrtextprimitive2d.hxx> +#include <sdr/primitive2d/sdrtextprimitive2d.hxx> #include <basegfx/range/b2drange.hxx> #include <svl/itemset.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> @@ -55,7 +55,7 @@ #include <editeng/editstat.hxx> #include <svx/unoapi.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> -#include <svx/sdr/attribute/sdrformtextoutlineattribute.hxx> +#include <sdr/attribute/sdrformtextoutlineattribute.hxx> diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index a0267ddae4ca..25997de5c3af 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -27,7 +27,7 @@ #include <svx/svdmodel.hxx> #include <editeng/editdata.hxx> #include <editeng/outliner.hxx> -#include <svx/sdr/properties/itemsettools.hxx> +#include <sdr/properties/itemsettools.hxx> #include <svx/sdr/properties/properties.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <svl/itemset.hxx> diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index f79bab6ad5ac..cb6e1ad300ce 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/contact/viewcontactofunocontrol.hxx> -#include <svx/sdr/contact/viewobjectcontactofunocontrol.hxx> +#include <sdr/contact/viewcontactofunocontrol.hxx> +#include <sdr/contact/viewobjectcontactofunocontrol.hxx> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/PosSize.hpp> diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 873e9d80daef..b0a9c4477c6e 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -49,7 +49,7 @@ #include <svx/fmdpage.hxx> #include <sfx2/objsh.hxx> -#include <svx/sdr/contact/viewcontactofsdrpage.hxx> +#include <sdr/contact/viewcontactofsdrpage.hxx> #include <svx/sdr/contact/viewobjectcontact.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <algorithm> diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index 31545c923556..39ffbaa5e02a 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -36,7 +36,7 @@ #include <svx/svdtypes.hxx> #include <svx/svdoole2.hxx> -#include <svx/sdr/contact/objectcontactofpageview.hxx> +#include <sdr/contact/objectcontactofpageview.hxx> #include <svx/sdr/contact/viewobjectcontactredirector.hxx> #include <svx/fmview.hxx> diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 36d7a415a105..180396120b1e 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -42,7 +42,7 @@ #include "svx/svditer.hxx" #include <svx/svdouno.hxx> #include <svx/sdr/overlay/overlayobjectlist.hxx> -#include <svx/sdr/overlay/overlayrollingrectangle.hxx> +#include <sdr/overlay/overlayrollingrectangle.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <sxlayitm.hxx> #include <svl/itemiter.hxx> diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx index 823e2193d332..00a61b109137 100644 --- a/svx/source/svdraw/svdsnpv.cxx +++ b/svx/source/svdraw/svdsnpv.cxx @@ -27,8 +27,8 @@ #include <svx/svdpage.hxx> #include "svx/svditer.hxx" #include <svx/sdr/overlay/overlayobjectlist.hxx> -#include <svx/sdr/overlay/overlaycrosshair.hxx> -#include <svx/sdr/overlay/overlayhelpline.hxx> +#include <sdr/overlay/overlaycrosshair.hxx> +#include <sdr/overlay/overlayhelpline.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdrpaintwindow.hxx> diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 58527d898ab9..b51142e6a50e 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -33,14 +33,14 @@ #include <editeng/editdata.hxx> #include <editeng/outlobj.hxx> #include <svx/svdogrp.hxx> -#include <svx/sdr/properties/itemsettools.hxx> +#include <sdr/properties/itemsettools.hxx> #include <svx/sdr/properties/properties.hxx> #include <svx/svdocapt.hxx> #include <svl/whiter.hxx> #include <svx/e3dsceneupdater.hxx> #include <svx/svdviter.hxx> #include <svx/svdograf.hxx> -#include <svx/sdr/contact/viewcontactofgraphic.hxx> +#include <sdr/contact/viewcontactofgraphic.hxx> #include <svx/svdotable.hxx> // #i124389# diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx index 1c93064a7bb2..4eac136b287a 100644 --- a/svx/source/table/tablehandles.cxx +++ b/svx/source/table/tablehandles.cxx @@ -35,7 +35,7 @@ #include <svx/svdmrkv.hxx> #include <svx/svdpagv.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> -#include <svx/sdr/overlay/overlayrectangle.hxx> +#include <sdr/overlay/overlayrectangle.hxx> #include <drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx> namespace sdr { namespace table { diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx index a98fe20e1db9..bc87338bb96f 100644 --- a/svx/source/table/viewcontactoftableobj.cxx +++ b/svx/source/table/viewcontactoftableobj.cxx @@ -32,7 +32,7 @@ #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <editeng/borderline.hxx> #include <drawinglayer/primitive2d/borderlineprimitive2d.hxx> -#include <svx/sdr/attribute/sdrfilltextattribute.hxx> +#include <sdr/attribute/sdrfilltextattribute.hxx> #include <drawinglayer/attribute/sdrlineattribute.hxx> #include <drawinglayer/attribute/sdrshadowattribute.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> |