sw/source/uibase/docvw/AnchorOverlayObject.hxx | 5 +---- sw/source/uibase/docvw/AnnotationMenuButton.hxx | 5 +---- sw/source/uibase/docvw/OverlayRanges.hxx | 5 +---- sw/source/uibase/docvw/ShadowOverlayObject.hxx | 5 +---- sw/source/uibase/docvw/SidebarTxtControl.hxx | 5 +---- sw/source/uibase/docvw/SidebarTxtControlAcc.hxx | 5 +---- sw/source/uibase/docvw/SidebarWinAcc.hxx | 5 +---- sw/source/uibase/docvw/frmsidebarwincontainer.hxx | 6 ++---- sw/source/uibase/docvw/romenu.hxx | 6 ++---- 9 files changed, 11 insertions(+), 36 deletions(-)
New commits: commit 17aca7c66fd71b3259e4cb0a964224f371db45d2 Author: Tolunay Dündar <dndr....@protonmail.com> AuthorDate: Sat Nov 21 19:13:07 2020 +0000 Commit: Julien Nabet <serval2...@yahoo.fr> CommitDate: Sun Nov 22 09:03:20 2020 +0100 tdf#124176: Use pragma once instead of include guards Change-Id: I74f5f128e739e199002c60388243a5a7c60dee0f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106325 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2...@yahoo.fr> diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.hxx b/sw/source/uibase/docvw/AnchorOverlayObject.hxx index 6618f9575bd2..744b2f062725 100644 --- a/sw/source/uibase/docvw/AnchorOverlayObject.hxx +++ b/sw/source/uibase/docvw/AnchorOverlayObject.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_ANCHOROVERLAYOBJECT_HXX -#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_ANCHOROVERLAYOBJECT_HXX +#pragma once #include <svx/sdr/overlay/overlayobject.hxx> #include <tools/long.hxx> @@ -118,6 +117,4 @@ class AnchorOverlayObject final : public sdr::overlay::OverlayObjectWithBasePosi } // end of namespace sw::annotation -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.hxx b/sw/source/uibase/docvw/AnnotationMenuButton.hxx index 2e8ce9221b20..8734cd9565b8 100644 --- a/sw/source/uibase/docvw/AnnotationMenuButton.hxx +++ b/sw/source/uibase/docvw/AnnotationMenuButton.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_ANNOTATIONMENUBUTTON_HXX -#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_ANNOTATIONMENUBUTTON_HXX +#pragma once #include <vcl/menubtn.hxx> @@ -49,6 +48,4 @@ class AnnotationMenuButton : public MenuButton } // end of namespace sw::annotation -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/docvw/OverlayRanges.hxx b/sw/source/uibase/docvw/OverlayRanges.hxx index 9e860a5c612a..e086b8462ea2 100644 --- a/sw/source/uibase/docvw/OverlayRanges.hxx +++ b/sw/source/uibase/docvw/OverlayRanges.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_OVERLAYRANGES_HXX -#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_OVERLAYRANGES_HXX +#pragma once #include <svx/sdr/overlay/overlayobject.hxx> #include <basegfx/range/b2drange.hxx> @@ -67,6 +66,4 @@ namespace sw::overlay }; } // end of namespace sw::overlay -#endif // INCLUDED_SW_SOURCE_UIBASE_DOCVW_OVERLAYRANGES_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.hxx b/sw/source/uibase/docvw/ShadowOverlayObject.hxx index b9af12c58d72..df8e27009f5e 100644 --- a/sw/source/uibase/docvw/ShadowOverlayObject.hxx +++ b/sw/source/uibase/docvw/ShadowOverlayObject.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_SHADOWOVERLAYOBJECT_HXX -#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_SHADOWOVERLAYOBJECT_HXX +#pragma once #include <svx/sdr/overlay/overlayobject.hxx> @@ -61,6 +60,4 @@ public: } // end of namespace sw::sidebarwindows -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/docvw/SidebarTxtControl.hxx b/sw/source/uibase/docvw/SidebarTxtControl.hxx index def75229cc01..456aac4ef989 100644 --- a/sw/source/uibase/docvw/SidebarTxtControl.hxx +++ b/sw/source/uibase/docvw/SidebarTxtControl.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_SIDEBARTXTCONTROL_HXX -#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_SIDEBARTXTCONTROL_HXX +#pragma once #include <vcl/ctrl.hxx> @@ -73,6 +72,4 @@ class SidebarTextControl : public Control } // end of namespace sw::sidebarwindows -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx index b05693484be2..db60972501c6 100644 --- a/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx +++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_SIDEBARTXTCONTROLACC_HXX -#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_SIDEBARTXTCONTROLACC_HXX +#pragma once #include <toolkit/awt/vclxwindow.hxx> @@ -41,6 +40,4 @@ class SidebarTextControlAccessible : public VCLXWindow } // end of namespace sw::sidebarwindows -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/docvw/SidebarWinAcc.hxx b/sw/source/uibase/docvw/SidebarWinAcc.hxx index f22dfac3ef80..6484baad2711 100644 --- a/sw/source/uibase/docvw/SidebarWinAcc.hxx +++ b/sw/source/uibase/docvw/SidebarWinAcc.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_SIDEBARWINACC_HXX -#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_SIDEBARWINACC_HXX +#pragma once #include <toolkit/awt/vclxwindow.hxx> @@ -51,6 +50,4 @@ class SidebarWinAccessible : public VCLXWindow } // end of namespace sw::sidebarwindows -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/docvw/frmsidebarwincontainer.hxx b/sw/source/uibase/docvw/frmsidebarwincontainer.hxx index 4e8d7b41ab03..33ae9a9d4da1 100644 --- a/sw/source/uibase/docvw/frmsidebarwincontainer.hxx +++ b/sw/source/uibase/docvw/frmsidebarwincontainer.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_SOURCE_UIBASE_DOCVW_FRMSIDEBARWINCONTAINER_HXX -#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_FRMSIDEBARWINCONTAINER_HXX + +#pragma once #include <sal/types.h> #include <memory> @@ -59,6 +59,4 @@ class SwFrameSidebarWinContainer } // namespace sw::sidebarwindows -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/docvw/romenu.hxx b/sw/source/uibase/docvw/romenu.hxx index 7d2e82994e63..edaab24da8ce 100644 --- a/sw/source/uibase/docvw/romenu.hxx +++ b/sw/source/uibase/docvw/romenu.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_SOURCE_UIBASE_DOCVW_ROMENU_HXX -#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_ROMENU_HXX + +#pragma once #include <editeng/brushitem.hxx> #include <vcl/builder.hxx> @@ -77,6 +77,4 @@ public: void Execute( vcl::Window* pWin, sal_uInt16 nId ); }; -#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