[Libreoffice-commits] core.git: 2 commits - forms/source include/svx svx/inc svx/source

Tue May 6 04:54:11 PDT 2014

forms/source/component/Currency.cxx                                 |    2 
 include/svx/sdr/attribute/sdrfilltextattribute.hxx                  |   65 -
 include/svx/sdr/attribute/sdrformtextoutlineattribute.hxx           |   74 --
 include/svx/sdr/contact/objectcontactofpageview.hxx                 |  144 ----
 include/svx/sdr/contact/viewcontactofe3dcube.hxx                    |   61 -
 include/svx/sdr/contact/viewcontactofe3dextrude.hxx                 |   61 -
 include/svx/sdr/contact/viewcontactofe3dlathe.hxx                   |   61 -
 include/svx/sdr/contact/viewcontactofe3dpolygon.hxx                 |   61 -
 include/svx/sdr/contact/viewcontactofe3dsphere.hxx                  |   61 -
 include/svx/sdr/contact/viewcontactofgraphic.hxx                    |   85 --
 include/svx/sdr/contact/viewcontactofgroup.hxx                      |   67 -
 include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx       |   77 --
 include/svx/sdr/contact/viewcontactofopenglobj.hxx                  |   37 -
 include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx              |   62 -
 include/svx/sdr/contact/viewcontactofsdrcircobj.hxx                 |   62 -
 include/svx/sdr/contact/viewcontactofsdredgeobj.hxx                 |   62 -
 include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx              |   62 -
 include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx          |   65 -
 include/svx/sdr/contact/viewcontactofsdrole2obj.hxx                 |   84 --
 include/svx/sdr/contact/viewcontactofsdrpage.hxx                    |  303 --------
 include/svx/sdr/contact/viewcontactofsdrpathobj.hxx                 |   62 -
 include/svx/sdr/contact/viewcontactofunocontrol.hxx                 |   92 --
 include/svx/sdr/contact/viewobjectcontactofe3d.hxx                  |   74 --
 include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx             |   54 -
 include/svx/sdr/contact/viewobjectcontactofgraphic.hxx              |   73 --
 include/svx/sdr/contact/viewobjectcontactofgroup.hxx                |   54 -
 include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx |   57 -
 include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx            |   36 -
 include/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx          |   66 -
 include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx           |   54 -
 include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx              |  238 -------
 include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx           |  131 ---
 include/svx/sdr/overlay/overlaycrosshair.hxx                        |   51 -
 include/svx/sdr/overlay/overlayhatchrect.hxx                        |   71 --
 include/svx/sdr/overlay/overlayhelpline.hxx                         |   60 -
 include/svx/sdr/overlay/overlayline.hxx                             |   59 -
 include/svx/sdr/overlay/overlaymanagerbuffered.hxx                  |   98 --
 include/svx/sdr/overlay/overlayrectangle.hxx                        |   86 --
 include/svx/sdr/overlay/overlayrollingrectangle.hxx                 |   75 --
 include/svx/sdr/overlay/overlaytools.hxx                            |  275 --------
 include/svx/sdr/overlay/overlaytriangle.hxx                         |   62 -
 include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx               |   79 --
 include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx             |   68 --
 include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx           |   89 --
 include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx               |  112 ---
 include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx                  |   76 --
 include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx               |  125 ---
 include/svx/sdr/primitive2d/sdrole2primitive2d.hxx                  |   70 --
 include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx            |   80 --
 include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx                  |   72 --
 include/svx/sdr/primitive2d/sdrprimitivetools.hxx                   |   49 -
 include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx             |   81 --
 include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx                  |  338 ----------
 include/svx/sdr/primitive3d/sdrattributecreator3d.hxx               |   55 -
 include/svx/sdr/properties/captionproperties.hxx                    |   67 -
 include/svx/sdr/properties/circleproperties.hxx                     |   67 -
 include/svx/sdr/properties/connectorproperties.hxx                  |   63 -
 include/svx/sdr/properties/customshapeproperties.hxx                |   91 --
 include/svx/sdr/properties/e3dextrudeproperties.hxx                 |   58 -
 include/svx/sdr/properties/e3dlatheproperties.hxx                   |   58 -
 include/svx/sdr/properties/e3dsceneproperties.hxx                   |   88 --
 include/svx/sdr/properties/e3dsphereproperties.hxx                  |   57 -
 include/svx/sdr/properties/graphicproperties.hxx                    |   67 -
 include/svx/sdr/properties/groupproperties.hxx                      |  121 ---
 include/svx/sdr/properties/itemsettools.hxx                         |   68 --
 include/svx/sdr/properties/measureproperties.hxx                    |   67 -
 include/svx/sdr/properties/oleproperties.hxx                        |   58 -
 include/svx/sdr/properties/pageproperties.hxx                       |   73 --
 svx/inc/sdr/attribute/sdrfilltextattribute.hxx                      |   65 +
 svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx               |   74 ++
 svx/inc/sdr/contact/objectcontactofpageview.hxx                     |  144 ++++
 svx/inc/sdr/contact/viewcontactofe3dcube.hxx                        |   61 +
 svx/inc/sdr/contact/viewcontactofe3dextrude.hxx                     |   61 +
 svx/inc/sdr/contact/viewcontactofe3dlathe.hxx                       |   61 +
 svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx                     |   61 +
 svx/inc/sdr/contact/viewcontactofe3dsphere.hxx                      |   61 +
 svx/inc/sdr/contact/viewcontactofgraphic.hxx                        |   85 ++
 svx/inc/sdr/contact/viewcontactofgroup.hxx                          |   67 +
 svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx           |   77 ++
 svx/inc/sdr/contact/viewcontactofopenglobj.hxx                      |   37 +
 svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx                  |   62 +
 svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx                     |   62 +
 svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx                     |   62 +
 svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx                  |   62 +
 svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx              |   65 +
 svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx                     |   84 ++
 svx/inc/sdr/contact/viewcontactofsdrpage.hxx                        |  303 ++++++++
 svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx                     |   62 +
 svx/inc/sdr/contact/viewcontactofunocontrol.hxx                     |   92 ++
 svx/inc/sdr/contact/viewobjectcontactofe3d.hxx                      |   74 ++
 svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx                 |   54 +
 svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx                  |   73 ++
 svx/inc/sdr/contact/viewobjectcontactofgroup.hxx                    |   54 +
 svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx     |   57 +
 svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx                |   36 +
 svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx              |   66 +
 svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx               |   54 +
 svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx                  |  238 +++++++
 svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx               |  131 +++
 svx/inc/sdr/overlay/overlaycrosshair.hxx                            |   51 +
 svx/inc/sdr/overlay/overlayhatchrect.hxx                            |   71 ++
 svx/inc/sdr/overlay/overlayhelpline.hxx                             |   60 +
 svx/inc/sdr/overlay/overlayline.hxx                                 |   59 +
 svx/inc/sdr/overlay/overlaymanagerbuffered.hxx                      |   98 ++
 svx/inc/sdr/overlay/overlayrectangle.hxx                            |   86 ++
 svx/inc/sdr/overlay/overlayrollingrectangle.hxx                     |   75 ++
 svx/inc/sdr/overlay/overlaytools.hxx                                |  275 ++++++++
 svx/inc/sdr/overlay/overlaytriangle.hxx                             |   62 +
 svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx                   |   79 ++
 svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx                 |   68 ++
 svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx               |   89 ++
 svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx                   |  112 +++
 svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx                      |   76 ++
 svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx                   |  125 +++
 svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx                      |   70 ++
 svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx                |   80 ++
 svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx                      |   72 ++
 svx/inc/sdr/primitive2d/sdrprimitivetools.hxx                       |   49 +
 svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx                 |   81 ++
 svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx                      |  338 ++++++++++
 svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx                   |   55 +
 svx/inc/sdr/properties/captionproperties.hxx                        |   67 +
 svx/inc/sdr/properties/circleproperties.hxx                         |   67 +
 svx/inc/sdr/properties/connectorproperties.hxx                      |   63 +
 svx/inc/sdr/properties/customshapeproperties.hxx                    |   91 ++
 svx/inc/sdr/properties/e3dextrudeproperties.hxx                     |   58 +
 svx/inc/sdr/properties/e3dlatheproperties.hxx                       |   58 +
 svx/inc/sdr/properties/e3dsceneproperties.hxx                       |   88 ++
 svx/inc/sdr/properties/e3dsphereproperties.hxx                      |   57 +
 svx/inc/sdr/properties/graphicproperties.hxx                        |   67 +
 svx/inc/sdr/properties/groupproperties.hxx                          |  121 +++
 svx/inc/sdr/properties/itemsettools.hxx                             |   68 ++
 svx/inc/sdr/properties/measureproperties.hxx                        |   67 +
 svx/inc/sdr/properties/oleproperties.hxx                            |   58 +
 svx/inc/sdr/properties/pageproperties.hxx                           |   73 ++
 svx/source/engine3d/cube3d.cxx                                      |    2 
 svx/source/engine3d/extrud3d.cxx                                    |    4 
 svx/source/engine3d/lathe3d.cxx                                     |    4 
 svx/source/engine3d/polygn3d.cxx                                    |    2 
 svx/source/engine3d/scene3d.cxx                                     |    2 
 svx/source/engine3d/sphere3d.cxx                                    |    4 
 svx/source/sdr/attribute/sdrfilltextattribute.cxx                   |    2 
 svx/source/sdr/attribute/sdrformtextattribute.cxx                   |    2 
 svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx            |    2 
 svx/source/sdr/contact/objectcontactofpageview.cxx                  |    4 
 svx/source/sdr/contact/sdrmediawindow.cxx                           |    2 
 svx/source/sdr/contact/viewcontact.cxx                              |    2 
 svx/source/sdr/contact/viewcontactofe3d.cxx                         |    2 
 svx/source/sdr/contact/viewcontactofe3dcube.cxx                     |    4 
 svx/source/sdr/contact/viewcontactofe3dextrude.cxx                  |    4 
 svx/source/sdr/contact/viewcontactofe3dlathe.cxx                    |    4 
 svx/source/sdr/contact/viewcontactofe3dpolygon.cxx                  |    4 
 svx/source/sdr/contact/viewcontactofe3dscene.cxx                    |    2 
 svx/source/sdr/contact/viewcontactofe3dsphere.cxx                   |    4 
 svx/source/sdr/contact/viewcontactofgraphic.cxx                     |    8 
 svx/source/sdr/contact/viewcontactofgroup.cxx                       |    4 
 svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx        |    6 
 svx/source/sdr/contact/viewcontactofopenglobj.cxx                   |    4 
 svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx               |    4 
 svx/source/sdr/contact/viewcontactofsdrcircobj.cxx                  |    4 
 svx/source/sdr/contact/viewcontactofsdredgeobj.cxx                  |    4 
 svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx               |    4 
 svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx                 |    2 
 svx/source/sdr/contact/viewcontactofsdrobj.cxx                      |    2 
 svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx           |    4 
 svx/source/sdr/contact/viewcontactofsdrole2obj.cxx                  |    8 
 svx/source/sdr/contact/viewcontactofsdrpage.cxx                     |    4 
 svx/source/sdr/contact/viewcontactofsdrpathobj.cxx                  |    4 
 svx/source/sdr/contact/viewcontactofsdrrectobj.cxx                  |    4 
 svx/source/sdr/contact/viewcontactofunocontrol.cxx                  |    6 
 svx/source/sdr/contact/viewobjectcontactofe3d.cxx                   |    4 
 svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx              |    4 
 svx/source/sdr/contact/viewobjectcontactofgraphic.cxx               |    4 
 svx/source/sdr/contact/viewobjectcontactofgroup.cxx                 |    2 
 svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx  |    4 
 svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx             |    4 
 svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx           |    2 
 svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx                |    2 
 svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx            |    4 
 svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx               |    6 
 svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx            |    6 
 svx/source/sdr/overlay/overlayanimatedbitmapex.cxx                  |    2 
 svx/source/sdr/overlay/overlaybitmapex.cxx                          |    2 
 svx/source/sdr/overlay/overlaycrosshair.cxx                         |    4 
 svx/source/sdr/overlay/overlayhelpline.cxx                          |    4 
 svx/source/sdr/overlay/overlayline.cxx                              |    2 
 svx/source/sdr/overlay/overlaymanagerbuffered.cxx                   |    2 
 svx/source/sdr/overlay/overlayrectangle.cxx                         |    4 
 svx/source/sdr/overlay/overlayrollingrectangle.cxx                  |    4 
 svx/source/sdr/overlay/overlaytools.cxx                             |    2 
 svx/source/sdr/overlay/overlaytriangle.cxx                          |    2 
 svx/source/sdr/primitive2d/sdrattributecreator.cxx                  |    2 
 svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx                |    2 
 svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx              |    2 
 svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx            |    2 
 svx/source/sdr/primitive2d/sdrdecompositiontools.cxx                |    2 
 svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx                |    2 
 svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx                   |    2 
 svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx                |    4 
 svx/source/sdr/primitive2d/sdrole2primitive2d.cxx                   |    2 
 svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx             |    2 
 svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx                   |    2 
 svx/source/sdr/primitive2d/sdrprimitivetools.cxx                    |    2 
 svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx              |    2 
 svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx                   |    2 
 svx/source/sdr/primitive3d/sdrattributecreator3d.cxx                |    2 
 svx/source/sdr/properties/attributeproperties.cxx                   |    2 
 svx/source/sdr/properties/captionproperties.cxx                     |    2 
 svx/source/sdr/properties/circleproperties.cxx                      |    2 
 svx/source/sdr/properties/connectorproperties.cxx                   |    2 
 svx/source/sdr/properties/customshapeproperties.cxx                 |    2 
 svx/source/sdr/properties/defaultproperties.cxx                     |    2 
 svx/source/sdr/properties/e3dextrudeproperties.cxx                  |    2 
 svx/source/sdr/properties/e3dlatheproperties.cxx                    |    2 
 svx/source/sdr/properties/e3dsceneproperties.cxx                    |    2 
 svx/source/sdr/properties/e3dsphereproperties.cxx                   |    2 
 svx/source/sdr/properties/graphicproperties.cxx                     |    2 
 svx/source/sdr/properties/groupproperties.cxx                       |    2 
 svx/source/sdr/properties/itemsettools.cxx                          |    2 
 svx/source/sdr/properties/measureproperties.cxx                     |    2 
 svx/source/sdr/properties/oleproperties.cxx                         |    2 
 svx/source/sdr/properties/pageproperties.cxx                        |    2 
 svx/source/sdr/properties/properties.cxx                            |    2 
 svx/source/svdraw/sdrmasterpagedescriptor.cxx                       |    2 
 svx/source/svdraw/sdrpagewindow.cxx                                 |    2 
 svx/source/svdraw/sdrpaintwindow.cxx                                |    2 
 svx/source/svdraw/svddrgmt.cxx                                      |    4 
 svx/source/svdraw/svdedxv.cxx                                       |    2 
 svx/source/svdraw/svdhdl.cxx                                        |    6 
 svx/source/svdraw/svdmrkv.cxx                                       |    2 
 svx/source/svdraw/svdoashp.cxx                                      |    4 
 svx/source/svdraw/svdobj.cxx                                        |    2 
 svx/source/svdraw/svdocapt.cxx                                      |    4 
 svx/source/svdraw/svdocirc.cxx                                      |    4 
 svx/source/svdraw/svdoedge.cxx                                      |    4 
 svx/source/svdraw/svdograf.cxx                                      |    4 
 svx/source/svdraw/svdogrp.cxx                                       |    4 
 svx/source/svdraw/svdomeas.cxx                                      |    4 
 svx/source/svdraw/svdoole2.cxx                                      |    4 
 svx/source/svdraw/svdoopengl.cxx                                    |    2 
 svx/source/svdraw/svdopage.cxx                                      |    2 
 svx/source/svdraw/svdopath.cxx                                      |    2 
 svx/source/svdraw/svdotextdecomposition.cxx                         |    2 
 svx/source/svdraw/svdotextpathdecomposition.cxx                     |    4 
 svx/source/svdraw/svdotxtr.cxx                                      |    2 
 svx/source/svdraw/svdouno.cxx                                       |    4 
 svx/source/svdraw/svdpage.cxx                                       |    2 
 svx/source/svdraw/svdpagv.cxx                                       |    2 
 svx/source/svdraw/svdpntv.cxx                                       |    2 
 svx/source/svdraw/svdsnpv.cxx                                       |    4 
 svx/source/svdraw/svdundo.cxx                                       |    4 
 svx/source/table/tablehandles.cxx                                   |    2 
 svx/source/table/viewcontactoftableobj.cxx                          |    2 
 253 files changed, 5857 insertions(+), 5857 deletions(-)

