diff options
author | George Bateman <george.bateman16@gmail.com> | 2020-09-13 12:15:12 +0000 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2020-09-13 17:52:06 +0200 |
commit | 66253cace2db6026ec636a4a8b6062f125957da7 (patch) | |
tree | 37b35822de8adf2a3c6ac63667a702f34e24e889 | |
parent | tdf#124176 Use #pragma once in dtrans (diff) | |
download | core-66253cace2db6026ec636a4a8b6062f125957da7.tar.gz core-66253cace2db6026ec636a4a8b6062f125957da7.zip |
tdf#124176 Use #pragma once in editeng
This commit was carried out by a Python script, source of which
is at https://bugs.documentfoundation.org/show_bug.cgi?id=124176#c97.
Change-Id: Ib435cc551e1fa301bf4ee3e796241e6b9219dc87
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102576
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
-rw-r--r-- | editeng/inc/editattr.hxx | 5 | ||||
-rw-r--r-- | editeng/inc/editdoc.hxx | 5 | ||||
-rw-r--r-- | editeng/inc/editxml.hxx | 5 | ||||
-rw-r--r-- | editeng/inc/edtspell.hxx | 5 | ||||
-rw-r--r-- | editeng/inc/eerdll2.hxx | 5 | ||||
-rw-r--r-- | editeng/inc/helpids.h | 5 | ||||
-rw-r--r-- | editeng/inc/strings.hrc | 5 | ||||
-rw-r--r-- | editeng/inc/unomodel.hxx | 5 | ||||
-rw-r--r-- | editeng/source/accessibility/AccessibleHyperlink.hxx | 5 | ||||
-rw-r--r-- | editeng/source/accessibility/AccessibleImageBullet.hxx | 5 | ||||
-rw-r--r-- | editeng/source/editeng/eeobj.hxx | 5 | ||||
-rw-r--r-- | editeng/source/editeng/eertfpar.hxx | 5 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.hxx | 5 | ||||
-rw-r--r-- | editeng/source/editeng/textconv.hxx | 5 | ||||
-rw-r--r-- | editeng/source/misc/SvXMLAutoCorrectExport.hxx | 4 | ||||
-rw-r--r-- | editeng/source/misc/SvXMLAutoCorrectImport.hxx | 5 | ||||
-rw-r--r-- | editeng/source/outliner/outleeng.hxx | 5 | ||||
-rw-r--r-- | editeng/source/outliner/outlundo.hxx | 5 | ||||
-rw-r--r-- | editeng/source/outliner/paralist.hxx | 5 | ||||
-rw-r--r-- | editeng/source/uno/unofored_internal.hxx | 5 | ||||
-rw-r--r-- | editeng/source/xml/editsource.hxx | 5 |
21 files changed, 21 insertions, 83 deletions
diff --git a/editeng/inc/editattr.hxx b/editeng/inc/editattr.hxx index 85df8454dccc..f0a6ec58da76 100644 --- a/editeng/inc/editattr.hxx +++ b/editeng/inc/editattr.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_EDITENG_INC_EDITATTR_HXX -#define INCLUDED_EDITENG_INC_EDITATTR_HXX +#pragma once #include <editeng/eeitem.hxx> #include <svl/poolitem.hxx> @@ -405,6 +404,4 @@ public: }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx index 2a5fc1e3f8de..f4ef714999e9 100644 --- a/editeng/inc/editdoc.hxx +++ b/editeng/inc/editdoc.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_EDITENG_INC_EDITDOC_HXX -#define INCLUDED_EDITENG_INC_EDITDOC_HXX +#pragma once #include "editattr.hxx" #include "edtspell.hxx" @@ -829,6 +828,4 @@ private: virtual ~EditEngineItemPool() override; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/inc/editxml.hxx b/editeng/inc/editxml.hxx index a3918e1c5397..51ded36f684e 100644 --- a/editeng/inc/editxml.hxx +++ b/editeng/inc/editxml.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_EDITENG_INC_EDITXML_HXX -#define INCLUDED_EDITENG_INC_EDITXML_HXX +#pragma once class EditEngine; class SvStream; @@ -31,7 +30,5 @@ extern void SvxWriteXML( EditEngine& rEditEngine, SvStream& rStream, const ESele /** this function imports xml from the stream into the selected of an edit engine */ extern EditPaM SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& rSel ); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/inc/edtspell.hxx b/editeng/inc/edtspell.hxx index efd9272f4859..eaf73b8908de 100644 --- a/editeng/inc/edtspell.hxx +++ b/editeng/inc/edtspell.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_EDITENG_INC_EDTSPELL_HXX -#define INCLUDED_EDITENG_INC_EDTSPELL_HXX +#pragma once #include <editeng/splwrap.hxx> #include <editeng/svxacorr.hxx> @@ -141,6 +140,4 @@ public: }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/inc/eerdll2.hxx b/editeng/inc/eerdll2.hxx index e9f271bac447..1d98ddc6d75c 100644 --- a/editeng/inc/eerdll2.hxx +++ b/editeng/inc/eerdll2.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_EDITENG_INC_EERDLL2_HXX -#define INCLUDED_EDITENG_INC_EERDLL2_HXX +#pragma once #include <com/sun/star/linguistic2/XLanguageGuessing.hpp> #include <editeng/forbiddencharacterstable.hxx> @@ -65,6 +64,4 @@ public: css::uno::Reference< css::linguistic2::XLanguageGuessing > const & GetLanguageGuesser(); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/inc/helpids.h b/editeng/inc/helpids.h index 5105dbd46b0f..8c4639e8951d 100644 --- a/editeng/inc/helpids.h +++ b/editeng/inc/helpids.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_EDITENG_INC_HELPIDS_H -#define INCLUDED_EDITENG_INC_HELPIDS_H +#pragma once #define HID_EDITENG_SPELLER_WORDLANGUAGE "EDITENG_HID_EDITENG_SPELLER_WORDLANGUAGE" #define HID_EDITENG_SPELLER_PARALANGUAGE "EDITENG_HID_EDITENG_SPELLER_PARALANGUAGE" -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/inc/strings.hrc b/editeng/inc/strings.hrc index 7ed30a3ef599..813fa1f92591 100644 --- a/editeng/inc/strings.hrc +++ b/editeng/inc/strings.hrc @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_EDITENG_INC_UNITS_HRC -#define INCLUDED_EDITENG_INC_UNITS_HRC +#pragma once #define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) @@ -40,6 +39,4 @@ const char* RID_SVXITEMS_JUSTMETHOD[] = NC_("RID_SVXITEMS_JUSTMETHOD_DISTRIBUTE", "Distributed Justify") }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/inc/unomodel.hxx b/editeng/inc/unomodel.hxx index 29e8fa18112e..cfe5b59ee24b 100644 --- a/editeng/inc/unomodel.hxx +++ b/editeng/inc/unomodel.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_EDITENG_UNOMODEL_HXX -#define INCLUDED_EDITENG_UNOMODEL_HXX +#pragma once #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/ucb/XAnyCompareFactory.hpp> @@ -66,6 +65,4 @@ public: }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/accessibility/AccessibleHyperlink.hxx b/editeng/source/accessibility/AccessibleHyperlink.hxx index 93e6177a8706..7e4f36a6bb77 100644 --- a/editeng/source/accessibility/AccessibleHyperlink.hxx +++ b/editeng/source/accessibility/AccessibleHyperlink.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_EDITENG_SOURCE_ACCESSIBILITY_ACCESSIBLEHYPERLINK_HXX -#define INCLUDED_EDITENG_SOURCE_ACCESSIBILITY_ACCESSIBLEHYPERLINK_HXX +#pragma once #include <cppuhelper/implbase.hxx> @@ -62,6 +61,4 @@ namespace accessibility } // end of namespace accessibility -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/accessibility/AccessibleImageBullet.hxx b/editeng/source/accessibility/AccessibleImageBullet.hxx index b09e393cbae0..8d75494a994b 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.hxx +++ b/editeng/source/accessibility/AccessibleImageBullet.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_EDITENG_ACCESSIBLEIMAGEBULLET_HXX -#define INCLUDED_EDITENG_ACCESSIBLEIMAGEBULLET_HXX +#pragma once #include <tools/gen.hxx> #include <cppuhelper/implbase.hxx> @@ -196,6 +195,4 @@ namespace accessibility } // end of namespace accessibility -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/editeng/eeobj.hxx b/editeng/source/editeng/eeobj.hxx index bc7fd6669a33..de06f1b703da 100644 --- a/editeng/source/editeng/eeobj.hxx +++ b/editeng/source/editeng/eeobj.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_EDITENG_SOURCE_EDITENG_EEOBJ_HXX -#define INCLUDED_EDITENG_SOURCE_EDITENG_EEOBJ_HXX +#pragma once #include <cppuhelper/implbase.hxx> #include <com/sun/star/datatransfer/XTransferable.hpp> @@ -48,6 +47,4 @@ public: sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) override; }; -#endif // INCLUDED_EDITENG_SOURCE_EDITENG_EEOBJ_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx index 7005a5276ff2..140385027b1a 100644 --- a/editeng/source/editeng/eertfpar.hxx +++ b/editeng/source/editeng/eertfpar.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_EDITENG_SOURCE_EDITENG_EERTFPAR_HXX -#define INCLUDED_EDITENG_SOURCE_EDITENG_EERTFPAR_HXX +#pragma once #include <editeng/svxrtf.hxx> @@ -64,6 +63,4 @@ public: typedef tools::SvRef<EditRTFParser> EditRTFParserRef; -#endif // INCLUDED_EDITENG_SOURCE_EDITENG_EERTFPAR_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 77d8059fdcdb..e9493ecdfa5b 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.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_EDITENG_SOURCE_EDITENG_IMPEDIT_HXX -#define INCLUDED_EDITENG_SOURCE_EDITENG_IMPEDIT_HXX +#pragma once #include <eerdll2.hxx> #include <editdoc.hxx> @@ -1290,7 +1289,5 @@ void ConvertAndPutItems( SfxItemSet& rDest, const SfxItemSet& rSource, const Map AsianCompressionFlags GetCharTypeForCompression( sal_Unicode cChar ); Point Rotate( const Point& rPoint, short nOrientation, const Point& rOrigin ); -#endif // INCLUDED_EDITENG_SOURCE_EDITENG_IMPEDIT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/editeng/textconv.hxx b/editeng/source/editeng/textconv.hxx index 1acb9a7148f5..536c0c1674d8 100644 --- a/editeng/source/editeng/textconv.hxx +++ b/editeng/source/editeng/textconv.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_EDITENG_SOURCE_EDITENG_TEXTCONV_HXX -#define INCLUDED_EDITENG_SOURCE_EDITENG_TEXTCONV_HXX +#pragma once #include <editeng/editdata.hxx> #include <editeng/svxenum.hxx> @@ -105,6 +104,4 @@ public: void Convert(); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.hxx b/editeng/source/misc/SvXMLAutoCorrectExport.hxx index b9729de4ee2d..58570e3ad191 100644 --- a/editeng/source/misc/SvXMLAutoCorrectExport.hxx +++ b/editeng/source/misc/SvXMLAutoCorrectExport.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_EDITENG_SOURCE_MISC_SVXMLAUTOCORRECTEXPORT_HXX -#define INCLUDED_EDITENG_SOURCE_MISC_SVXMLAUTOCORRECTEXPORT_HXX +#pragma once #include <xmloff/xmlexp.hxx> #include <editeng/svxacorr.hxx> @@ -57,6 +56,5 @@ public: void ExportMasterStyles_ () override {} void ExportContent_() override {} }; -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.hxx b/editeng/source/misc/SvXMLAutoCorrectImport.hxx index c45180608390..d04e8f1a10ef 100644 --- a/editeng/source/misc/SvXMLAutoCorrectImport.hxx +++ b/editeng/source/misc/SvXMLAutoCorrectImport.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_EDITENG_SOURCE_MISC_SVXMLAUTOCORRECTIMPORT_HXX -#define INCLUDED_EDITENG_SOURCE_MISC_SVXMLAUTOCORRECTIMPORT_HXX +#pragma once #include <sot/storage.hxx> #include <xmloff/xmlictxt.hxx> @@ -119,6 +118,4 @@ public: }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/outliner/outleeng.hxx b/editeng/source/outliner/outleeng.hxx index 2d2119593ba3..bb911b711c5b 100644 --- a/editeng/source/outliner/outleeng.hxx +++ b/editeng/source/outliner/outleeng.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_EDITENG_SOURCE_OUTLINER_OUTLEENG_HXX -#define INCLUDED_EDITENG_SOURCE_OUTLINER_OUTLEENG_HXX +#pragma once #include <editeng/outliner.hxx> #include <editeng/editeng.hxx> @@ -82,6 +81,4 @@ public: NotifyList aNotifyCache; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/outliner/outlundo.hxx b/editeng/source/outliner/outlundo.hxx index 68b518474b6b..066b415e138b 100644 --- a/editeng/source/outliner/outlundo.hxx +++ b/editeng/source/outliner/outlundo.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_EDITENG_SOURCE_OUTLINER_OUTLUNDO_HXX -#define INCLUDED_EDITENG_SOURCE_OUTLINER_OUTLUNDO_HXX +#pragma once #include <editeng/outliner.hxx> #include <editeng/editund2.hxx> @@ -116,6 +115,4 @@ public: sal_Int32 nCount; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/outliner/paralist.hxx b/editeng/source/outliner/paralist.hxx index 0b60ac78eb9c..47413ff5ff6c 100644 --- a/editeng/source/outliner/paralist.hxx +++ b/editeng/source/outliner/paralist.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_EDITENG_SOURCE_OUTLINER_PARALIST_HXX -#define INCLUDED_EDITENG_SOURCE_OUTLINER_PARALIST_HXX +#pragma once #include <sal/config.h> #include <sal/log.hxx> @@ -80,6 +79,4 @@ private: std::vector<std::unique_ptr<Paragraph>> maEntries; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/uno/unofored_internal.hxx b/editeng/source/uno/unofored_internal.hxx index 6714e1395bef..f58b8aa98b55 100644 --- a/editeng/source/uno/unofored_internal.hxx +++ b/editeng/source/uno/unofored_internal.hxx @@ -17,14 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_EDITENG_SOURCE_UNO_UNFORED_INTERNAL_HXX -#define INCLUDED_EDITENG_SOURCE_UNO_UNFORED_INTERNAL_HXX +#pragma once #include <editeng/editeng.hxx> SfxItemState GetSvxEditEngineItemState( EditEngine const & rEditEngine, const ESelection& rSel, sal_uInt16 nWhich ); -#endif // INCLUDED_EDITENG_SOURCE_UNO_UNFORED_INTERNAL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/xml/editsource.hxx b/editeng/source/xml/editsource.hxx index 51d5fc968976..726ddabc8c9e 100644 --- a/editeng/source/xml/editsource.hxx +++ b/editeng/source/xml/editsource.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_EDITENG_SOURCE_XML_EDITSOURCE_HXX -#define INCLUDED_EDITENG_SOURCE_XML_EDITSOURCE_HXX +#pragma once #include <editeng/unoedsrc.hxx> @@ -41,6 +40,4 @@ private: rtl::Reference<SvxEditEngineSourceImpl> mxImpl; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |