[Libreoffice-commits] core.git: basic/inc basic/qa basic/source
George Bateman (via logerrit)
logerrit at kemper.freedesktop.org
Fri Sep 4 06:57:43 UTC 2020
basic/inc/basic.hrc | 5 +----
basic/inc/global.hxx | 5 +----
basic/inc/sb.hxx | 5 +----
basic/inc/sbobjmod.hxx | 5 +----
basic/inc/sbprop.hxx | 5 +----
basic/inc/sbstdobj.hxx | 5 +----
basic/inc/sbxbase.hxx | 5 +----
basic/inc/strings.hrc | 5 +----
basic/qa/cppunit/basictest.hxx | 5 +----
basic/source/inc/basiccharclass.hxx | 5 +----
basic/source/inc/buffer.hxx | 5 +----
basic/source/inc/codegen.hxx | 5 +----
basic/source/inc/date.hxx | 5 +----
basic/source/inc/dlgcont.hxx | 5 +----
basic/source/inc/errobject.hxx | 4 +---
basic/source/inc/eventatt.hxx | 5 +----
basic/source/inc/expr.hxx | 5 +----
basic/source/inc/filefmt.hxx | 5 +----
basic/source/inc/image.hxx | 5 +----
basic/source/inc/iosys.hxx | 5 +----
basic/source/inc/namecont.hxx | 5 +----
basic/source/inc/opcodes.hxx | 5 +----
basic/source/inc/parser.hxx | 5 +----
basic/source/inc/propacc.hxx | 5 +----
basic/source/inc/rtlproto.hxx | 5 +----
basic/source/inc/runtime.hxx | 5 +----
basic/source/inc/sbintern.hxx | 5 +----
basic/source/inc/sbjsmeth.hxx | 5 +----
basic/source/inc/sbjsmod.hxx | 5 +----
basic/source/inc/sbunoobj.hxx | 5 +----
basic/source/inc/sbxmod.hxx | 5 +----
basic/source/inc/scanner.hxx | 5 +----
basic/source/inc/scriptcont.hxx | 5 +----
basic/source/inc/stdobj.hxx | 5 +----
basic/source/inc/symtbl.hxx | 5 +----
basic/source/inc/token.hxx | 5 +----
basic/source/runtime/dllmgr.hxx | 5 +----
basic/source/sbx/sbxconv.hxx | 5 +----
38 files changed, 38 insertions(+), 151 deletions(-)
New commits:
commit fb4ddf2fc997f3b0c193b6dce22a0b1313f24240
Author: George Bateman <george.bateman16 at gmail.com>
AuthorDate: Tue Aug 4 21:07:00 2020 +0000
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Fri Sep 4 08:57:06 2020 +0200
tdf#124176 Use #pragma once in basic
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: Ief7f29d8efaa3d6ac417080f3147a087844621a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100128
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/basic/inc/basic.hrc b/basic/inc/basic.hrc
index c860fce7aaed..1a063615318e 100644
--- a/basic/inc/basic.hrc
+++ b/basic/inc/basic.hrc
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_INC_STRINGS_HRC
-#define INCLUDED_BASIC_INC_STRINGS_HRC
+#pragma once
#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
@@ -156,6 +155,4 @@ std::pair<const char*, ErrCode> const RID_BASIC_START[] =
{ nullptr, ERRCODE_NONE }
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/inc/global.hxx b/basic/inc/global.hxx
index 640759ef8c17..aa101a562ced 100644
--- a/basic/inc/global.hxx
+++ b/basic/inc/global.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_BASIC_INC_GLOBAL_HXX
-#define INCLUDED_BASIC_INC_GLOBAL_HXX
+#pragma once
namespace utl {
class TransliterationWrapper;
@@ -20,6 +19,4 @@ public:
static utl::TransliterationWrapper& GetTransliteration();
};
-#endif // INCLUDED_BASIC_INC_GLOBAL_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/inc/sb.hxx b/basic/inc/sb.hxx
index bfac343fb5d6..4f3132fcf569 100644
--- a/basic/inc/sb.hxx
+++ b/basic/inc/sb.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_INC_SB_HXX
-#define INCLUDED_BASIC_INC_SB_HXX
+#pragma once
#include <basic/sbxobj.hxx>
@@ -27,6 +26,4 @@ SbxObject* createUserTypeImpl( const OUString& rClassName );
SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj );
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/inc/sbobjmod.hxx b/basic/inc/sbobjmod.hxx
index b87892f52323..788be5fe43dd 100644
--- a/basic/inc/sbobjmod.hxx
+++ b/basic/inc/sbobjmod.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_INC_SBOBJMOD_HXX
-#define INCLUDED_BASIC_INC_SBOBJMOD_HXX
+#pragma once
#include <rtl/ref.hxx>
#include <basic/sbmod.hxx>
@@ -94,6 +93,4 @@ public:
virtual SbxVariable* Find( const OUString& rName, SbxClassType t ) override;
};
-#endif // INCLUDED_BASIC_INC_SBOBJMOD_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/inc/sbprop.hxx b/basic/inc/sbprop.hxx
index bd4a8b117c54..e554267f9e0b 100644
--- a/basic/inc/sbprop.hxx
+++ b/basic/inc/sbprop.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_INC_SBPROP_HXX
-#define INCLUDED_BASIC_INC_SBPROP_HXX
+#pragma once
#include "sbxprop.hxx"
#include <basic/sbdef.hxx>
@@ -58,6 +57,4 @@ public:
{ mbSet = bSet; }
};
-#endif // INCLUDED_BASIC_INC_SBPROP_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx
index ad242dfb1489..93e9abf6887e 100644
--- a/basic/inc/sbstdobj.hxx
+++ b/basic/inc/sbstdobj.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_INC_SBSTDOBJ_HXX
-#define INCLUDED_BASIC_INC_SBSTDOBJ_HXX
+#pragma once
#include <basic/sbxobj.hxx>
#include <vcl/graph.hxx>
@@ -104,6 +103,4 @@ public:
SbStdClipboard();
};
-#endif // INCLUDED_BASIC_INC_SBSTDOBJ_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/inc/sbxbase.hxx b/basic/inc/sbxbase.hxx
index a1f5a2c7dffb..40255c485a8f 100644
--- a/basic/inc/sbxbase.hxx
+++ b/basic/inc/sbxbase.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_INC_SBXBASE_HXX
-#define INCLUDED_BASIC_INC_SBXBASE_HXX
+#pragma once
#include <sal/config.h>
@@ -57,6 +56,4 @@ SbxAppData& GetSbxData_Impl();
/** returns true if the SbxAppData is still valid, used to check if we are in shutdown. */
bool IsSbxData_Impl();
-#endif // INCLUDED_BASIC_INC_SBXBASE_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/inc/strings.hrc b/basic/inc/strings.hrc
index c257ac2fd225..ff8e0fc22618 100644
--- a/basic/inc/strings.hrc
+++ b/basic/inc/strings.hrc
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_INC_STRINGS_HRC
-#define INCLUDED_BASIC_INC_STRINGS_HRC
+#pragma once
#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
@@ -33,6 +32,4 @@
#define IDS_SBERR_TERMINATED NC_("IDS_SBERR_TERMINATED", "The macro running has been interrupted")
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx
index c8d262ee6def..f5fb79f557ba 100644
--- a/basic/qa/cppunit/basictest.hxx
+++ b/basic/qa/cppunit/basictest.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_BASIC_QA_CPPUNIT_BASICTEST_HXX
-#define INCLUDED_BASIC_QA_CPPUNIT_BASICTEST_HXX
+#pragma once
#include <sal/types.h>
#include <cppunit/TestFixture.h>
@@ -50,6 +49,4 @@ public:
const ErrCode& getError() const;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/basiccharclass.hxx b/basic/source/inc/basiccharclass.hxx
index 3b8109b89192..e58b71c1a2c6 100644
--- a/basic/source/inc/basiccharclass.hxx
+++ b/basic/source/inc/basiccharclass.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_BASICCHARCLASS_HXX
-#define INCLUDED_BASIC_SOURCE_INC_BASICCHARCLASS_HXX
+#pragma once
#include <sal/types.h>
@@ -31,6 +30,4 @@ namespace BasicCharClass
bool isWhitespace( sal_Unicode c );
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/buffer.hxx b/basic/source/inc/buffer.hxx
index 89d664453cef..aa9111c54785 100644
--- a/basic/source/inc/buffer.hxx
+++ b/basic/source/inc/buffer.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_BUFFER_HXX
-#define INCLUDED_BASIC_SOURCE_INC_BUFFER_HXX
+#pragma once
#include <sal/types.h>
#include <memory>
@@ -48,6 +47,4 @@ public:
sal_uInt32 GetSize() const { return nOff; }
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/codegen.hxx b/basic/source/inc/codegen.hxx
index 857968e26e15..c5111002f110 100644
--- a/basic/source/inc/codegen.hxx
+++ b/basic/source/inc/codegen.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_CODEGEN_HXX
-#define INCLUDED_BASIC_SOURCE_INC_CODEGEN_HXX
+#pragma once
class SbiParser;
class SbModule;
@@ -80,6 +79,4 @@ public:
#define PARAM_INFO_PARAMARRAY 0x0010000
#define PARAM_INFO_WITHBRACKETS 0x0020000
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/date.hxx b/basic/source/inc/date.hxx
index 1a994ca3fa0c..4b6cb115fbbf 100644
--- a/basic/source/inc/date.hxx
+++ b/basic/source/inc/date.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_DATE_HXX
-#define INCLUDED_BASIC_SOURCE_INC_DATE_HXX
+#pragma once
#include <com/sun/star/util/Date.hpp>
#include <com/sun/star/util/Time.hpp>
@@ -56,6 +55,4 @@ void SbxDateFromUNOTime( SbxValue*, const css::util::Time& );
css::util::DateTime SbxDateToUNODateTime( const SbxValue* );
void SbxDateFromUNODateTime( SbxValue*, const css::util::DateTime& );
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx
index 582e462ab93e..f9dbe2745c25 100644
--- a/basic/source/inc/dlgcont.hxx
+++ b/basic/source/inc/dlgcont.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_DLGCONT_HXX
-#define INCLUDED_BASIC_SOURCE_INC_DLGCONT_HXX
+#pragma once
#include "namecont.hxx"
@@ -147,6 +146,4 @@ protected:
} // namespace basic
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/errobject.hxx b/basic/source/inc/errobject.hxx
index 65c4722e3319..95900abeb46a 100644
--- a/basic/source/inc/errobject.hxx
+++ b/basic/source/inc/errobject.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_ERROBJECT_HXX
-#define INCLUDED_BASIC_SOURCE_INC_ERROBJECT_HXX
+#pragma once
#include "sbunoobj.hxx"
#include <ooo/vba/XErrObject.hpp>
@@ -38,6 +37,5 @@ public:
/// @throws css::uno::RuntimeException
void setNumberAndDescription( ::sal_Int32 _number, const OUString& _description );
};
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/eventatt.hxx b/basic/source/inc/eventatt.hxx
index b38c83c597ce..4ea3e044069f 100644
--- a/basic/source/inc/eventatt.hxx
+++ b/basic/source/inc/eventatt.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_EVENTATT_HXX
-#define INCLUDED_BASIC_SOURCE_INC_EVENTATT_HXX
+#pragma once
#include <sal/config.h>
@@ -29,6 +28,4 @@ class SbxArray;
// and attach events.
void RTL_Impl_CreateUnoDialog(SbxArray& rPar);
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index d83594c4951f..b0656717e399 100644
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_EXPR_HXX
-#define INCLUDED_BASIC_SOURCE_INC_EXPR_HXX
+#pragma once
#include <memory>
@@ -225,6 +224,4 @@ public:
void addExpression( std::unique_ptr<SbiExpression>&& pExpr );
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/filefmt.hxx b/basic/source/inc/filefmt.hxx
index eb1990087d9e..f6cc8e1fe88f 100644
--- a/basic/source/inc/filefmt.hxx
+++ b/basic/source/inc/filefmt.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_FILEFMT_HXX
-#define INCLUDED_BASIC_SOURCE_INC_FILEFMT_HXX
+#pragma once
class SvStream;
@@ -187,6 +186,4 @@ enum class FileOffset {
// sal_Int32 lower bound
// sal_Int32 upper bound
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/image.hxx b/basic/source/inc/image.hxx
index ee1aaa4168b6..bf87f725cc8c 100644
--- a/basic/source/inc/image.hxx
+++ b/basic/source/inc/image.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_IMAGE_HXX
-#define INCLUDED_BASIC_SOURCE_INC_IMAGE_HXX
+#pragma once
#include <basic/sbx.hxx>
#include <rtl/ustring.hxx>
@@ -99,6 +98,4 @@ public:
bool ExceedsLegacyLimits();
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx
index 4931b86a3e94..9f60c4f29c50 100644
--- a/basic/source/inc/iosys.hxx
+++ b/basic/source/inc/iosys.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_IOSYS_HXX
-#define INCLUDED_BASIC_SOURCE_INC_IOSYS_HXX
+#pragma once
#include <memory>
#include <tools/stream.hxx>
@@ -107,6 +106,4 @@ public:
void CloseAll(); // JSM
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 3a86f059c839..56b688dd1271 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_NAMECONT_HXX
-#define INCLUDED_BASIC_SOURCE_INC_NAMECONT_HXX
+#pragma once
#include <unordered_map>
#include <com/sun/star/uno/XComponentContext.hpp>
@@ -655,6 +654,4 @@ private:
} // namespace basic
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/opcodes.hxx b/basic/source/inc/opcodes.hxx
index cb97110369f4..b9c5e692a1aa 100644
--- a/basic/source/inc/opcodes.hxx
+++ b/basic/source/inc/opcodes.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_OPCODES_HXX
-#define INCLUDED_BASIC_SOURCE_INC_OPCODES_HXX
+#pragma once
// An opcode can have a length of 1, 3 or 5 bytes,
// depending on its numeric value (see below).
@@ -154,6 +153,4 @@ enum class SbiOpcode {
SbOP2_END = FIND_STATIC_
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx
index 88f4f34b2b33..4e03e6d39058 100644
--- a/basic/source/inc/parser.hxx
+++ b/basic/source/inc/parser.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_PARSER_HXX
-#define INCLUDED_BASIC_SOURCE_INC_PARSER_HXX
+#pragma once
#include "expr.hxx"
#include "codegen.hxx"
@@ -139,6 +138,4 @@ public:
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx
index c00673055c8c..f6df70797434 100644
--- a/basic/source/inc/propacc.hxx
+++ b/basic/source/inc/propacc.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_BASIC_SOURCE_INC_PROPACC_HXX
-#define INCLUDED_BASIC_SOURCE_INC_PROPACC_HXX
+#pragma once
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -74,6 +73,4 @@ class SbxArray;
void RTL_Impl_CreatePropertySet( SbxArray& rPar );
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/rtlproto.hxx b/basic/source/inc/rtlproto.hxx
index 6e26f9316103..2d0cb78f84b7 100644
--- a/basic/source/inc/rtlproto.hxx
+++ b/basic/source/inc/rtlproto.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_RTLPROTO_HXX
-#define INCLUDED_BASIC_SOURCE_INC_RTLPROTO_HXX
+#pragma once
#include <basic/sbstar.hxx>
@@ -360,6 +359,4 @@ extern void SbRtl_Partition(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); /
extern double Now_Impl();
extern void Wait_Impl( bool bDurationBased, SbxArray& rPar );
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 65be051e704f..030b9c2041db 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_RUNTIME_HXX
-#define INCLUDED_BASIC_SOURCE_INC_RUNTIME_HXX
+#pragma once
#include <basic/sberrors.hxx>
#include <basic/sbmeth.hxx>
@@ -416,6 +415,4 @@ bool IsBaseIndexOne();
void removeDimAsNewRecoverItem( SbxVariable* pVar );
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx
index 9a0436813f42..a79cbb59dd1e 100644
--- a/basic/source/inc/sbintern.hxx
+++ b/basic/source/inc/sbintern.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_SBINTERN_HXX
-#define INCLUDED_BASIC_SOURCE_INC_SBINTERN_HXX
+#pragma once
#include <basic/basicdllapi.h>
#include <basic/sbstar.hxx>
@@ -142,6 +141,4 @@ struct SbiGlobals
SbiGlobals* GetSbData();
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/sbjsmeth.hxx b/basic/source/inc/sbjsmeth.hxx
index 2e4abc509bed..b813eebd9183 100644
--- a/basic/source/inc/sbjsmeth.hxx
+++ b/basic/source/inc/sbjsmeth.hxx
@@ -18,8 +18,7 @@
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_SBJSMETH_HXX
-#define INCLUDED_BASIC_SOURCE_INC_SBJSMETH_HXX
+#pragma once
#include <basic/sbmeth.hxx>
@@ -37,6 +36,4 @@ public:
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/sbjsmod.hxx b/basic/source/inc/sbjsmod.hxx
index 9d2d7d8f4194..2219c64db004 100644
--- a/basic/source/inc/sbjsmod.hxx
+++ b/basic/source/inc/sbjsmod.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_SBJSMOD_HXX
-#define INCLUDED_BASIC_SOURCE_INC_SBJSMOD_HXX
+#pragma once
#include <basic/sbmod.hxx>
@@ -35,7 +34,5 @@ public:
SbJScriptModule(); // hand through
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index 6827bf755d0d..e06b0e0137d2 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.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_BASIC_SOURCE_INC_SBUNOOBJ_HXX
-#define INCLUDED_BASIC_SOURCE_INC_SBUNOOBJ_HXX
+#pragma once
#include <basic/sbxobj.hxx>
#include <basic/sbxmeth.hxx>
@@ -390,6 +389,4 @@ bool handleToStringForCOMObjects( SbxObject* pObj, SbxValue* pVal );
void registerComListenerVariableForBasic( SbxVariable* pVar, StarBASIC* pBasic );
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/sbxmod.hxx b/basic/source/inc/sbxmod.hxx
index 853715c4b130..ceacaa84e191 100644
--- a/basic/source/inc/sbxmod.hxx
+++ b/basic/source/inc/sbxmod.hxx
@@ -17,14 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_SBXMOD_HXX
-#define INCLUDED_BASIC_SOURCE_INC_SBXMOD_HXX
+#pragma once
#include <com/sun/star/frame/XModel.hpp>
#include <basic/sbstar.hxx>
css::uno::Reference<css::frame::XModel> getDocumentModel(StarBASIC*);
-#endif // INCLUDED_BASIC_SOURCE_INC_SBXMOD_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/scanner.hxx b/basic/source/inc/scanner.hxx
index 9b03b0adc568..339b4421b829 100644
--- a/basic/source/inc/scanner.hxx
+++ b/basic/source/inc/scanner.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_SCANNER_HXX
-#define INCLUDED_BASIC_SOURCE_INC_SCANNER_HXX
+#pragma once
#include <basic/sbxdef.hxx>
#include <vcl/errcode.hxx>
@@ -91,6 +90,4 @@ public:
double GetDbl() const { return nVal; }
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index 98fce14b6040..bc82a42ca915 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_SCRIPTCONT_HXX
-#define INCLUDED_BASIC_SOURCE_INC_SCRIPTCONT_HXX
+#pragma once
#include "namecont.hxx"
#include <basic/basmgr.hxx>
@@ -158,6 +157,4 @@ protected:
} // namespace basic
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/stdobj.hxx b/basic/source/inc/stdobj.hxx
index d7bc4c176493..e488648c1128 100644
--- a/basic/source/inc/stdobj.hxx
+++ b/basic/source/inc/stdobj.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_STDOBJ_HXX
-#define INCLUDED_BASIC_SOURCE_INC_STDOBJ_HXX
+#pragma once
#include <basic/sbxobj.hxx>
@@ -39,6 +38,4 @@ public:
virtual void SetModified( bool ) override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index 2dfc9c758bda..d025024918c3 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_SYMTBL_HXX
-#define INCLUDED_BASIC_SOURCE_INC_SYMTBL_HXX
+#pragma once
#include <memory>
#include <vector>
@@ -217,6 +216,4 @@ public:
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/token.hxx b/basic/source/inc/token.hxx
index 34abfce82a7f..4230ff585b7a 100644
--- a/basic/source/inc/token.hxx
+++ b/basic/source/inc/token.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_INC_TOKEN_HXX
-#define INCLUDED_BASIC_SOURCE_INC_TOKEN_HXX
+#pragma once
#include "scanner.hxx"
@@ -135,6 +134,4 @@ public:
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/runtime/dllmgr.hxx b/basic/source/runtime/dllmgr.hxx
index 461375467ad1..ce79c54797f3 100644
--- a/basic/source/runtime/dllmgr.hxx
+++ b/basic/source/runtime/dllmgr.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_RUNTIME_DLLMGR_HXX
-#define INCLUDED_BASIC_SOURCE_RUNTIME_DLLMGR_HXX
+#pragma once
#include <sal/config.h>
#include <vcl/errcode.hxx>
@@ -48,6 +47,4 @@ private:
std::unique_ptr< Impl > impl_;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/sbx/sbxconv.hxx b/basic/source/sbx/sbxconv.hxx
index e053e7e028be..dede96942297 100644
--- a/basic/source/sbx/sbxconv.hxx
+++ b/basic/source/sbx/sbxconv.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASIC_SOURCE_SBX_SBXCONV_HXX
-#define INCLUDED_BASIC_SOURCE_SBX_SBXCONV_HXX
+#pragma once
#include "sbxdec.hxx"
#include <basic/sbx.hxx>
@@ -127,6 +126,4 @@ void ImpPutBool( SbxValues*, sal_Int16 );
SbxArray* StringToByteArray(const OUString& rStr);
OUString ByteArrayToString(SbxArray* pArr);
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list