clean up all the UNO IDL module header guards

.. so I don't keep tripping over the bad ones during my UNO cleanup work.

(1) make them all use a similar syntax, makes it easier to run my automatic checker
(2) some of them were just cut'n'paste accidents waiting to happen
(3) remove unnecessary header guards in the __including__ file. That is very brittle.

Change-Id: I4e679c15161483ad93aeb316a25d6db6d97e9d4e

15 files changed, 31 insertions, 30 deletions

diff --git a/udkapi/com/sun/star/beans/XMultiPropertyStates.idl b/udkapi/com/sun/star/beans/XMultiPropertyStates.idl
index 55008990dfce..a4398e958ccd 100644
--- a/udkapi/com/sun/star/beans/XMultiPropertyStates.idl
+++ b/udkapi/com/sun/star/beans/XMultiPropertyStates.idl
@@ -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 __com_sun_star_beans_XMultiPropertyState_idl__
-#define __com_sun_star_beans_XMultiPropertyState_idl__
+#ifndef __com_sun_star_beans_XMultiPropertyStates_idl__
+#define __com_sun_star_beans_XMultiPropertyStates_idl__
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/beans/PropertyState.idl>
diff --git a/udkapi/com/sun/star/bridge/BridgeExistsException.idl b/udkapi/com/sun/star/bridge/BridgeExistsException.idl
index b303b33284d8..ec53eb98e0a4 100644
--- a/udkapi/com/sun/star/bridge/BridgeExistsException.idl
+++ b/udkapi/com/sun/star/bridge/BridgeExistsException.idl
@@ -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 _COM_SUN_STAR_CONNECTION_BRIDGEEXISTSEXCEPTION_IDL_
-#define _COM_SUN_STAR_CONNECTION_BRIDGEEXISTSEXCEPTION_IDL_
+#ifndef _COM_SUN_STAR_BRIDGE_BRIDGEEXISTSEXCEPTION_IDL_
+#define _COM_SUN_STAR_BRIDGE_BRIDGEEXISTSEXCEPTION_IDL_
 
 #include <com/sun/star/uno/Exception.idl>
 
diff --git a/udkapi/com/sun/star/bridge/IiopBridge.idl b/udkapi/com/sun/star/bridge/IiopBridge.idl
index 4b17efd0a7b7..1c04cab10d7a 100644
--- a/udkapi/com/sun/star/bridge/IiopBridge.idl
+++ b/udkapi/com/sun/star/bridge/IiopBridge.idl
@@ -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 __com_sun_star_bridge_Iiop_idl__
-#define __com_sun_star_bridge_Iiop_idl__
+#ifndef __com_sun_star_bridge_IiopBridge_idl__
+#define __com_sun_star_bridge_IiopBridge_idl__
 
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XComponent.idl>
diff --git a/udkapi/com/sun/star/bridge/InvalidProtocolChangeException.idl b/udkapi/com/sun/star/bridge/InvalidProtocolChangeException.idl
index e94b77e85c72..9b6191ab5615 100644
--- a/udkapi/com/sun/star/bridge/InvalidProtocolChangeException.idl
+++ b/udkapi/com/sun/star/bridge/InvalidProtocolChangeException.idl
@@ -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 _COM_SUN_STAR_BRIDGE_INVALIDPROTCOLCHANGEEXCEPTION_IDL_
-#define _COM_SUN_STAR_BRIDGE_INVALIDPROTCOLCHANGEEXCEPTION_IDL_
+#ifndef _COM_SUN_STAR_BRIDGE_INVALIDPROTOCOLCHANGEEXCEPTION_IDL_
+#define _COM_SUN_STAR_BRIDGE_INVALIDPROTOCOLCHANGEEXCEPTION_IDL_
+
 #include <com/sun/star/bridge/ProtocolProperty.idl>
 #include <com/sun/star/uno/Exception.idl>
 
