diff options
| author | Roman Kuznetsov <antilibreoffice@gmail.com> | 2020-11-18 23:08:50 +0100 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-11-19 07:26:22 +0100 |
| commit | 6d74413e5d2b03d84a2f8f748827234b2c22d62c (patch) | |
| tree | 0a3dae67d88b5c696d412e3f71fa1712a3d3956f /include | |
| parent | 19926ed35ebb623fc896942b1f232b83edf1fc1e (diff) | |
tdf#124176 use pragma once instead of include guards
in /core/include/svtools/
Change-Id: Ic8614f77dfde02f4c1fc4cceccd1de4ff5a05f72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106006
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include')
82 files changed, 82 insertions, 338 deletions
diff --git a/include/svtools/DocumentToGraphicRenderer.hxx b/include/svtools/DocumentToGraphicRenderer.hxx index 519f47e7b74a..a5dc8e115a8e 100644 --- a/include/svtools/DocumentToGraphicRenderer.hxx +++ b/include/svtools/DocumentToGraphicRenderer.hxx @@ -18,8 +18,7 @@ */ -#ifndef INCLUDED_SVTOOLS_DOCUMENTTOGRAPHICRENDERER_HXX -#define INCLUDED_SVTOOLS_DOCUMENTTOGRAPHICRENDERER_HXX +#pragma once #include <vector> @@ -106,6 +105,4 @@ public: bool isImpress() const; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/HtmlWriter.hxx b/include/svtools/HtmlWriter.hxx index 49f2aa6c02f2..58b0861e9fb4 100644 --- a/include/svtools/HtmlWriter.hxx +++ b/include/svtools/HtmlWriter.hxx @@ -8,8 +8,7 @@ * */ -#ifndef INCLUDED_SVTOOLS_HTMLWRITER_HXX -#define INCLUDED_SVTOOLS_HTMLWRITER_HXX +#pragma once #include <rtl/string.hxx> #include <rtl/ustring.hxx> @@ -57,6 +56,4 @@ public: void characters(const OString& rChars); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx index 2effba66fdf2..33374b766d60 100644 --- a/include/svtools/PlaceEditDialog.hxx +++ b/include/svtools/PlaceEditDialog.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_SVTOOLS_PLACEEDITDIALOG_HXX -#define INCLUDED_SVTOOLS_PLACEEDITDIALOG_HXX +#pragma once #include <config_options.h> #include <svtools/svtdllapi.h> @@ -100,5 +99,4 @@ private: }; -#endif // INCLUDED_SVTOOLS_PLACEEDITDIALOG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx index 6c846bc5287e..56fb1c4c627c 100644 --- a/include/svtools/acceleratorexecute.hxx +++ b/include/svtools/acceleratorexecute.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_ACCELERATOREXECUTE_HXX -#define INCLUDED_SVTOOLS_ACCELERATOREXECUTE_HXX +#pragma once #include <svtools/svtdllapi.h> @@ -208,6 +207,4 @@ class SVT_DLLPUBLIC AcceleratorExecute final : private TMutexInit } // namespace svt -#endif // INCLUDED_SVTOOLS_ACCELERATOREXECUTE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/accessibilityoptions.hxx b/include/svtools/accessibilityoptions.hxx index 06c24c009d10..0cc485befb31 100644 --- a/include/svtools/accessibilityoptions.hxx +++ b/include/svtools/accessibilityoptions.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_SVTOOLS_ACCESSIBILITYOPTIONS_HXX -#define INCLUDED_SVTOOLS_ACCESSIBILITYOPTIONS_HXX +#pragma once #include <svtools/svtdllapi.h> #include <unotools/options.hxx> @@ -45,6 +44,4 @@ public: void SetVCLSettings(); }; -#endif // #ifndef INCLUDED_SVTOOLS_ACCESSIBILITYOPTIONS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index 5cfe0bf0ee6d..48fe7a59f060 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_ADDRESSTEMPLATE_HXX -#define INCLUDED_SVTOOLS_ADDRESSTEMPLATE_HXX +#pragma once #include <config_options.h> #include <memory> @@ -126,6 +125,4 @@ namespace svt }; } // namespace svt -#endif // INCLUDED_SVTOOLS_ADDRESSTEMPLATE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/apearcfg.hxx b/include/svtools/apearcfg.hxx index 119d012ed555..900155856e81 100644 --- a/include/svtools/apearcfg.hxx +++ b/include/svtools/apearcfg.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_SVTOOLS_APEARCFG_HXX -#define INCLUDED_SVTOOLS_APEARCFG_HXX +#pragma once #include <svtools/svtdllapi.h> #include <unotools/configitem.hxx> @@ -81,6 +80,4 @@ public: static void SetInitialized() { bInitialized = true; } }; -#endif // _OFA_APEARCFG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/asynclink.hxx b/include/svtools/asynclink.hxx index f7f59d467604..468f2a722548 100644 --- a/include/svtools/asynclink.hxx +++ b/include/svtools/asynclink.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_ASYNCLINK_HXX -#define INCLUDED_SVTOOLS_ASYNCLINK_HXX +#pragma once #include <config_options.h> #include <svtools/svtdllapi.h> @@ -69,6 +68,4 @@ public: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/bindablecontrolhelper.hxx b/include/svtools/bindablecontrolhelper.hxx index d05f52b71e9f..8ec4762d2dd1 100644 --- a/include/svtools/bindablecontrolhelper.hxx +++ b/include/svtools/bindablecontrolhelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_BINDABLECONTROLHELPER_HXX -#define INCLUDED_SVTOOLS_BINDABLECONTROLHELPER_HXX +#pragma once #include <svtools/svtdllapi.h> @@ -44,7 +43,4 @@ namespace svt } // namespace svt - -#endif // INCLUDED_SVTOOLS_BINDABLECONTROLHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/borderhelper.hxx b/include/svtools/borderhelper.hxx index 3692cdf5a3d9..c7169d767767 100644 --- a/include/svtools/borderhelper.hxx +++ b/include/svtools/borderhelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_BORDERHELPER_HXX -#define INCLUDED_SVTOOLS_BORDERHELPER_HXX +#pragma once #include <svtools/svtdllapi.h> @@ -45,6 +44,4 @@ SVT_DLLPUBLIC void DrawLine( OutputDevice& rDev, const Point& rBeg, const Point& rEnd, sal_uInt32 nWidth, SvxBorderLineStyle nDashing ); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/borderline.hxx b/include/svtools/borderline.hxx index efd233dd87ac..36780bddf422 100644 --- a/include/svtools/borderline.hxx +++ b/include/svtools/borderline.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_BORDERLINE_HXX -#define INCLUDED_SVTOOLS_BORDERLINE_HXX +#pragma once #include <svtools/svtdllapi.h> #include <o3tl/typed_flags_set.hxx> @@ -76,6 +75,4 @@ public: bool IsDouble( ) const { return (0 != m_nRate1) && (0 != m_nRate2); } }; -#endif // INCLUDED_SVTOOLS_BORDERLINE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 3bca5dcc4765..a86fce72307f 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.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_SVTOOLS_BRWBOX_HXX -#define INCLUDED_SVTOOLS_BRWBOX_HXX +#pragma once #include <svtools/svtdllapi.h> #include <vcl/ctrl.hxx> @@ -847,7 +846,4 @@ private: using Window::ToTop; }; - -#endif // INCLUDED_SVTOOLS_BRWBOX_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/brwhead.hxx b/include/svtools/brwhead.hxx index 082e9c134970..6d753e0ee507 100644 --- a/include/svtools/brwhead.hxx +++ b/include/svtools/brwhead.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_BRWHEAD_HXX -#define INCLUDED_SVTOOLS_BRWHEAD_HXX +#pragma once #include <svtools/svtdllapi.h> #include <vcl/headbar.hxx> @@ -42,6 +41,4 @@ public: }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/cliplistener.hxx b/include/svtools/cliplistener.hxx index 1324decc268c..fb0452f67ff9 100644 --- a/include/svtools/cliplistener.hxx +++ b/include/svtools/cliplistener.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_CLIPLISTENER_HXX -#define INCLUDED_SVTOOLS_CLIPLISTENER_HXX +#pragma once #include <svtools/svtdllapi.h> #include <tools/link.hxx> @@ -50,6 +49,4 @@ public: virtual void SAL_CALL changedContents( const css::datatransfer::clipboard::ClipboardEvent& event ) override; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/collatorres.hxx b/include/svtools/collatorres.hxx index adb854213d5f..cfc0e550917a 100644 --- a/include/svtools/collatorres.hxx +++ b/include/svtools/collatorres.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_COLLATORRES_HXX -#define INCLUDED_SVTOOLS_COLLATORRES_HXX +#pragma once #include <svtools/svtdllapi.h> #include <rtl/ustring.hxx> @@ -49,6 +48,4 @@ public: const OUString& GetTranslation(const OUString& rAlgorithm); }; -#endif // INCLUDED_SVTOOLS_COLLATORRES_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/colorcfg.hxx b/include/svtools/colorcfg.hxx index b404f40dd9d9..c7a811140ef3 100644 --- a/include/svtools/colorcfg.hxx +++ b/include/svtools/colorcfg.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_SVTOOLS_COLORCFG_HXX -#define INCLUDED_SVTOOLS_COLORCFG_HXX +#pragma once #include <svtools/svtdllapi.h> #include <rtl/ustring.hxx> @@ -136,6 +135,5 @@ public: void EnableBroadcast(); }; }//namespace svtools -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/colrdlg.hxx b/include/svtools/colrdlg.hxx index f89ec0f5419a..ce644d63a865 100644 --- a/include/svtools/colrdlg.hxx +++ b/include/svtools/colrdlg.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_COLRDLG_HXX -#define INCLUDED_SVTOOLS_COLRDLG_HXX +#pragma once #include <svtools/svtdllapi.h> #include <tools/color.hxx> @@ -50,6 +49,4 @@ private: svtools::ColorPickerMode meMode; }; -#endif // INCLUDED_SVTOOLS_COLRDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index be530e97f5e5..43347a14ce40 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_CTRLBOX_HXX -#define INCLUDED_SVTOOLS_CTRLBOX_HXX +#pragma once #include <svtools/svtdllapi.h> #include <editeng/borderline.hxx> @@ -495,7 +494,4 @@ private: FontSizeBox& operator=(const FontSizeBox&) = delete; }; - -#endif // INCLUDED_SVTOOLS_CTRLBOX_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx index a5add537f415..0bd75f0aefe0 100644 --- a/include/svtools/ctrltool.hxx +++ b/include/svtools/ctrltool.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_CTRLTOOL_HXX -#define INCLUDED_SVTOOLS_CTRLTOOL_HXX +#pragma once #include <config_options.h> #include <svtools/svtdllapi.h> @@ -213,6 +212,4 @@ public: sal_Int32 GetIndexSize( sal_Int32 nIndex ) const; }; -#endif // INCLUDED_SVTOOLS_CTRLTOOL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/dialogclosedlistener.hxx b/include/svtools/dialogclosedlistener.hxx index 7b7c324fa688..c460c1afa214 100644 --- a/include/svtools/dialogclosedlistener.hxx +++ b/include/svtools/dialogclosedlistener.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_DIALOGCLOSEDLISTENER_HXX -#define INCLUDED_SVTOOLS_DIALOGCLOSEDLISTENER_HXX +#pragma once #include <svtools/svtdllapi.h> #include <cppuhelper/implbase.hxx> @@ -59,7 +58,4 @@ namespace svt } // namespace svt - -#endif// COMPHELPER_DIALOGCLOSEDLISTENER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 9d3f9cea3ee1..4f212bf9de4d 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_EDITBROWSEBOX_HXX -#define INCLUDED_SVTOOLS_EDITBROWSEBOX_HXX +#pragma once #include <config_options.h> #include <memory> @@ -1007,7 +1006,4 @@ namespace svt } // namespace svt - -#endif // INCLUDED_SVTOOLS_EDITBROWSEBOX_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx index 054ac94fdc23..bcfdd93b2442 100644 --- a/include/svtools/ehdl.hxx +++ b/include/svtools/ehdl.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_EHDL_HXX -#define INCLUDED_SVTOOLS_EHDL_HXX +#pragma once #include <svtools/svtdllapi.h> #include <svtools/svtresid.hxx> @@ -68,6 +67,4 @@ private: virtual bool CreateString(const ErrorInfo *, OUString &) const override; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/embedhlp.hxx b/include/svtools/embedhlp.hxx index 12a8a2367a4b..79b09cf9c2da 100644 --- a/include/svtools/embedhlp.hxx +++ b/include/svtools/embedhlp.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_EMBEDHLP_HXX -#define INCLUDED_SVTOOLS_EMBEDHLP_HXX +#pragma once #include <svtools/svtdllapi.h> #include <com/sun/star/uno/Reference.hxx> @@ -123,6 +122,4 @@ public: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/embedtransfer.hxx b/include/svtools/embedtransfer.hxx index a6787cc24795..98bab1683aa8 100644 --- a/include/svtools/embedtransfer.hxx +++ b/include/svtools/embedtransfer.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_EMBEDTRANSFER_HXX -#define INCLUDED_SVTOOLS_EMBEDTRANSFER_HXX +#pragma once #include <svtools/svtdllapi.h> #include <vcl/transfer.hxx> @@ -56,6 +55,4 @@ public: sal_Int64 nAspect ); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/extcolorcfg.hxx b/include/svtools/extcolorcfg.hxx index 2374d0fb18fc..408f8651eefd 100644 --- a/include/svtools/extcolorcfg.hxx +++ b/include/svtools/extcolorcfg.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_SVTOOLS_EXTCOLORCFG_HXX -#define INCLUDED_SVTOOLS_EXTCOLORCFG_HXX +#pragma once #include <svtools/svtdllapi.h> #include <rtl/ustring.hxx> @@ -104,6 +103,5 @@ public: void EnableBroadcast(); }; }//namespace svtools -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/filechangedchecker.hxx b/include/svtools/filechangedchecker.hxx index 016fe9279800..03021799bc2b 100644 --- a/include/svtools/filechangedchecker.hxx +++ b/include/svtools/filechangedchecker.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_SVTOOLS_FILECHANGEDCHECKER_HXX -#define INCLUDED_SVTOOLS_FILECHANGEDCHECKER_HXX +#pragma once #include <config_options.h> #include <svtools/svtdllapi.h> @@ -43,5 +42,3 @@ public: FileChangedChecker(const OUString& rFilename, const ::std::function<void ()>& rCallback); }; - -#endif diff --git a/include/svtools/fontsubstconfig.hxx b/include/svtools/fontsubstconfig.hxx index 76830d1c013f..8399203dfb8f 100644 --- a/include/svtools/fontsubstconfig.hxx +++ b/include/svtools/fontsubstconfig.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_SVTOOLS_FONTSUBSTCONFIG_HXX -#define INCLUDED_SVTOOLS_FONTSUBSTCONFIG_HXX +#pragma once #include <svtools/svtdllapi.h> #include <unotools/configitem.hxx> @@ -58,7 +57,4 @@ public: void Apply(); }; -#endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx index 32d4c4ddc119..77cc12f9e100 100644 --- a/include/svtools/framestatuslistener.hxx +++ b/include/svtools/framestatuslistener.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_FRAMESTATUSLISTENER_HXX -#define INCLUDED_SVTOOLS_FRAMESTATUSLISTENER_HXX +#pragma once #include <com/sun/star/frame/XFrameActionListener.hpp> #include <com/sun/star/frame/XStatusListener.hpp> @@ -89,6 +88,4 @@ class FrameStatusListener : public css::frame::XStatusListener, } -#endif // INCLUDED_SVTOOLS_FRAMESTATUSLISTENER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index 5f2f643088f3..e87dc9518f46 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_GENERICUNODIALOG_HXX -#define INCLUDED_SVTOOLS_GENERICUNODIALOG_HXX +#pragma once #include <svtools/svtdllapi.h> @@ -158,7 +157,4 @@ namespace svt } // namespace svt - -#endif // INCLUDED_SVTOOLS_GENERICUNODIALOG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/helpids.h b/include/svtools/helpids.h index ce1b29cf6cd6..62263636429b 100644 --- a/include/svtools/helpids.h +++ b/include/svtools/helpids.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_HELPIDS_H -#define INCLUDED_SVTOOLS_HELPIDS_H +#pragma once #define HID_FILEDLG_LINK_CB "SVT_HID_FILEDLG_LINK_CB" #define HID_FILEDLG_PREVIEW_CB "SVT_HID_FILEDLG_PREVIEW_CB" @@ -45,6 +44,4 @@ #define HID_FILEOPEN_IMAGE_TEMPLATE "SVT_HID_FILEOPEN_IMAGE_TEMPLATE" #define HID_FILEOPEN_IMAGE_ANCHOR "SVT_HID_FILEOPEN_IMAGE_ANCHOR" -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/helpopt.hxx b/include/svtools/helpopt.hxx index 0f7ada539c4d..962884a4676b 100644 --- a/include/svtools/helpopt.hxx +++ b/include/svtools/helpopt.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_SVTOOLS_HELPOPT_HXX -#define INCLUDED_SVTOOLS_HELPOPT_HXX +#pragma once #include <svtools/svtdllapi.h> @@ -48,6 +47,4 @@ public: OUString const & GetSystem() const; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx index eff992147392..e9189574cec6 100644 --- a/include/svtools/htmlcfg.hxx +++ b/include/svtools/htmlcfg.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_SVTOOLS_HTMLCFG_HXX -#define INCLUDED_SVTOOLS_HTMLCFG_HXX +#pragma once #include <unotools/configitem.hxx> #include <svtools/svtdllapi.h> @@ -81,7 +80,4 @@ public: void SetNumbersEnglishUS(bool bSet); }; -#endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/htmlkywd.hxx b/include/svtools/htmlkywd.hxx index 36e7512e83e0..4abccfd46817 100644 --- a/include/svtools/htmlkywd.hxx +++ b/include/svtools/htmlkywd.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_HTMLKYWD_HXX -#define INCLUDED_SVTOOLS_HTMLKYWD_HXX +#pragma once #include <sal/config.h> @@ -686,6 +685,4 @@ #define OOO_STRING_SVTOOLS_HTML_ET_multipart "multipart/form-data" #define OOO_STRING_SVTOOLS_HTML_ET_text "text/plain" -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx index 7543f7335785..760cc2b3c90b 100644 --- a/include/svtools/htmlout.hxx +++ b/include/svtools/htmlout.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_HTMLOUT_HXX -#define INCLUDED_SVTOOLS_HTMLOUT_HXX +#pragma once #include <svtools/svtdllapi.h> #include <tools/solar.h> @@ -108,6 +107,4 @@ struct HtmlWriterHelper SVT_DLLPUBLIC static void applyEvents(HtmlWriter& rHtmlWriter, const SvxMacroTableDtor& rMacroTable, const HTMLOutEvent* pEventTable, bool bOutStarBasic); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/htmltokn.h b/include/svtools/htmltokn.h index a3374a37e877..1632109f45be 100644 --- a/include/svtools/htmltokn.h +++ b/include/svtools/htmltokn.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_HTMLTOKN_H -#define INCLUDED_SVTOOLS_HTMLTOKN_H +#pragma once #include <svtools/svtdllapi.h> #include <sal/types.h> @@ -474,6 +473,4 @@ UNKNOWN = CONTEXT_END, END }; -#endif // INCLUDED_SVTOOLS_HTMLTOKN_H - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/imagemgr.hxx b/include/svtools/imagemgr.hxx index 3dd2f4acef50..4abd02168ead 100644 --- a/include/svtools/imagemgr.hxx +++ b/include/svtools/imagemgr.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_IMAGEMGR_HXX -#define INCLUDED_SVTOOLS_IMAGEMGR_HXX +#pragma once #include <rtl/ustring.hxx> #include <svtools/svtdllapi.h> @@ -131,6 +130,4 @@ public: SVT_DLLPUBLIC static OUString GetFolderDescription( const svtools::VolumeInfo& rInfo ); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/imageresourceaccess.hxx b/include/svtools/imageresourceaccess.hxx index 566ca1ab8280..d7e8a5629b11 100644 --- a/include/svtools/imageresourceaccess.hxx +++ b/include/svtools/imageresourceaccess.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_IMAGERESOURCEACCESS_HXX -#define INCLUDED_SVTOOLS_IMAGERESOURCEACCESS_HXX +#pragma once #include <config_options.h> #include <svtools/svtdllapi.h> @@ -62,6 +61,4 @@ UNLESS_MERGELIBS(SVT_DLLPUBLIC) css::uno::Reference<css::io::XInputStream> getIm } // namespace svt::GraphicAccess -#endif // INCLUDED_SVTOOLS_IMAGERESOURCEACCESS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/imgdef.hxx b/include/svtools/imgdef.hxx index 308fd27225a1..3dd59cf07c5e 100644 --- a/include/svtools/imgdef.hxx +++ b/include/svtools/imgdef.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_IMGDEF_HXX -#define INCLUDED_SVTOOLS_IMGDEF_HXX +#pragma once enum SfxSymbolsSize { @@ -28,6 +27,4 @@ enum SfxSymbolsSize SFX_SYMBOLS_SIZE_AUTO = 2, }; -#endif // INCLUDED_SVTOOLS_IMGDEF_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/indexentryres.hxx b/include/svtools/indexentryres.hxx index 800ee906e3ce..2cea22ff00f9 100644 --- a/include/svtools/indexentryres.hxx +++ b/include/svtools/indexentryres.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_INDEXENTRYRES_HXX -#define INCLUDED_SVTOOLS_INDEXENTRYRES_HXX +#pragma once #include <svtools/svtdllapi.h> #include <rtl/ustring.hxx> @@ -49,7 +48,4 @@ public: const OUString& GetTranslation(const OUString& rAlgorithm); }; -#endif // INCLUDED_SVTOOLS_INDEXENTRYRES_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index 57439cf3ebac..21e4e0913dd9 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_INETTBC_HXX -#define INCLUDED_SVTOOLS_INETTBC_HXX +#pragma once #include <memory> #include <rtl/ref.hxx> @@ -105,6 +104,4 @@ public: void SetFilter(const OUString& _sFilter); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/insdlg.hxx b/include/svtools/insdlg.hxx index 041588f6fc11..58be96c4fe90 100644 --- a/include/svtools/insdlg.hxx +++ b/include/svtools/insdlg.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_SVTOOLS_INSDLG_HXX -#define INCLUDED_SVTOOLS_INSDLG_HXX +#pragma once #include <svtools/svtdllapi.h> #include <tools/globname.hxx> @@ -69,6 +68,4 @@ public: static bool GetEmbeddedName(const TransferableDataHelper& rData, OUString& _rName, OUString& _rSource, SotClipboardFormatId const & _nFormat); }; -#endif // INCLUDED_SVTOOLS_INSDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/javacontext.hxx b/include/svtools/javacontext.hxx index c34c555bb648..2784075ee041 100644 --- a/include/svtools/javacontext.hxx +++ b/include/svtools/javacontext.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_JAVACONTEXT_HXX -#define INCLUDED_SVTOOLS_JAVACONTEXT_HXX +#pragma once #include <svtools/svtdllapi.h> @@ -67,6 +66,4 @@ namespace svt }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/javainteractionhandler.hxx b/include/svtools/javainteractionhandler.hxx index 5fbff61fff23..aafbf6b1db71 100644 --- a/include/svtools/javainteractionhandler.hxx +++ b/include/svtools/javainteractionhandler.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_JAVAINTERACTIONHANDLER_HXX -#define INCLUDED_SVTOOLS_JAVAINTERACTIONHANDLER_HXX +#pragma once #include <svtools/svtdllapi.h> #include <sal/types.h> @@ -60,6 +59,4 @@ private: }; } -#endif // _DESKTOP_JAVAINTERACTION_HXX_ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/langhelp.hxx b/include/svtools/langhelp.hxx index 248c559b6340..1aa8bcb72a78 100644 --- a/include/svtools/langhelp.hxx +++ b/include/svtools/langhelp.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_SVTOOLS_LANGHELP_HXX -#define INCLUDED_SVTOOLS_LANGHELP_HXX +#pragma once #include <svtools/svtdllapi.h> @@ -27,6 +26,4 @@ SVT_DLLPUBLIC void localizeWebserviceURI( OUString& io_rURI ); OUString SVT_DLLPUBLIC getInstalledLocaleForLanguage(css::uno::Sequence<OUString> const & installed, OUString const & locale); OUString SVT_DLLPUBLIC getInstalledLocaleForSystemUILanguage(css::uno::Sequence<OUString> const & installed, bool bRequestInstallIfMissing, const OUString& rPreferredLocale = OUString()); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/langtab.hxx b/include/svtools/langtab.hxx index 9038fb24d421..6d50d05b0382 100644 --- a/include/svtools/langtab.hxx +++ b/include/svtools/langtab.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_SVTOOLS_LANGTAB_HXX -#define INCLUDED_SVTOOLS_LANGTAB_HXX +#pragma once #include <i18nlangtag/lang.h> #include <rtl/ustring.hxx> @@ -44,6 +43,4 @@ public: // String content (see #i78466#, #i32179#) SVT_DLLPUBLIC OUString ApplyLreOrRleEmbedding( const OUString &rText ); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/menuoptions.hxx b/include/svtools/menuoptions.hxx index 9db1fe281ee3..5f8d7882331e 100644 --- a/include/svtools/menuoptions.hxx +++ b/include/svtools/menuoptions.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_SVTOOLS_MENUOPTIONS_HXX -#define INCLUDED_SVTOOLS_MENUOPTIONS_HXX +#pragma once #include <svtools/svtdllapi.h> #include <sal/types.h> @@ -86,6 +85,4 @@ class SAL_WARN_UNUSED SVT_DLLPUBLIC SvtMenuOptions final : public utl::detail::O }; // class SvtMenuOptions -#endif // #ifndef INCLUDED_SVTOOLS_MENUOPTIONS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/miscopt.hxx b/include/svtools/miscopt.hxx index 68396d39ea33..0300cb3eca02 100644 --- a/include/svtools/miscopt.hxx +++ b/include/svtools/miscopt.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_SVTOOLS_MISCOPT_HXX -#define INCLUDED_SVTOOLS_MISCOPT_HXX +#pragma once #include <svtools/svtdllapi.h> #include <sal/types.h> @@ -87,6 +86,4 @@ class SVT_DLLPUBLIC SvtMiscOptions final : public utl::detail::Options }; // class SvtMiscOptions -#endif // #ifndef INCLUDED_SVTOOLS_MISCOPT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/openfiledroptargetlistener.hxx b/include/svtools/openfiledroptargetlistener.hxx index 1565ce3c828c..56f983e20203 100644 --- a/include/svtools/openfiledroptargetlistener.hxx +++ b/include/svtools/openfiledroptargetlistener.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_OPENFILEDROPTARGETLISTENER_HXX -#define INCLUDED_SVTOOLS_OPENFILEDROPTARGETLISTENER_HXX +#pragma once #include <config_options.h> #include <svtools/svtdllapi.h> @@ -73,6 +72,4 @@ class UNLESS_MERGELIBS(SVT_DLLPUBLIC) OpenFileDropTargetListener final : public void implts_OpenFile( const OUString& rFilePath ); }; -#endif // INCLUDED_SVTOOLS_OPENFILEDROPTARGETLISTENER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/optionsdrawinglayer.hxx b/include/svtools/optionsdrawinglayer.hxx index 762b2545e1af..139f8d56834d 100644 --- a/include/svtools/optionsdrawinglayer.hxx +++ b/include/svtools/optionsdrawinglayer.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_OPTIONSDRAWINGLAYER_HXX -#define INCLUDED_SVTOOLS_OPTIONSDRAWINGLAYER_HXX +#pragma once #include <svtools/svtdllapi.h> #include <sal/types.h> @@ -133,6 +132,4 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer std::shared_ptr<SvtOptionsDrawinglayer_Impl> m_pImpl; }; -#endif // #ifndef INCLUDED_SVTOOLS_OPTIONSDRAWINGLAYER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index 1c9392d2d0b3..7915dc91a5db 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_PARHTML_HXX -#define INCLUDED_SVTOOLS_PARHTML_HXX +#pragma once #include <svtools/svtdllapi.h> #include <svtools/svparser.hxx> @@ -290,6 +289,4 @@ inline void HTMLParser::StartXMP() nPre_LinePos = 0; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/parrtf.hxx b/include/svtools/parrtf.hxx index cd846e6f2294..c67318a400f5 100644 --- a/include/svtools/parrtf.hxx +++ b/include/svtools/parrtf.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_PARRTF_HXX -#define INCLUDED_SVTOOLS_PARRTF_HXX +#pragma once #include <svtools/svtdllapi.h> #include <svtools/svparser.hxx> @@ -69,6 +68,4 @@ public: virtual void Continue( int nToken ) override; }; -#endif // INCLUDED_SVTOOLS_PARRTF_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/place.hxx b/include/svtools/place.hxx index 0d59f4667667..2cae08bf2e7a 100644 --- a/include/svtools/place.hxx +++ b/include/svtools/place.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_SVTOOLS_PLACE_HXX -#define INCLUDED_SVTOOLS_PLACE_HXX +#pragma once #include <tools/urlobj.hxx> @@ -37,6 +36,4 @@ public: bool IsEditable( ) const { return mbEditable; } }; -#endif // INCLUDED_SVTOOLS_PLACE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx index 2c506af1e101..31fc398b513d 100644 --- a/include/svtools/popupmenucontrollerbase.hxx +++ b/include/svtools/popupmenucontrollerbase.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_POPUPMENUCONTROLLERBASE_HXX -#define INCLUDED_SVTOOLS_POPUPMENUCONTROLLERBASE_HXX +#pragma once #include <config_options.h> #include <svtools/svtdllapi.h> @@ -122,6 +121,4 @@ namespace svt }; } -#endif // INCLUDED_SVTOOLS_POPUPMENUCONTROLLERBASE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/popupwindowcontroller.hxx b/include/svtools/popupwindowcontroller.hxx index 7aa1ca08f39a..893ad11ca82d 100644 --- a/include/svtools/popupwindowcontroller.hxx +++ b/include/svtools/popupwindowcontroller.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_POPUPWINDOWCONTROLLER_HXX -#define INCLUDED_SVTOOLS_POPUPWINDOWCONTROLLER_HXX +#pragma once #include <memory> #include <o3tl/deleter.hxx> @@ -86,6 +85,4 @@ private: } // namespace svt -#endif // INCLUDED_SVTOOLS_POPUPWINDOWCONTROLLER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/printoptions.hxx b/include/svtools/printoptions.hxx index 2a0b3f012262..72120306c5f5 100644 --- a/include/svtools/printoptions.hxx +++ b/include/svtools/printoptions.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_PRINTOPTIONS_HXX -#define INCLUDED_SVTOOLS_PRINTOPTIONS_HXX +#pragma once #include <config_options.h> #include <svtools/svtdllapi.h> @@ -107,6 +106,4 @@ public: virtual ~SvtPrintFileOptions() override; }; -#endif // INCLUDED_SVTOOLS_PRINTOPTIONS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index 5f55b6b416b2..2ec0cfbfef6d 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_PRNSETUP_HXX -#define INCLUDED_SVTOOLS_PRNSETUP_HXX +#pragma once #include <svtools/svtdllapi.h> #include <vcl/print.hxx> @@ -77,6 +76,4 @@ Printer* ImplPrnDlgUpdatePrinter( Printer const * pPrinter, Printer* pTempPrinte void ImplPrnDlgUpdateQueueInfo( weld::ComboBox const * pBox, QueueInfo& rInfo ); OUString ImplPrnDlgGetStatusText( const QueueInfo& rInfo ); -#endif // INCLUDED_SVTOOLS_PRNSETUP_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/querydelete.hxx b/include/svtools/querydelete.hxx index 2d8e2b915bb1..63f48d62fe48 100644 --- a/include/svtools/querydelete.hxx +++ b/include/svtools/querydelete.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_SVTOOLS_FILEVIEW_HXX -#define INCLUDED_SVTOOLS_FILEVIEW_HXX +#pragma once #include <memory> #include <vcl/weld.hxx> @@ -47,6 +46,4 @@ public: }; } -#endif // INCLUDED_SVTOOLS_FILEVIEW_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/restartdialog.hxx b/include/svtools/restartdialog.hxx index 9147b005d220..4ca8cbc1de45 100644 --- a/include/svtools/restartdialog.hxx +++ b/include/svtools/restartdialog.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_SVTOOLS_RESTARTDIALOG_HXX -#define INCLUDED_SVTOOLS_RESTARTDIALOG_HXX +#pragma once #include <sal/config.h> @@ -77,6 +76,4 @@ SVT_DLLPUBLIC bool executeRestartDialog( } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/rtfkeywd.hxx b/include/svtools/rtfkeywd.hxx index fa297843e6be..1f96630cb4f8 100644 --- a/include/svtools/rtfkeywd.hxx +++ b/include/svtools/rtfkeywd.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_RTFKEYWD_HXX -#define INCLUDED_SVTOOLS_RTFKEYWD_HXX +#pragma once #include <sal/config.h> @@ -1225,6 +1224,4 @@ #define LO_STRING_SVTOOLS_RTF_SAAUTO "\\saauto" #define LO_STRING_SVTOOLS_RTF_HTMAUTSP "\\htmautsp" -#endif // INCLUDED_SVTOOLS_RTFKEYWD_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/rtfout.hxx b/include/svtools/rtfout.hxx index 1bcd3361b370..50b738836557 100644 --- a/include/svtools/rtfout.hxx +++ b/include/svtools/rtfout.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_RTFOUT_HXX -#define INCLUDED_SVTOOLS_RTFOUT_HXX +#pragma once #include <svtools/svtdllapi.h> @@ -35,7 +34,4 @@ SVT_DLLPUBLIC SvStream& Out_String( } -#endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/rtftoken.h b/include/svtools/rtftoken.h index 754408dd9d40..df44b0013807 100644 --- a/include/svtools/rtftoken.h +++ b/include/svtools/rtftoken.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_RTFTOKEN_H -#define INCLUDED_SVTOOLS_RTFTOKEN_H +#pragma once #include <rtl/ustring.hxx> @@ -1265,6 +1264,4 @@ enum RTF_TOKEN_IDS { }; -#endif // INCLUDED_SVTOOLS_RTFTOKEN_H - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 7ea4771d5f53..5c7cc2f6ba8c 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_RULER_HXX -#define INCLUDED_SVTOOLS_RULER_HXX +#pragma once #include <memory> #include <map> @@ -799,6 +798,4 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; }; -#endif // INCLUDED_SVTOOLS_RULER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/sampletext.hxx b/include/svtools/sampletext.hxx index 3d2ed5091ce4..3027f384f289 100644 --- a/include/svtools/sampletext.hxx +++ b/include/svtools/sampletext.hxx @@ -6,8 +6,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_SVTOOLS_SAMPLETEXT_HXX -#define INCLUDED_SVTOOLS_SAMPLETEXT_HXX +#pragma once #include <svtools/svtdllapi.h> #include <rtl/ustring.hxx> @@ -35,6 +34,4 @@ OUString makeShortMinimalTextForScript(UScriptCode eScript); //These ones are typically for use in the font preview window in format character SVT_DLLPUBLIC OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const vcl::Font &rFont); - -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/scriptedtext.hxx b/include/svtools/scriptedtext.hxx index 603ff22cb8d8..553cd9ba62e7 100644 --- a/include/svtools/scriptedtext.hxx +++ b/include/svtools/scriptedtext.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_SCRIPTEDTEXT_HXX -#define INCLUDED_SVTOOLS_SCRIPTEDTEXT_HXX +#pragma once #include <svtools/svtdllapi.h> #include <rtl/ustring.hxx> @@ -89,7 +88,4 @@ public: void DrawText( const Point& _rPos ); }; - -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/sfxecode.hxx b/include/svtools/sfxecode.hxx index 3cdad87f4cd9..a57c6b9e966f 100644 --- a/include/svtools/sfxecode.hxx +++ b/include/svtools/sfxecode.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_SVTOOLS_SFXECODE_HXX -#define INCLUDED_SVTOOLS_SFXECODE_HXX +#pragma once class ErrCode; @@ -71,7 +70,4 @@ class ErrCode; // Addressbook #define ERRCTX_SFX_SEARCHADDRESS 90 -#endif // INCLUDED_SVTOOLS_SFXECODE_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/slidesorterbaropt.hxx b/include/svtools/slidesorterbaropt.hxx index c12268fea1fa..4456a857513b 100644 --- a/include/svtools/slidesorterbaropt.hxx +++ b/include/svtools/slidesorterbaropt.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_SLIDESORTERBAROPT_HXX -#define INCLUDED_SVTOOLS_SLIDESORTERBAROPT_HXX +#pragma once #include <svtools/svtdllapi.h> #include <unotools/options.hxx> @@ -72,6 +71,4 @@ class SVT_DLLPUBLIC SvtSlideSorterBarOptions final : public utl::detail::Options std::shared_ptr<SvtSlideSorterBarOptions_Impl> m_pImpl; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/soerr.hxx b/include/svtools/soerr.hxx index 1e882ea76d3a..de314db6dfc0 100644 --- a/include/svtools/soerr.hxx +++ b/include/svtools/soerr.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_SVTOOLS_SOERR_HXX -#define INCLUDED_SVTOOLS_SOERR_HXX +#pragma once #include <svtools/ehdl.hxx> #include <svtools/svtdllapi.h> @@ -37,6 +36,4 @@ SVT_DLLPUBLIC extern const ErrMsgCode RID_SO_ERROR_HANDLER[]; SVT_DLLPUBLIC extern const ErrMsgCode RID_SO_ERRCTX[]; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx index 129a7af57f46..e784dad4dc99 100644 --- a/include/svtools/statusbarcontroller.hxx +++ b/include/svtools/statusbarcontroller.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_STATUSBARCONTROLLER_HXX -#define INCLUDED_SVTOOLS_STATUSBARCONTROLLER_HXX +#pragma once #include <svtools/svtdllapi.h> #include <com/sun/star/frame/XStatusbarController.hpp> @@ -130,6 +129,4 @@ class SVT_DLLPUBLIC StatusbarController : } -#endif // INCLUDED_SVTOOLS_STATUSBARCONTROLLER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc index e07a94f6aa2b..774d701d6e1a 100644 --- a/include/svtools/strings.hrc +++ b/include/svtools/strings.hrc @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_INC_STRINGS_HRC -#define INCLUDED_SVTOOLS_INC_STRINGS_HRC +#pragma once #define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) @@ -339,6 +338,5 @@ #define STR_DESCRIPTION_LIBHYPHEN NC_("STR_DESCRIPTION_LIBHYPHEN", "Libhyphen Hyphenator") #define STR_DESCRIPTION_MYTHES NC_("STR_DESCRIPTION_MYTHES", "MyThes Thesaurus") #define STR_DESCRIPTION_IGNOREALLLIST NC_("STR_DESCRIPTION_IGNOREALLLIST", "List of Ignored Words") -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/stringtransfer.hxx b/include/svtools/stringtransfer.hxx index 90a6e28f7b5e..9e3fead4e84c 100644 --- a/include/svtools/stringtransfer.hxx +++ b/include/svtools/stringtransfer.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_STRINGTRANSFER_HXX -#define INCLUDED_SVTOOLS_STRINGTRANSFER_HXX +#pragma once #include <config_options.h> #include <svtools/svtdllapi.h> @@ -65,6 +64,4 @@ namespace svt } // namespace svt -#endif // INCLUDED_SVTOOLS_STRINGTRANSFER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx index 22185ad5dee2..35da5bd51ad8 100644 --- a/include/svtools/svparser.hxx +++ b/include/svtools/svparser.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_SVPARSER_HXX -#define INCLUDED_SVTOOLS_SVPARSER_HXX +#pragma once #include <svtools/svtdllapi.h> #include <tools/link.hxx> @@ -220,6 +219,4 @@ public: typedef tools::SvRef<SvKeyValueIterator> SvKeyValueIteratorRef; -#endif // INCLUDED_SVTOOLS_SVPARSER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/svtdllapi.h b/include/svtools/svtdllapi.h index 687ed9d3fc7f..8f5061aff9b8 100644 --- a/include/svtools/svtdllapi.h +++ b/include/svtools/svtdllapi.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_SVTDLLAPI_H -#define INCLUDED_SVTOOLS_SVTDLLAPI_H +#pragma once #include <sal/types.h> @@ -29,6 +28,4 @@ #endif #define SVT_DLLPRIVATE SAL_DLLPRIVATE -#endif // INCLUDED_SVTOOLS_SVTDLLAPI_H - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/svtresid.hxx b/include/svtools/svtresid.hxx index f0f9b45fcc29..d89790c854d6 100644 --- a/include/svtools/svtresid.hxx +++ b/include/svtools/svtresid.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_SVTRESID_HXX -#define INCLUDED_SVTOOLS_SVTRESID_HXX +#pragma once #include <svtools/svtdllapi.h> #include <rtl/ustring.hxx> @@ -27,6 +26,4 @@ SVT_DLLPUBLIC std::locale SvtResLocale(); SVT_DLLPUBLIC OUString SvtResId(const char* pId); -#endif // INCLUDED_SVTOOLS_SVTRESID_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index 0fb815dac40f..2a9d8a43eba3 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_TABBAR_HXX -#define INCLUDED_SVTOOLS_TABBAR_HXX +#pragma once #include <svtools/svtdllapi.h> #include <tools/link.hxx> @@ -500,6 +499,4 @@ public: virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; }; -#endif // INCLUDED_SVTOOLS_TABBAR_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/templatefoldercache.hxx b/include/svtools/templatefoldercache.hxx index efeb57aba261..a7bcb785fec4 100644 --- a/include/svtools/templatefoldercache.hxx +++ b/include/svtools/templatefoldercache.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_TEMPLATEFOLDERCACHE_HXX -#define INCLUDED_SVTOOLS_TEMPLATEFOLDERCACHE_HXX +#pragma once #include <config_options.h> #include <svtools/svtdllapi.h> @@ -87,7 +86,4 @@ namespace svt } // namespace svt - -#endif // INCLUDED_SVTOOLS_TEMPLATEFOLDERCACHE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index ced73974d7d4..a9b0a9f5415c 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_TOOLBARMENU_HXX -#define INCLUDED_SVTOOLS_TOOLBARMENU_HXX +#pragma once #include <config_options.h> #include <svtools/svtdllapi.h> @@ -102,6 +101,4 @@ public: void EndPopupMode(); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx index dfad5af20a6c..0bf372e9502f 100644 --- a/include/svtools/toolboxcontroller.hxx +++ b/include/svtools/toolboxcontroller.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_TOOLBOXCONTROLLER_HXX -#define INCLUDED_SVTOOLS_TOOLBOXCONTROLLER_HXX +#pragma once #include <svtools/svtdllapi.h> #include <com/sun/star/beans/PropertyValue.hpp> @@ -192,6 +191,4 @@ class SVT_DLLPUBLIC ToolboxController : } -#endif // INCLUDED_SVTOOLS_TOOLBOXCONTROLLER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/unitconv.hxx b/include/svtools/unitconv.hxx index f763ac0743c2..34025261e46c 100644 --- a/include/svtools/unitconv.hxx +++ b/include/svtools/unitconv.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_SVTOOLS_UNITCONV_HXX -#define INCLUDED_SVTOOLS_UNITCONV_HXX +#pragma once #include <svtools/svtdllapi.h> #include <tools/mapunit.hxx> @@ -51,6 +50,4 @@ SVT_DLLPUBLIC tools::Long PointToTwips( tools::Long nIn ); SVT_DLLPUBLIC tools::Long TransformMetric( tools::Long nVal, FieldUnit aOld, FieldUnit aNew ); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/unoevent.hxx b/include/svtools/unoevent.hxx index 46335a5d2c86..acad27b51f44 100644 --- a/include/svtools/unoevent.hxx +++ b/include/svtools/unoevent.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_SVTOOLS_UNOEVENT_HXX -#define INCLUDED_SVTOOLS_UNOEVENT_HXX +#pragma once #include <svtools/svtdllapi.h> #include <com/sun/star/container/XNameReplace.hpp> @@ -257,6 +256,4 @@ public: void copyMacrosIntoTable(SvxMacroTableDtor& aFmt); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/unoimap.hxx b/include/svtools/unoimap.hxx index 58810153c43c..f668aaa38708 100644 --- a/include/svtools/unoimap.hxx +++ b/include/svtools/unoimap.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_UNOIMAP_HXX -#define INCLUDED_SVTOOLS_UNOIMAP_HXX +#pragma once #include <svtools/svtdllapi.h> #include <com/sun/star/uno/Reference.hxx> @@ -36,6 +35,4 @@ SVT_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvUnoImageMap_createIn SVT_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvUnoImageMap_createInstance( const ImageMap& rMap, const SvEventDescription* pSupportedMacroItems ); SVT_DLLPUBLIC bool SvUnoImageMap_fillImageMap( const css::uno::Reference< css::uno::XInterface >& xImageMap, ImageMap& rMap ); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/urlfilter.hxx b/include/svtools/urlfilter.hxx index 9f91407f86f4..e62902d34d4f 100644 --- a/include/svtools/urlfilter.hxx +++ b/include/svtools/urlfilter.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVL_URLFILTER_HXX -#define INCLUDED_SVL_URLFILTER_HXX +#pragma once #include <config_options.h> #include <svtools/svtdllapi.h> @@ -40,6 +39,4 @@ public: static void createWildCardFilterList(const OUString& _rFilterList,::std::vector< WildCard >& _rFilters); }; -#endif // INCLUDED_SVL_URLFILTER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 70065b1f281c..a80c16751cfa 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_VALUESET_HXX -#define INCLUDED_SVTOOLS_VALUESET_HXX +#pragma once #include <svtools/svtdllapi.h> #include <tools/wintypes.hxx> @@ -413,7 +412,4 @@ public: virtual FactoryFunction GetUITestFactory() const override; }; - -#endif // INCLUDED_SVTOOLS_VALUESET_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |