diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2021-06-15 21:36:24 +0900 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-06-17 10:42:59 +0200 |
commit | 68eb62b9bf8a64d892b3cfa58447e7c890ed3ec4 (patch) | |
tree | b45e66f9f84be671f17cb346b8ad38302c1b9f1d /include/svx | |
parent | 3bae5216881a2b8d84066a81b5e2f728675000f0 (diff) |
svx: pragma once for some SdrObject subclasses
Change-Id: Ibbadf5069fbf5327a8a5964a3003bf6e258fd00b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117351
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'include/svx')
33 files changed, 35 insertions, 139 deletions
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index bbe0e8eb2446..48ebb4917414 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDMRKV_HXX -#define INCLUDED_SVX_SVDMRKV_HXX +#pragma once #include <svx/svdmark.hxx> #include <svx/svdhdl.hxx> @@ -460,6 +459,4 @@ public: // In opposite, a hit in the surrounding sensitive area enables Dragging. -#endif // INCLUDED_SVX_SVDMRKV_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index 65540e93a9d5..48374bc035aa 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDOASHP_HXX -#define INCLUDED_SVX_SVDOASHP_HXX +#pragma once #include <svx/svdobj.hxx> #include <svx/svdotext.hxx> @@ -251,6 +250,4 @@ public: OUString GetCustomShapeName() const; }; -#endif // INCLUDED_SVX_SVDOASHP_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdoattr.hxx b/include/svx/svdoattr.hxx index 2505811d2948..3933caa3f3f5 100644 --- a/include/svx/svdoattr.hxx +++ b/include/svx/svdoattr.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDOATTR_HXX -#define INCLUDED_SVX_SVDOATTR_HXX +#pragma once #include <svx/svdobj.hxx> #include <svx/svxdllapi.h> @@ -64,7 +63,4 @@ public: virtual const tools::Rectangle& GetSnapRect() const override; }; - -#endif // INCLUDED_SVX_SVDOATTR_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx index 2805a147a5cf..28337b6631c4 100644 --- a/include/svx/svdocapt.hxx +++ b/include/svx/svdocapt.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDOCAPT_HXX -#define INCLUDED_SVX_SVDOCAPT_HXX +#pragma once #include <svx/svdorect.hxx> #include <svx/svxdllapi.h> @@ -152,7 +151,4 @@ public: ::basegfx::B2DPolygon getTailPolygon() const; }; - -#endif //_SVDOCAPT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx index a13eeac0e241..5da739068aee 100644 --- a/include/svx/svdocirc.hxx +++ b/include/svx/svdocirc.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDOCIRC_HXX -#define INCLUDED_SVX_SVDOCIRC_HXX +#pragma once #include <svx/svdorect.hxx> #include <svx/svxdllapi.h> @@ -141,6 +140,4 @@ public: }; -#endif // INCLUDED_SVX_SVDOCIRC_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index 17108ad856ec..3389fd19c151 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDOEDGE_HXX -#define INCLUDED_SVX_SVDOEDGE_HXX +#pragma once #include <memory> #include <svx/svdotext.hxx> @@ -408,6 +407,4 @@ public: // entire object, then the connector tries to find the most // convenient of the 4 vertex glue points (and only of those). -#endif // INCLUDED_SVX_SVDOEDGE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index 950bb00b6cd5..0903f448b251 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDOGRAF_HXX -#define INCLUDED_SVX_SVDOGRAF_HXX +#pragma once #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/graphic/XGraphic.hpp> @@ -309,6 +308,4 @@ public: } }; -#endif // INCLUDED_SVX_SVDOGRAF_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx index 3eef83bbd3ac..f92c5c7a1e53 100644 --- a/include/svx/svdogrp.hxx +++ b/include/svx/svdogrp.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDOGRP_HXX -#define INCLUDED_SVX_SVDOGRP_HXX +#pragma once #include <memory> #include <svx/svdobj.hxx> @@ -113,6 +112,4 @@ public: virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override; }; -#endif // INCLUDED_SVX_SVDOGRP_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx index 4e9738bc2906..e3ca9abc3449 100644 --- a/include/svx/svdomeas.hxx +++ b/include/svx/svdomeas.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDOMEAS_HXX -#define INCLUDED_SVX_SVDOMEAS_HXX +#pragma once #include <svx/svdotext.hxx> #include <svx/svxdllapi.h> @@ -195,6 +194,4 @@ public: // -> during Copy, etc. use the respective code of the connectors?!? // this probably will be pretty complicated ... -#endif // INCLUDED_SVX_SVDOMEAS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx index bc80acfff76c..d80ec5a577b9 100644 --- a/include/svx/svdomedia.hxx +++ b/include/svx/svdomedia.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDOMEDIA_HXX -#define INCLUDED_SVX_SVDOMEDIA_HXX +#pragma once #include <memory> #include <svx/svdorect.hxx> @@ -81,6 +80,4 @@ private: std::unique_ptr<Impl> m_xImpl; }; -#endif // INCLUDED_SVX_SVDOMEDIA_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index 56b40a6f00df..ae6ff818bdf6 100644 --- a/include/svx/svdoole2.hxx +++ b/include/svx/svdoole2.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDOOLE2_HXX -#define INCLUDED_SVX_SVDOOLE2_HXX +#pragma once #include <memory> #include <svx/svdorect.hxx> @@ -200,6 +199,4 @@ public: void Connect() { GetRealObject(); } }; -#endif // INCLUDED_SVX_SVDOOLE2_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdopage.hxx b/include/svx/svdopage.hxx index c5e700ad9acd..a6be49dad6df 100644 --- a/include/svx/svdopage.hxx +++ b/include/svx/svdopage.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDOPAGE_HXX -#define INCLUDED_SVX_SVDOPAGE_HXX +#pragma once #include <svx/svdobj.hxx> #include <svx/sdrpageuser.hxx> @@ -67,7 +66,4 @@ public: virtual OUString TakeObjNamePlural() const override; }; - -#endif // INCLUDED_SVX_SVDOPAGE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx index be345a850b7d..fc7e2686dcd2 100644 --- a/include/svx/svdopath.hxx +++ b/include/svx/svdopath.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDOPATH_HXX -#define INCLUDED_SVX_SVDOPATH_HXX +#pragma once #include <svx/svdotext.hxx> #include <svx/svxdllapi.h> @@ -172,6 +171,4 @@ public: void SetHandleScale(bool bHandleScale); }; -#endif // INCLUDED_SVX_SVDOPATH_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx index f10105db87ba..4e52c6289faa 100644 --- a/include/svx/svdorect.hxx +++ b/include/svx/svdorect.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDORECT_HXX -#define INCLUDED_SVX_SVDORECT_HXX +#pragma once #include <memory> #include <svx/svdotext.hxx> @@ -125,6 +124,4 @@ public: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; }; -#endif // INCLUDED_SVX_SVDORECT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index 59299425d2b1..88c5728412b6 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDOTABLE_HXX -#define INCLUDED_SVX_SVDOTABLE_HXX +#pragma once #include <com/sun/star/text/WritingMode.hpp> #include <com/sun/star/container/XIndexAccess.hpp> @@ -288,6 +287,4 @@ SVX_DLLPUBLIC void ImportAsRTF( SvStream& rStrm, SdrTableObj& rObj ); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 360c8c72daac..ab235ef6dbb4 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDOTEXT_HXX -#define INCLUDED_SVX_SVDOTEXT_HXX +#pragma once #include <svx/itextprovider.hxx> #include <svx/svdoattr.hxx> @@ -639,7 +638,4 @@ public: friend class ::SdrTextObjTest; }; - -#endif // INCLUDED_SVX_SVDOTEXT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx index c416439ecb5d..2c81f47a185b 100644 --- a/include/svx/svdouno.hxx +++ b/include/svx/svdouno.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDOUNO_HXX -#define INCLUDED_SVX_SVDOUNO_HXX +#pragma once #include <com/sun/star/awt/XControlModel.hpp> #include <com/sun/star/awt/XControl.hpp> @@ -143,6 +142,4 @@ private: SVX_DLLPRIVATE bool impl_getViewContact( sdr::contact::ViewContactOfUnoControl*& _out_rpContact ) const; }; -#endif // INCLUDED_SVX_SVDOUNO_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdoutl.hxx b/include/svx/svdoutl.hxx index 767d8231862b..453d3b4ba3a7 100644 --- a/include/svx/svdoutl.hxx +++ b/include/svx/svdoutl.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDOUTL_HXX -#define INCLUDED_SVX_SVDOUTL_HXX +#pragma once #include <editeng/outliner.hxx> #include <svx/svxdllapi.h> @@ -48,6 +47,5 @@ public: bool hasEditViewCallbacks() const; }; -#endif // INCLUDED_SVX_SVDOUTL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx index d4fdd821acf3..fa2f935f34e5 100644 --- a/include/svx/svdovirt.hxx +++ b/include/svx/svdovirt.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDOVIRT_HXX -#define INCLUDED_SVX_SVDOVIRT_HXX +#pragma once #include <svx/svdobj.hxx> #include <svx/svxdllapi.h> @@ -148,6 +147,4 @@ public: virtual Point GetOffset() const; }; -#endif // INCLUDED_SVX_SVDOVIRT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 11d49191a017..9837a422572b 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDPAGE_HXX -#define INCLUDED_SVX_SVDPAGE_HXX +#pragma once #include <cppuhelper/weak.hxx> #include <svl/stylesheetuser.hxx> @@ -533,7 +532,4 @@ public: bool bEdit ); }; - -#endif // INCLUDED_SVX_SVDPAGE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index 6d703d5c6145..ab9bfa5625ae 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDPAGV_HXX -#define INCLUDED_SVX_SVDPAGV_HXX +#pragma once #include <com/sun/star/awt/XControlContainer.hpp> #include <rtl/ustring.hxx> @@ -118,7 +117,7 @@ private: public: SdrPageView(SdrPage* pPage1, SdrView& rNewView); ~SdrPageView(); - + SdrPageView& operator=( SdrPageView const & ) = delete; // MSVC2017 workaround SdrPageView( SdrPageView const & ) = delete; // MSVC2017 workaround @@ -256,7 +255,6 @@ public: const Color& GetApplicationDocumentColor() const { return maDocumentColor;} }; - -#endif // INCLUDED_SVX_SVDPAGV_HXX +#pragma once /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 7fe2bcc9a23d..0e06b2c681db 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDPNTV_HXX -#define INCLUDED_SVX_SVDPNTV_HXX +#pragma once #include <svl/SfxBroadcaster.hxx> #include <svl/lstner.hxx> @@ -509,6 +508,4 @@ public: const SvtOptionsDrawinglayer& getOptionsDrawinglayer() const { return maDrawinglayerOpt; } }; -#endif // INCLUDED_SVX_SVDPNTV_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdpoev.hxx b/include/svx/svdpoev.hxx index 0ad7addd3a63..8c0c8947cd71 100644 --- a/include/svx/svdpoev.hxx +++ b/include/svx/svdpoev.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDPOEV_HXX -#define INCLUDED_SVX_SVDPOEV_HXX +#pragma once #include <svx/svxdllapi.h> #include <svx/svdedtv.hxx> @@ -80,6 +79,4 @@ public: void CheckPolyPossibilitiesHelper( SdrMark* pM, bool& b1stSmooth, bool& b1stSegm, bool& bCurve, bool& bSmoothFuz, bool& bSegmFuz, basegfx::B2VectorContinuity& eSmooth ); }; -#endif // INCLUDED_SVX_SVDPOEV_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdpool.hxx b/include/svx/svdpool.hxx index 95eea37c59c5..e61b6fe97005 100644 --- a/include/svx/svdpool.hxx +++ b/include/svx/svdpool.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDPOOL_HXX -#define INCLUDED_SVX_SVDPOOL_HXX +#pragma once #include <svx/xpool.hxx> #include <svx/svxdllapi.h> @@ -26,7 +25,6 @@ class XLineAttrSetItem; class XFillAttrSetItem; - class SVXCORE_DLLPUBLIC SdrItemPool final : public XOutdevItemPool { public: @@ -45,6 +43,4 @@ public: static OUString GetItemName(sal_uInt16 nWhich); }; -#endif // INCLUDED_SVX_SVDPOOL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx index b7b06e499590..1fd8fce3ba97 100644 --- a/include/svx/svdsnpv.hxx +++ b/include/svx/svdsnpv.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDSNPV_HXX -#define INCLUDED_SVX_SVDSNPV_HXX +#pragma once #include <svx/svdpntv.hxx> #include <svx/svdhlpln.hxx> @@ -285,6 +284,4 @@ public: Degree100 GetEliminatePolyPointLimitAngle() const { return nEliminatePolyPointLimitAngle; } }; -#endif // INCLUDED_SVX_SVDSNPV_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdsob.hxx b/include/svx/svdsob.hxx index 92725a329bae..2d17ab05640a 100644 --- a/include/svx/svdsob.hxx +++ b/include/svx/svdsob.hxx @@ -17,15 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDSOB_HXX -#define INCLUDED_SVX_SVDSOB_HXX +#pragma once #include <com/sun/star/uno/Any.hxx> #include <svx/svxdllapi.h> #include <svx/svdtypes.hxx> - /* Stores a bitfield of the layer values that have been set. */ @@ -87,6 +85,4 @@ public: }; -#endif // INCLUDED_SVX_SVDSOB_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdtext.hxx b/include/svx/svdtext.hxx index 2eb8ac691c0d..4a11c12b841e 100644 --- a/include/svx/svdtext.hxx +++ b/include/svx/svdtext.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDTEXT_HXX -#define INCLUDED_SVX_SVDTEXT_HXX +#pragma once #include <svx/sdr/properties/defaultproperties.hxx> #include <svx/svxdllapi.h> @@ -78,6 +77,4 @@ private: bool mbPortionInfoChecked; }; -#endif // INCLUDED_SVX_SVDTEXT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx index ccc6308fc018..abc19bf617cd 100644 --- a/include/svx/svdtrans.hxx +++ b/include/svx/svdtrans.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDTRANS_HXX -#define INCLUDED_SVX_SVDTRANS_HXX +#pragma once #include <rtl/ustring.hxx> #include <svx/svxdllapi.h> @@ -297,7 +296,4 @@ public: static OUString GetUnitStr(FieldUnit eUnit); }; - -#endif // INCLUDED_SVX_SVDTRANS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdtypes.hxx b/include/svx/svdtypes.hxx index a2c065c4b342..5b73552a5719 100644 --- a/include/svx/svdtypes.hxx +++ b/include/svx/svdtypes.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDTYPES_HXX -#define INCLUDED_SVX_SVDTYPES_HXX +#pragma once #include <sal/types.h> #include <o3tl/strong_int.hxx> @@ -88,6 +87,4 @@ enum class SdrRepeatFunc ImportMtf, }; -#endif // INCLUDED_SVX_SVDTYPES_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 04665b9daa28..b624b6e77428 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDUNDO_HXX -#define INCLUDED_SVX_SVDUNDO_HXX +#pragma once #include <config_options.h> #include <sal/config.h> @@ -738,6 +737,4 @@ public: virtual std::unique_ptr<SdrUndoAction> CreateUndoPageChangeMasterPage(SdrPage& rChangedPage); }; -#endif // INCLUDED_SVX_SVDUNDO_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index f7efd59b708e..7415e50ff7f6 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDVIEW_HXX -#define INCLUDED_SVX_SVDVIEW_HXX +#pragma once // HACK to avoid too deep includes and to have some // levels free in svdmark itself (MS compiler include depth limit) @@ -279,6 +278,5 @@ public: // Pointer GetPreferredPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nTol=0) const; // OUString GetStatusText(); -#endif // INCLUDED_SVX_SVDVIEW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdviter.hxx b/include/svx/svdviter.hxx index d8a3de57727f..2a74d6741f80 100644 --- a/include/svx/svdviter.hxx +++ b/include/svx/svdviter.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDVITER_HXX -#define INCLUDED_SVX_SVDVITER_HXX +#pragma once #include <svx/svxdllapi.h> @@ -82,6 +81,4 @@ public: SdrView* NextView(); }; -#endif // INCLUDED_SVX_SVDVITER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdxcgv.hxx b/include/svx/svdxcgv.hxx index 8ed2adbb126d..87ea2a28569b 100644 --- a/include/svx/svdxcgv.hxx +++ b/include/svx/svdxcgv.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVDXCGV_HXX -#define INCLUDED_SVX_SVDXCGV_HXX +#pragma once #include <svx/svdedxv.hxx> @@ -111,6 +110,4 @@ public: bool Paste(SvStream& rInput, EETextFormat eFormat, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions); }; -#endif // INCLUDED_SVX_SVDXCGV_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |