diff options
| author | Vincent LE GARREC <libreoffice@le-garrec.fr> | 2021-03-23 20:02:02 +0100 |
|---|---|---|
| committer | Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> | 2021-03-24 07:39:31 +0100 |
| commit | 7fb85fa0f0a85384f085b13e7d08113f63392445 (patch) | |
| tree | c7d9534df412b61feadd77f76bb662b036669398 /sd/inc | |
| parent | bdbb5d0389642c0d445b5779fe2a18fda3e4a4d4 (diff) | |
tdf#124176 Use pragma once in sd
Change-Id: Ic439140d9ecdcdee9272185bd3c2d11e11288f07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112051
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Tested-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Diffstat (limited to 'sd/inc')
65 files changed, 65 insertions, 257 deletions
diff --git a/sd/inc/AnnotationEnumeration.hxx b/sd/inc/AnnotationEnumeration.hxx index 3acc18e9a131..6dbc7250e92f 100644 --- a/sd/inc/AnnotationEnumeration.hxx +++ b/sd/inc/AnnotationEnumeration.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_ANNOTATIONENUMERATION_HXX -#define INCLUDED_SD_INC_ANNOTATIONENUMERATION_HXX +#pragma once #include <sal/config.h> @@ -35,6 +34,4 @@ css::uno::Reference<css::office::XAnnotationEnumeration> createAnnotationEnumeration(const AnnotationVector&); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/CustomAnimationCloner.hxx b/sd/inc/CustomAnimationCloner.hxx index 52b727c97289..5cc71b0e69ab 100644 --- a/sd/inc/CustomAnimationCloner.hxx +++ b/sd/inc/CustomAnimationCloner.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_CUSTOMANIMATIONCLONER_HXX -#define INCLUDED_SD_INC_CUSTOMANIMATIONCLONER_HXX +#pragma once #include <com/sun/star/animations/XAnimationNode.hpp> @@ -31,6 +30,4 @@ Clone(const css::uno::Reference<css::animations::XAnimationNode>& xSourceNode, const SdPage* pSource = nullptr, const SdPage* pTarget = nullptr); } -#endif // INCLUDED_SD_INC_CUSTOMANIMATIONCLONER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx index 59c29717995a..eebda95f01b8 100644 --- a/sd/inc/CustomAnimationEffect.hxx +++ b/sd/inc/CustomAnimationEffect.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_CUSTOMANIMATIONEFFECT_HXX -#define INCLUDED_SD_INC_CUSTOMANIMATIONEFFECT_HXX +#pragma once #include <com/sun/star/animations/XAnimationNode.hpp> #include <com/sun/star/animations/XTimeContainer.hpp> @@ -452,6 +451,4 @@ private: } -#endif // INCLUDED_SD_INC_CUSTOMANIMATIONEFFECT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx index e2739fd3213c..6894a7c7af77 100644 --- a/sd/inc/CustomAnimationPreset.hxx +++ b/sd/inc/CustomAnimationPreset.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_CUSTOMANIMATIONPRESET_HXX -#define INCLUDED_SD_INC_CUSTOMANIMATIONPRESET_HXX +#pragma once #include <sal/config.h> @@ -140,6 +139,4 @@ void implImportLabels( const css::uno::Reference< css::lang::XMultiServiceFactor } -#endif // _SD_CUSTOMANIMATIONEFFECTS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/DocumentRenderer.hrc b/sd/inc/DocumentRenderer.hrc index 1b2cefe4732f..3cdd5b004f55 100644 --- a/sd/inc/DocumentRenderer.hrc +++ b/sd/inc/DocumentRenderer.hrc @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_DOCUMENTRENDERER_HRC -#define INCLUDED_SD_INC_DOCUMENTRENDERER_HRC +#pragma once #define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) @@ -91,6 +90,4 @@ const char* STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE[] = NC_("STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE", "~Selection") }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/EffectMigration.hxx b/sd/inc/EffectMigration.hxx index adc8bbd4eaa3..7d803cb16bd9 100644 --- a/sd/inc/EffectMigration.hxx +++ b/sd/inc/EffectMigration.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_EFFECTMIGRATION_HXX -#define INCLUDED_SD_INC_EFFECTMIGRATION_HXX +#pragma once #include <com/sun/star/presentation/AnimationEffect.hpp> #include <com/sun/star/presentation/AnimationSpeed.hpp> @@ -73,6 +72,4 @@ public: } // end of namespace sd -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/FactoryIds.hxx b/sd/inc/FactoryIds.hxx index b6a5284b479c..cc257b20a94b 100644 --- a/sd/inc/FactoryIds.hxx +++ b/sd/inc/FactoryIds.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_FACTORYIDS_HXX -#define INCLUDED_SD_INC_FACTORYIDS_HXX +#pragma once #include <sfx2/shell.hxx> @@ -38,6 +37,4 @@ constexpr auto PRESENTATION_FACTORY_ID = SfxInterfaceId(4); } // end of namespace sd -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index adee254359e1..40a25641be4c 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_OUTLINER_HXX -#define INCLUDED_SD_INC_OUTLINER_HXX +#pragma once #include <svx/svdoutl.hxx> #include "pres.hxx" @@ -529,6 +528,4 @@ private: weld::Window* GetMessageBoxParent(); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx index 84ab712073ba..d160609d885b 100644 --- a/sd/inc/OutlinerIterator.hxx +++ b/sd/inc/OutlinerIterator.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_OUTLINERITERATOR_HXX -#define INCLUDED_SD_INC_OUTLINERITERATOR_HXX +#pragma once #include <svx/svdobj.hxx> @@ -312,6 +311,4 @@ public: } } // end of namespace ::sd::outliner -#endif // _ INCLUDED_SD_INC_OUTLINERITERATOR_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/SdShapeTypes.hxx b/sd/inc/SdShapeTypes.hxx index daf11f6d4b96..ef944e59333e 100644 --- a/sd/inc/SdShapeTypes.hxx +++ b/sd/inc/SdShapeTypes.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_SDSHAPETYPES_HXX -#define INCLUDED_SD_INC_SDSHAPETYPES_HXX +#pragma once namespace accessibility { @@ -49,6 +48,4 @@ enum SdShapeTypes } // end of namespace accessibility -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx index 0549289e820b..0075e32057fb 100644 --- a/sd/inc/TransitionPreset.hxx +++ b/sd/inc/TransitionPreset.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_TRANSITIONPRESET_HXX -#define INCLUDED_SD_INC_TRANSITIONPRESET_HXX +#pragma once #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -76,6 +75,4 @@ private: } -#endif // INCLUDED_SD_INC_TRANSITIONPRESET_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/animations.hxx b/sd/inc/animations.hxx index 72d31be5e9c1..cb7863473206 100644 --- a/sd/inc/animations.hxx +++ b/sd/inc/animations.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_ANIMATIONS_HXX -#define INCLUDED_SD_INC_ANIMATIONS_HXX +#pragma once #include "sddllapi.h" @@ -48,6 +47,4 @@ SD_DLLPUBLIC void stl_process_after_effect_node_func(AfterEffectNode const & rNo } // namespace sd; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx index 1c27e7745df1..8abc54c90dc6 100644 --- a/sd/inc/anminfo.hxx +++ b/sd/inc/anminfo.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_ANMINFO_HXX -#define INCLUDED_SD_INC_ANMINFO_HXX +#pragma once #include <com/sun/star/presentation/AnimationEffect.hpp> #include <com/sun/star/presentation/AnimationSpeed.hpp> @@ -65,6 +64,4 @@ public: SAL_DLLPRIVATE virtual std::unique_ptr<SdrObjUserData> Clone(SdrObject* pObject) const override; }; -#endif // INCLUDED_SD_INC_ANMINFO_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index 4a20807138b9..f88e7ad0d434 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_APP_HRC -#define INCLUDED_SD_INC_APP_HRC +#pragma once #include <svl/solar.hrc> @@ -466,6 +465,5 @@ #define SID_PRESENTATION_MINIMIZER (SID_SD_START+450) #define SID_REGENERATE_DIAGRAM (SID_SD_START+451) #define SID_EDIT_DIAGRAM (SID_SD_START+452) -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/bitmaps.hlst b/sd/inc/bitmaps.hlst index 6986085a8992..030028124152 100644 --- a/sd/inc/bitmaps.hlst +++ b/sd/inc/bitmaps.hlst @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_SD_INC_BITMAPS_HRC -#define INCLUDED_SD_INC_BITMAPS_HRC +#pragma once // preview bitmaps for layouts #define BMP_LAYOUT_EMPTY "sd/res/layout_empty.png" @@ -209,6 +208,4 @@ #define BMP_MENU_FIRST "cmd/sc_firstrecord.png" #define BMP_MENU_LAST "cmd/sc_lastrecord.png" -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/sd/inc/createpresentation.hxx b/sd/inc/createpresentation.hxx index de1a79c71d55..b1c3016e4da9 100644 --- a/sd/inc/createpresentation.hxx +++ b/sd/inc/createpresentation.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_CREATEPRESENTATION_HXX -#define INCLUDED_SD_INC_CREATEPRESENTATION_HXX +#pragma once #include <sal/config.h> @@ -33,6 +32,4 @@ class SdDrawDocument; css::uno::Reference<css::presentation::XPresentation2> CreatePresentation(SdDrawDocument const& rDocument); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/createunocustomshow.hxx b/sd/inc/createunocustomshow.hxx index dbe19babeb0c..334aa867acdf 100644 --- a/sd/inc/createunocustomshow.hxx +++ b/sd/inc/createunocustomshow.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_CREATEUNOCUSTOMSHOW_HXX -#define INCLUDED_SD_INC_CREATEUNOCUSTOMSHOW_HXX +#pragma once #include <com/sun/star/uno/Reference.hxx> @@ -28,6 +27,4 @@ class SdCustomShow; css::uno::Reference<css::uno::XInterface> createUnoCustomShow( SdCustomShow * pShow); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/createunopageimpl.hxx b/sd/inc/createunopageimpl.hxx index 2d8159f0fe2e..8707704c1470 100644 --- a/sd/inc/createunopageimpl.hxx +++ b/sd/inc/createunopageimpl.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_CREATEUNOPAGEIMPL_HXX -#define INCLUDED_SD_INC_CREATEUNOPAGEIMPL_HXX +#pragma once #include <com/sun/star/uno/Reference.hxx> @@ -30,6 +29,4 @@ class SdPage; css::uno::Reference<css::uno::XInterface> createUnoPageImpl(SdPage* pPage); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx index a30894c943a4..c0115c310a75 100644 --- a/sd/inc/cusshow.hxx +++ b/sd/inc/cusshow.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_CUSSHOW_HXX -#define INCLUDED_SD_INC_CUSSHOW_HXX +#pragma once #include <vector> #include <cppuhelper/weakref.hxx> @@ -63,6 +62,4 @@ public: css::uno::Reference<css::uno::XInterface> getUnoCustomShow(); }; -#endif // INCLUDED_SD_INC_CUSSHOW_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/customshowlist.hxx b/sd/inc/customshowlist.hxx index c612ce4bf93e..8a1706ec2ee3 100644 --- a/sd/inc/customshowlist.hxx +++ b/sd/inc/customshowlist.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_CUSTOMSHOWLIST_HXX -#define INCLUDED_SD_INC_CUSTOMSHOWLIST_HXX +#pragma once #include "sddllapi.h" #include "cusshow.hxx" @@ -87,6 +86,4 @@ public: } }; -#endif // INCLUDED_SD_INC_CUSTOMSHOWLIST_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/diadef.h b/sd/inc/diadef.h index e09cab69649d..6d0f9a266c7c 100644 --- a/sd/inc/diadef.h +++ b/sd/inc/diadef.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_DIADEF_H -#define INCLUDED_SD_INC_DIADEF_H +#pragma once enum class PresChange { @@ -28,6 +27,4 @@ enum class PresChange LAST = SemiAuto }; -#endif // INCLUDED_SD_INC_DIADEF_H - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index e51886931fd7..7d4c3c92ce5c 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_DRAWDOC_HXX -#define INCLUDED_SD_INC_DRAWDOC_HXX +#pragma once #include <com/sun/star/text/WritingMode.hpp> #include <svl/style.hxx> @@ -711,6 +710,4 @@ private: } -#endif // INCLUDED_SD_INC_DRAWDOC_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/errhdl.hrc b/sd/inc/errhdl.hrc index 57119cc730e9..affe12ac4331 100644 --- a/sd/inc/errhdl.hrc +++ b/sd/inc/errhdl.hrc @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_ERRHDL_HRC -#define INCLUDED_SD_INC_ERRHDL_HRC +#pragma once #define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) @@ -37,6 +36,4 @@ const ErrMsgCode RID_SD_ERRHDL[] = { nullptr, ERRCODE_NONE } }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/fadedef.h b/sd/inc/fadedef.h index 2754990ca564..84100f944ff7 100644 --- a/sd/inc/fadedef.h +++ b/sd/inc/fadedef.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_FADEDEF_H -#define INCLUDED_SD_INC_FADEDEF_H +#pragma once // has to be adjusted! #define FADE_EFFECT_COUNT 57 @@ -26,6 +25,4 @@ // has to be adjusted! #define FADE_SPEED_COUNT 3 -#endif // INCLUDED_SD_INC_FADEDEF_H - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/family.hrc b/sd/inc/family.hrc index fdf02a73729d..28a1d4429b81 100644 --- a/sd/inc/family.hrc +++ b/sd/inc/family.hrc @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_FAMILY_HRC -#define INCLUDED_SD_INC_FAMILY_HRC +#pragma once #include <svl/style.hxx> @@ -40,6 +39,4 @@ const std::pair<const char*, SfxStyleSearchBits> RID_PRESENTATIONSTYLEFAMILY[] = { nullptr, SfxStyleSearchBits::Auto } }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx index b4560c0a8a5a..e4173d39ab72 100644 --- a/sd/inc/glob.hxx +++ b/sd/inc/glob.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_GLOB_HXX -#define INCLUDED_SD_INC_GLOB_HXX +#pragma once #define SD_IF_SDAPP SFX_INTERFACE_SD_START + SfxInterfaceId(0) #define SD_IF_SDDRAWDOCSHELL SFX_INTERFACE_SD_START + SfxInterfaceId(1) @@ -51,6 +50,4 @@ #define SD_OPTION_MORPHING u"Morph" #define SD_OPTION_VECTORIZE u"Vectorize" -#endif // _ INCLUDED_SD_INC_GLOB_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/helper/simplereferencecomponent.hxx b/sd/inc/helper/simplereferencecomponent.hxx index 3417f4bda1f7..89e43639e466 100644 --- a/sd/inc/helper/simplereferencecomponent.hxx +++ b/sd/inc/helper/simplereferencecomponent.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_HELPER_SIMPLEREFERENCECOMPONENT_HXX -#define INCLUDED_SD_INC_HELPER_SIMPLEREFERENCECOMPONENT_HXX +#pragma once #include <osl/interlck.h> @@ -61,6 +60,4 @@ private: }; } -#endif // _SALHELPER_SimpleReferenceComponent_HXX_ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h index 25b4625d06e6..5a694dfab928 100644 --- a/sd/inc/helpids.h +++ b/sd/inc/helpids.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_HELPIDS_H -#define INCLUDED_SD_INC_HELPIDS_H +#pragma once #define HID_SDDRAWVIEWSHELL "SD_HID_SDDRAWVIEWSHELL" #define HID_SDGRAPHICVIEWSHELL "SD_HID_SDGRAPHICVIEWSHELL" @@ -58,6 +57,4 @@ #define HID_SD_RULER_HORIZONTAL "SD_HID_SD_RULER_HORIZONTAL" #define HID_SD_RULER_VERTICAL "SD_HID_SD_RULER_VERTICAL" -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/misc/scopelock.hxx b/sd/inc/misc/scopelock.hxx index 5b25ff062c0f..544bb5873f32 100644 --- a/sd/inc/misc/scopelock.hxx +++ b/sd/inc/misc/scopelock.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_MISC_SCOPELOCK_HXX -#define INCLUDED_SD_INC_MISC_SCOPELOCK_HXX +#pragma once #include <sal/types.h> @@ -49,6 +48,4 @@ private: } // namespace sd -#endif // INCLUDED_SD_INC_MISC_SCOPELOCK_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/notifydocumentevent.hxx b/sd/inc/notifydocumentevent.hxx index 16c74a318522..11847a7f9eb1 100644 --- a/sd/inc/notifydocumentevent.hxx +++ b/sd/inc/notifydocumentevent.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_NOTIFYDOCUMENTEVENT_HXX -#define INCLUDED_SD_INC_NOTIFYDOCUMENTEVENT_HXX +#pragma once #include <sal/config.h> #include <rtl/ustring.hxx> @@ -30,6 +29,4 @@ void NotifyDocumentEvent( SdDrawDocument const & rDocument, const OUString& rEve void NotifyDocumentEvent( SdDrawDocument const & rDocument, const OUString& rEventName, const css::uno::Reference< css::uno::XInterface >& xSource ); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/pageformatpanel.hrc b/sd/inc/pageformatpanel.hrc index 979864a0f5f7..3eb2f5763ae2 100644 --- a/sd/inc/pageformatpanel.hrc +++ b/sd/inc/pageformatpanel.hrc @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_SD_INC_PAGEFORMATPANEL_HRC -#define INCLUDED_SD_INC_PAGEFORMATPANEL_HRC +#pragma once #include <utility> @@ -49,6 +48,4 @@ const std::pair<const char*, int> RID_PAGEFORMATPANEL_MARGINS_CM[] = } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/sd/inc/pglink.hxx b/sd/inc/pglink.hxx index c36b2afcda3a..5d4a31451740 100644 --- a/sd/inc/pglink.hxx +++ b/sd/inc/pglink.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_PGLINK_HXX -#define INCLUDED_SD_INC_PGLINK_HXX +#pragma once #include <sfx2/lnkbase.hxx> @@ -38,6 +37,4 @@ public: void Connect() { SvBaseLink::GetRealObject(); } }; -#endif // INCLUDED_SD_INC_PGLINK_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/pres.hxx b/sd/inc/pres.hxx index 6019283af66b..ab2b44adf6c5 100644 --- a/sd/inc/pres.hxx +++ b/sd/inc/pres.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_SD_INC_PRES_HXX -#define INCLUDED_SD_INC_PRES_HXX +#pragma once enum class PresObjKind { @@ -71,6 +70,4 @@ enum NavigatorDragType }; #define NAVIGATOR_DRAGTYPE_COUNT 4 -#endif // INCLUDED_SD_INC_PRES_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/prlayout.hxx b/sd/inc/prlayout.hxx index 54c62dda96dc..7cf768eae8ea 100644 --- a/sd/inc/prlayout.hxx +++ b/sd/inc/prlayout.hxx @@ -23,8 +23,7 @@ |* checked in and does only contain the enumerator. \************************************************************************/ -#ifndef INCLUDED_SD_INC_PRLAYOUT_HXX -#define INCLUDED_SD_INC_PRLAYOUT_HXX +#pragma once enum class PresentationObjects { @@ -44,6 +43,4 @@ enum class PresentationObjects Subtitle }; -#endif // INCLUDED_SD_INC_PRLAYOUT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/randomnode.hxx b/sd/inc/randomnode.hxx index 62cd3805747c..6bccc738b7e1 100644 --- a/sd/inc/randomnode.hxx +++ b/sd/inc/randomnode.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_RANDOMNODE_HXX -#define INCLUDED_SD_INC_RANDOMNODE_HXX +#pragma once #include <sal/config.h> @@ -33,6 +32,4 @@ SD_DLLPUBLIC css::uno::Reference<css::uno::XInterface> RandomAnimationNode_createInstance(sal_Int16 nPresetClass); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/resltn.hxx b/sd/inc/resltn.hxx index b5e1894e776b..cac2602b69f1 100644 --- a/sd/inc/resltn.hxx +++ b/sd/inc/resltn.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_RESLTN_HXX -#define INCLUDED_SD_INC_RESLTN_HXX +#pragma once enum PublishingFormat { @@ -33,6 +32,4 @@ enum PublishingScript SCRIPT_PERL }; -#endif // INCLUDED_SD_INC_RESLTN_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index 820c3666214b..c5c8c3a38ad4 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.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_SD_INC_SDABSTDLG_HXX -#define INCLUDED_SD_INC_SDABSTDLG_HXX +#pragma once #include <vector> @@ -211,6 +210,5 @@ public: protected: ~SdAbstractDialogFactory() {} }; -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc index 8c7629460a4c..90dc0964322b 100644 --- a/sd/inc/sdattr.hrc +++ b/sd/inc/sdattr.hrc @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_SDATTR_HRC -#define INCLUDED_SD_INC_SDATTR_HRC +#pragma once #include <svl/solar.hrc> @@ -119,6 +118,4 @@ #define ATTR_NUMBER_NEWSTART_AT ATTR_PARANUMBERING_START + 1 #define ATTR_PARANUMBERING_END ATTR_NUMBER_NEWSTART_AT -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx index 44e0eb0d20a4..bff52726ebdf 100644 --- a/sd/inc/sdattr.hxx +++ b/sd/inc/sdattr.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_SDATTR_HXX -#define INCLUDED_SD_INC_SDATTR_HXX +#pragma once #include <svl/eitem.hxx> #include <svl/stritem.hxx> @@ -58,6 +57,4 @@ inline SfxBoolItem makeSdAttrLayerLocked(bool bValue = false) inline SfxBoolItem makeSdAttrLayerThisPage() { return SfxBoolItem(ATTR_LAYER_THISPAGE, false); } -#endif // INCLUDED_SD_INC_SDATTR_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdcgmfilter.hxx b/sd/inc/sdcgmfilter.hxx index 000a50bde63d..6d5022f3c43c 100644 --- a/sd/inc/sdcgmfilter.hxx +++ b/sd/inc/sdcgmfilter.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_SDCGMFILTER_HXX -#define INCLUDED_SD_INC_SDCGMFILTER_HXX +#pragma once #include "sdfilter.hxx" @@ -35,6 +34,4 @@ public: bool Export() override; }; -#endif // INCLUDED_SD_INC_SDCGMFILTER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h index 30dfaf035686..84f439197a32 100644 --- a/sd/inc/sdcommands.h +++ b/sd/inc/sdcommands.h @@ -16,12 +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_SD_INC_SDCOMMANDS_H -#define INCLUDED_SD_INC_SDCOMMANDS_H +#pragma once #define CMD_SID_HANDOUT_MASTER_MODE ".uno:HandoutMode" #define CMD_SID_NOTES_MODE ".uno:NotesMode" -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sddll.hxx b/sd/inc/sddll.hxx index 082445e2ca28..7f1258500ee3 100644 --- a/sd/inc/sddll.hxx +++ b/sd/inc/sddll.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_SDDLL_HXX -#define INCLUDED_SD_INC_SDDLL_HXX +#pragma once #include "sddllapi.h" @@ -52,6 +51,4 @@ public: static void Init(); // called directly after loading the DLL }; -#endif // INCLUDED_SD_INC_SDDLL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sddllapi.h b/sd/inc/sddllapi.h index bcf377dbff25..d8d4e1938b5a 100644 --- a/sd/inc/sddllapi.h +++ b/sd/inc/sddllapi.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_SDDLLAPI_H -#define INCLUDED_SD_INC_SDDLLAPI_H +#pragma once #include <sal/types.h> @@ -28,6 +27,4 @@ #define SD_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif -#endif // INCLUDED_SD_INC_SDDLLAPI_H - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdenumdef.hxx b/sd/inc/sdenumdef.hxx index d307f3d7128e..bd04c67a9e07 100644 --- a/sd/inc/sdenumdef.hxx +++ b/sd/inc/sdenumdef.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_SDENUMDEF_HXX -#define INCLUDED_SD_INC_SDENUMDEF_HXX +#pragma once #define RET_SNAP_DELETE 111 @@ -29,6 +28,4 @@ enum class SnapKind Point }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sderror.hxx b/sd/inc/sderror.hxx index a337c3018917..07ee1d7fa801 100644 --- a/sd/inc/sderror.hxx +++ b/sd/inc/sderror.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_SDERROR_HXX -#define INCLUDED_SD_INC_SDERROR_HXX +#pragma once #include <vcl/errcode.hxx> @@ -29,6 +28,4 @@ // Warnings #define WARN_FORMAT_FILE_ROWCOL ErrCode(WarningFlag::Yes, ErrCodeArea::Sd, ErrCodeClass::Read, 100) -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdfilter.hxx b/sd/inc/sdfilter.hxx index 47f07378cc4b..8d7782e4fc92 100644 --- a/sd/inc/sdfilter.hxx +++ b/sd/inc/sdfilter.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_SDFILTER_HXX -#define INCLUDED_SD_INC_SDFILTER_HXX +#pragma once #include <osl/module.h> #include <rtl/ustring.hxx> @@ -64,6 +63,4 @@ private: }; -#endif // INCLUDED_SD_INC_SDFILTER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdgrffilter.hxx b/sd/inc/sdgrffilter.hxx index 90366e2df7da..dc9027f94ca3 100644 --- a/sd/inc/sdgrffilter.hxx +++ b/sd/inc/sdgrffilter.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_SDGRFFILTER_HXX -#define INCLUDED_SD_INC_SDGRFFILTER_HXX +#pragma once #include "sdfilter.hxx" class ErrCode; @@ -37,6 +36,4 @@ public: static void HandleGraphicFilterError(ErrCode nFilterError, ErrCode nStreamError); }; -#endif // INCLUDED_SD_INC_SDGRFFILTER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdhtmlfilter.hxx b/sd/inc/sdhtmlfilter.hxx index 788a87ed569a..84b9c5d48e0f 100644 --- a/sd/inc/sdhtmlfilter.hxx +++ b/sd/inc/sdhtmlfilter.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_SDHTMLFILTER_HXX -#define INCLUDED_SD_INC_SDHTMLFILTER_HXX +#pragma once #include "sdfilter.hxx" @@ -32,6 +31,4 @@ public: virtual bool Export() override; }; -#endif // INCLUDED_SD_INC_SDHTMLFILTER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdiocmpt.hxx b/sd/inc/sdiocmpt.hxx index fb1872f16832..9f1395fd7c22 100644 --- a/sd/inc/sdiocmpt.hxx +++ b/sd/inc/sdiocmpt.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_SDIOCMPT_HXX -#define INCLUDED_SD_INC_SDIOCMPT_HXX +#pragma once #include <tools/stream.hxx> #include "sddllapi.h" @@ -55,6 +54,4 @@ public: ~SdIOCompat(); }; -#endif // INCLUDED_SD_INC_SDIOCMPT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index 7789b896b871..218913a1b69a 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_SDMOD_HXX -#define INCLUDED_SD_INC_SDMOD_HXX +#pragma once #include "glob.hxx" #include "pres.hxx" @@ -172,6 +171,4 @@ private: #define SD_MOD() ( static_cast<SdModule*>(SfxApplication::GetModule(SfxToolsModule::Draw)) ) -#endif // INCLUDED_SD_INC_SDMOD_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdpdffilter.hxx b/sd/inc/sdpdffilter.hxx index 44cae287d19f..685a3485ac35 100644 --- a/sd/inc/sdpdffilter.hxx +++ b/sd/inc/sdpdffilter.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_SDPDFIUMFILTER_HXX -#define INCLUDED_SD_INC_SDPDFIUMFILTER_HXX +#pragma once #include "sdfilter.hxx" @@ -39,6 +38,4 @@ public: bool Export() override; }; -#endif // INCLUDED_SD_INC_SDGRFFILTER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdpptwrp.hxx b/sd/inc/sdpptwrp.hxx index 9126f814d585..7ff62a5c05e7 100644 --- a/sd/inc/sdpptwrp.hxx +++ b/sd/inc/sdpptwrp.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_SDPPTWRP_HXX -#define INCLUDED_SD_INC_SDPPTWRP_HXX +#pragma once #include "sdfilter.hxx" @@ -44,6 +43,4 @@ private: SvMemoryStream* pBas; }; -#endif // INCLUDED_SD_INC_SDPPTWRP_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx index d2959cf9a159..fbcc03574c56 100644 --- a/sd/inc/sdundo.hxx +++ b/sd/inc/sdundo.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_SDUNDO_HXX -#define INCLUDED_SD_INC_SDUNDO_HXX +#pragma once #include <svl/undo.hxx> #include "sddllapi.h" @@ -43,6 +42,4 @@ private: OUString maComment; }; -#endif // INCLUDED_SD_INC_SDUNDO_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdxmlwrp.hxx b/sd/inc/sdxmlwrp.hxx index 0c42447be28f..9a1bf82c028a 100644 --- a/sd/inc/sdxmlwrp.hxx +++ b/sd/inc/sdxmlwrp.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_SD_INC_SDXMLWRP_HXX -#define INCLUDED_SD_INC_SDXMLWRP_HXX +#pragma once #include <comphelper/fileformat.h> #include <tools/solar.h> @@ -50,6 +49,4 @@ private: sal_uLong mnStoreVer; }; -#endif // INCLUDED_SD_INC_SDXMLWRP_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/shapelist.hxx b/sd/inc/shapelist.hxx index c151fa6d2fcd..6528cc073286 100644 --- a/sd/inc/shapelist.hxx +++ b/sd/inc/shapelist.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_SHAPELIST_HXX -#define INCLUDED_SD_INC_SHAPELIST_HXX +#pragma once #include <sal/types.h> #include <svx/sdrobjectuser.hxx> @@ -69,6 +68,4 @@ namespace sd }; } -#endif // INCLUDED_SD_INC_SHAPELIST_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/stlfamily.hxx b/sd/inc/stlfamily.hxx index aff19d1f1739..df7ded613a4e 100644 --- a/sd/inc/stlfamily.hxx +++ b/sd/inc/stlfamily.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_STLFAMILY_HXX -#define INCLUDED_SD_INC_STLFAMILY_HXX +#pragma once #include <memory> #include <com/sun/star/uno/Any.hxx> @@ -114,6 +113,4 @@ private: typedef rtl::Reference< SdStyleFamily > SdStyleFamilyRef; -#endif // INCLUDED_SD_INC_STLFAMILY_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index dbe38d63828f..bb73e157ed3f 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_STLPOOL_HXX -#define INCLUDED_SD_INC_STLPOOL_HXX +#pragma once #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XIndexAccess.hpp> @@ -139,6 +138,4 @@ private: OUString msTableFamilyName; }; -#endif // INCLUDED_SD_INC_STLPOOL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index b6b693d4f937..e0eced36a280 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_STLSHEET_HXX -#define INCLUDED_SD_INC_STLSHEET_HXX +#pragma once #include <rtl/ref.hxx> @@ -166,6 +165,4 @@ struct StyleSheetCopyResult typedef std::vector<StyleSheetCopyResult> StyleSheetCopyResultVector; -#endif // INCLUDED_SD_INC_STLSHEET_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc index 751b576ec0ec..d55bf8824568 100644 --- a/sd/inc/strings.hrc +++ b/sd/inc/strings.hrc @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_STRINGS_HRC -#define INCLUDED_SD_INC_STRINGS_HRC +#pragma once #define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) #define NNC_(Context, StringSingular, StringPlural) reinterpret_cast<char const *>(Context "\004" u8##StringSingular "\004" u8##StringPlural) @@ -486,6 +485,4 @@ #define RID_SVXSTR_MENU_FIRST NC_("RID_SVXSTR_MENU_FIRST", "~First Slide") #define RID_SVXSTR_MENU_LAST NC_("RID_SVXSTR_MENU_LAST", "~Last Slide") -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/strings.hxx b/sd/inc/strings.hxx index 47eb130897f0..b5c01c0d89cf 100644 --- a/sd/inc/strings.hxx +++ b/sd/inc/strings.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_SD_INC_STRINGS_HXX -#define INCLUDED_SD_INC_STRINGS_HXX +#pragma once /* do not translate */ #define STR_LAYOUT_TITLE "Titel" @@ -18,6 +17,5 @@ #define STR_LAYOUT_NOTES "Notizen" #define STR_LAYOUT_SUBTITLE "Untertitel" #define STR_HTMLEXP_DEFAULT_EXTENSION ".html" -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/sd/inc/textapi.hxx b/sd/inc/textapi.hxx index 40449c2f0cc2..4b2d1a751d9e 100644 --- a/sd/inc/textapi.hxx +++ b/sd/inc/textapi.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_TEXTAPI_HXX -#define INCLUDED_SD_INC_TEXTAPI_HXX +#pragma once #include <editeng/unotext.hxx> #include <rtl/ref.hxx> @@ -53,6 +52,4 @@ private: } // namespace sd -#endif // INCLUDED_SD_INC_TEXTAPI_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/undo/undofactory.hxx b/sd/inc/undo/undofactory.hxx index 6341b006a568..92b875c78f3b 100644 --- a/sd/inc/undo/undofactory.hxx +++ b/sd/inc/undo/undofactory.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_UNDO_UNDOFACTORY_HXX -#define INCLUDED_SD_INC_UNDO_UNDOFACTORY_HXX +#pragma once #include <svx/svdundo.hxx> @@ -38,6 +37,4 @@ public: } -#endif // INCLUDED_SD_INC_UNDO_UNDOFACTORY_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx index 771af280103f..f4b2e6dd4e6f 100644 --- a/sd/inc/undo/undomanager.hxx +++ b/sd/inc/undo/undomanager.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_UNDO_UNDOMANAGER_HXX -#define INCLUDED_SD_INC_UNDO_UNDOMANAGER_HXX +#pragma once #include <svx/sdrundomanager.hxx> @@ -59,6 +58,4 @@ private: } -#endif // INCLUDED_SD_INC_UNDO_UNDOMANAGER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/undo/undoobjects.hxx b/sd/inc/undo/undoobjects.hxx index b7eae9b85d66..4602187ec28e 100644 --- a/sd/inc/undo/undoobjects.hxx +++ b/sd/inc/undo/undoobjects.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_UNDO_UNDOOBJECTS_HXX -#define INCLUDED_SD_INC_UNDO_UNDOOBJECTS_HXX +#pragma once #include <memory> #include <svx/svdundo.hxx> @@ -173,6 +172,4 @@ private: } // namespace sd -#endif // INCLUDED_SD_INC_UNDO_UNDOOBJECTS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/undoanim.hxx b/sd/inc/undoanim.hxx index 44b0fa67fcac..2d329b50da45 100644 --- a/sd/inc/undoanim.hxx +++ b/sd/inc/undoanim.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_UNDOANIM_HXX -#define INCLUDED_SD_INC_UNDOANIM_HXX +#pragma once #include <com/sun/star/animations/XAnimationNode.hpp> #include <svx/svdundo.hxx> @@ -82,6 +81,4 @@ private: }; } -#endif // INCLUDED_SD_INC_UNDOANIM_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |