io/source/acceptor/acceptor.hxx | 4 +---
io/source/connector/connector.hxx | 4 +---
io/source/stm/streamhelper.hxx | 5 +----
io/test/stm/testfactreg.hxx | 6 +-----
sw/inc/accessibilityoptions.hxx | 4 +---
sw/inc/usrfld.hxx | 5 +----
sw/inc/viewsh.hxx | 5 ++---
sw/inc/viscrs.hxx | 4 +---
sw/inc/wdocsh.hxx | 7 +++----
9 files changed, 12 insertions(+), 32 deletions(-)
New commits:
commit 74583d24f67f41d15da211cfb00b7eaa8419e685
Author: Alchemist <rhithic...@gmail.com>
AuthorDate: Thu Dec 31 18:04:12 2020 +0530
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Jan 3 10:11:23 2021 +0100
tdf#124176 Use pragma once instead of include guards
Change-Id: I491742c51ddc7c97f02b148dfb81d9ba820a759e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108600
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/io/source/acceptor/acceptor.hxx b/io/source/acceptor/acceptor.hxx
index a88f3728f5e7..0ebe00c9e372 100644
--- a/io/source/acceptor/acceptor.hxx
+++ b/io/source/acceptor/acceptor.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_IO_SOURCE_ACCEPTOR_ACCEPTOR_HXX
-#define INCLUDED_IO_SOURCE_ACCEPTOR_ACCEPTOR_HXX
+#pragma once
#include <osl/pipe.hxx>
#include <osl/socket.hxx>
@@ -71,6 +70,5 @@ namespace io_acceptor {
}
-#endif // INCLUDED_IO_SOURCE_ACCEPTOR_ACCEPTOR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/connector/connector.hxx
b/io/source/connector/connector.hxx
index 9aad55a45dfa..a9321932798e 100644
--- a/io/source/connector/connector.hxx
+++ b/io/source/connector/connector.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_IO_SOURCE_CONNECTOR_CONNECTOR_HXX
-#define INCLUDED_IO_SOURCE_CONNECTOR_CONNECTOR_HXX
+#pragma once
#include <cppuhelper/implbase.hxx>
@@ -90,6 +89,5 @@ namespace stoc_connector
};
}
-#endif // INCLUDED_IO_SOURCE_CONNECTOR_CONNECTOR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/stm/streamhelper.hxx b/io/source/stm/streamhelper.hxx
index c1bb1b7db748..6d49003e9d77 100644
--- a/io/source/stm/streamhelper.hxx
+++ b/io/source/stm/streamhelper.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_IO_SOURCE_STM_STREAMHELPER_HXX
-#define INCLUDED_IO_SOURCE_STM_STREAMHELPER_HXX
+#pragma once
#include <com/sun/star/uno/Sequence.hxx>
@@ -83,6 +82,4 @@ public:
}
-#endif // INCLUDED_IO_SOURCE_STM_STREAMHELPER_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/test/stm/testfactreg.hxx b/io/test/stm/testfactreg.hxx
index 2dbff6d62d2b..7952867b4912 100644
--- a/io/test/stm/testfactreg.hxx
+++ b/io/test/stm/testfactreg.hxx
@@ -17,9 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_IO_TEST_STM_TESTFACTREG_HXX
-#define INCLUDED_IO_TEST_STM_TESTFACTREG_HXX
-
+#pragma once
#include <rtl/strbuf.hxx>
Reference< XInterface > SAL_CALL OPipeTest_CreateInstance( const Reference<
XMultiServiceFactory > & rSMgr ) throw( Exception );
@@ -106,6 +104,4 @@ Sequence<sal_Int8> createIntSeq( sal_Int32 i );
}\
((void)0)
-#endif // INCLUDED_IO_TEST_STM_TESTFACTREG_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/accessibilityoptions.hxx b/sw/inc/accessibilityoptions.hxx
index 92ec871b5bd3..ce8e94a158be 100644
--- a/sw/inc/accessibilityoptions.hxx
+++ b/sw/inc/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_SW_INC_ACCESSIBILITYOPTIONS_HXX
-#define INCLUDED_SW_INC_ACCESSIBILITYOPTIONS_HXX
+#pragma once
struct SwAccessibilityOptions
{
@@ -34,6 +33,5 @@ struct SwAccessibilityOptions
bool IsStopAnimatedGraphics() const { return
bIsStopAnimatedGraphics;}
void SetStopAnimatedGraphics( bool b ) { bIsStopAnimatedGraphics = b; }
};
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx
index 3592c6834380..d9ea9e407440 100644
--- a/sw/inc/usrfld.hxx
+++ b/sw/inc/usrfld.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_SW_INC_USRFLD_HXX
-#define INCLUDED_SW_INC_USRFLD_HXX
+#pragma once
#include "swdllapi.h"
#include "fldbas.hxx"
@@ -129,6 +128,4 @@ public:
void dumpAsXml(xmlTextWriterPtr pWriter) const override;
};
-#endif // INCLUDED_SW_INC_USRFLD_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 071c60d11bd3..27d29e9f65f0 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -16,8 +16,8 @@
* 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_SW_INC_VIEWSH_HXX
-#define INCLUDED_SW_INC_VIEWSH_HXX
+
+#pragma once
#include "swdllapi.h"
#include "swtypes.hxx"
@@ -614,6 +614,5 @@ inline const SfxItemPool& SwViewShell::GetAttrPool() const
return const_cast<SwViewShell*>(this)->GetAttrPool();
}
-#endif // INCLUDED_SW_INC_VIEWSH_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index 95c013b233ca..4818edfc4dfb 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.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_SW_INC_VISCRS_HXX
-#define INCLUDED_SW_INC_VISCRS_HXX
+#pragma once
#include <config_feature_desktop.h>
@@ -207,6 +206,5 @@ public:
const SwShellTableCursor* GetPrev() const { return
dynamic_cast<SwShellTableCursor const *>(GetPrevInRing()); }
};
-#endif // INCLUDED_SW_INC_VISCRS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/wdocsh.hxx b/sw/inc/wdocsh.hxx
index 37424d0fb4a5..addae9eb418f 100644
--- a/sw/inc/wdocsh.hxx
+++ b/sw/inc/wdocsh.hxx
@@ -16,8 +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_SW_INC_WDOCSH_HXX
-#define INCLUDED_SW_INC_WDOCSH_HXX
+
+#pragma once
+
#include "swdllapi.h"
#include "docsh.hxx"
@@ -47,6 +48,4 @@ public:
void SetSourcePara(sal_uInt16 nSet) { m_nSourcePara = nSet; }
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