diff --git a/udkapi/com/sun/star/bridge/UrpBridge.idl b/udkapi/com/sun/star/bridge/UrpBridge.idl
index 21687e3d89c7..da59d3363725 100644
--- a/udkapi/com/sun/star/bridge/UrpBridge.idl
+++ b/udkapi/com/sun/star/bridge/UrpBridge.idl
@@ -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 __com_sun_star_bridge_Urp_idl__
-#define __com_sun_star_bridge_Urp_idl__
+#ifndef __com_sun_star_bridge_UrpBridge_idl__
+#define __com_sun_star_bridge_UrpBridge_idl__
 
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XComponent.idl>
diff --git a/udkapi/com/sun/star/container/EnumerableMap.idl b/udkapi/com/sun/star/container/EnumerableMap.idl
index acd84d49ec3c..8a55d448c229 100644
--- a/udkapi/com/sun/star/container/EnumerableMap.idl
+++ b/udkapi/com/sun/star/container/EnumerableMap.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __com_sun_star_container_Map_idl__
-#define __com_sun_star_container_Map_idl__
+#ifndef __com_sun_star_container_EnumerableMap_idl__
+#define __com_sun_star_container_EnumerableMap_idl__
 
 #include <com/sun/star/beans/IllegalTypeException.idl>
 #include <com/sun/star/beans/Pair.idl>
diff --git a/udkapi/com/sun/star/io/MarkableInputStream.idl b/udkapi/com/sun/star/io/MarkableInputStream.idl
index 9ef2e92ff783..0733ecb44911 100644
--- a/udkapi/com/sun/star/io/MarkableInputStream.idl
+++ b/udkapi/com/sun/star/io/MarkableInputStream.idl
@@ -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 __com_sun_star_io_DataInputStream_idl__
-#define __com_sun_star_io_DataInputStream_idl__
+#ifndef __com_sun_star_io_MarkableInputStream_idl__
+#define __com_sun_star_io_MarkableInputStream_idl__
 
 #include <com/sun/star/io/XMarkableStream.idl>
 
diff --git a/udkapi/com/sun/star/io/MarkableOutputStream.idl b/udkapi/com/sun/star/io/MarkableOutputStream.idl
index 41756c8634a7..4f3fb5f01cc7 100644
--- a/udkapi/com/sun/star/io/MarkableOutputStream.idl
+++ b/udkapi/com/sun/star/io/MarkableOutputStream.idl
@@ -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 __com_sun_star_io_DataInputStream_idl__
-#define __com_sun_star_io_DataInputStream_idl__
+#ifndef __com_sun_star_io_MarkableOutputStream_idl__
+#define __com_sun_star_io_MarkableOutputStream_idl__
 
 #include <com/sun/star/io/XMarkableStream.idl>
 #include <com/sun/star/io/XActiveDataSource.idl>
diff --git a/udkapi/com/sun/star/io/Pump.idl b/udkapi/com/sun/star/io/Pump.idl
index d10e6467ea1a..9294b5965209 100644
--- a/udkapi/com/sun/star/io/Pump.idl
+++ b/udkapi/com/sun/star/io/Pump.idl
@@ -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 __com_sun_star_io_Pipe_idl__
-#define __com_sun_star_io_Pipe_idl__
+#ifndef __com_sun_star_io_Pump_idl__
+#define __com_sun_star_io_Pump_idl__
 
 #include <com/sun/star/io/XActiveDataSource.idl>
 
diff --git a/udkapi/com/sun/star/loader/Dynamic.idl b/udkapi/com/sun/star/loader/Dynamic.idl
index fbf9176ada65..7759e775a6e6 100644
--- a/udkapi/com/sun/star/loader/Dynamic.idl
+++ b/udkapi/com/sun/star/loader/Dynamic.idl
@@ -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 __com_sun_star_loader_SharedLibrary_idl__
-#define __com_sun_star_loader_SharedLibrary_idl__
+#ifndef __com_sun_star_loader_Dynamic_idl__
+#define __com_sun_star_loader_Dynamic_idl__
 
 #include <com/sun/star/lang/XServiceInfo.idl>
 
