fixincludeguards.sh: some smaller dirs

Change-Id: Ic25bd678dc299627299b22145efd7bebcf2b39d0

9 files changed, 27 insertions, 27 deletions

diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx
index 4938a69e9762..c09b1b54bc49 100644
--- a/UnoControls/inc/basecontainercontrol.hxx
+++ b/UnoControls/inc/basecontainercontrol.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UNOCONTROLS_BASECONTAINERCONTROL_CTRL_HXX
-#define _UNOCONTROLS_BASECONTAINERCONTROL_CTRL_HXX
+#ifndef INCLUDED_UNOCONTROLS_INC_BASECONTAINERCONTROL_HXX
+#define INCLUDED_UNOCONTROLS_INC_BASECONTAINERCONTROL_HXX
 
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -278,6 +278,6 @@ private:
 
 }   // namespace unocontrols
 
-#endif  // ifndef _UNOCONTROLS_BASECONTAINERCONTROL_CTRL_HXX
+#endif // INCLUDED_UNOCONTROLS_INC_BASECONTAINERCONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
index c46f30f9adf4..ad11518def9e 100644
--- a/UnoControls/inc/basecontrol.hxx
+++ b/UnoControls/inc/basecontrol.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UNOCONTROLS_BASECONTROL_CTRL_HXX
-#define _UNOCONTROLS_BASECONTROL_CTRL_HXX
+#ifndef INCLUDED_UNOCONTROLS_INC_BASECONTROL_HXX
+#define INCLUDED_UNOCONTROLS_INC_BASECONTROL_HXX
 
 #include <com/sun/star/awt/XKeyListener.hpp>
 #include <com/sun/star/awt/XPaintListener.hpp>
@@ -600,6 +600,6 @@ private:
 
 }   // namespace unocontrols
 
-#endif  // ifndef _UNOCONTROLS_BASECONTROL_CTRL_HXX
+#endif // INCLUDED_UNOCONTROLS_INC_BASECONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx
index 4ec3c66a02fd..79414840a160 100644
--- a/UnoControls/inc/multiplexer.hxx
+++ b/UnoControls/inc/multiplexer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UNOCONTROLS_MULTIPLEXER_HXX
-#define _UNOCONTROLS_MULTIPLEXER_HXX
+#ifndef INCLUDED_UNOCONTROLS_INC_MULTIPLEXER_HXX
+#define INCLUDED_UNOCONTROLS_INC_MULTIPLEXER_HXX
 
 #include <com/sun/star/awt/XKeyListener.hpp>
 #include <com/sun/star/awt/XPaintListener.hpp>
@@ -358,6 +358,6 @@ private:
 
 }   // namespace unocontrols
 
-#endif  // ifndef _UNOCONTROLS_MULTIPLEXER_HXX
+#endif // INCLUDED_UNOCONTROLS_INC_MULTIPLEXER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
index 891da3fb8a73..3abb4f846e97 100644
--- a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OCONNECTIONPOINTCONTAINERHELPER_HXX
-#define _OCONNECTIONPOINTCONTAINERHELPER_HXX
+#ifndef INCLUDED_UNOCONTROLS_SOURCE_INC_OCONNECTIONPOINTCONTAINERHELPER_HXX
+#define INCLUDED_UNOCONTROLS_SOURCE_INC_OCONNECTIONPOINTCONTAINERHELPER_HXX
 
 #include <com/sun/star/lang/XConnectionPointContainer.hpp>
 #include <com/sun/star/lang/XConnectionPoint.hpp>
@@ -204,6 +204,6 @@ private:
 
 }   // namespace unocontrols
 
-#endif  // #ifndef _OCONNECTIONPOINTCONTAINERHELPER_HXX
+#endif // INCLUDED_UNOCONTROLS_SOURCE_INC_OCONNECTIONPOINTCONTAINERHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx
index 2a424b78878f..3ac295a79859 100644
--- a/UnoControls/source/inc/OConnectionPointHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OCONNECTIONPOINTHELPER_HXX
-#define _OCONNECTIONPOINTHELPER_HXX
+#ifndef INCLUDED_UNOCONTROLS_SOURCE_INC_OCONNECTIONPOINTHELPER_HXX
+#define INCLUDED_UNOCONTROLS_SOURCE_INC_OCONNECTIONPOINTHELPER_HXX
 
 #include <com/sun/star/lang/XConnectionPointContainer.hpp>
 #include <com/sun/star/lang/XConnectionPoint.hpp>