New commits:
commit aa8abbe736b0c8ad54f208916b0eca2d04ebd396
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue May 6 14:52:33 2014 +0300

    Move headers included only in svx from include/svx/sdr/* to svx/inc/sdr/*
    
    Change-Id: I084cbab30dfb0a7d567d1b172a79320687d20a06

diff --git a/include/svx/sdr/attribute/sdrfilltextattribute.hxx b/svx/inc/sdr/attribute/sdrfilltextattribute.hxx
similarity index 100%
rename from include/svx/sdr/attribute/sdrfilltextattribute.hxx
rename to svx/inc/sdr/attribute/sdrfilltextattribute.hxx
diff --git a/include/svx/sdr/attribute/sdrformtextoutlineattribute.hxx b/svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx
similarity index 100%
rename from include/svx/sdr/attribute/sdrformtextoutlineattribute.hxx
rename to svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx
diff --git a/include/svx/sdr/contact/objectcontactofpageview.hxx b/svx/inc/sdr/contact/objectcontactofpageview.hxx
similarity index 100%
rename from include/svx/sdr/contact/objectcontactofpageview.hxx
rename to svx/inc/sdr/contact/objectcontactofpageview.hxx
diff --git a/include/svx/sdr/contact/viewcontactofe3dcube.hxx b/svx/inc/sdr/contact/viewcontactofe3dcube.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewcontactofe3dcube.hxx
rename to svx/inc/sdr/contact/viewcontactofe3dcube.hxx
diff --git a/include/svx/sdr/contact/viewcontactofe3dextrude.hxx b/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewcontactofe3dextrude.hxx
rename to svx/inc/sdr/contact/viewcontactofe3dextrude.hxx
diff --git a/include/svx/sdr/contact/viewcontactofe3dlathe.hxx b/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewcontactofe3dlathe.hxx
rename to svx/inc/sdr/contact/viewcontactofe3dlathe.hxx
diff --git a/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx b/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewcontactofe3dpolygon.hxx
rename to svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx
diff --git a/include/svx/sdr/contact/viewcontactofe3dsphere.hxx b/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewcontactofe3dsphere.hxx
rename to svx/inc/sdr/contact/viewcontactofe3dsphere.hxx
diff --git a/include/svx/sdr/contact/viewcontactofgraphic.hxx b/svx/inc/sdr/contact/viewcontactofgraphic.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewcontactofgraphic.hxx
rename to svx/inc/sdr/contact/viewcontactofgraphic.hxx
diff --git a/include/svx/sdr/contact/viewcontactofgroup.hxx b/svx/inc/sdr/contact/viewcontactofgroup.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewcontactofgroup.hxx
rename to svx/inc/sdr/contact/viewcontactofgroup.hxx
diff --git a/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx b/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx
rename to svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx
diff --git a/include/svx/sdr/contact/viewcontactofopenglobj.hxx b/svx/inc/sdr/contact/viewcontactofopenglobj.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewcontactofopenglobj.hxx
rename to svx/inc/sdr/contact/viewcontactofopenglobj.hxx
diff --git a/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx
rename to svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx
diff --git a/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewcontactofsdrcircobj.hxx
rename to svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx
diff --git a/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx b/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewcontactofsdredgeobj.hxx
rename to svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx
diff --git a/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx
rename to svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx
diff --git a/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx b/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx
rename to svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx
diff --git a/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx b/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewcontactofsdrole2obj.hxx
rename to svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx
diff --git a/include/svx/sdr/contact/viewcontactofsdrpage.hxx b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewcontactofsdrpage.hxx
rename to svx/inc/sdr/contact/viewcontactofsdrpage.hxx
diff --git a/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewcontactofsdrpathobj.hxx
rename to svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx
diff --git a/include/svx/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewcontactofunocontrol.hxx
rename to svx/inc/sdr/contact/viewcontactofunocontrol.hxx
diff --git a/include/svx/sdr/contact/viewobjectcontactofe3d.hxx b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewobjectcontactofe3d.hxx
rename to svx/inc/sdr/contact/viewobjectcontactofe3d.hxx
diff --git a/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx b/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx
rename to svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx
diff --git a/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx b/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewobjectcontactofgraphic.hxx
rename to svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx
diff --git a/include/svx/sdr/contact/viewobjectcontactofgroup.hxx b/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewobjectcontactofgroup.hxx
rename to svx/inc/sdr/contact/viewobjectcontactofgroup.hxx
diff --git a/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx b/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
rename to svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
diff --git a/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx b/svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx
rename to svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx
diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
rename to svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx
rename to svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx
diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx
rename to svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx
diff --git a/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
similarity index 100%
rename from include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
rename to svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
diff --git a/include/svx/sdr/overlay/overlaycrosshair.hxx b/svx/inc/sdr/overlay/overlaycrosshair.hxx
similarity index 100%
rename from include/svx/sdr/overlay/overlaycrosshair.hxx
rename to svx/inc/sdr/overlay/overlaycrosshair.hxx
diff --git a/include/svx/sdr/overlay/overlayhatchrect.hxx b/svx/inc/sdr/overlay/overlayhatchrect.hxx
similarity index 100%
rename from include/svx/sdr/overlay/overlayhatchrect.hxx
rename to svx/inc/sdr/overlay/overlayhatchrect.hxx
diff --git a/include/svx/sdr/overlay/overlayhelpline.hxx b/svx/inc/sdr/overlay/overlayhelpline.hxx
similarity index 100%
rename from include/svx/sdr/overlay/overlayhelpline.hxx
rename to svx/inc/sdr/overlay/overlayhelpline.hxx
diff --git a/include/svx/sdr/overlay/overlayline.hxx b/svx/inc/sdr/overlay/overlayline.hxx
similarity index 100%
rename from include/svx/sdr/overlay/overlayline.hxx
rename to svx/inc/sdr/overlay/overlayline.hxx
diff --git a/include/svx/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
similarity index 100%
rename from include/svx/sdr/overlay/overlaymanagerbuffered.hxx
rename to svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
diff --git a/include/svx/sdr/overlay/overlayrectangle.hxx b/svx/inc/sdr/overlay/overlayrectangle.hxx
similarity index 100%
rename from include/svx/sdr/overlay/overlayrectangle.hxx
rename to svx/inc/sdr/overlay/overlayrectangle.hxx
diff --git a/include/svx/sdr/overlay/overlayrollingrectangle.hxx b/svx/inc/sdr/overlay/overlayrollingrectangle.hxx
similarity index 100%
rename from include/svx/sdr/overlay/overlayrollingrectangle.hxx
rename to svx/inc/sdr/overlay/overlayrollingrectangle.hxx
diff --git a/include/svx/sdr/overlay/overlaytools.hxx b/svx/inc/sdr/overlay/overlaytools.hxx
similarity index 100%
rename from include/svx/sdr/overlay/overlaytools.hxx
rename to svx/inc/sdr/overlay/overlaytools.hxx
diff --git a/include/svx/sdr/overlay/overlaytriangle.hxx b/svx/inc/sdr/overlay/overlaytriangle.hxx
similarity index 100%
rename from include/svx/sdr/overlay/overlaytriangle.hxx
rename to svx/inc/sdr/overlay/overlaytriangle.hxx
diff --git a/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx
similarity index 100%
rename from include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx
rename to svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx
diff --git a/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx
similarity index 100%
rename from include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx
rename to svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx
diff --git a/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
similarity index 100%
rename from include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
rename to svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
diff --git a/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx
similarity index 100%
rename from include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx
rename to svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx
diff --git a/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx
similarity index 100%
rename from include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx
rename to svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx
diff --git a/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx
similarity index 100%
rename from include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
rename to svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx
diff --git a/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx b/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx
similarity index 100%
rename from include/svx/sdr/primitive2d/sdrole2primitive2d.hxx
rename to svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx
diff --git a/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
similarity index 100%
rename from include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
rename to svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
diff --git a/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx
similarity index 100%
rename from include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx
rename to svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx
diff --git a/include/svx/sdr/primitive2d/sdrprimitivetools.hxx b/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx
similarity index 100%
rename from include/svx/sdr/primitive2d/sdrprimitivetools.hxx
rename to svx/inc/sdr/primitive2d/sdrprimitivetools.hxx
diff --git a/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx
similarity index 100%
rename from include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx
rename to svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx
diff --git a/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
similarity index 100%
rename from include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
rename to svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
diff --git a/include/svx/sdr/primitive3d/sdrattributecreator3d.hxx b/svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx
similarity index 100%
rename from include/svx/sdr/primitive3d/sdrattributecreator3d.hxx
rename to svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx
diff --git a/include/svx/sdr/properties/captionproperties.hxx b/svx/inc/sdr/properties/captionproperties.hxx
similarity index 100%
rename from include/svx/sdr/properties/captionproperties.hxx
rename to svx/inc/sdr/properties/captionproperties.hxx
diff --git a/include/svx/sdr/properties/circleproperties.hxx b/svx/inc/sdr/properties/circleproperties.hxx
similarity index 100%
rename from include/svx/sdr/properties/circleproperties.hxx
rename to svx/inc/sdr/properties/circleproperties.hxx
diff --git a/include/svx/sdr/properties/connectorproperties.hxx b/svx/inc/sdr/properties/connectorproperties.hxx
similarity index 100%
rename from include/svx/sdr/properties/connectorproperties.hxx
rename to svx/inc/sdr/properties/connectorproperties.hxx
diff --git a/include/svx/sdr/properties/customshapeproperties.hxx b/svx/inc/sdr/properties/customshapeproperties.hxx
similarity index 100%
rename from include/svx/sdr/properties/customshapeproperties.hxx
rename to svx/inc/sdr/properties/customshapeproperties.hxx
diff --git a/include/svx/sdr/properties/e3dextrudeproperties.hxx b/svx/inc/sdr/properties/e3dextrudeproperties.hxx
similarity index 100%
rename from include/svx/sdr/properties/e3dextrudeproperties.hxx
rename to svx/inc/sdr/properties/e3dextrudeproperties.hxx
diff --git a/include/svx/sdr/properties/e3dlatheproperties.hxx b/svx/inc/sdr/properties/e3dlatheproperties.hxx
similarity index 100%
rename from include/svx/sdr/properties/e3dlatheproperties.hxx
rename to svx/inc/sdr/properties/e3dlatheproperties.hxx
diff --git a/include/svx/sdr/properties/e3dsceneproperties.hxx b/svx/inc/sdr/properties/e3dsceneproperties.hxx
similarity index 100%
rename from include/svx/sdr/properties/e3dsceneproperties.hxx
rename to svx/inc/sdr/properties/e3dsceneproperties.hxx
diff --git a/include/svx/sdr/properties/e3dsphereproperties.hxx b/svx/inc/sdr/properties/e3dsphereproperties.hxx
similarity index 100%
rename from include/svx/sdr/properties/e3dsphereproperties.hxx
rename to svx/inc/sdr/properties/e3dsphereproperties.hxx
diff --git a/include/svx/sdr/properties/graphicproperties.hxx b/svx/inc/sdr/properties/graphicproperties.hxx
similarity index 100%
rename from include/svx/sdr/properties/graphicproperties.hxx
rename to svx/inc/sdr/properties/graphicproperties.hxx
diff --git a/include/svx/sdr/properties/groupproperties.hxx b/svx/inc/sdr/properties/groupproperties.hxx
similarity index 100%
rename from include/svx/sdr/properties/groupproperties.hxx
rename to svx/inc/sdr/properties/groupproperties.hxx
diff --git a/include/svx/sdr/properties/itemsettools.hxx b/svx/inc/sdr/properties/itemsettools.hxx
similarity index 100%
rename from include/svx/sdr/properties/itemsettools.hxx
rename to svx/inc/sdr/properties/itemsettools.hxx
diff --git a/include/svx/sdr/properties/measureproperties.hxx b/svx/inc/sdr/properties/measureproperties.hxx
similarity index 100%
rename from include/svx/sdr/properties/measureproperties.hxx
rename to svx/inc/sdr/properties/measureproperties.hxx
diff --git a/include/svx/sdr/properties/oleproperties.hxx b/svx/inc/sdr/properties/oleproperties.hxx
similarity index 100%
rename from include/svx/sdr/properties/oleproperties.hxx
rename to svx/inc/sdr/properties/oleproperties.hxx
diff --git a/include/svx/sdr/properties/pageproperties.hxx b/svx/inc/sdr/properties/pageproperties.hxx
similarity index 100%
rename from include/svx/sdr/properties/pageproperties.hxx
rename to svx/inc/sdr/properties/pageproperties.hxx
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index 2a827c7..4677662 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 0c4a707..9219be6 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 c9d0f46..939e947 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 4d23a13..dd50842 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 4f9829c..40e606a 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 07b47f9..1f9d562 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 7dae820..8ecad40 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 fd1467f..1b10633 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 659cd3e..23a8bf8 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 09b37be..cefbd96 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 4c5412a..57ae8d3 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 0f9ba0d..292bfba 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 f4f22b98..810a9ec 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 5a99ff8..94c9776 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 fd5bd0f..f9110bc 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 6899bf7..72d290b 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 ae6bd95..ca24df8 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 e37b3a3..9a80884 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 fdc5e6f..60fa51d 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 56f0a78..dfd033a 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 4bed2ea..af037e5 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 158fc78..a989304 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 1b50326..75768ac 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 0ae9f80..4dfdf33 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 146ed9c..d595917 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 47e61c0..8ce64ca 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 234197f..275e28b 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 c17d71c..75460ec 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 551a09e..663e876 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 372988e..518d30a 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 4f852cb..df2f0ff 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 77d19c3..ce25218 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 db0a39f..c95a47b 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 fd0e6b0..8a02658 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 f4efab5..edc551b 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 828b990..85bb776 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 b105137..7a65548 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 037e8c5..5649d32 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 567e4f2..7a145bf 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 15fd691..437319b 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 af8a63e..ff71c14 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 81ccab3..7987309 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 2d4871a..3ac4ca1 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 d0fbbeb..38b73be 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 b3926af..43f3f09 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 6628d21..d236a9c 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 3e351d5..ea717f4 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 702db3a..cf24af6 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 c24de94..c3fa518 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 f54046c..95958b2 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 c1967d7..17da890 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 dabb5cc..e8ee217 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 81fe0be..0f1f6b6 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 6ccaf89..a633ab7 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 b63eb2c..ea0cab6 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 43afc3a..752a73a 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 4726d06..4b3315b 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 6a8996e..33c3f37 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 069693c..b2d5c77 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 c5c8271..d387520 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 6866013..a12ff99 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 5ec3fe8..19223a0 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 b625f2e..f5bce28 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 5b2b45f..ea9ae60 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 26b6ed6..acc3349 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 17aad02..1eb4279 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 dd4f443..512098e 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 518af37..0ffbee0 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 bb9b1e4..0822d7c 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 18e13a0..158a0d0 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 d81a89b..7c996ec 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 b163ab5..2675438 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 cd80b35..b0900af 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 fc3b53d..701cce5 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 804e083..a65c245 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 72577da..d36d33c 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 e8c3dc2..ac067fe 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 021df87..596fabf 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 e7ec445..cf3cb9b 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 da8e51f..9339a81 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 81154b0..fa5cfdc 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 f90b1a2..6300f5f 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 9f6ff55..e4421f5 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 352f967..ce937b3 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 44a7efa..d124045 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 9ae5bd1..585b28e 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 89714ea..ece177a 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 4388deb..7fe8e20 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 39ae2a7..9b44726 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 cfab3ff..6e3cde9 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 77f3d9d..963d7fe 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 da55ea1..8124d75 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 01b2e78..a0bbfa1 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 7548698..db6345e 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 73caddc..230cceb 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 59591d2..c08039f 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 4693b0c..ca94637 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 c9ce507..4eaefcb 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 83527e1..1cdf8be 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 88dc8d0..c25513d 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 5404f87..df6189d 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 e583ed8..3c30b4d 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 e457ed5..0ff1493 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 95d5109..e01dae9 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 089cee3..f1e8398 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 b6e3fcd..409c2b1 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 f001b80..8c96c9f 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 417cacc..8767e5d 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 9ab9333..4e87e4c 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 a0267dd..25997de 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 f79bab6..cb6e1ad 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 873e9d8..b0a9c44 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 31545c9..39ffbaa 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 36d7a41..1803961 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 823e219..00a61b1 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 58527d8..b51142e 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 1c93064..4eac136 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 a98fe20..bc87338 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>
commit 0748e529909c772036f5cb83c270329ca4e5f1a0
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue May 6 14:47:59 2014 +0300

    WaE: 'bPrependCurrencySymbol' may be used uninitialized in this function
    
    Change-Id: I2a9807640ef25e30ea34aa017cf02221f355153f

diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index c116afc..66e94d3 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -100,7 +100,7 @@ void OCurrencyModel::implConstruct()
             const LocaleDataWrapper& aLocaleInfo = aSysLocale.GetLocaleData();
 
             OUString sCurrencySymbol;
-            bool bPrependCurrencySymbol;
+            bool bPrependCurrencySymbol = false;
             switch ( aLocaleInfo.getCurrPositiveFormat() )
             {
                 case 0: // $1
