include/sfx2/sidebar/AsynchronousCall.hxx | 5 +----
include/sfx2/sidebar/Context.hxx | 5 +----
include/sfx2/sidebar/ControllerItem.hxx | 5 +----
include/sfx2/sidebar/Deck.hxx | 5 +----
include/sfx2/sidebar/FocusManager.hxx | 5 +----
include/sfx2/sidebar/IContextChangeReceiver.hxx | 5 +----
include/sfx2/sidebar/ILayoutableWindow.hxx | 5 +----
include/sfx2/sidebar/Panel.hxx | 5 +----
include/sfx2/sidebar/ResourceManager.hxx | 5 +----
include/sfx2/sidebar/Sidebar.hxx | 5 +----
include/sfx2/sidebar/SidebarChildWindow.hxx | 5 +----
include/sfx2/sidebar/SidebarController.hxx | 5 +----
include/sfx2/sidebar/SidebarDockingWindow.hxx | 6 +-----
include/sfx2/sidebar/SidebarModelUpdate.hxx | 5 +----
include/sfx2/sidebar/SidebarPanelBase.hxx | 5 +----
include/sfx2/sidebar/TabBar.hxx | 5 +----
include/sfx2/sidebar/Theme.hxx | 5 +----
17 files changed, 17 insertions(+), 69 deletions(-)
New commits:
commit 023b77182a5818063f53ecfbe7ec3562ee37dcbc
Author: Roman Kuznetsov <antilibreoff...@gmail.com>
AuthorDate: Thu Nov 19 19:49:51 2020 +0100
Commit: Roman Kuznetsov <antilibreoff...@gmail.com>
CommitDate: Thu Nov 19 23:11:18 2020 +0100
tdf#124176 use pragma once instead of include guards
in /core/include/sfx2/sidebar
Change-Id: I3ce7ccbd1e0e8e905c1f0eeefe1b17f4a2cd238f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106138
Tested-by: Jenkins
Reviewed-by: Roman Kuznetsov <antilibreoff...@gmail.com>
diff --git a/include/sfx2/sidebar/AsynchronousCall.hxx
b/include/sfx2/sidebar/AsynchronousCall.hxx
index 675e53b58dac..dfdf9d6d946a 100644
--- a/include/sfx2/sidebar/AsynchronousCall.hxx
+++ b/include/sfx2/sidebar/AsynchronousCall.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_SFX2_SOURCE_SIDEBAR_ASYNCHRONOUSCALL_HXX
-#define INCLUDED_SFX2_SOURCE_SIDEBAR_ASYNCHRONOUSCALL_HXX
+#pragma once
#include <tools/link.hxx>
@@ -50,6 +49,4 @@ private:
} // end of namespace sfx2::sidebar
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/Context.hxx b/include/sfx2/sidebar/Context.hxx
index b69838a8fd41..b6a369f66c61 100644
--- a/include/sfx2/sidebar/Context.hxx
+++ b/include/sfx2/sidebar/Context.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_SFX2_SOURCE_SIDEBAR_CONTEXT_HXX
-#define INCLUDED_SFX2_SOURCE_SIDEBAR_CONTEXT_HXX
+#pragma once
#include <rtl/ustring.hxx>
@@ -56,6 +55,4 @@ public:
} // end of namespace sfx2::sidebar
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/ControllerItem.hxx
b/include/sfx2/sidebar/ControllerItem.hxx
index ef75d0dc9f68..05e5910ff55d 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.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_SFX2_SIDEBAR_CONTROLLERITEM_HXX
-#define INCLUDED_SFX2_SIDEBAR_CONTROLLERITEM_HXX
+#pragma once
#include <sfx2/ctrlitem.hxx>
@@ -77,6 +76,4 @@ private:
} // end of namespace sfx2::sidebar
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx
index e8f00b6c7f65..2be908141e82 100644
--- a/include/sfx2/sidebar/Deck.hxx
+++ b/include/sfx2/sidebar/Deck.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_SFX2_SOURCE_SIDEBAR_DECK_HXX
-#define INCLUDED_SFX2_SOURCE_SIDEBAR_DECK_HXX
+#pragma once
#include <sfx2/sidebar/Panel.hxx>
@@ -106,6 +105,4 @@ private:
} // end of namespace sfx2::sidebar
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/FocusManager.hxx
b/include/sfx2/sidebar/FocusManager.hxx
index afd32d01716d..a51f4502ec97 100644
--- a/include/sfx2/sidebar/FocusManager.hxx
+++ b/include/sfx2/sidebar/FocusManager.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_SFX2_SOURCE_SIDEBAR_FOCUSMANAGER_HXX
-#define INCLUDED_SFX2_SOURCE_SIDEBAR_FOCUSMANAGER_HXX
+#pragma once
#include <sfx2/sidebar/Panel.hxx>
#include <tools/link.hxx>
@@ -144,6 +143,4 @@ private:
} // end of namespace sfx2::sidebar
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/IContextChangeReceiver.hxx
b/include/sfx2/sidebar/IContextChangeReceiver.hxx
index c3138c3f369b..12ed5e6fce8a 100644
--- a/include/sfx2/sidebar/IContextChangeReceiver.hxx
+++ b/include/sfx2/sidebar/IContextChangeReceiver.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_SFX2_SIDEBAR_ICONTEXTCHANGERECEIVER_HXX
-#define INCLUDED_SFX2_SIDEBAR_ICONTEXTCHANGERECEIVER_HXX
+#pragma once
#include <sfx2/dllapi.h>
@@ -37,6 +36,4 @@ public:
} // end of namespace ::sd::sidebar
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/ILayoutableWindow.hxx
b/include/sfx2/sidebar/ILayoutableWindow.hxx
index cb78ec5ad384..4eb3158a64d7 100644
--- a/include/sfx2/sidebar/ILayoutableWindow.hxx
+++ b/include/sfx2/sidebar/ILayoutableWindow.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_SFX2_SIDEBAR_ILAYOUTABLEWINDOW_HXX
-#define INCLUDED_SFX2_SIDEBAR_ILAYOUTABLEWINDOW_HXX
+#pragma once
#include <sfx2/dllapi.h>
#include <sal/types.h>
@@ -40,6 +39,4 @@ public:
} // end of namespace ::sd::sidebar
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/Panel.hxx b/include/sfx2/sidebar/Panel.hxx
index cdeee5223559..1df3802c2f48 100644
--- a/include/sfx2/sidebar/Panel.hxx
+++ b/include/sfx2/sidebar/Panel.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_SFX2_SOURCE_SIDEBAR_PANEL_HXX
-#define INCLUDED_SFX2_SOURCE_SIDEBAR_PANEL_HXX
+#pragma once
#include <sfx2/dllapi.h>
@@ -88,6 +87,4 @@ typedef std::vector<VclPtr<Panel> > SharedPanelContainer;
} // end of namespace sfx2::sidebar
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/ResourceManager.hxx
b/include/sfx2/sidebar/ResourceManager.hxx
index 68c208f7b603..5f0768ac7fcc 100644
--- a/include/sfx2/sidebar/ResourceManager.hxx
+++ b/include/sfx2/sidebar/ResourceManager.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_SFX2_SOURCE_SIDEBAR_RESOURCEMANAGER_HXX
-#define INCLUDED_SFX2_SOURCE_SIDEBAR_RESOURCEMANAGER_HXX
+#pragma once
#include <unotools/confignode.hxx>
#include <map>
@@ -128,6 +127,4 @@ private:
} // end of namespace sfx2::sidebar
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/Sidebar.hxx b/include/sfx2/sidebar/Sidebar.hxx
index 9bb250029a28..4b104301da8d 100644
--- a/include/sfx2/sidebar/Sidebar.hxx
+++ b/include/sfx2/sidebar/Sidebar.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SFX2_SIDEBAR_SIDEBAR_HXX
-#define INCLUDED_SFX2_SIDEBAR_SIDEBAR_HXX
+#pragma once
#include <sfx2/dllapi.h>
#include <sfx2/viewfrm.hxx>
@@ -64,6 +63,4 @@ public:
} // end of namespace sfx2::sidebar
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/SidebarChildWindow.hxx
b/include/sfx2/sidebar/SidebarChildWindow.hxx
index 6a9254df560f..279aa79b5f2d 100644
--- a/include/sfx2/sidebar/SidebarChildWindow.hxx
+++ b/include/sfx2/sidebar/SidebarChildWindow.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_SFX2_SIDEBAR_SIDEBARCHILDWINDOW_HXX
-#define INCLUDED_SFX2_SIDEBAR_SIDEBARCHILDWINDOW_HXX
+#pragma once
#include <sfx2/childwin.hxx>
@@ -44,6 +43,4 @@ public:
} // end of namespace sfx2::sidebar
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/SidebarController.hxx
b/include/sfx2/sidebar/SidebarController.hxx
index e9b653762e82..3fe1e9a26c9e 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.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_SFX2_SOURCE_SIDEBAR_SIDEBARCONTROLLER_HXX
-#define INCLUDED_SFX2_SOURCE_SIDEBAR_SIDEBARCONTROLLER_HXX
+#pragma once
#include <memory>
#include <sal/config.h>
@@ -291,6 +290,4 @@ private:
} // end of namespace sfx2::sidebar
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/SidebarDockingWindow.hxx
b/include/sfx2/sidebar/SidebarDockingWindow.hxx
index f156ab0cb0fb..903db6f42bf0 100644
--- a/include/sfx2/sidebar/SidebarDockingWindow.hxx
+++ b/include/sfx2/sidebar/SidebarDockingWindow.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_SFX2_SOURCE_SIDEBAR_SIDEBARDOCKINGWINDOW_HXX
-#define INCLUDED_SFX2_SOURCE_SIDEBAR_SIDEBARDOCKINGWINDOW_HXX
+#pragma once
#include <sfx2/dockwin.hxx>
@@ -73,7 +72,4 @@ private:
} // end of namespace sfx2::sidebar
-
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/SidebarModelUpdate.hxx
b/include/sfx2/sidebar/SidebarModelUpdate.hxx
index 0ecb988e5279..fde6f4110d7c 100644
--- a/include/sfx2/sidebar/SidebarModelUpdate.hxx
+++ b/include/sfx2/sidebar/SidebarModelUpdate.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_INCLUDE_SFX2_SIDEBAR_SIDEBARUPDATEMODEL_HXX
-#define INCLUDED_INCLUDE_SFX2_SIDEBAR_SIDEBARUPDATEMODEL_HXX
+#pragma once
#include <sfx2/dllapi.h>
@@ -26,6 +25,4 @@ public:
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx
b/include/sfx2/sidebar/SidebarPanelBase.hxx
index 84a3e4dfbf3b..015406771c4f 100644
--- a/include/sfx2/sidebar/SidebarPanelBase.hxx
+++ b/include/sfx2/sidebar/SidebarPanelBase.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_SFX2_SIDEBAR_SIDEBARPANELBASE_HXX
-#define INCLUDED_SFX2_SIDEBAR_SIDEBARPANELBASE_HXX
+#pragma once
#include <sfx2/dllapi.h>
@@ -97,6 +96,4 @@ private:
} // end of namespace sfx2::sidebar
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx
index 84ec840a7575..4eda225a29a1 100644
--- a/include/sfx2/sidebar/TabBar.hxx
+++ b/include/sfx2/sidebar/TabBar.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_SFX2_SOURCE_SIDEBAR_TABBAR_HXX
-#define INCLUDED_SFX2_SOURCE_SIDEBAR_TABBAR_HXX
+#pragma once
#include <config_options.h>
#include <sfx2//dllapi.h>
@@ -123,6 +122,4 @@ private:
} // end of namespace sfx2::sidebar
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx
index 7c6b441334e1..247d339958b1 100644
--- a/include/sfx2/sidebar/Theme.hxx
+++ b/include/sfx2/sidebar/Theme.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_SFX2_SIDEBAR_THEME_HXX
-#define INCLUDED_SFX2_SIDEBAR_THEME_HXX
+#pragma once
#include <sfx2/dllapi.h>
@@ -215,6 +214,4 @@ private:
} // end of namespace sfx2::sidebar
-#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
