From 2a1b850b789a386fe77fecf8c4c2bfb0a4d099dc Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Wed, 12 Dec 2012 12:36:45 +0200
Subject: 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
---
 offapi/com/sun/star/configuration/AdministrationProvider.idl    | 4 ++--
 offapi/com/sun/star/configuration/ReadOnlyAccess.idl            | 4 ++--
 offapi/com/sun/star/configuration/ReadWriteAccess.idl           | 4 ++--
 offapi/com/sun/star/configuration/XReadWriteAccess.idl          | 4 ++--
 offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl | 4 ++--
 offapi/com/sun/star/configuration/theDefaultProvider.idl        | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'offapi/com/sun/star/configuration')

diff --git a/offapi/com/sun/star/configuration/AdministrationProvider.idl b/offapi/com/sun/star/configuration/AdministrationProvider.idl
index 79a90ba2ccf4..6fcb945a05e1 100644
--- a/offapi/com/sun/star/configuration/AdministrationProvider.idl
+++ b/offapi/com/sun/star/configuration/AdministrationProvider.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_configuration_ConfigurationProvider_idl__
-#define __com_sun_star_configuration_ConfigurationProvider_idl__
+#ifndef __com_sun_star_configuration_AdministrationProvider_idl__
+#define __com_sun_star_configuration_AdministrationProvider_idl__
 
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
 #include <com/sun/star/lang/XComponent.idl>
diff --git a/offapi/com/sun/star/configuration/ReadOnlyAccess.idl b/offapi/com/sun/star/configuration/ReadOnlyAccess.idl
index dc47c68b5980..d833e1436704 100644
--- a/offapi/com/sun/star/configuration/ReadOnlyAccess.idl
+++ b/offapi/com/sun/star/configuration/ReadOnlyAccess.idl
@@ -27,8 +27,8 @@
  * instead of those above.
  */
 
-#ifndef INCLUDED_COM_SUN_STAR_CONFIGURATION_READONLYACCESS_IDL
-#define INCLUDED_COM_SUN_STAR_CONFIGURATION_READONLYACCESS_IDL
+#ifndef _COM_SUN_STAR_CONFIGURATION_READONLYACCESS_IDL
+#define _COM_SUN_STAR_CONFIGURATION_READONLYACCESS_IDL
 
 #include <com/sun/star/container/XHierarchicalNameAccess.idl>
 
diff --git a/offapi/com/sun/star/configuration/ReadWriteAccess.idl b/offapi/com/sun/star/configuration/ReadWriteAccess.idl
index f9a3a034fc1e..3c48999af496 100644
--- a/offapi/com/sun/star/configuration/ReadWriteAccess.idl
+++ b/offapi/com/sun/star/configuration/ReadWriteAccess.idl
@@ -27,8 +27,8 @@
  * instead of those above.
  */
 
-#ifndef INCLUDED_COM_SUN_STAR_CONFIGURATION_READWRITEACCESS_IDL
-#define INCLUDED_COM_SUN_STAR_CONFIGURATION_READWRITEACCESS_IDL
+#ifndef _COM_SUN_STAR_CONFIGURATION_READWRITEACCESS_IDL
+#define _COM_SUN_STAR_CONFIGURATION_READWRITEACCESS_IDL
 
 #include <com/sun/star/configuration/XReadWriteAccess.idl>
 
diff --git a/offapi/com/sun/star/configuration/XReadWriteAccess.idl b/offapi/com/sun/star/configuration/XReadWriteAccess.idl
index c5e8c31ebba7..7c3bd733ea64 100644
--- a/offapi/com/sun/star/configuration/XReadWriteAccess.idl
+++ b/offapi/com/sun/star/configuration/XReadWriteAccess.idl
@@ -27,8 +27,8 @@
  * instead of those above.
  */
 
-#ifndef INCLUDED_COM_SUN_STAR_CONFIGURATION_XREADWRITEACCESS_IDL
-#define INCLUDED_COM_SUN_STAR_CONFIGURATION_XREADWRITEACCESS_IDL
+#ifndef _COM_SUN_STAR_CONFIGURATION_XREADWRITEACCESS_IDL
+#define _COM_SUN_STAR_CONFIGURATION_XREADWRITEACCESS_IDL
 
 #include <com/sun/star/container/XHierarchicalNameReplace.idl>
 #include <com/sun/star/util/XChangesBatch.idl>
diff --git a/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl b/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl
index 8f7677d2fc21..b88120a10e2c 100644
--- a/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/MultiLayerStratum.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_configuration_backend_SingleLayerStratum_idl__
-#define __com_sun_star_configuration_backend_SingleLayerStratum_idl__
+#ifndef __com_sun_star_configuration_backend_MultiLayerStratum_idl__
+#define __com_sun_star_configuration_backend_MultiLayerStratum_idl__
 
 #include <com/sun/star/configuration/backend/XBackendEntities.idl>
 #include <com/sun/star/configuration/backend/XMultiLayerStratum.idl>
diff --git a/offapi/com/sun/star/configuration/theDefaultProvider.idl b/offapi/com/sun/star/configuration/theDefaultProvider.idl
index ecb86616a938..39301ca75f90 100644
--- a/offapi/com/sun/star/configuration/theDefaultProvider.idl
+++ b/offapi/com/sun/star/configuration/theDefaultProvider.idl
@@ -27,8 +27,8 @@
  * instead of those above.
  */
 
-#ifndef INCLUDED_COM_SUN_STAR_CONFIGURATION_THEDEFAULTPROVIDER_IDL
-#define INCLUDED_COM_SUN_STAR_CONFIGURATION_THEDEFAULTPROVIDER_IDL
+#ifndef _COM_SUN_STAR_CONFIGURATION_THEDEFAULTPROVIDER_IDL
+#define _COM_SUN_STAR_CONFIGURATION_THEDEFAULTPROVIDER_IDL
 
 module com { module sun { module star { module lang {
     published interface XMultiServiceFactory;
-- 
cgit