diff --git a/udkapi/com/sun/star/reflection/XServiceConstructorDescription.idl b/udkapi/com/sun/star/reflection/XServiceConstructorDescription.idl
index 0121f1d83c36..6f43537c93d0 100644
--- a/udkapi/com/sun/star/reflection/XServiceConstructorDescription.idl
+++ b/udkapi/com/sun/star/reflection/XServiceConstructorDescription.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __com_sun_star_reflection_XServiceConstructorDescription2_idl__
-#define __com_sun_star_reflection_XServiceConstructorDescription2_idl__
+#ifndef __com_sun_star_reflection_XServiceConstructorDescription_idl__
+#define __com_sun_star_reflection_XServiceConstructorDescription_idl__
 
 #include <com/sun/star/uno/XInterface.idl>
 
diff --git a/udkapi/com/sun/star/registry/NestedRegistry.idl b/udkapi/com/sun/star/registry/NestedRegistry.idl
index b3870650209d..d44e8d6f3003 100644
--- a/udkapi/com/sun/star/registry/NestedRegistry.idl
+++ b/udkapi/com/sun/star/registry/NestedRegistry.idl
@@ -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 __com_sun_star_registry_DefaultRegistry_idl__
-#define __com_sun_star_registry_DefaultRegistry_idl__
+#ifndef __com_sun_star_registry_NestedRegistry_idl__
+#define __com_sun_star_registry_NestedRegistry_idl__
 
 #include <com/sun/star/registry/XSimpleRegistry.idl>
 #include <com/sun/star/lang/XInitialization.idl>
diff --git a/udkapi/com/sun/star/script/ArrayWrapper.idl b/udkapi/com/sun/star/script/ArrayWrapper.idl
index 36e22183e1d5..f7e50c6272d9 100644
--- a/udkapi/com/sun/star/script/ArrayWrapper.idl
+++ b/udkapi/com/sun/star/script/ArrayWrapper.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __com_sun_star_script_XArrayWrapper_idl__
-#define __com_sun_star_script_XArrayWrapper_idl__
+#ifndef __com_sun_star_script_ArrayWrapper_idl__
+#define __com_sun_star_script_ArrayWrapper_idl__
 
 #include <com/sun/star/uno/XInterface.idl>
 
diff --git a/udkapi/com/sun/star/uri/XVndSunStarExpandUrlReference.idl b/udkapi/com/sun/star/uri/XVndSunStarExpandUrlReference.idl
index 14928fb51e52..ab7f07dd650c 100644
--- a/udkapi/com/sun/star/uri/XVndSunStarExpandUrlReference.idl
+++ b/udkapi/com/sun/star/uri/XVndSunStarExpandUrlReference.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __com_sun_star_uri_VndSunStarExpandUrlReference_idl__
-#define __com_sun_star_uri_VndSunStarExpandUrlReference_idl__
+#ifndef __com_sun_star_uri_XVndSunStarExpandUrlReference_idl__
+#define __com_sun_star_uri_XVndSunStarExpandUrlReference_idl__
 
 #include <com/sun/star/uri/XUriReference.idl>
 #include <com/sun/star/uri/XVndSunStarExpandUrl.idl>
diff --git a/udkapi/com/sun/star/uri/XVndSunStarScriptUrlReference.idl b/udkapi/com/sun/star/uri/XVndSunStarScriptUrlReference.idl
index 73287205cf03..77209068f4cd 100644
--- a/udkapi/com/sun/star/uri/XVndSunStarScriptUrlReference.idl
+++ b/udkapi/com/sun/star/uri/XVndSunStarScriptUrlReference.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __com_sun_star_uri_VndSunStarScriptUrlReference_idl__
-#define __com_sun_star_uri_VndSunStarScriptUrlReference_idl__
+#ifndef __com_sun_star_uri_XVndSunStarScriptUrlReference_idl__
+#define __com_sun_star_uri_XVndSunStarScriptUrlReference_idl__
 
 #include <com/sun/star/uri/XUriReference.idl>
 #include <com/sun/star/uri/XVndSunStarScriptUrl.idl>