diff options
170 files changed, 265 insertions, 372 deletions
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index b5b759ee45a3..ac29126124f2 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -6776,14 +6776,11 @@ include/svx/AccessibleShapeInfo.hxx include/svx/AccessibleShapeTreeInfo.hxx include/svx/AccessibleTextHelper.hxx include/svx/ActionDescriptionProvider.hxx -include/svx/AffineMatrixItem.hxx include/svx/ChildrenManager.hxx include/svx/ClassificationDialog.hxx include/svx/ClassificationField.hxx include/svx/ColorSets.hxx include/svx/CommonStyleManager.hxx -include/svx/CommonStylePreviewRenderer.hxx -include/svx/DescriptionGenerator.hxx include/svx/EnhancedCustomShape2d.hxx include/svx/EnhancedCustomShapeFunctionParser.hxx include/svx/EnhancedCustomShapeGeometry.hxx @@ -6807,7 +6804,6 @@ include/svx/TextCharacterSpacingPopup.hxx include/svx/TextUnderlinePopup.hxx include/svx/UnoNamespaceMap.hxx include/svx/XPropertyEntry.hxx -include/svx/XPropertyTable.hxx include/svx/algitem.hxx include/svx/anchorid.hxx include/svx/autoformathelper.hxx @@ -6820,7 +6816,6 @@ include/svx/clipboardctl.hxx include/svx/clipfmtitem.hxx include/svx/colorbox.hxx include/svx/colorwindow.hxx -include/svx/colrctrl.hxx include/svx/compressgraphicdialog.hxx include/svx/connctrl.hxx include/svx/contdlg.hxx @@ -6831,7 +6826,6 @@ include/svx/databaselocationinput.hxx include/svx/databaseregistrationui.hxx include/svx/dbaexchange.hxx include/svx/dbaobjectex.hxx -include/svx/dbcharsethelper.hxx include/svx/def3d.hxx include/svx/deflt3d.hxx include/svx/dialcontrol.hxx @@ -6843,7 +6837,6 @@ include/svx/e3ditem.hxx include/svx/e3dsceneupdater.hxx include/svx/e3dundo.hxx include/svx/extedit.hxx -include/svx/extrud3d.hxx include/svx/extrusionbar.hxx include/svx/f3dchild.hxx include/svx/fillctrl.hxx @@ -6922,7 +6915,6 @@ include/svx/pagenumberlistbox.hxx include/svx/papersizelistbox.hxx include/svx/paraprev.hxx include/svx/passwd.hxx -include/svx/polygn3d.hxx include/svx/polypolygoneditor.hxx include/svx/postattr.hxx include/svx/pszctrl.hxx @@ -6937,13 +6929,10 @@ include/svx/scene3d.hxx include/svx/sdangitm.hxx include/svx/sdasitm.hxx include/svx/sderitm.hxx -include/svx/sdgcoitm.hxx include/svx/sdgcpitm.hxx include/svx/sdggaitm.hxx -include/svx/sdginitm.hxx include/svx/sdgluitm.hxx include/svx/sdgmoitm.hxx -include/svx/sdgtritm.hxx include/svx/sdmetitm.hxx include/svx/sdooitm.hxx include/svx/sdprcitm.hxx @@ -6951,40 +6940,25 @@ include/svx/sdr/animation/animationstate.hxx include/svx/sdr/animation/objectanimator.hxx include/svx/sdr/animation/scheduler.hxx include/svx/sdr/attribute/sdrallfillattributeshelper.hxx -include/svx/sdr/attribute/sdrformtextattribute.hxx -include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx -include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx -include/svx/sdr/attribute/sdrshadowtextattribute.hxx -include/svx/sdr/attribute/sdrtextattribute.hxx include/svx/sdr/contact/displayinfo.hxx include/svx/sdr/contact/objectcontact.hxx -include/svx/sdr/contact/objectcontactofobjlistpainter.hxx include/svx/sdr/contact/objectcontactofpageview.hxx include/svx/sdr/contact/viewcontact.hxx -include/svx/sdr/contact/viewcontactofe3d.hxx include/svx/sdr/contact/viewcontactofe3dscene.hxx -include/svx/sdr/contact/viewcontactofpageobj.hxx include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx include/svx/sdr/contact/viewcontactofsdrobj.hxx -include/svx/sdr/contact/viewcontactofsdrrectobj.hxx -include/svx/sdr/contact/viewcontactoftextobj.hxx include/svx/sdr/contact/viewcontactofvirtobj.hxx include/svx/sdr/contact/viewobjectcontact.hxx -include/svx/sdr/contact/viewobjectcontactofpageobj.hxx include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx include/svx/sdr/contact/viewobjectcontactredirector.hxx include/svx/sdr/overlay/overlayanimatedbitmapex.hxx include/svx/sdr/overlay/overlaybitmapex.hxx include/svx/sdr/overlay/overlaymanager.hxx include/svx/sdr/overlay/overlayobject.hxx -include/svx/sdr/overlay/overlayobjectcell.hxx include/svx/sdr/overlay/overlayobjectlist.hxx include/svx/sdr/overlay/overlaypolypolygon.hxx include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx include/svx/sdr/overlay/overlayselection.hxx -include/svx/sdr/overlay/overlaytriangle.hxx -include/svx/sdr/primitive2d/sdrattributecreator.hxx -include/svx/sdr/primitive2d/sdrdecompositiontools.hxx include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx include/svx/sdr/properties/defaultproperties.hxx @@ -7093,7 +7067,6 @@ include/svx/swframeexample.hxx include/svx/swframeposstrings.hxx include/svx/swframetypes.hxx include/svx/swframevalidation.hxx -include/svx/sxcaitm.hxx include/svx/sxcecitm.hxx include/svx/sxcgitm.hxx include/svx/sxciaitm.hxx @@ -7102,24 +7075,18 @@ include/svx/sxctitm.hxx include/svx/sxekitm.hxx include/svx/sxelditm.hxx include/svx/sxenditm.hxx -include/svx/sxfiitm.hxx include/svx/sxmbritm.hxx -include/svx/sxmfsitm.hxx include/svx/sxmlhitm.hxx include/svx/sxmtfitm.hxx include/svx/sxmtpitm.hxx include/svx/sxmtritm.hxx include/svx/sxmuitm.hxx -include/svx/sxsiitm.hxx include/svx/tabarea.hxx include/svx/tabline.hxx include/svx/tbcontrl.hxx include/svx/tbxcolor.hxx include/svx/tbxcolorupdate.hxx include/svx/tbxctl.hxx -include/svx/textchain.hxx -include/svx/textchaincursor.hxx -include/svx/textchainflow.hxx include/svx/transfrmhelper.hxx include/svx/txencbox.hxx include/svx/ucsubset.hxx @@ -7168,7 +7135,6 @@ include/svx/xftmrit.hxx include/svx/xftouit.hxx include/svx/xftshcit.hxx include/svx/xftshit.hxx -include/svx/xftshtit.hxx include/svx/xftshxy.hxx include/svx/xftstit.hxx include/svx/xgrad.hxx @@ -13388,15 +13354,33 @@ svtools/source/uno/wizard/wizardpagecontroller.hxx svtools/source/uno/wizard/wizardshell.cxx svtools/source/uno/wizard/wizardshell.hxx svx/inc/AccessibleTableShape.hxx +svx/inc/AffineMatrixItem.hxx +svx/inc/CommonStylePreviewRenderer.hxx +svx/inc/DescriptionGenerator.hxx svx/inc/GalleryControl.hxx +svx/inc/XPropertyTable.hxx +svx/inc/colrctrl.hxx +svx/inc/dbcharsethelper.hxx svx/inc/dragmt3d.hxx +svx/inc/extrud3d.hxx svx/inc/extrusiondepthdialog.hxx svx/inc/galbrws2.hxx svx/inc/galobj.hxx svx/inc/helpids.h svx/inc/palettes.hxx +svx/inc/polygn3d.hxx +svx/inc/sdgcoitm.hxx +svx/inc/sdginitm.hxx +svx/inc/sdgtritm.hxx svx/inc/sdr/attribute/sdrfilltextattribute.hxx +svx/inc/sdr/attribute/sdrformtextattribute.hxx svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx +svx/inc/sdr/attribute/sdrlinefillshadowtextattribute.hxx +svx/inc/sdr/attribute/sdrlineshadowtextattribute.hxx +svx/inc/sdr/attribute/sdrshadowtextattribute.hxx +svx/inc/sdr/attribute/sdrtextattribute.hxx +svx/inc/sdr/contact/objectcontactofobjlistpainter.hxx +svx/inc/sdr/contact/viewcontactofe3d.hxx svx/inc/sdr/contact/viewcontactofe3dcube.hxx svx/inc/sdr/contact/viewcontactofe3dextrude.hxx svx/inc/sdr/contact/viewcontactofe3dlathe.hxx @@ -13405,6 +13389,7 @@ svx/inc/sdr/contact/viewcontactofe3dsphere.hxx svx/inc/sdr/contact/viewcontactofgraphic.hxx svx/inc/sdr/contact/viewcontactofgroup.hxx svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx +svx/inc/sdr/contact/viewcontactofpageobj.hxx svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx @@ -13413,12 +13398,15 @@ svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx svx/inc/sdr/contact/viewcontactofsdrpage.hxx svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx +svx/inc/sdr/contact/viewcontactofsdrrectobj.hxx +svx/inc/sdr/contact/viewcontactoftextobj.hxx svx/inc/sdr/contact/viewcontactofunocontrol.hxx svx/inc/sdr/contact/viewobjectcontactofe3d.hxx svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx svx/inc/sdr/contact/viewobjectcontactofgroup.hxx svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx +svx/inc/sdr/contact/viewobjectcontactofpageobj.hxx svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx @@ -13428,12 +13416,16 @@ svx/inc/sdr/overlay/overlayhandle.hxx svx/inc/sdr/overlay/overlayhelpline.hxx svx/inc/sdr/overlay/overlayline.hxx svx/inc/sdr/overlay/overlaymanagerbuffered.hxx +svx/inc/sdr/overlay/overlayobjectcell.hxx svx/inc/sdr/overlay/overlayrectangle.hxx svx/inc/sdr/overlay/overlayrollingrectangle.hxx svx/inc/sdr/overlay/overlaytools.hxx +svx/inc/sdr/overlay/overlaytriangle.hxx +svx/inc/sdr/primitive2d/sdrattributecreator.hxx svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx +svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx @@ -13466,9 +13458,12 @@ svx/inc/sdr/properties/rectangleproperties.hxx svx/inc/sdr/properties/textproperties.hxx svx/inc/strings.hxx svx/inc/sxallitm.hxx +svx/inc/sxcaitm.hxx svx/inc/sxcikitm.hxx +svx/inc/sxfiitm.hxx svx/inc/sxlayitm.hxx svx/inc/sxlogitm.hxx +svx/inc/sxmfsitm.hxx svx/inc/sxmkitm.hxx svx/inc/sxmoitm.hxx svx/inc/sxmovitm.hxx @@ -13482,10 +13477,15 @@ svx/inc/sxroaitm.hxx svx/inc/sxrooitm.hxx svx/inc/sxsaitm.hxx svx/inc/sxsalitm.hxx +svx/inc/sxsiitm.hxx svx/inc/sxsoitm.hxx svx/inc/sxtraitm.hxx +svx/inc/textchain.hxx +svx/inc/textchaincursor.hxx +svx/inc/textchainflow.hxx svx/inc/uiobject.hxx svx/inc/unomlstr.hxx +svx/inc/xftshtit.hxx svx/inc/xpolyimp.hxx svx/qa/unit/svdraw/test_SdrTextObject.cxx svx/qa/unit/svx-dialogs-test.cxx diff --git a/include/svx/AffineMatrixItem.hxx b/svx/inc/AffineMatrixItem.hxx index 4c9f9cf06a6c..7d1c48a538f6 100644 --- a/include/svx/AffineMatrixItem.hxx +++ b/svx/inc/AffineMatrixItem.hxx @@ -16,13 +16,11 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_AFFINEMATRIXITEM_HXX -#define INCLUDED_SVX_AFFINEMATRIXITEM_HXX +#pragma once #include <com/sun/star/geometry/AffineMatrix2D.hpp> #include <sal/types.h> #include <svl/poolitem.hxx> -#include <svx/svxdllapi.h> class SfxItemPool; @@ -43,6 +41,4 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; -#endif // INCLUDED_SVX_AFFINEMATRIXITEM_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/CommonStylePreviewRenderer.hxx b/svx/inc/CommonStylePreviewRenderer.hxx index 5b742861134c..88e3d6ddeb0c 100644 --- a/include/svx/CommonStylePreviewRenderer.hxx +++ b/svx/inc/CommonStylePreviewRenderer.hxx @@ -7,14 +7,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_SVX_COMMONSTYLEPREVIEWRENDERER_HXX -#define INCLUDED_SVX_COMMONSTYLEPREVIEWRENDERER_HXX +#pragma once #include <memory> #include <sfx2/objsh.hxx> #include <sfx2/StylePreviewRenderer.hxx> -#include <svx/svxdllapi.h> #include <rtl/ustring.hxx> #include <tools/color.hxx> #include <tools/gen.hxx> @@ -46,6 +44,4 @@ public: } // end namespace svx -#endif // INCLUDED_SVX_COMMONSTYLEPREVIEWRENDERER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/DescriptionGenerator.hxx b/svx/inc/DescriptionGenerator.hxx index 7ee67c9104ff..c1407a769188 100644 --- a/include/svx/DescriptionGenerator.hxx +++ b/svx/inc/DescriptionGenerator.hxx @@ -18,12 +18,10 @@ */ -#ifndef INCLUDED_SVX_DESCRIPTIONGENERATOR_HXX -#define INCLUDED_SVX_DESCRIPTIONGENERATOR_HXX +#pragma once #include <com/sun/star/uno/Reference.hxx> #include <rtl/ustrbuf.hxx> -#include <svx/svxdllapi.h> namespace com::sun::star::beans { class XPropertySet; } namespace com::sun::star::drawing { class XShape; } @@ -133,6 +131,4 @@ private: } // end of namespace accessibility -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/XPropertyTable.hxx b/svx/inc/XPropertyTable.hxx index 4bec7a94ba6c..87015e2f1363 100644 --- a/include/svx/XPropertyTable.hxx +++ b/svx/inc/XPropertyTable.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_XPROPERTYTABLE_HXX -#define INCLUDED_SVX_XPROPERTYTABLE_HXX +#pragma once #include <com/sun/star/uno/XInterface.hpp> #include <svx/xtable.hxx> @@ -32,7 +31,5 @@ css::uno::Reference< css::uno::XInterface > SvxUnoXHatchTable_createInstance( XP css::uno::Reference< css::uno::XInterface > SvxUnoXGradientTable_createInstance( XPropertyList* pList ) throw(); css::uno::Reference< css::uno::XInterface > SvxUnoXBitmapTable_createInstance( XPropertyList* pList ) throw(); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/colrctrl.hxx b/svx/inc/colrctrl.hxx index de0fe888dd28..f7005730c7af 100644 --- a/include/svx/colrctrl.hxx +++ b/svx/inc/colrctrl.hxx @@ -16,8 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_COLRCTRL_HXX -#define INCLUDED_SVX_COLRCTRL_HXX +#pragma once #include <sal/types.h> #include <sfx2/dockwin.hxx> @@ -108,6 +107,4 @@ public: virtual bool EventNotify( NotifyEvent& rNEvt ) override; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/dbcharsethelper.hxx b/svx/inc/dbcharsethelper.hxx index 91d7aa5f6e1f..218d2b85af87 100644 --- a/include/svx/dbcharsethelper.hxx +++ b/svx/inc/dbcharsethelper.hxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_DBCHARSETHELPER_HXX -#define INCLUDED_SVX_DBCHARSETHELPER_HXX +#pragma once -#include <svx/svxdllapi.h> #include <rtl/textenc.h> #include <vector> @@ -37,7 +35,4 @@ namespace svxform { namespace charset_helper } -#endif // SVX_DBCHARSETCLIENT_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/extrud3d.hxx b/svx/inc/extrud3d.hxx index b66779957dc7..124e7e93da2d 100644 --- a/include/svx/extrud3d.hxx +++ b/svx/inc/extrud3d.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_EXTRUD3D_HXX -#define INCLUDED_SVX_EXTRUD3D_HXX +#pragma once #include <svl/intitem.hxx> #include <svl/itemset.hxx> @@ -111,6 +110,4 @@ public: virtual std::unique_ptr<SdrAttrObj,SdrObjectFreeOp> GetBreakObj() override; }; -#endif // INCLUDED_SVX_EXTRUD3D_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index c463eccb9b4a..cf586c07325f 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -368,7 +368,7 @@ #include <svx/AccessibleShape.hxx> #include <svx/AccessibleShapeInfo.hxx> #include <svx/AccessibleTextHelper.hxx> -#include <svx/DescriptionGenerator.hxx> +#include <DescriptionGenerator.hxx> #include <svx/IAccessibleViewForwarder.hxx> #include <svx/ShapeTypeHandler.hxx> #include <svx/SvxShapeTypes.hxx> diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index a441ac85ab86..b35efb4736d3 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -448,10 +448,10 @@ #include <fmservs.hxx> #include <fmshimp.hxx> #include <fmundo.hxx> -#include <svx/XPropertyTable.hxx> +#include <XPropertyTable.hxx> #include <svx/dialmgr.hxx> #include <svx/e3dsceneupdater.hxx> -#include <svx/extrud3d.hxx> +#include <extrud3d.hxx> #include <svx/fmglob.hxx> #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> @@ -472,7 +472,7 @@ #include <svx/sdr/animation/scheduler.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <svx/sdr/contact/objectcontact.hxx> -#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> +#include <sdr/contact/objectcontactofobjlistpainter.hxx> #include <svx/sdr/contact/objectcontactofpageview.hxx> #include <svx/sdr/contact/viewcontact.hxx> #include <svx/sdr/contact/viewcontactofe3dscene.hxx> @@ -481,8 +481,8 @@ #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/sdr/overlay/overlayobject.hxx> #include <svx/sdr/overlay/overlaypolypolygon.hxx> -#include <svx/sdr/primitive2d/sdrattributecreator.hxx> -#include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> +#include <sdr/primitive2d/sdrattributecreator.hxx> +#include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <svx/sdrhittesthelper.hxx> #include <svx/sdrpagewindow.hxx> @@ -527,7 +527,7 @@ #include <svx/svx3ditems.hxx> #include <svx/svxdlg.hxx> #include <svx/svxdllapi.h> -#include <svx/textchain.hxx> +#include <textchain.hxx> #include <svx/unoapi.hxx> #include <svx/unofill.hxx> #include <svx/unomid.hxx> diff --git a/include/svx/polygn3d.hxx b/svx/inc/polygn3d.hxx index 0c6a7799d27a..4a2d7cc4a101 100644 --- a/include/svx/polygn3d.hxx +++ b/svx/inc/polygn3d.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_INC_POLYGN3D_HXX -#define INCLUDED_SVX_INC_POLYGN3D_HXX +#pragma once #include <svx/obj3d.hxx> #include <svx/svxdllapi.h> @@ -66,6 +65,4 @@ public: void SetLineOnly(bool bNew); }; -#endif // INCLUDED_SVX_INC_POLYGN3D_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdgcoitm.hxx b/svx/inc/sdgcoitm.hxx index 936d60bed35c..23b7825bfeb9 100644 --- a/include/svx/sdgcoitm.hxx +++ b/svx/inc/sdgcoitm.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SDGCOITM_HXX -#define INCLUDED_SVX_SDGCOITM_HXX +#pragma once #include <svx/sdprcitm.hxx> #include <svx/svddef.hxx> @@ -66,6 +65,4 @@ public: virtual SdrGrafBlueItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; -#endif // INCLUDED_SVX_SDGCOITM_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdginitm.hxx b/svx/inc/sdginitm.hxx index 975c0b8c7be8..ef5ef1a02db6 100644 --- a/include/svx/sdginitm.hxx +++ b/svx/inc/sdginitm.hxx @@ -17,12 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SDGINITM_HXX -#define INCLUDED_SVX_SDGINITM_HXX +#pragma once #include <svx/sdooitm.hxx> #include <svx/svddef.hxx> -#include <svx/svxdllapi.h> // SdrGrafInvertItem - @@ -38,6 +36,4 @@ public: virtual SdrGrafInvertItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; -#endif // INCLUDED_SVX_SDGINITM_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdgtritm.hxx b/svx/inc/sdgtritm.hxx index 05f2f8eb5554..87b39d863b4e 100644 --- a/include/svx/sdgtritm.hxx +++ b/svx/inc/sdgtritm.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SDGTRITM_HXX -#define INCLUDED_SVX_SDGTRITM_HXX +#pragma once #include <svx/sdprcitm.hxx> #include <svx/svddef.hxx> @@ -37,6 +36,4 @@ public: virtual SdrGrafTransparenceItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; -#endif // INCLUDED_SVX_SDGTRITM_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/attribute/sdrfilltextattribute.hxx b/svx/inc/sdr/attribute/sdrfilltextattribute.hxx index 74d992917fe5..bef9d543021e 100644 --- a/svx/inc/sdr/attribute/sdrfilltextattribute.hxx +++ b/svx/inc/sdr/attribute/sdrfilltextattribute.hxx @@ -22,7 +22,7 @@ #include <drawinglayer/attribute/sdrfillattribute.hxx> #include <drawinglayer/attribute/fillgradientattribute.hxx> -#include <svx/sdr/attribute/sdrtextattribute.hxx> +#include <sdr/attribute/sdrtextattribute.hxx> namespace drawinglayer diff --git a/include/svx/sdr/attribute/sdrformtextattribute.hxx b/svx/inc/sdr/attribute/sdrformtextattribute.hxx index 1260509b4234..9b7f7a72fbd4 100644 --- a/include/svx/sdr/attribute/sdrformtextattribute.hxx +++ b/svx/inc/sdr/attribute/sdrformtextattribute.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SDR_ATTRIBUTE_SDRFORMTEXTATTRIBUTE_HXX -#define INCLUDED_SVX_SDR_ATTRIBUTE_SDRFORMTEXTATTRIBUTE_HXX +#pragma once #include <sal/types.h> #include <svx/xenum.hxx> @@ -81,6 +80,4 @@ namespace drawinglayer } // end of namespace drawinglayer -#endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRFORMTEXTATTRIBUTE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx b/svx/inc/sdr/attribute/sdrlinefillshadowtextattribute.hxx index 510b481d5922..519800e7dd02 100644 --- a/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx +++ b/svx/inc/sdr/attribute/sdrlinefillshadowtextattribute.hxx @@ -17,10 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINEFILLSHADOWTEXTATTRIBUTE_HXX -#define INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINEFILLSHADOWTEXTATTRIBUTE_HXX +#pragma once -#include <svx/sdr/attribute/sdrlineshadowtextattribute.hxx> +#include <sdr/attribute/sdrlineshadowtextattribute.hxx> #include <drawinglayer/attribute/sdrfillattribute.hxx> #include <drawinglayer/attribute/fillgradientattribute.hxx> @@ -61,6 +60,4 @@ namespace drawinglayer } // end of namespace drawinglayer -#endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINEFILLSHADOWTEXTATTRIBUTE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx b/svx/inc/sdr/attribute/sdrlineshadowtextattribute.hxx index c084013b59b9..af7df7982422 100644 --- a/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx +++ b/svx/inc/sdr/attribute/sdrlineshadowtextattribute.hxx @@ -17,10 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINESHADOWTEXTATTRIBUTE_HXX -#define INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINESHADOWTEXTATTRIBUTE_HXX +#pragma once -#include <svx/sdr/attribute/sdrshadowtextattribute.hxx> +#include <sdr/attribute/sdrshadowtextattribute.hxx> #include <drawinglayer/attribute/sdrlineattribute.hxx> #include <drawinglayer/attribute/sdrlinestartendattribute.hxx> @@ -59,6 +58,4 @@ namespace drawinglayer } // end of namespace drawinglayer -#endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINESHADOWTEXTATTRIBUTE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/attribute/sdrshadowtextattribute.hxx b/svx/inc/sdr/attribute/sdrshadowtextattribute.hxx index 9bac9712adf1..c58437b70928 100644 --- a/include/svx/sdr/attribute/sdrshadowtextattribute.hxx +++ b/svx/inc/sdr/attribute/sdrshadowtextattribute.hxx @@ -17,11 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SDR_ATTRIBUTE_SDRSHADOWTEXTATTRIBUTE_HXX -#define INCLUDED_SVX_SDR_ATTRIBUTE_SDRSHADOWTEXTATTRIBUTE_HXX +#pragma once #include <drawinglayer/attribute/sdrshadowattribute.hxx> -#include <svx/sdr/attribute/sdrtextattribute.hxx> +#include <sdr/attribute/sdrtextattribute.hxx> namespace drawinglayer @@ -56,6 +55,4 @@ namespace drawinglayer } // end of namespace drawinglayer -#endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRSHADOWTEXTATTRIBUTE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/attribute/sdrtextattribute.hxx b/svx/inc/sdr/attribute/sdrtextattribute.hxx index b81853ac637c..d3fb22e140ed 100644 --- a/include/svx/sdr/attribute/sdrtextattribute.hxx +++ b/svx/inc/sdr/attribute/sdrtextattribute.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SDR_ATTRIBUTE_SDRTEXTATTRIBUTE_HXX -#define INCLUDED_SVX_SDR_ATTRIBUTE_SDRTEXTATTRIBUTE_HXX +#pragma once #include <sal/types.h> #include <svx/xenum.hxx> @@ -125,6 +124,4 @@ namespace drawinglayer } // end of namespace drawinglayer -#endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRTEXTATTRIBUTE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/svx/inc/sdr/contact/objectcontactofobjlistpainter.hxx index a7124bade869..6f914a87549c 100644 --- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx +++ b/svx/inc/sdr/contact/objectcontactofobjlistpainter.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACTOFOBJLISTPAINTER_HXX -#define INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACTOFOBJLISTPAINTER_HXX +#pragma once #include <svx/sdr/contact/objectcontact.hxx> #include <svx/svxdllapi.h> @@ -110,6 +109,4 @@ public: }} -#endif // INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACTOFOBJLISTPAINTER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/contact/viewcontactofe3d.hxx b/svx/inc/sdr/contact/viewcontactofe3d.hxx index d5931aeec66f..7151071c5c59 100644 --- a/include/svx/sdr/contact/viewcontactofe3d.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3d.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3D_HXX -#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3D_HXX +#pragma once #include <svx/obj3d.hxx> #include <svx/sdr/contact/viewcontactofsdrobj.hxx> @@ -93,6 +92,4 @@ public: }} -#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3D_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/contact/viewcontactofe3dcube.hxx b/svx/inc/sdr/contact/viewcontactofe3dcube.hxx index 8b45f78869ab..933bc8d14d57 100644 --- a/svx/inc/sdr/contact/viewcontactofe3dcube.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dcube.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX #define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX -#include <svx/sdr/contact/viewcontactofe3d.hxx> +#include <sdr/contact/viewcontactofe3d.hxx> #include <svx/cube3d.hxx> namespace sdr diff --git a/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx b/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx index d5a070986696..0d96fb989050 100644 --- a/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX #define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX -#include <svx/sdr/contact/viewcontactofe3d.hxx> -#include <svx/extrud3d.hxx> +#include <sdr/contact/viewcontactofe3d.hxx> +#include <extrud3d.hxx> namespace sdr diff --git a/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx b/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx index 65ef74141a92..00e42754f226 100644 --- a/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX #define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX -#include <svx/sdr/contact/viewcontactofe3d.hxx> +#include <sdr/contact/viewcontactofe3d.hxx> #include <svx/lathe3d.hxx> diff --git a/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx b/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx index 2dfc5f5789f3..16116cc19af7 100644 --- a/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX #define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX -#include <svx/sdr/contact/viewcontactofe3d.hxx> -#include <svx/polygn3d.hxx> +#include <sdr/contact/viewcontactofe3d.hxx> +#include <polygn3d.hxx> namespace sdr { diff --git a/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx b/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx index ad4262657d3e..78d9a7ca7826 100644 --- a/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX #define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX -#include <svx/sdr/contact/viewcontactofe3d.hxx> +#include <sdr/contact/viewcontactofe3d.hxx> #include <svx/sphere3d.hxx> diff --git a/svx/inc/sdr/contact/viewcontactofgraphic.hxx b/svx/inc/sdr/contact/viewcontactofgraphic.hxx index 22083324e97a..4d16d91940f8 100644 --- a/svx/inc/sdr/contact/viewcontactofgraphic.hxx +++ b/svx/inc/sdr/contact/viewcontactofgraphic.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFGRAPHIC_HXX #define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFGRAPHIC_HXX -#include <svx/sdr/contact/viewcontactoftextobj.hxx> +#include <sdr/contact/viewcontactoftextobj.hxx> #include <svx/svdograf.hxx> namespace drawinglayer { namespace attribute { class SdrLineFillShadowTextAttribute; }} diff --git a/include/svx/sdr/contact/viewcontactofpageobj.hxx b/svx/inc/sdr/contact/viewcontactofpageobj.hxx index a339f1bcecdd..bfb2d8f1c908 100644 --- a/include/svx/sdr/contact/viewcontactofpageobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofpageobj.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFPAGEOBJ_HXX -#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFPAGEOBJ_HXX +#pragma once #include <svx/sdr/contact/viewcontactofsdrobj.hxx> #include <svx/svxdllapi.h> @@ -54,6 +53,4 @@ public: }} -#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFPAGEOBJ_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx index 20d9646e1006..6e2f07b5a1df 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRCAPTIONOBJ_HXX #define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRCAPTIONOBJ_HXX -#include <svx/sdr/contact/viewcontactofsdrrectobj.hxx> +#include <sdr/contact/viewcontactofsdrrectobj.hxx> #include <svx/svdocapt.hxx> diff --git a/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx index d5b42b7e5bdd..64972ebee3ff 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRCIRCOBJ_HXX #define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRCIRCOBJ_HXX -#include <svx/sdr/contact/viewcontactofsdrrectobj.hxx> +#include <sdr/contact/viewcontactofsdrrectobj.hxx> #include <svx/svdocirc.hxx> diff --git a/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx b/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx index a8ad594019ab..fb22bf97d424 100644 --- a/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDREDGEOBJ_HXX #define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDREDGEOBJ_HXX -#include <svx/sdr/contact/viewcontactoftextobj.hxx> +#include <sdr/contact/viewcontactoftextobj.hxx> #include <svx/svdoedge.hxx> diff --git a/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx index f0c351c45672..caeaa283cc39 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRMEASUREOBJ_HXX #define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRMEASUREOBJ_HXX -#include <svx/sdr/contact/viewcontactoftextobj.hxx> +#include <sdr/contact/viewcontactoftextobj.hxx> #include <svx/svdomeas.hxx> diff --git a/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx b/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx index acaf4c1b8fce..9834de646a6b 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDROBJCUSTOMSHAPE_HXX #define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDROBJCUSTOMSHAPE_HXX -#include <svx/sdr/contact/viewcontactoftextobj.hxx> +#include <sdr/contact/viewcontactoftextobj.hxx> #include <svx/svdoashp.hxx> diff --git a/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx b/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx index e70f64faa362..cbab385fb3c7 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDROLE2OBJ_HXX #define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDROLE2OBJ_HXX -#include <svx/sdr/contact/viewcontactofsdrrectobj.hxx> +#include <sdr/contact/viewcontactofsdrrectobj.hxx> #include <svx/svdoole2.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx index bbb7d264704f..f2055f74cc15 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRPATHOBJ_HXX #define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRPATHOBJ_HXX -#include <svx/sdr/contact/viewcontactoftextobj.hxx> +#include <sdr/contact/viewcontactoftextobj.hxx> #include <svx/svdopath.hxx> diff --git a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrrectobj.hxx index e067fce70bda..5fe37f7cbfad 100644 --- a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrrectobj.hxx @@ -17,10 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRRECTOBJ_HXX -#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRRECTOBJ_HXX +#pragma once -#include <svx/sdr/contact/viewcontactoftextobj.hxx> +#include <sdr/contact/viewcontactoftextobj.hxx> #include <svx/svdorect.hxx> namespace sdr { namespace contact { @@ -47,6 +46,4 @@ protected: }} -#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRRECTOBJ_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/contact/viewcontactoftextobj.hxx b/svx/inc/sdr/contact/viewcontactoftextobj.hxx index a81c4893bea2..ca6a6b30fc8a 100644 --- a/include/svx/sdr/contact/viewcontactoftextobj.hxx +++ b/svx/inc/sdr/contact/viewcontactoftextobj.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFTEXTOBJ_HXX -#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFTEXTOBJ_HXX +#pragma once #include <svx/sdr/contact/viewcontactofsdrobj.hxx> @@ -36,6 +35,4 @@ public: }} -#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFTEXTOBJ_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/svx/inc/sdr/contact/viewobjectcontactofpageobj.hxx index 4af2540c0fd6..64851fe8ec9d 100644 --- a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofpageobj.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFPAGEOBJ_HXX -#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFPAGEOBJ_HXX +#pragma once #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx> #include <memory> @@ -48,6 +47,5 @@ public: }} -#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFPAGEOBJ_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/overlay/overlayobjectcell.hxx b/svx/inc/sdr/overlay/overlayobjectcell.hxx index 050893ce907f..63669ba06ec7 100644 --- a/include/svx/sdr/overlay/overlayobjectcell.hxx +++ b/svx/inc/sdr/overlay/overlayobjectcell.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECTCELL_HXX -#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECTCELL_HXX +#pragma once #include <svx/sdr/overlay/overlayobject.hxx> @@ -51,6 +50,4 @@ namespace sdr } // end of namespace sdr -#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECTCELL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/overlay/overlaytriangle.hxx b/svx/inc/sdr/overlay/overlaytriangle.hxx index a7fbe0cb6200..730671f80d83 100644 --- a/include/svx/sdr/overlay/overlaytriangle.hxx +++ b/svx/inc/sdr/overlay/overlaytriangle.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYTRIANGLE_HXX -#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYTRIANGLE_HXX +#pragma once #include <svx/sdr/overlay/overlayobject.hxx> @@ -46,6 +45,4 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYTRIANGLE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/primitive2d/sdrattributecreator.hxx b/svx/inc/sdr/primitive2d/sdrattributecreator.hxx index b26d516b239d..1d9e17d60d2a 100644 --- a/include/svx/sdr/primitive2d/sdrattributecreator.hxx +++ b/svx/inc/sdr/primitive2d/sdrattributecreator.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRATTRIBUTECREATOR_HXX -#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRATTRIBUTECREATOR_HXX +#pragma once #include <sal/types.h> #include <svx/svxdllapi.h> @@ -127,6 +126,4 @@ namespace drawinglayer } // end of namespace drawinglayer -#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRATTRIBUTECREATOR_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx index 23e180129384..a0ec102cab73 100644 --- a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx @@ -22,7 +22,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx> +#include <sdr/attribute/sdrlinefillshadowtextattribute.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx index 16f08c23c9cd..64cfddc43203 100644 --- a/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRCONNECTORPRIMITIVE2D_HXX #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -#include <svx/sdr/attribute/sdrlineshadowtextattribute.hxx> +#include <sdr/attribute/sdrlineshadowtextattribute.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx index 910673c705cf..4012ed29613d 100644 --- a/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx @@ -22,7 +22,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <svx/sdr/attribute/sdrshadowtextattribute.hxx> +#include <sdr/attribute/sdrshadowtextattribute.hxx> // predefines diff --git a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx b/svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx index e8e538d8e4ed..f55edda1b7c1 100644 --- a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx +++ b/svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx @@ -17,11 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS_HXX -#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS_HXX +#pragma once #include <drawinglayer/primitive2d/baseprimitive2d.hxx> - #include <svx/svxdllapi.h> // predefines @@ -77,6 +75,4 @@ namespace drawinglayer } // end of namespace drawinglayer -#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx index 58ae7579d0bd..746d46a75585 100644 --- a/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx @@ -22,7 +22,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx> +#include <sdr/attribute/sdrlinefillshadowtextattribute.hxx> // predefines diff --git a/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx index cc815806734a..2a317df334d6 100644 --- a/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx @@ -23,7 +23,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <vcl/GraphicObject.hxx> -#include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx> +#include <sdr/attribute/sdrlinefillshadowtextattribute.hxx> // predefines diff --git a/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx index 2854750d8dbf..aa666a4ec051 100644 --- a/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRMEASUREPRIMITIVE2D_HXX #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -#include <svx/sdr/attribute/sdrlineshadowtextattribute.hxx> +#include <sdr/attribute/sdrlineshadowtextattribute.hxx> // predefines diff --git a/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx b/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx index aab22d94fac4..722244e463af 100644 --- a/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx @@ -22,7 +22,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx> +#include <sdr/attribute/sdrlinefillshadowtextattribute.hxx> // predefines diff --git a/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx index af0e44acf4dc..1373c5986cf4 100644 --- a/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx @@ -22,7 +22,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx> +#include <sdr/attribute/sdrlinefillshadowtextattribute.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> diff --git a/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx index ae7414c0b5c4..276bbcdb57c1 100644 --- a/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx @@ -22,7 +22,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx> +#include <sdr/attribute/sdrlinefillshadowtextattribute.hxx> // predefines diff --git a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx index ea95065b17b3..1edd4377672a 100644 --- a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/drawing/XDrawPage.hpp> #include <editeng/outlobj.hxx> #include <tools/color.hxx> -#include <svx/sdr/attribute/sdrformtextattribute.hxx> +#include <sdr/attribute/sdrformtextattribute.hxx> #include <tools/weakbase.h> #include <svx/sdtaitm.hxx> diff --git a/include/svx/sxcaitm.hxx b/svx/inc/sxcaitm.hxx index fc36d007604a..fc36d007604a 100644 --- a/include/svx/sxcaitm.hxx +++ b/svx/inc/sxcaitm.hxx diff --git a/include/svx/sxfiitm.hxx b/svx/inc/sxfiitm.hxx index 20bd44b84ff3..b629acfebaf7 100644 --- a/include/svx/sxfiitm.hxx +++ b/svx/inc/sxfiitm.hxx @@ -16,8 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SXFIITM_HXX -#define INCLUDED_SVX_SXFIITM_HXX +#pragma once #include <svl/poolitem.hxx> #include <tools/fract.hxx> @@ -37,6 +36,4 @@ public: }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sxmfsitm.hxx b/svx/inc/sxmfsitm.hxx index 741ebc27e1d7..5a9049740481 100644 --- a/include/svx/sxmfsitm.hxx +++ b/svx/inc/sxmfsitm.hxx @@ -16,8 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SXMFSITM_HXX -#define INCLUDED_SVX_SXMFSITM_HXX +#pragma once #include <svx/svddef.hxx> #include <svl/stritem.hxx> @@ -33,6 +32,4 @@ public: } }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sxmsitm.hxx b/svx/inc/sxmsitm.hxx index 914553c5c5e7..78dea13bf74e 100644 --- a/svx/inc/sxmsitm.hxx +++ b/svx/inc/sxmsitm.hxx @@ -20,7 +20,7 @@ #define INCLUDED_SVX_INC_SXMSITM_HXX #include <svx/svddef.hxx> -#include <svx/sxsiitm.hxx> +#include "sxsiitm.hxx" // Measure scale setting // We do not overwrite a measure scale (UIScale), If the model already has one set. diff --git a/svx/inc/sxreaitm.hxx b/svx/inc/sxreaitm.hxx index 409a6512a1cf..b7675a63c88c 100644 --- a/svx/inc/sxreaitm.hxx +++ b/svx/inc/sxreaitm.hxx @@ -21,7 +21,7 @@ #include <svx/svddef.hxx> -#include <svx/sxfiitm.hxx> +#include "sxfiitm.hxx" class SdrResizeXAllItem: public SdrFractionItem { public: diff --git a/svx/inc/sxreoitm.hxx b/svx/inc/sxreoitm.hxx index 0c58a3f618f5..b619f57f888a 100644 --- a/svx/inc/sxreoitm.hxx +++ b/svx/inc/sxreoitm.hxx @@ -21,7 +21,7 @@ #include <svx/svddef.hxx> -#include <svx/sxfiitm.hxx> +#include "sxfiitm.hxx" class SdrResizeXOneItem: public SdrFractionItem { public: diff --git a/include/svx/sxsiitm.hxx b/svx/inc/sxsiitm.hxx index 38d2d58ab205..2a5d6586393f 100644 --- a/include/svx/sxsiitm.hxx +++ b/svx/inc/sxsiitm.hxx @@ -16,10 +16,9 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SXSIITM_HXX -#define INCLUDED_SVX_SXSIITM_HXX +#pragma once -#include <svx/sxfiitm.hxx> +#include "sxfiitm.hxx" class SdrScaleItem: public SdrFractionItem { public: @@ -28,6 +27,4 @@ public: virtual SdrScaleItem* Clone(SfxItemPool *pPool=nullptr) const override; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/textchain.hxx b/svx/inc/textchain.hxx index cba226c98ff2..d5cae0be281c 100644 --- a/include/svx/textchain.hxx +++ b/svx/inc/textchain.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_TEXTCHAIN_HXX -#define INCLUDED_SVX_TEXTCHAIN_HXX +#pragma once #include <editeng/editdata.hxx> #include <map> @@ -103,6 +102,4 @@ private: friend class SdrModel; }; -#endif // INCLUDED_SVX_TEXTCHAIN_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/textchaincursor.hxx b/svx/inc/textchaincursor.hxx index 562a24dbd8ec..8dfb65725a92 100644 --- a/include/svx/textchaincursor.hxx +++ b/svx/inc/textchaincursor.hxx @@ -17,10 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_TEXTCHAINCURSOR_HXX -#define INCLUDED_SVX_TEXTCHAINCURSOR_HXX - -#include <svx/svxdllapi.h> +#pragma once class SdrObjEditView; class SdrTextObj; @@ -60,7 +57,5 @@ private: }; -#endif // INCLUDED_SVX_TEXTCHAINCURSOR_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/textchainflow.hxx b/svx/inc/textchainflow.hxx index 2c5f5d8c00a5..c823663d631b 100644 --- a/include/svx/textchainflow.hxx +++ b/svx/inc/textchainflow.hxx @@ -17,10 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_TEXTCHAINFLOW_HXX -#define INCLUDED_SVX_TEXTCHAINFLOW_HXX +#pragma once -#include <svx/textchain.hxx> +#include "textchain.hxx" #include <memory> class SdrTextObj; @@ -102,6 +101,4 @@ private: void impBroadcastCursorInfo() const; }; -#endif // INCLUDED_SVX_TEXTCHAINFLOW_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/xftshtit.hxx b/svx/inc/xftshtit.hxx index 2195386c7f49..e8f223e6b820 100644 --- a/include/svx/xftshtit.hxx +++ b/svx/inc/xftshtit.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_XFTSHTIT_HXX -#define INCLUDED_SVX_XFTSHTIT_HXX +#pragma once #include <svl/intitem.hxx> @@ -35,6 +34,4 @@ public: virtual XFormTextShadowTranspItem* Clone(SfxItemPool* pPool = nullptr) const override; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/qa/unit/svdraw.cxx b/svx/qa/unit/svdraw.cxx index a0b32dc5c08e..b7fa853005c4 100644 --- a/svx/qa/unit/svdraw.cxx +++ b/svx/qa/unit/svdraw.cxx @@ -25,7 +25,7 @@ #include <svx/svdpage.hxx> #include <svx/unopage.hxx> #include <vcl/virdev.hxx> -#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> +#include <sdr/contact/objectcontactofobjlistpainter.hxx> using namespace ::com::sun::star; diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index 60f7d651a6f5..981cfdf36214 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -19,7 +19,7 @@ #include <svx/AccessibleControlShape.hxx> #include <svx/AccessibleShapeInfo.hxx> -#include <svx/DescriptionGenerator.hxx> +#include <DescriptionGenerator.hxx> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/XControlShape.hpp> diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx index 464968a33e4a..95e24dfcc40b 100644 --- a/svx/source/accessibility/DescriptionGenerator.cxx +++ b/svx/source/accessibility/DescriptionGenerator.cxx @@ -18,7 +18,7 @@ */ -#include <svx/DescriptionGenerator.hxx> +#include <DescriptionGenerator.hxx> #include <com/sun/star/beans/PropertyState.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index a0b6572e84e4..b25fe8faac07 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -34,7 +34,7 @@ #include <svx/svdopath.hxx> #include <svx/svddef.hxx> #include <svx/svx3ditems.hxx> -#include <svx/extrud3d.hxx> +#include <extrud3d.hxx> #include <svx/xflbmtit.hxx> #include <svx/xlnclit.hxx> #include <svx/sdasitm.hxx> @@ -46,7 +46,7 @@ #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/range/b2drange.hxx> -#include <svx/sdr/primitive2d/sdrattributecreator.hxx> +#include <sdr/primitive2d/sdrattributecreator.hxx> #include <drawinglayer/attribute/sdrlineattribute.hxx> #include <drawinglayer/attribute/sdrlinestartendattribute.hxx> #include <svx/xlnwtit.hxx> diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx index 4e1d71c39c3c..b3006fe24f25 100644 --- a/svx/source/dialog/connctrl.cxx +++ b/svx/source/dialog/connctrl.cxx @@ -23,7 +23,7 @@ #include <svx/dlgutil.hxx> #include <svx/sdr/contact/displayinfo.hxx> -#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> +#include <sdr/contact/objectcontactofobjlistpainter.hxx> #include <svx/svdmark.hxx> #include <svx/svdoedge.hxx> #include <svx/svdpage.hxx> diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index afbef78f9818..2a2e58dab8bd 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -31,7 +31,7 @@ #include <vcl/svapp.hxx> #include <svx/helperhittest3d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include <svx/polygn3d.hxx> +#include <polygn3d.hxx> #include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <svx/xlineit0.hxx> diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index fc73e1ac5a84..c061aa742452 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -39,7 +39,7 @@ #include <svx/svdorect.hxx> #include <svx/svdmodel.hxx> #include <svx/svdopath.hxx> -#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> +#include <sdr/contact/objectcontactofobjlistpainter.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <vcl/BitmapTools.hxx> diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 052306aa0a9a..4229ea109d87 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -23,7 +23,7 @@ #include <svx/dialmgr.hxx> #include <svx/txenctab.hxx> #if HAVE_FEATURE_DBCONNECTIVITY -#include <svx/dbcharsethelper.hxx> +#include <dbcharsethelper.hxx> #endif #include <unotools/syslocale.hxx> #include <rtl/tencinfo.h> diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx index 0b66f8e0b977..4f5269e1e6a1 100644 --- a/svx/source/engine3d/extrud3d.cxx +++ b/svx/source/engine3d/extrud3d.cxx @@ -22,7 +22,7 @@ #include <svx/deflt3d.hxx> #include <svx/dialmgr.hxx> #include <svx/globl3d.hxx> -#include <svx/extrud3d.hxx> +#include <extrud3d.hxx> #include <svx/svdopath.hxx> #include <svx/svdmodel.hxx> diff --git a/svx/source/engine3d/helperhittest3d.cxx b/svx/source/engine3d/helperhittest3d.cxx index ef4d3bad4743..f553b4d0e744 100644 --- a/svx/source/engine3d/helperhittest3d.cxx +++ b/svx/source/engine3d/helperhittest3d.cxx @@ -24,7 +24,7 @@ #include <svx/scene3d.hxx> #include <svx/svditer.hxx> #include <drawinglayer/processor3d/cutfindprocessor3d.hxx> -#include <svx/sdr/contact/viewcontactofe3d.hxx> +#include <sdr/contact/viewcontactofe3d.hxx> #include <svx/sdr/contact/viewcontactofe3dscene.hxx> #include <com/sun/star/uno/Sequence.h> diff --git a/svx/source/engine3d/helperminimaldepth3d.cxx b/svx/source/engine3d/helperminimaldepth3d.cxx index 9d170160d24f..cfcc2c7d1483 100644 --- a/svx/source/engine3d/helperminimaldepth3d.cxx +++ b/svx/source/engine3d/helperminimaldepth3d.cxx @@ -24,7 +24,7 @@ #include <drawinglayer/primitive3d/transformprimitive3d.hxx> #include <drawinglayer/primitive3d/polygonprimitive3d.hxx> #include <drawinglayer/primitive3d/polypolygonprimitive3d.hxx> -#include <svx/sdr/contact/viewcontactofe3d.hxx> +#include <sdr/contact/viewcontactofe3d.hxx> #include <svx/sdr/contact/viewcontactofe3dscene.hxx> #include <svx/obj3d.hxx> #include <svx/scene3d.hxx> diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 0094f7e86c60..131ea08de758 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -34,7 +34,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <svx/helperhittest3d.hxx> -#include <svx/sdr/contact/viewcontactofe3d.hxx> +#include <sdr/contact/viewcontactofe3d.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx> #include <com/sun/star/uno/Sequence.h> #include <svx/sdr/contact/viewcontactofe3dscene.hxx> diff --git a/svx/source/engine3d/objfac3d.cxx b/svx/source/engine3d/objfac3d.cxx index aed342eab8ee..5c617127b0ec 100644 --- a/svx/source/engine3d/objfac3d.cxx +++ b/svx/source/engine3d/objfac3d.cxx @@ -20,9 +20,9 @@ #include <svx/globl3d.hxx> #include <svx/cube3d.hxx> #include <svx/sphere3d.hxx> -#include <svx/extrud3d.hxx> +#include <extrud3d.hxx> #include <svx/lathe3d.hxx> -#include <svx/polygn3d.hxx> +#include <polygn3d.hxx> #include <svx/objfac3d.hxx> #include <svx/svdobj.hxx> #include <svx/scene3d.hxx> diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx index 12cdb312b58a..d8c1b5d0c212 100644 --- a/svx/source/engine3d/polygn3d.cxx +++ b/svx/source/engine3d/polygn3d.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/polygn3d.hxx> +#include <polygn3d.hxx> #include <svx/globl3d.hxx> #include <basegfx/point/b3dpoint.hxx> #include <sdr/contact/viewcontactofe3dpolygon.hxx> diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index 07ec90033d43..4d7e13897166 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -29,7 +29,7 @@ #include <svx/dialmgr.hxx> #include <svx/obj3d.hxx> #include <svx/lathe3d.hxx> -#include <svx/extrud3d.hxx> +#include <extrud3d.hxx> #include <dragmt3d.hxx> #include <svx/scene3d.hxx> #include <svx/view3d.hxx> diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx index 332cc825aae4..7f0acf713f80 100644 --- a/svx/source/engine3d/view3d1.cxx +++ b/svx/source/engine3d/view3d1.cxx @@ -26,7 +26,7 @@ #include <svx/lathe3d.hxx> #include <svx/scene3d.hxx> #include <svx/sphere3d.hxx> -#include <svx/extrud3d.hxx> +#include <extrud3d.hxx> #include <svx/view3d.hxx> #include <svx/cube3d.hxx> #include <svx/xlineit0.hxx> diff --git a/svx/source/form/dbcharsethelper.cxx b/svx/source/form/dbcharsethelper.cxx index fb5f6f9bdb08..64b4acec01e7 100644 --- a/svx/source/form/dbcharsethelper.cxx +++ b/svx/source/form/dbcharsethelper.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/dbcharsethelper.hxx> +#include <dbcharsethelper.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/dbcharset.hxx> diff --git a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx index cc954881d9c3..51eaa95cae5e 100644 --- a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx +++ b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <svx/sdr/attribute/sdrallfillattributeshelper.hxx> -#include <svx/sdr/primitive2d/sdrattributecreator.hxx> -#include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> +#include <sdr/primitive2d/sdrattributecreator.hxx> +#include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx index 85b902949c46..82ba4c0fd4d3 100644 --- a/svx/source/sdr/attribute/sdrformtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/attribute/sdrformtextattribute.hxx> +#include <sdr/attribute/sdrformtextattribute.hxx> #include <basegfx/vector/b2enums.hxx> #include <svl/itemset.hxx> #include <svx/xftdiit.hxx> #include <svx/xftstit.hxx> #include <svx/xftshxy.hxx> -#include <svx/xftshtit.hxx> +#include <xftshtit.hxx> #include <svx/xtextit0.hxx> #include <svx/xftadit.hxx> #include <svx/xftshit.hxx> diff --git a/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx index d65afc97b4d4..6ab08fcba99f 100644 --- a/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx @@ -18,7 +18,7 @@ */ -#include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx> +#include <sdr/attribute/sdrlinefillshadowtextattribute.hxx> namespace drawinglayer::attribute diff --git a/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx index 421d79857188..bc15ad8473e4 100644 --- a/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx @@ -18,7 +18,7 @@ */ -#include <svx/sdr/attribute/sdrlineshadowtextattribute.hxx> +#include <sdr/attribute/sdrlineshadowtextattribute.hxx> namespace drawinglayer::attribute diff --git a/svx/source/sdr/attribute/sdrshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrshadowtextattribute.cxx index 690938bd8331..8d08b770a7a0 100644 --- a/svx/source/sdr/attribute/sdrshadowtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrshadowtextattribute.cxx @@ -18,7 +18,7 @@ */ -#include <svx/sdr/attribute/sdrshadowtextattribute.hxx> +#include <sdr/attribute/sdrshadowtextattribute.hxx> namespace drawinglayer::attribute diff --git a/svx/source/sdr/attribute/sdrtextattribute.cxx b/svx/source/sdr/attribute/sdrtextattribute.cxx index 50ae63e5ea06..fc894e920549 100644 --- a/svx/source/sdr/attribute/sdrtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrtextattribute.cxx @@ -18,8 +18,8 @@ */ -#include <svx/sdr/attribute/sdrtextattribute.hxx> -#include <svx/sdr/attribute/sdrformtextattribute.hxx> +#include <sdr/attribute/sdrtextattribute.hxx> +#include <sdr/attribute/sdrformtextattribute.hxx> #include <svx/svdotext.hxx> #include <editeng/outlobj.hxx> #include <editeng/editobj.hxx> diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx index 0f4a01623432..42ccb520b0f4 100644 --- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx +++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> +#include <sdr/contact/objectcontactofobjlistpainter.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <svx/sdr/contact/viewobjectcontact.hxx> #include <svx/svdpage.hxx> diff --git a/svx/source/sdr/contact/viewcontactofe3d.cxx b/svx/source/sdr/contact/viewcontactofe3d.cxx index 3d5770ffe856..ce2e00f50285 100644 --- a/svx/source/sdr/contact/viewcontactofe3d.cxx +++ b/svx/source/sdr/contact/viewcontactofe3d.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/contact/viewcontactofe3d.hxx> +#include <sdr/contact/viewcontactofe3d.hxx> #include <sdr/contact/viewobjectcontactofe3d.hxx> #include <svx/obj3d.hxx> #include <drawinglayer/primitive2d/embedded3dprimitive2d.hxx> diff --git a/svx/source/sdr/contact/viewcontactofe3dcube.cxx b/svx/source/sdr/contact/viewcontactofe3dcube.cxx index bc315b10fa5c..00e990f576cf 100644 --- a/svx/source/sdr/contact/viewcontactofe3dcube.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dcube.cxx @@ -21,7 +21,7 @@ #include <sdr/contact/viewcontactofe3dcube.hxx> #include <svx/cube3d.hxx> #include <drawinglayer/primitive3d/sdrcubeprimitive3d.hxx> -#include <svx/sdr/primitive2d/sdrattributecreator.hxx> +#include <sdr/primitive2d/sdrattributecreator.hxx> #include <sdr/primitive3d/sdrattributecreator3d.hxx> #include <basegfx/range/b3drange.hxx> #include <memory> diff --git a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx index e4a5df993579..d510f9803d5d 100644 --- a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx @@ -19,9 +19,9 @@ #include <sdr/contact/viewcontactofe3dextrude.hxx> -#include <svx/extrud3d.hxx> +#include <extrud3d.hxx> #include <drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx> -#include <svx/sdr/primitive2d/sdrattributecreator.hxx> +#include <sdr/primitive2d/sdrattributecreator.hxx> #include <sdr/primitive3d/sdrattributecreator3d.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <memory> diff --git a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx index d3d8f59f2934..c76cae4df81c 100644 --- a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx @@ -21,7 +21,7 @@ #include <sdr/contact/viewcontactofe3dlathe.hxx> #include <svx/lathe3d.hxx> #include <drawinglayer/primitive3d/sdrlatheprimitive3d.hxx> -#include <svx/sdr/primitive2d/sdrattributecreator.hxx> +#include <sdr/primitive2d/sdrattributecreator.hxx> #include <sdr/primitive3d/sdrattributecreator3d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <memory> diff --git a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx index eb9b2c261faa..ec8a4be00acf 100644 --- a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx @@ -19,9 +19,9 @@ #include <sdr/contact/viewcontactofe3dpolygon.hxx> -#include <svx/polygn3d.hxx> +#include <polygn3d.hxx> #include <drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx> -#include <svx/sdr/primitive2d/sdrattributecreator.hxx> +#include <sdr/primitive2d/sdrattributecreator.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 e2b4a636bbc6..8192ea766cd8 100644 --- a/svx/source/sdr/contact/viewcontactofe3dscene.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dscene.cxx @@ -23,12 +23,12 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/color/bcolor.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> -#include <svx/sdr/primitive2d/sdrattributecreator.hxx> +#include <sdr/primitive2d/sdrattributecreator.hxx> #include <sdr/contact/viewobjectcontactofe3dscene.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/range/b3drange.hxx> #include <drawinglayer/primitive3d/baseprimitive3d.hxx> -#include <svx/sdr/contact/viewcontactofe3d.hxx> +#include <sdr/contact/viewcontactofe3d.hxx> #include <drawinglayer/primitive2d/sceneprimitive2d.hxx> #include <drawinglayer/primitive3d/transformprimitive3d.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> diff --git a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx index dbec97e884fc..c34e098564fc 100644 --- a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx @@ -21,7 +21,7 @@ #include <sdr/contact/viewcontactofe3dsphere.hxx> #include <svx/sphere3d.hxx> #include <drawinglayer/primitive3d/sdrsphereprimitive3d.hxx> -#include <svx/sdr/primitive2d/sdrattributecreator.hxx> +#include <sdr/primitive2d/sdrattributecreator.hxx> #include <sdr/primitive3d/sdrattributecreator3d.hxx> #include <memory> diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index 28064f64556c..0e175c9fd78e 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -20,13 +20,13 @@ #include <sdr/contact/viewcontactofgraphic.hxx> #include <sdr/contact/viewobjectcontactofgraphic.hxx> #include <svx/svdograf.hxx> -#include <svx/sdgtritm.hxx> +#include <sdgtritm.hxx> #include <svx/sdgluitm.hxx> -#include <svx/sdgcoitm.hxx> +#include <sdgcoitm.hxx> #include <svx/sdggaitm.hxx> -#include <svx/sdginitm.hxx> +#include <sdginitm.hxx> #include <svx/sdgmoitm.hxx> -#include <svx/sdr/primitive2d/sdrattributecreator.hxx> +#include <sdr/primitive2d/sdrattributecreator.hxx> #include <svl/itemset.hxx> #include <tools/debug.hxx> diff --git a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx index 760378f07179..90936b5fe4be 100644 --- a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx +++ b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx @@ -22,16 +22,16 @@ #include <svx/svdpage.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <svx/svdobj.hxx> -#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> +#include <sdr/contact/objectcontactofobjlistpainter.hxx> #include <vcl/timer.hxx> #include <svx/svdpagv.hxx> #include <svx/svdview.hxx> #include <sdr/contact/viewcontactofsdrpage.hxx> #include <sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx> -#include <svx/sdr/primitive2d/sdrattributecreator.hxx> +#include <sdr/primitive2d/sdrattributecreator.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> +#include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <drawinglayer/attribute/sdrfillattribute.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <drawinglayer/attribute/fillgradientattribute.hxx> diff --git a/svx/source/sdr/contact/viewcontactofpageobj.cxx b/svx/source/sdr/contact/viewcontactofpageobj.cxx index a14572e9c686..6f1ea810c61b 100644 --- a/svx/source/sdr/contact/viewcontactofpageobj.cxx +++ b/svx/source/sdr/contact/viewcontactofpageobj.cxx @@ -17,16 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/contact/viewcontactofpageobj.hxx> +#include <sdr/contact/viewcontactofpageobj.hxx> #include <svx/svdopage.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <vcl/canvastools.hxx> #include <vcl/outdev.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> -#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> +#include <sdr/contact/objectcontactofobjlistpainter.hxx> #include <svx/sdr/contact/viewobjectcontact.hxx> -#include <svx/sdr/contact/viewobjectcontactofpageobj.hxx> +#include <sdr/contact/viewobjectcontactofpageobj.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx index a8e57620bef9..f3366f04634f 100644 --- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx @@ -20,7 +20,7 @@ #include <sdr/contact/viewcontactofsdrcaptionobj.hxx> #include <svx/svdocapt.hxx> -#include <svx/sdr/primitive2d/sdrattributecreator.hxx> +#include <sdr/primitive2d/sdrattributecreator.hxx> #include <sdr/primitive2d/sdrcaptionprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> @@ -37,7 +37,7 @@ #include <svx/sdmetitm.hxx> #include <svx/sdprcitm.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> +#include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <basegfx/polygon/b2dpolygonclipper.hxx> #include <vcl/canvastools.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx index 675dc1fe973b..50214bfdb960 100644 --- a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx @@ -20,7 +20,7 @@ #include <sdr/contact/viewcontactofsdrcircobj.hxx> #include <svx/svdocirc.hxx> -#include <svx/sdr/primitive2d/sdrattributecreator.hxx> +#include <sdr/primitive2d/sdrattributecreator.hxx> #include <sdr/primitive2d/sdrellipseprimitive2d.hxx> #include <svl/itemset.hxx> #include <svx/sxciaitm.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx index 85af9e68e515..08858dde129f 100644 --- a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx @@ -20,7 +20,7 @@ #include <sdr/contact/viewcontactofsdredgeobj.hxx> #include <svx/svdoedge.hxx> -#include <svx/sdr/primitive2d/sdrattributecreator.hxx> +#include <sdr/primitive2d/sdrattributecreator.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 69303bba9758..3f436e043277 100644 --- a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx @@ -20,7 +20,7 @@ #include <sdr/contact/viewcontactofsdrmeasureobj.hxx> #include <svx/svdomeas.hxx> -#include <svx/sdr/primitive2d/sdrattributecreator.hxx> +#include <sdr/primitive2d/sdrattributecreator.hxx> #include <svl/itemset.hxx> #include <svx/sxmbritm.hxx> #include <svx/sxmlhitm.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx index 3097e5f14c4c..9862c57aff05 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx @@ -21,7 +21,7 @@ #include <svx/svdoashp.hxx> #include <svx/sdooitm.hxx> #include <svx/sdr/contact/displayinfo.hxx> -#include <svx/sdr/primitive2d/sdrattributecreator.hxx> +#include <sdr/primitive2d/sdrattributecreator.hxx> #include <svx/svditer.hxx> #include <sdr/primitive2d/sdrcustomshapeprimitive2d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx index 04191602e075..253e58bbc011 100644 --- a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx @@ -28,7 +28,7 @@ #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx> #include <svtools/colorcfg.hxx> -#include <svx/sdr/primitive2d/sdrattributecreator.hxx> +#include <sdr/primitive2d/sdrattributecreator.hxx> #include <vcl/canvastools.hxx> #include <vcl/svapp.hxx> #include <tools/debug.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx index defe3962e222..553ae1ca98c1 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx @@ -33,8 +33,8 @@ #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -#include <svx/sdr/primitive2d/sdrattributecreator.hxx> -#include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> +#include <sdr/primitive2d/sdrattributecreator.hxx> +#include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <vcl/lazydelete.hxx> #include <vcl/settings.hxx> #include <drawinglayer/primitive2d/discreteshadowprimitive2d.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx index bda673d35a9e..3aefa6d48cb7 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx @@ -22,7 +22,7 @@ #include <svtools/optionsdrawinglayer.hxx> #include <svx/svdopath.hxx> #include <svx/svdpage.hxx> -#include <svx/sdr/primitive2d/sdrattributecreator.hxx> +#include <sdr/primitive2d/sdrattributecreator.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b2dpolygonclipper.hxx> #include <sdr/primitive2d/sdrpathprimitive2d.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx index 75c3c097d7e3..5ce1e4f595b8 100644 --- a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/contact/viewcontactofsdrrectobj.hxx> +#include <sdr/contact/viewcontactofsdrrectobj.hxx> #include <svx/svdorect.hxx> -#include <svx/sdr/primitive2d/sdrattributecreator.hxx> +#include <sdr/primitive2d/sdrattributecreator.hxx> #include <sdr/primitive2d/sdrrectangleprimitive2d.hxx> #include <svl/itemset.hxx> #include <sdr/primitive2d/sdrprimitivetools.hxx> diff --git a/svx/source/sdr/contact/viewcontactoftextobj.cxx b/svx/source/sdr/contact/viewcontactoftextobj.cxx index 265b594b9a03..4f4cd9e408ef 100644 --- a/svx/source/sdr/contact/viewcontactoftextobj.cxx +++ b/svx/source/sdr/contact/viewcontactoftextobj.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/contact/viewcontactoftextobj.hxx> +#include <sdr/contact/viewcontactoftextobj.hxx> #include <svx/svdotext.hxx> namespace sdr::contact { diff --git a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx index 8e0dcd474ae8..7bb78f069aae 100644 --- a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx @@ -18,7 +18,7 @@ */ #include <sdr/contact/viewobjectcontactofe3d.hxx> -#include <svx/sdr/contact/viewcontactofe3d.hxx> +#include <sdr/contact/viewcontactofe3d.hxx> #include <basegfx/color/bcolor.hxx> #include <drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx> #include <sdr/contact/viewobjectcontactofe3dscene.hxx> diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx index aac38032875b..fefb01679717 100644 --- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx @@ -18,15 +18,15 @@ */ #include <vcl/idle.hxx> -#include <svx/sdr/contact/viewobjectcontactofpageobj.hxx> -#include <svx/sdr/contact/viewcontactofpageobj.hxx> +#include <sdr/contact/viewobjectcontactofpageobj.hxx> +#include <sdr/contact/viewcontactofpageobj.hxx> #include <svx/svdopage.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <svtools/colorcfg.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> -#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> +#include <sdr/contact/objectcontactofobjlistpainter.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/svdpage.hxx> #include <svx/unoapi.hxx> diff --git a/svx/source/sdr/overlay/overlayobjectcell.cxx b/svx/source/sdr/overlay/overlayobjectcell.cxx index 5b0d2b520e3f..3f060a7ccf81 100644 --- a/svx/source/sdr/overlay/overlayobjectcell.cxx +++ b/svx/source/sdr/overlay/overlayobjectcell.cxx @@ -21,7 +21,7 @@ #include <basegfx/numeric/ftools.hxx> #include <vcl/outdev.hxx> #include <vcl/hatch.hxx> -#include <svx/sdr/overlay/overlayobjectcell.hxx> +#include <sdr/overlay/overlayobjectcell.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> diff --git a/svx/source/sdr/overlay/overlaytriangle.cxx b/svx/source/sdr/overlay/overlaytriangle.cxx index 4722dbc593db..30d6aca87c08 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 875f052b23cf..587a3f833cd2 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/primitive2d/sdrattributecreator.hxx> +#include <sdr/primitive2d/sdrattributecreator.hxx> #include <svl/itemset.hxx> #include <svx/xdef.hxx> #include <basegfx/polygon/b2dpolygon.hxx> @@ -57,7 +57,7 @@ #include <basegfx/polygon/b2dlinegeometry.hxx> #include <svx/svdotext.hxx> #include <drawinglayer/attribute/fillgraphicattribute.hxx> -#include <svx/sdr/attribute/sdrtextattribute.hxx> +#include <sdr/attribute/sdrtextattribute.hxx> #include <svx/xbtmpit.hxx> #include <svl/itempool.hxx> #include <vcl/svapp.hxx> @@ -74,10 +74,10 @@ #include <editeng/editstat.hxx> #include <drawinglayer/attribute/fillhatchattribute.hxx> #include <drawinglayer/attribute/fillgradientattribute.hxx> -#include <svx/sdr/attribute/sdrshadowtextattribute.hxx> -#include <svx/sdr/attribute/sdrlineshadowtextattribute.hxx> -#include <svx/sdr/attribute/sdrformtextattribute.hxx> -#include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx> +#include <sdr/attribute/sdrshadowtextattribute.hxx> +#include <sdr/attribute/sdrlineshadowtextattribute.hxx> +#include <sdr/attribute/sdrformtextattribute.hxx> +#include <sdr/attribute/sdrlinefillshadowtextattribute.hxx> #include <drawinglayer/attribute/sdrsceneattribute3d.hxx> #include <drawinglayer/attribute/sdrlightingattribute3d.hxx> #include <drawinglayer/attribute/sdrlightattribute3d.hxx> diff --git a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx index 1a07c0d652f2..2b4ff074b709 100644 --- a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx @@ -20,7 +20,7 @@ #include <sdr/primitive2d/sdrcaptionprimitive2d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> +#include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> diff --git a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx index 6a51d7cb75c9..3aaed40da085 100644 --- a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx @@ -18,7 +18,7 @@ */ #include <sdr/primitive2d/sdrconnectorprimitive2d.hxx> -#include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> +#include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx index 0946cd3428c7..60474f0e8f30 100644 --- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx @@ -21,7 +21,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -#include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> +#include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <drawinglayer/attribute/sdrlineattribute.hxx> diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx index 86e085ea8581..13d21fd79a0e 100644 --- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx +++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> +#include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> @@ -30,7 +30,7 @@ #include <drawinglayer/attribute/sdrfillgraphicattribute.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <drawinglayer/primitive2d/shadowprimitive2d.hxx> -#include <svx/sdr/attribute/sdrtextattribute.hxx> +#include <sdr/attribute/sdrtextattribute.hxx> #include <sdr/primitive2d/sdrtextprimitive2d.hxx> #include <svx/svdotext.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> diff --git a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx index baa8bad642f9..5eece7078000 100644 --- a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx @@ -21,7 +21,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -#include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> +#include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <basegfx/color/bcolor.hxx> diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx index 517daf35e121..43b02a44410b 100644 --- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx @@ -20,7 +20,7 @@ #include <sdr/primitive2d/sdrgrafprimitive2d.hxx> #include <drawinglayer/primitive2d/graphicprimitive2d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> +#include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> diff --git a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx index 82e2fc502160..46244cc5f56d 100644 --- a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx @@ -18,10 +18,10 @@ */ #include <sdr/primitive2d/sdrmeasureprimitive2d.hxx> -#include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> +#include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <sdr/primitive2d/sdrtextprimitive2d.hxx> -#include <svx/sdr/attribute/sdrtextattribute.hxx> +#include <sdr/attribute/sdrtextattribute.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/utils/canvastools.hxx> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> diff --git a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx index da099c1e395b..7d6b5bbb8ff2 100644 --- a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx @@ -20,7 +20,7 @@ #include <sdr/primitive2d/sdrole2primitive2d.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> +#include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> diff --git a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx index 1e1c46aada61..f69a9d0f0290 100644 --- a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx @@ -18,7 +18,7 @@ */ #include <sdr/primitive2d/sdrpathprimitive2d.hxx> -#include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> +#include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> diff --git a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx index d7e491c7ba14..3b7ee9c85207 100644 --- a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx @@ -19,7 +19,7 @@ #include <sdr/primitive2d/sdrrectangleprimitive2d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> +#include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> diff --git a/svx/source/sdr/properties/e3dextrudeproperties.cxx b/svx/source/sdr/properties/e3dextrudeproperties.cxx index bf7275ac9304..7cc5a1db3c5c 100644 --- a/svx/source/sdr/properties/e3dextrudeproperties.cxx +++ b/svx/source/sdr/properties/e3dextrudeproperties.cxx @@ -19,7 +19,7 @@ #include <sdr/properties/e3dextrudeproperties.hxx> #include <svl/itemset.hxx> -#include <svx/extrud3d.hxx> +#include <extrud3d.hxx> namespace sdr::properties diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx index 3d976bbc757e..ec19696c2d78 100644 --- a/svx/source/sdr/properties/graphicproperties.cxx +++ b/svx/source/sdr/properties/graphicproperties.cxx @@ -28,10 +28,10 @@ #include <svx/sdgcpitm.hxx> #include <svx/svdmodel.hxx> #include <svx/sdgluitm.hxx> -#include <svx/sdgcoitm.hxx> +#include <sdgcoitm.hxx> #include <svx/sdggaitm.hxx> -#include <svx/sdgtritm.hxx> -#include <svx/sdginitm.hxx> +#include <sdgtritm.hxx> +#include <sdginitm.hxx> #include <svx/sdgmoitm.hxx> #include <svx/xfillit0.hxx> #include <svx/xlineit0.hxx> diff --git a/svx/source/styles/CommonStyleManager.cxx b/svx/source/styles/CommonStyleManager.cxx index e88b97aad7d3..d1fc8dbf6d7c 100644 --- a/svx/source/styles/CommonStyleManager.cxx +++ b/svx/source/styles/CommonStyleManager.cxx @@ -9,7 +9,7 @@ */ #include <svx/CommonStyleManager.hxx> -#include <svx/CommonStylePreviewRenderer.hxx> +#include <CommonStylePreviewRenderer.hxx> namespace svx { diff --git a/svx/source/styles/CommonStylePreviewRenderer.cxx b/svx/source/styles/CommonStylePreviewRenderer.cxx index 886200571d74..5b93b837c00d 100644 --- a/svx/source/styles/CommonStylePreviewRenderer.cxx +++ b/svx/source/styles/CommonStylePreviewRenderer.cxx @@ -9,7 +9,7 @@ */ #include <memory> -#include <svx/CommonStylePreviewRenderer.hxx> +#include <CommonStylePreviewRenderer.hxx> #include <sfx2/objsh.hxx> #include <svl/style.hxx> diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index a068447a82f3..203a0b572a16 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -54,12 +54,12 @@ #include <svx/sdgcpitm.hxx> #include <svx/sdtfchim.hxx> #include <svx/sdasitm.hxx> -#include <svx/sdgcoitm.hxx> +#include <sdgcoitm.hxx> #include <svx/sdggaitm.hxx> -#include <svx/sdginitm.hxx> +#include <sdginitm.hxx> #include <svx/sdgluitm.hxx> #include <svx/sdgmoitm.hxx> -#include <svx/sdgtritm.hxx> +#include <sdgtritm.hxx> #include <svx/sdprcitm.hxx> #include <svx/sdtaaitm.hxx> #include <svx/sdtacitm.hxx> @@ -75,7 +75,7 @@ #include <svx/svx3ditems.hxx> #include <svx/svxids.hrc> #include <sxallitm.hxx> -#include <svx/sxcaitm.hxx> +#include <sxcaitm.hxx> #include <svx/sxcecitm.hxx> #include <svx/sxcgitm.hxx> #include <svx/sxciaitm.hxx> @@ -85,11 +85,11 @@ #include <svx/sxekitm.hxx> #include <svx/sxelditm.hxx> #include <svx/sxenditm.hxx> -#include <svx/sxfiitm.hxx> +#include <sxfiitm.hxx> #include <sxlayitm.hxx> #include <sxlogitm.hxx> #include <svx/sxmbritm.hxx> -#include <svx/sxmfsitm.hxx> +#include <sxmfsitm.hxx> #include <sxmkitm.hxx> #include <svx/sxmlhitm.hxx> #include <sxmoitm.hxx> @@ -108,7 +108,7 @@ #include <sxrooitm.hxx> #include <sxsaitm.hxx> #include <sxsalitm.hxx> -#include <svx/sxsiitm.hxx> +#include <sxsiitm.hxx> #include <sxsoitm.hxx> #include <sxtraitm.hxx> #include <svx/xfillit0.hxx> diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index b6d1bd96e064..ea8aa3bda525 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -31,7 +31,7 @@ #include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <svx/xlineit0.hxx> -#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> +#include <sdr/contact/objectcontactofobjlistpainter.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <svx/svdouno.hxx> #include <svx/svdopath.hxx> diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 80c421e40149..82bd19e4815a 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -62,8 +62,8 @@ #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/transformprimitive2d.hxx> #include <drawinglayer/primitive2d/markerarrayprimitive2d.hxx> -#include <svx/sdr/primitive2d/sdrattributecreator.hxx> -#include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> +#include <sdr/primitive2d/sdrattributecreator.hxx> +#include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <svx/svdoole2.hxx> #include <svx/svdovirt.hxx> #include <svx/svdouno.hxx> diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 35676d9faaf2..72d76d0a8beb 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -34,7 +34,7 @@ #include <svx/svditer.hxx> #include <svx/strings.hrc> -#include <svx/AffineMatrixItem.hxx> +#include <AffineMatrixItem.hxx> #include <svx/e3dsceneupdater.hxx> #include <svx/obj3d.hxx> #include <svx/rectenum.hxx> diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 2908d7edcf7b..2d0a58749e5e 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -65,8 +65,8 @@ #include <svx/strings.hrc> #include <svx/svddrgv.hxx> #include <svx/svdviter.hxx> -#include <svx/textchain.hxx> -#include <svx/textchaincursor.hxx> +#include <textchain.hxx> +#include <textchaincursor.hxx> #include <tools/debug.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index fc1a6caf7d3a..d5895ffa5718 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -48,7 +48,7 @@ #include <svx/sdr/overlay/overlayanimatedbitmapex.hxx> #include <svx/sdr/overlay/overlaybitmapex.hxx> #include <sdr/overlay/overlayline.hxx> -#include <svx/sdr/overlay/overlaytriangle.hxx> +#include <sdr/overlay/overlaytriangle.hxx> #include <sdr/overlay/overlayhandle.hxx> #include <sdr/overlay/overlayrectangle.hxx> #include <svx/sdrpagewindow.hxx> diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index e78fffc0b34f..839c290deec7 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -49,7 +49,7 @@ #include <svx/svdpool.hxx> #include <svx/svdobj.hxx> #include <svx/svdotext.hxx> -#include <svx/textchain.hxx> +#include <textchain.hxx> #include <svx/svdetc.hxx> #include <svx/svdoutl.hxx> #include <svx/svdoole2.hxx> diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index def37015ef50..59ffc2ee9a8d 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -63,7 +63,7 @@ #include <svx/fmmodel.hxx> #include <svx/sdr/contact/displayinfo.hxx> -#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> +#include <sdr/contact/objectcontactofobjlistpainter.hxx> #include <sdr/contact/viewcontactofgraphic.hxx> #include <svx/sdr/contact/viewcontactofsdrobj.hxx> #include <sdr/properties/emptyproperties.hxx> diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index dc7bdaf3aa4d..e346ee7a94d9 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -49,7 +49,7 @@ #include <svx/svdpool.hxx> #include <svx/svdtrans.hxx> #include <svx/svdview.hxx> -#include <svx/sxcaitm.hxx> +#include <sxcaitm.hxx> #include <svx/sxcecitm.hxx> #include <svx/sxcgitm.hxx> #include <svx/sxcllitm.hxx> diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 67b598ce14b3..127de6a0c6f5 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -52,13 +52,13 @@ #include <svx/xflbmtit.hxx> #include <svx/svdundo.hxx> #include "svdfmtf.hxx" -#include <svx/sdgcoitm.hxx> +#include <sdgcoitm.hxx> #include <svx/sdgcpitm.hxx> #include <svx/sdggaitm.hxx> -#include <svx/sdginitm.hxx> +#include <sdginitm.hxx> #include <svx/sdgluitm.hxx> #include <svx/sdgmoitm.hxx> -#include <svx/sdgtritm.hxx> +#include <sdgtritm.hxx> #include <editeng/eeitem.hxx> #include <sdr/properties/graphicproperties.hxx> #include <sdr/contact/viewcontactofgraphic.hxx> diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 8ac271db2904..6facde80b742 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -49,7 +49,7 @@ #include <svx/svdtrans.hxx> #include <svx/svdview.hxx> #include <svx/sxmbritm.hxx> -#include <svx/sxmfsitm.hxx> +#include <sxmfsitm.hxx> #include <sxmkitm.hxx> #include <svx/sxmlhitm.hxx> #include <sxmoitm.hxx> diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx index a38768c01088..099a9455a7a4 100644 --- a/svx/source/svdraw/svdopage.cxx +++ b/svx/source/svdraw/svdopage.cxx @@ -30,7 +30,7 @@ #include <svtools/colorcfg.hxx> #include <svl/itemset.hxx> #include <sdr/properties/pageproperties.hxx> -#include <svx/sdr/contact/viewcontactofpageobj.hxx> +#include <sdr/contact/viewcontactofpageobj.hxx> // BaseProperties section diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index b333c3023928..320db90d0279 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -46,10 +46,10 @@ #include <basegfx/range/b2drange.hxx> #include <basegfx/curve/b2dcubicbezier.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include <svx/sdr/attribute/sdrtextattribute.hxx> -#include <svx/sdr/primitive2d/sdrattributecreator.hxx> +#include <sdr/attribute/sdrtextattribute.hxx> +#include <sdr/primitive2d/sdrattributecreator.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -#include <svx/sdr/attribute/sdrformtextattribute.hxx> +#include <sdr/attribute/sdrformtextattribute.hxx> #include <vcl/ptrstyle.hxx> #include <memory> #include <sal/log.hxx> diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index 0d4ccff0f2c1..a451f49c14ca 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -39,7 +39,7 @@ #include <svx/xlnclit.hxx> #include <svx/xlnwtit.hxx> #include <sdr/properties/rectangleproperties.hxx> -#include <svx/sdr/contact/viewcontactofsdrrectobj.hxx> +#include <sdr/contact/viewcontactofsdrrectobj.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <vcl/ptrstyle.hxx> diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index ef76a53b1dca..3ef7839b9891 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -38,8 +38,8 @@ #include <editeng/editobj.hxx> #include <editeng/outliner.hxx> #include <editeng/fhgtitem.hxx> -#include <svx/textchain.hxx> -#include <svx/textchainflow.hxx> +#include <textchain.hxx> +#include <textchainflow.hxx> #include <svl/itempool.hxx> #include <editeng/adjustitem.hxx> #include <editeng/flditem.hxx> @@ -60,7 +60,7 @@ #include <svl/itemiter.hxx> #include <sdr/properties/textproperties.hxx> #include <vcl/metaact.hxx> -#include <svx/sdr/contact/viewcontactoftextobj.hxx> +#include <sdr/contact/viewcontactoftextobj.hxx> #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index f02e7fa8c14c..8424d21ac6f1 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -23,8 +23,8 @@ #include <svx/svdpage.hxx> #include <svx/svdotext.hxx> #include <svx/svdmodel.hxx> -#include <svx/textchain.hxx> -#include <svx/textchainflow.hxx> +#include <textchain.hxx> +#include <textchainflow.hxx> #include <svx/sdtacitm.hxx> #include <svx/sdtayitm.hxx> #include <svx/sdtaiitm.hxx> diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index 52081470f2c3..7f04d0b6bfc9 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -29,7 +29,7 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <algorithm> -#include <svx/xftshtit.hxx> +#include <xftshtit.hxx> #include <vcl/virdev.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/i18n/ScriptType.hpp> diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index 12991843af10..fc90be9125a2 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -29,7 +29,7 @@ #include <svl/itemset.hxx> #include <editeng/eeitem.hxx> #include <svx/sdtfchim.hxx> -#include <svx/textchain.hxx> +#include <textchain.hxx> bool SdrTextObj::HasTextEdit() const diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 15aef91cdf19..827b0720b69d 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -54,7 +54,7 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <svx/sdr/contact/viewcontact.hxx> -#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> +#include <sdr/contact/objectcontactofobjlistpainter.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <svx/svdotable.hxx> diff --git a/svx/source/svdraw/textchain.cxx b/svx/source/svdraw/textchain.cxx index 10c033463f3a..ce4e23902a68 100644 --- a/svx/source/svdraw/textchain.cxx +++ b/svx/source/svdraw/textchain.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/textchain.hxx> +#include <textchain.hxx> #include <svx/svdotext.hxx> #include <svx/svdpage.hxx> diff --git a/svx/source/svdraw/textchaincursor.cxx b/svx/source/svdraw/textchaincursor.cxx index 3480481daad3..51c4d1d8ef87 100644 --- a/svx/source/svdraw/textchaincursor.cxx +++ b/svx/source/svdraw/textchaincursor.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/textchain.hxx> -#include <svx/textchaincursor.hxx> +#include <textchain.hxx> +#include <textchaincursor.hxx> #include <svx/svdedxv.hxx> #include <svx/svdoutl.hxx> #include <vcl/event.hxx> diff --git a/svx/source/svdraw/textchainflow.cxx b/svx/source/svdraw/textchainflow.cxx index 316091cd5776..c7c0b173374a 100644 --- a/svx/source/svdraw/textchainflow.cxx +++ b/svx/source/svdraw/textchainflow.cxx @@ -23,7 +23,7 @@ #include <editeng/outlobj.hxx> #include <editeng/editobj.hxx> #include <editeng/overflowingtxt.hxx> -#include <svx/textchainflow.hxx> +#include <textchainflow.hxx> #include <sal/log.hxx> TextChainFlow::TextChainFlow(SdrTextObj *pChainTarget) diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 1b0fbc5cc246..67b4e44d17b7 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -26,7 +26,7 @@ #include "accessiblecell.hxx" #include <cell.hxx> -#include <svx/DescriptionGenerator.hxx> +#include <DescriptionGenerator.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 54c67302cd9a..fddc5bdf2bbb 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -41,7 +41,7 @@ #include <sfx2/request.hxx> #include <svx/svdotable.hxx> -#include <svx/sdr/overlay/overlayobjectcell.hxx> +#include <sdr/overlay/overlayobjectcell.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/svxids.hrc> #include <editeng/outlobj.hxx> diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx index bdbb580d3382..1666a4dd5a4c 100644 --- a/svx/source/table/viewcontactoftableobj.cxx +++ b/svx/source/table/viewcontactoftableobj.cxx @@ -24,11 +24,11 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> -#include <svx/sdr/primitive2d/sdrattributecreator.hxx> +#include <sdr/primitive2d/sdrattributecreator.hxx> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> -#include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> +#include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <svx/sdr/attribute/sdrtextattribute.hxx> +#include <sdr/attribute/sdrtextattribute.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <editeng/borderline.hxx> #include <drawinglayer/primitive2d/borderlineprimitive2d.hxx> diff --git a/svx/source/tbxctrls/SvxColorChildWindow.cxx b/svx/source/tbxctrls/SvxColorChildWindow.cxx index 4de63f9fd42c..849cfc1344e9 100644 --- a/svx/source/tbxctrls/SvxColorChildWindow.cxx +++ b/svx/source/tbxctrls/SvxColorChildWindow.cxx @@ -20,7 +20,7 @@ #include <svx/SvxColorChildWindow.hxx> #include <sfx2/dockwin.hxx> #include <svx/svxids.hrc> -#include <svx/colrctrl.hxx> +#include <colrctrl.hxx> SFX_IMPL_DOCKINGWINDOW_WITHID( SvxColorChildWindow, SID_COLOR_CONTROL ) diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 65af6c136503..1f6208698790 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -30,7 +30,7 @@ #include <sfx2/viewfrm.hxx> #include <vcl/image.hxx> -#include <svx/colrctrl.hxx> +#include <colrctrl.hxx> #include <svx/svdview.hxx> #include <svx/drawitem.hxx> diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index bc9246689547..fe753171034a 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -51,11 +51,11 @@ #include <svx/svdtrans.hxx> #include <svx/grafctrl.hxx> #include <svx/tbxcolor.hxx> -#include <svx/sdgcoitm.hxx> +#include <sdgcoitm.hxx> #include <svx/sdggaitm.hxx> #include <svx/sdgluitm.hxx> #include <svx/sdgmoitm.hxx> -#include <svx/sdgtritm.hxx> +#include <sdgtritm.hxx> #include <bitmaps.hlst> #include <com/sun/star/frame/XDispatchProvider.hpp> diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 4480fd533540..86710d02fa43 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -47,7 +47,7 @@ #include <vcl/virdev.hxx> #include <vcl/FilterConfigItem.hxx> #include <svl/outstrm.hxx> -#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> +#include <sdr/contact/objectcontactofobjlistpainter.hxx> #include <svx/sdr/contact/viewobjectcontact.hxx> #include <svx/sdr/contact/viewcontact.hxx> #include <svx/sdr/contact/displayinfo.hxx> diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 68c1a27517fe..884eaa92a8cf 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -19,7 +19,7 @@ #include <memory> -#include <svx/XPropertyTable.hxx> +#include <XPropertyTable.hxx> #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp> #include <com/sun/star/drawing/LineDash.hpp> #include <com/sun/star/awt/Gradient.hpp> diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index 75522fc5e27a..f43a575c5350 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -49,7 +49,7 @@ #include <svx/svdopath.hxx> #include <svx/unoapi.hxx> #include <svx/svdomeas.hxx> -#include <svx/extrud3d.hxx> +#include <extrud3d.hxx> #include <svx/lathe3d.hxx> #include <svx/scene3d.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index 8c29b05755b2..6265dc646ff8 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -41,8 +41,8 @@ #include <svx/cube3d.hxx> #include <svx/sphere3d.hxx> #include <svx/lathe3d.hxx> -#include <svx/extrud3d.hxx> -#include <svx/polygn3d.hxx> +#include <extrud3d.hxx> +#include <polygn3d.hxx> #include <svx/unoshprp.hxx> #include <svx/svdmodel.hxx> #include <svx/scene3d.hxx> diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 7f76521c90fd..8c369d84fd1f 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -86,7 +86,7 @@ #include <sal/log.hxx> #include <svx/lathe3d.hxx> -#include <svx/extrud3d.hxx> +#include <extrud3d.hxx> #include <svx/sdr/contact/viewcontact.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <drawinglayer/primitive2d/transformprimitive2d.hxx> diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index 30284c8a9a86..7528f9a61ca4 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -29,7 +29,7 @@ #include <svx/xlncapit.hxx> #include <svx/xlntrit.hxx> #include <svx/xfltrit.hxx> -#include <svx/xftshtit.hxx> +#include <xftshtit.hxx> #include <svx/xgrscit.hxx> #include <svx/xflbmtit.hxx> #include <svx/xflbmpit.hxx> @@ -43,7 +43,7 @@ #include <svx/dialmgr.hxx> #include <editeng/itemtype.hxx> #include <svx/xdef.hxx> -#include <svx/AffineMatrixItem.hxx> +#include <AffineMatrixItem.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx index 9df5d81556e2..4663780c35d4 100644 --- a/svx/source/xoutdev/xpool.cxx +++ b/svx/source/xoutdev/xpool.cxx @@ -20,7 +20,7 @@ #include <sal/config.h> #include <svx/xflbckit.hxx> -#include <svx/xftshtit.hxx> +#include <xftshtit.hxx> #include <svx/xflboxy.hxx> #include <svx/xflbstit.hxx> #include <svx/xflclit.hxx> diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx index 7a4990a404a5..988532c4d7f0 100644 --- a/svx/source/xoutdev/xtabbtmp.cxx +++ b/svx/source/xoutdev/xtabbtmp.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/XPropertyTable.hxx> +#include <XPropertyTable.hxx> #include <osl/diagnose.h> #include <vcl/virdev.hxx> diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx index be2091125d2d..3787cc654338 100644 --- a/svx/source/xoutdev/xtabcolr.cxx +++ b/svx/source/xoutdev/xtabcolr.cxx @@ -18,7 +18,7 @@ */ #include <memory> -#include <svx/XPropertyTable.hxx> +#include <XPropertyTable.hxx> #include <unotools/configmgr.hxx> #include <unotools/pathoptions.hxx> diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx index 2a73fe02ef04..60a14965bc8d 100644 --- a/svx/source/xoutdev/xtabdash.cxx +++ b/svx/source/xoutdev/xtabdash.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/XPropertyTable.hxx> +#include <XPropertyTable.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx index c2485c594418..7ae6d0e39344 100644 --- a/svx/source/xoutdev/xtabgrdt.cxx +++ b/svx/source/xoutdev/xtabgrdt.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/XPropertyTable.hxx> +#include <XPropertyTable.hxx> #include <vcl/virdev.hxx> #include <svx/strings.hrc> diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx index c69c76b471c0..4d0b89b857ae 100644 --- a/svx/source/xoutdev/xtabhtch.cxx +++ b/svx/source/xoutdev/xtabhtch.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/XPropertyTable.hxx> +#include <XPropertyTable.hxx> #include <vcl/svapp.hxx> #include <vcl/virdev.hxx> diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx index f9dad9e532c5..349dea134f73 100644 --- a/svx/source/xoutdev/xtable.cxx +++ b/svx/source/xoutdev/xtable.cxx @@ -18,7 +18,7 @@ */ #include <memory> -#include <svx/XPropertyTable.hxx> +#include <XPropertyTable.hxx> #include <xmlxtexp.hxx> #include <xmlxtimp.hxx> #include <o3tl/safeint.hxx> diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx index fba2a3dc3f8b..e8f73a996beb 100644 --- a/svx/source/xoutdev/xtablend.cxx +++ b/svx/source/xoutdev/xtablend.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/XPropertyTable.hxx> +#include <XPropertyTable.hxx> #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/xoutdev/xtabptrn.cxx b/svx/source/xoutdev/xtabptrn.cxx index 9f73b5175763..de7ca007c59f 100644 --- a/svx/source/xoutdev/xtabptrn.cxx +++ b/svx/source/xoutdev/xtabptrn.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/XPropertyTable.hxx> +#include <XPropertyTable.hxx> #include <vcl/virdev.hxx> #include <svl/itemset.hxx> |