@@ -247,6 +247,6 @@ private:
 
 }   // namespace unocontrols
 
-#endif  // #ifndef _OCONNECTIONPOINTHELPER_HXX
+#endif // INCLUDED_UNOCONTROLS_SOURCE_INC_OCONNECTIONPOINTHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx
index f5dc4cfc92ec..55389e8d0cb5 100644
--- a/UnoControls/source/inc/framecontrol.hxx
+++ b/UnoControls/source/inc/framecontrol.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UNOCONTROLS_FRAMECONTROL_CTRL_HXX
-#define _UNOCONTROLS_FRAMECONTROL_CTRL_HXX
+#ifndef INCLUDED_UNOCONTROLS_SOURCE_INC_FRAMECONTROL_HXX
+#define INCLUDED_UNOCONTROLS_SOURCE_INC_FRAMECONTROL_HXX
 
 #include <com/sun/star/frame/XFrameActionListener.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
@@ -215,6 +215,6 @@ private:
 
 }   // namespace unocontrols
 
-#endif  // #ifndef _UNOCONTROLS_FRAMECONTROL_CTRL_HXX
+#endif // INCLUDED_UNOCONTROLS_SOURCE_INC_FRAMECONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx
index 5be2e5813ba9..11994533af19 100644
--- a/UnoControls/source/inc/progressbar.hxx
+++ b/UnoControls/source/inc/progressbar.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UNOCONTROLS_PROGRESSBAR_CTRL_HXX
-#define _UNOCONTROLS_PROGRESSBAR_CTRL_HXX
+#ifndef INCLUDED_UNOCONTROLS_SOURCE_INC_PROGRESSBAR_HXX
+#define INCLUDED_UNOCONTROLS_SOURCE_INC_PROGRESSBAR_HXX
 
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -381,6 +381,6 @@ private:
 
 }   // namespace unocontrols
 
-#endif  // #ifndef _UNOCONTROLS_PROGRESSBAR_CTRL_HXX
+#endif // INCLUDED_UNOCONTROLS_SOURCE_INC_PROGRESSBAR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx
index 2da6f8c3944e..a37a9367d952 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UNOCONTROLS_PROGRESSMONITOR_CTRL_HXX
-#define _UNOCONTROLS_PROGRESSMONITOR_CTRL_HXX
+#ifndef INCLUDED_UNOCONTROLS_SOURCE_INC_PROGRESSMONITOR_HXX
+#define INCLUDED_UNOCONTROLS_SOURCE_INC_PROGRESSMONITOR_HXX
 
 #include <com/sun/star/awt/XFileDialog.hpp>
 #include <com/sun/star/awt/XTextComponent.hpp>
@@ -428,6 +428,6 @@ private:
 
 }   // namespace unocontrols
 
-#endif  // #ifndef _UNOCONTROLS_PROGRESSMONITOR_CTRL_HXX
+#endif // INCLUDED_UNOCONTROLS_SOURCE_INC_PROGRESSMONITOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/inc/statusindicator.hxx b/UnoControls/source/inc/statusindicator.hxx
index a81d581183a2..50fcbddeefba 100644
--- a/UnoControls/source/inc/statusindicator.hxx
+++ b/UnoControls/source/inc/statusindicator.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UNOCONTROLS_STATUSINDICATOR_CTRL_HXX
-#define _UNOCONTROLS_STATUSINDICATOR_CTRL_HXX
+#ifndef INCLUDED_UNOCONTROLS_SOURCE_INC_STATUSINDICATOR_HXX
+#define INCLUDED_UNOCONTROLS_SOURCE_INC_STATUSINDICATOR_HXX
 
 #include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/awt/XFixedText.hpp>
@@ -294,6 +294,6 @@ private:
 
 }   // namespace unocontrols
 
-#endif  // #ifndef _UNOCONTROLS_STATUSINDICATOR_CTRL_HXX
+#endif // INCLUDED_UNOCONTROLS_SOURCE_INC_STATUSINDICATOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */