summaryrefslogtreecommitdiff
path: root/include/comphelper
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-10-23 19:17:00 +0200
committerThomas Arnhold <thomas@arnhold.org>2013-10-23 23:22:30 +0200
commit0bd7f12d41567842b1e31514e1d84340d90f5b42 (patch)
treed1140425ddbb62c4cf71634f2813f7e5dd7d88cb /include/comphelper
parentf20eef009438883ebc205c9cce3e4bac87256f29 (diff)
fixincludeguards.sh: include/c*
Change-Id: Icba422d99836518a1b662b15144bc9334bed1473
Diffstat (limited to 'include/comphelper')
-rw-r--r--include/comphelper/ChainablePropertySet.hxx4
-rw-r--r--include/comphelper/ChainablePropertySetInfo.hxx4
-rw-r--r--include/comphelper/IdPropArrayHelper.hxx6
-rw-r--r--include/comphelper/InlineContainer.hxx6
-rw-r--r--include/comphelper/MasterPropertySet.hxx4
-rw-r--r--include/comphelper/MasterPropertySetInfo.hxx4
-rw-r--r--include/comphelper/PropertyInfoHash.hxx4
-rw-r--r--include/comphelper/SelectionMultiplex.hxx6
-rw-r--r--include/comphelper/SettingsHelper.hxx4
-rw-r--r--include/comphelper/TypeGeneration.hxx4
-rw-r--r--include/comphelper/accessiblecomponenthelper.hxx6
-rw-r--r--include/comphelper/accessiblecontexthelper.hxx6
-rw-r--r--include/comphelper/accessiblekeybindinghelper.hxx6
-rw-r--r--include/comphelper/accessibleselectionhelper.hxx6
-rw-r--r--include/comphelper/accessibletexthelper.hxx6
-rw-r--r--include/comphelper/accessiblewrapper.hxx6
-rw-r--r--include/comphelper/accimplaccess.hxx6
-rw-r--r--include/comphelper/anycompare.hxx6
-rw-r--r--include/comphelper/asyncnotification.hxx6
-rw-r--r--include/comphelper/attributelist.hxx6
-rw-r--r--include/comphelper/basicio.hxx6
-rw-r--r--include/comphelper/broadcasthelper.hxx6
-rw-r--r--include/comphelper/classids.hxx4
-rw-r--r--include/comphelper/comphelperdllapi.h6
-rw-r--r--include/comphelper/componentbase.hxx6
-rw-r--r--include/comphelper/componentguard.hxx6
-rw-r--r--include/comphelper/componentmodule.hxx6
-rw-r--r--include/comphelper/configurationhelper.hxx6
-rw-r--r--include/comphelper/container.hxx6
-rw-r--r--include/comphelper/containermultiplexer.hxx6
-rw-r--r--include/comphelper/docpasswordhelper.hxx4
-rw-r--r--include/comphelper/docpasswordrequest.hxx4
-rw-r--r--include/comphelper/documentconstants.hxx4
-rw-r--r--include/comphelper/documentinfo.hxx6
-rw-r--r--include/comphelper/embeddedobjectcontainer.hxx4
-rw-r--r--include/comphelper/enumhelper.hxx6
-rw-r--r--include/comphelper/eventattachermgr.hxx6
-rw-r--r--include/comphelper/evtlistenerhlp.hxx6
-rw-r--r--include/comphelper/evtmethodhelper.hxx4
-rw-r--r--include/comphelper/expandmacro.hxx4
-rw-r--r--include/comphelper/extract.hxx4
-rw-r--r--include/comphelper/fileformat.h4
-rw-r--r--include/comphelper/flagguard.hxx6
-rw-r--r--include/comphelper/genericpropertyset.hxx6
-rw-r--r--include/comphelper/guarding.hxx6
-rw-r--r--include/comphelper/ihwrapnofilter.hxx4
-rw-r--r--include/comphelper/implementationreference.hxx6
-rw-r--r--include/comphelper/interaction.hxx6
-rw-r--r--include/comphelper/listenernotification.hxx6
-rw-r--r--include/comphelper/logging.hxx6
-rw-r--r--include/comphelper/makesequence.hxx6
-rw-r--r--include/comphelper/mediadescriptor.hxx6
-rw-r--r--include/comphelper/mimeconfighelper.hxx6
-rw-r--r--include/comphelper/namecontainer.hxx6
-rw-r--r--include/comphelper/namedvaluecollection.hxx6
-rw-r--r--include/comphelper/newarray.hxx6
-rw-r--r--include/comphelper/numberedcollection.hxx6
-rw-r--r--include/comphelper/numbers.hxx6
-rw-r--r--include/comphelper/officeresourcebundle.hxx6
-rw-r--r--include/comphelper/ofopxmlhelper.hxx4
-rw-r--r--include/comphelper/oslfile2streamwrap.hxx6
-rw-r--r--include/comphelper/processfactory.hxx6
-rw-r--r--include/comphelper/propagg.hxx6
-rw-r--r--include/comphelper/proparrhlp.hxx6
-rw-r--r--include/comphelper/property.hxx6
-rw-r--r--include/comphelper/propertybag.hxx6
-rw-r--r--include/comphelper/propertycontainer.hxx6
-rw-r--r--include/comphelper/propertycontainerhelper.hxx6
-rw-r--r--include/comphelper/propertysethelper.hxx4
-rw-r--r--include/comphelper/propertysetinfo.hxx4
-rw-r--r--include/comphelper/propertystatecontainer.hxx6
-rw-r--r--include/comphelper/propmultiplex.hxx6
-rw-r--r--include/comphelper/propstate.hxx6
-rw-r--r--include/comphelper/seekableinput.hxx4
-rw-r--r--include/comphelper/seqstream.hxx6
-rw-r--r--include/comphelper/sequence.hxx6
-rw-r--r--include/comphelper/sequenceashashmap.hxx6
-rw-r--r--include/comphelper/sequenceasvector.hxx6
-rw-r--r--include/comphelper/servicedecl.hxx6
-rw-r--r--include/comphelper/servicehelper.hxx6
-rw-r--r--include/comphelper/serviceinfohelper.hxx4
-rw-r--r--include/comphelper/sharedmutex.hxx6
-rw-r--r--include/comphelper/stillreadwriteinteraction.hxx4
-rw-r--r--include/comphelper/stl_types.hxx6
-rw-r--r--include/comphelper/stlunosequence.hxx4
-rw-r--r--include/comphelper/storagehelper.hxx4
-rw-r--r--include/comphelper/streamsection.hxx6
-rw-r--r--include/comphelper/synchronousdispatch.hxx6
-rw-r--r--include/comphelper/syntaxhighlight.hxx4
-rw-r--r--include/comphelper/types.hxx6
-rw-r--r--include/comphelper/uno3.hxx6
-rw-r--r--include/comphelper/unwrapargs.hxx6
-rw-r--r--include/comphelper/weak.hxx4
-rw-r--r--include/comphelper/weakeventlistener.hxx6
-rw-r--r--include/comphelper/xmltools.hxx4
95 files changed, 257 insertions, 257 deletions
diff --git a/include/comphelper/ChainablePropertySet.hxx b/include/comphelper/ChainablePropertySet.hxx
index 62546c0605e5..262dfd1b2230 100644
--- a/include/comphelper/ChainablePropertySet.hxx
+++ b/include/comphelper/ChainablePropertySet.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_CHAINABLEPROPERTYSET_HXX_
-#define _COMPHELPER_CHAINABLEPROPERTYSET_HXX_
+#ifndef INCLUDED_COMPHELPER_CHAINABLEPROPERTYSET_HXX
+#define INCLUDED_COMPHELPER_CHAINABLEPROPERTYSET_HXX
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
diff --git a/include/comphelper/ChainablePropertySetInfo.hxx b/include/comphelper/ChainablePropertySetInfo.hxx
index ce28803036d5..1de74e1cd41e 100644
--- a/include/comphelper/ChainablePropertySetInfo.hxx
+++ b/include/comphelper/ChainablePropertySetInfo.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_CHAINABLEPROPERTYSETINFO_HXX_
-#define _COMPHELPER_CHAINABLEPROPERTYSETINFO_HXX_
+#ifndef INCLUDED_COMPHELPER_CHAINABLEPROPERTYSETINFO_HXX
+#define INCLUDED_COMPHELPER_CHAINABLEPROPERTYSETINFO_HXX
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <comphelper/PropertyInfoHash.hxx>
diff --git a/include/comphelper/IdPropArrayHelper.hxx b/include/comphelper/IdPropArrayHelper.hxx
index 497a39fd500d..251236f57070 100644
--- a/include/comphelper/IdPropArrayHelper.hxx
+++ b/include/comphelper/IdPropArrayHelper.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 COMPHELPER_IDPROPERTYARRAYUSAGEHELPER_HXX
-#define COMPHELPER_IDPROPERTYARRAYUSAGEHELPER_HXX
+#ifndef INCLUDED_COMPHELPER_IDPROPARRAYHELPER_HXX
+#define INCLUDED_COMPHELPER_IDPROPARRAYHELPER_HXX
#include <cppuhelper/component.hxx>
#include <osl/mutex.hxx>
@@ -112,6 +112,6 @@ namespace comphelper
return (*s_pMap)[nId];
}
}
-#endif // COMPHELPER_IDPROPERTYARRAYUSAGEHELPER_HXX
+#endif // INCLUDED_COMPHELPER_IDPROPARRAYHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/InlineContainer.hxx b/include/comphelper/InlineContainer.hxx
index b23574bbad58..8f9ffa648a1c 100644
--- a/include/comphelper/InlineContainer.hxx
+++ b/include/comphelper/InlineContainer.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_COMPHELPER_INLINE_CONTAINER_HXX
-#define INCLUDED_COMPHELPER_INLINE_CONTAINER_HXX
+#ifndef INCLUDED_COMPHELPER_INLINECONTAINER_HXX
+#define INCLUDED_COMPHELPER_INLINECONTAINER_HXX
#include <com/sun/star/uno/Sequence.hxx>
@@ -138,6 +138,6 @@ public:
} // namespace comphelper
#endif
-// INCLUDED_COMPHELPER_INLINE_CONTAINER_HXX
+// INCLUDED_COMPHELPER_INLINECONTAINER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/MasterPropertySet.hxx b/include/comphelper/MasterPropertySet.hxx
index 00784c4f16f2..7047b2258069 100644
--- a/include/comphelper/MasterPropertySet.hxx
+++ b/include/comphelper/MasterPropertySet.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_MASTERPROPERTYSETHELPER_HXX_
-#define _COMPHELPER_MASTERPROPERTYSETHELPER_HXX_
+#ifndef INCLUDED_COMPHELPER_MASTERPROPERTYSET_HXX
+#define INCLUDED_COMPHELPER_MASTERPROPERTYSET_HXX
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
diff --git a/include/comphelper/MasterPropertySetInfo.hxx b/include/comphelper/MasterPropertySetInfo.hxx
index d2c772e2c5d5..9a81588cfabf 100644
--- a/include/comphelper/MasterPropertySetInfo.hxx
+++ b/include/comphelper/MasterPropertySetInfo.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_MASTERPROPERTYSETINFO_HXX_
-#define _COMPHELPER_MASTERPROPERTYSETINFO_HXX_
+#ifndef INCLUDED_COMPHELPER_MASTERPROPERTYSETINFO_HXX
+#define INCLUDED_COMPHELPER_MASTERPROPERTYSETINFO_HXX
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <comphelper/PropertyInfoHash.hxx>
#include <cppuhelper/implbase1.hxx>
diff --git a/include/comphelper/PropertyInfoHash.hxx b/include/comphelper/PropertyInfoHash.hxx
index 3241560b4a94..6796977c6792 100644
--- a/include/comphelper/PropertyInfoHash.hxx
+++ b/include/comphelper/PropertyInfoHash.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_PROPERTYINFOHASH_HXX_
-#define _COMPHELPER_PROPERTYINFOHASH_HXX_
+#ifndef INCLUDED_COMPHELPER_PROPERTYINFOHASH_HXX
+#define INCLUDED_COMPHELPER_PROPERTYINFOHASH_HXX
#include <rtl/ustring.hxx>
#include <comphelper/TypeGeneration.hxx>
diff --git a/include/comphelper/SelectionMultiplex.hxx b/include/comphelper/SelectionMultiplex.hxx
index 56e8375fd215..72b1ad8189de 100644
--- a/include/comphelper/SelectionMultiplex.hxx
+++ b/include/comphelper/SelectionMultiplex.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_COMPHELPER_SELECTION_MULTIPLEX_HXX
-#define INCLUDED_COMPHELPER_SELECTION_MULTIPLEX_HXX
+#ifndef INCLUDED_COMPHELPER_SELECTIONMULTIPLEX_HXX
+#define INCLUDED_COMPHELPER_SELECTIONMULTIPLEX_HXX
#include <com/sun/star/view/XSelectionChangeListener.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
@@ -100,6 +100,6 @@ namespace comphelper
} // namespace comphelper
//.........................................................................
-#endif // INCLUDED_COMPHELPER_SELECTION_MULTIPLEX_HXX
+#endif // INCLUDED_COMPHELPER_SELECTIONMULTIPLEX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/SettingsHelper.hxx b/include/comphelper/SettingsHelper.hxx
index af02cbd92067..37b7381c8b7b 100644
--- a/include/comphelper/SettingsHelper.hxx
+++ b/include/comphelper/SettingsHelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_SETTINGSHELPER_HXX_
-#define _COMPHELPER_SETTINGSHELPER_HXX_
+#ifndef INCLUDED_COMPHELPER_SETTINGSHELPER_HXX
+#define INCLUDED_COMPHELPER_SETTINGSHELPER_HXX
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/include/comphelper/TypeGeneration.hxx b/include/comphelper/TypeGeneration.hxx
index 0ced57b31714..a2435729c4a5 100644
--- a/include/comphelper/TypeGeneration.hxx
+++ b/include/comphelper/TypeGeneration.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_TYPEGENERATION_HXX_
-#define _COMPHELPER_TYPEGENERATION_HXX_
+#ifndef INCLUDED_COMPHELPER_TYPEGENERATION_HXX
+#define INCLUDED_COMPHELPER_TYPEGENERATION_HXX
#include <sal/types.h>
#include "comphelper/comphelperdllapi.h"
diff --git a/include/comphelper/accessiblecomponenthelper.hxx b/include/comphelper/accessiblecomponenthelper.hxx
index dc31550e8e5b..53ec9e10a58a 100644
--- a/include/comphelper/accessiblecomponenthelper.hxx
+++ b/include/comphelper/accessiblecomponenthelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_ACCESSIBLE_COMPONENT_HELPER_HXX
-#define COMPHELPER_ACCESSIBLE_COMPONENT_HELPER_HXX
+#ifndef INCLUDED_COMPHELPER_ACCESSIBLECOMPONENTHELPER_HXX
+#define INCLUDED_COMPHELPER_ACCESSIBLECOMPONENTHELPER_HXX
#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
@@ -131,7 +131,7 @@ namespace comphelper
} // namespace comphelper
//.........................................................................
-#endif // COMPHELPER_ACCESSIBLE_COMPONENT_HELPER_HXX
+#endif // INCLUDED_COMPHELPER_ACCESSIBLECOMPONENTHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx
index f01c9117c400..6e523d96afec 100644
--- a/include/comphelper/accessiblecontexthelper.hxx
+++ b/include/comphelper/accessiblecontexthelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_ACCESSIBLE_CONTEXT_HELPER_HXX
-#define COMPHELPER_ACCESSIBLE_CONTEXT_HELPER_HXX
+#ifndef INCLUDED_COMPHELPER_ACCESSIBLECONTEXTHELPER_HXX
+#define INCLUDED_COMPHELPER_ACCESSIBLECONTEXTHELPER_HXX
#include <cppuhelper/compbase2.hxx>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
@@ -339,7 +339,7 @@ namespace comphelper
} // namespace comphelper
//.........................................................................
-#endif // COMPHELPER_ACCESSIBLE_CONTEXT_HELPER_HXX
+#endif // INCLUDED_COMPHELPER_ACCESSIBLECONTEXTHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/accessiblekeybindinghelper.hxx b/include/comphelper/accessiblekeybindinghelper.hxx
index 4849b124cf87..527a8e99034b 100644
--- a/include/comphelper/accessiblekeybindinghelper.hxx
+++ b/include/comphelper/accessiblekeybindinghelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_ACCESSIBLE_KEYBINDING_HELPER_HXX
-#define COMPHELPER_ACCESSIBLE_KEYBINDING_HELPER_HXX
+#ifndef INCLUDED_COMPHELPER_ACCESSIBLEKEYBINDINGHELPER_HXX
+#define INCLUDED_COMPHELPER_ACCESSIBLEKEYBINDINGHELPER_HXX
#include <com/sun/star/accessibility/XAccessibleKeyBinding.hpp>
#include <cppuhelper/implbase1.hxx>
@@ -70,6 +70,6 @@ namespace comphelper
} // namespace comphelper
//..............................................................................
-#endif // COMPHELPER_ACCESSIBLE_KEYBINDING_HELPER_HXX
+#endif // INCLUDED_COMPHELPER_ACCESSIBLEKEYBINDINGHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/accessibleselectionhelper.hxx b/include/comphelper/accessibleselectionhelper.hxx
index e1bb5dd5f1ef..2ed234872caf 100644
--- a/include/comphelper/accessibleselectionhelper.hxx
+++ b/include/comphelper/accessibleselectionhelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_ACCESSIBLE_SELECTION_HELPER_HXX
-#define COMPHELPER_ACCESSIBLE_SELECTION_HELPER_HXX
+#ifndef INCLUDED_COMPHELPER_ACCESSIBLESELECTIONHELPER_HXX
+#define INCLUDED_COMPHELPER_ACCESSIBLESELECTIONHELPER_HXX
#include <comphelper/uno3.hxx>
#include <comphelper/accessiblecomponenthelper.hxx>
@@ -119,6 +119,6 @@ namespace comphelper
} // namespace comphelper
//.........................................................................
-#endif // COMPHELPER_ACCESSIBLE_SELECTION_HELPER_HXX
+#endif // INCLUDED_COMPHELPER_ACCESSIBLESELECTIONHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx
index ea3f505ee7fe..a3e80b6f3536 100644
--- a/include/comphelper/accessibletexthelper.hxx
+++ b/include/comphelper/accessibletexthelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_ACCESSIBLE_TEXT_HELPER_HXX
-#define COMPHELPER_ACCESSIBLE_TEXT_HELPER_HXX
+#ifndef INCLUDED_COMPHELPER_ACCESSIBLETEXTHELPER_HXX
+#define INCLUDED_COMPHELPER_ACCESSIBLETEXTHELPER_HXX
#include <com/sun/star/accessibility/XAccessibleText.hpp>
#include <com/sun/star/accessibility/TextSegment.hpp>
@@ -139,7 +139,7 @@ namespace comphelper
} // namespace comphelper
//..............................................................................
-#endif // COMPHELPER_ACCESSIBLE_TEXT_HELPER_HXX
+#endif // INCLUDED_COMPHELPER_ACCESSIBLETEXTHELPER_HXX
// -----------------------------------------------------------------------------
diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx
index fbd65d638899..36e39dafa1d1 100644
--- a/include/comphelper/accessiblewrapper.hxx
+++ b/include/comphelper/accessiblewrapper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_ACCESSIBLE_WRAPPER_HXX
-#define COMPHELPER_ACCESSIBLE_WRAPPER_HXX
+#ifndef INCLUDED_COMPHELPER_ACCESSIBLEWRAPPER_HXX
+#define INCLUDED_COMPHELPER_ACCESSIBLEWRAPPER_HXX
#include <comphelper/proxyaggregation.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
@@ -405,6 +405,6 @@ namespace comphelper
} // namespace accessibility
//.............................................................................
-#endif // COMPHELPER_ACCESSIBLE_WRAPPER_HXX
+#endif // INCLUDED_COMPHELPER_ACCESSIBLEWRAPPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/accimplaccess.hxx b/include/comphelper/accimplaccess.hxx
index d3a1ed4c2274..4406f9981338 100644
--- a/include/comphelper/accimplaccess.hxx
+++ b/include/comphelper/accimplaccess.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_ACCIMPLACCESS_HXX
-#define COMPHELPER_ACCIMPLACCESS_HXX
+#ifndef INCLUDED_COMPHELPER_ACCIMPLACCESS_HXX
+#define INCLUDED_COMPHELPER_ACCIMPLACCESS_HXX
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -135,7 +135,7 @@ namespace comphelper
//.........................................................................
-#endif // COMPHELPER_ACCIMPLACCESS_HXX
+#endif // INCLUDED_COMPHELPER_ACCIMPLACCESS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/anycompare.hxx b/include/comphelper/anycompare.hxx
index fb17b7ca67ec..9ddcbf92683b 100644
--- a/include/comphelper/anycompare.hxx
+++ b/include/comphelper/anycompare.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_ANYCOMPARE_HXX
-#define COMPHELPER_ANYCOMPARE_HXX
+#ifndef INCLUDED_COMPHELPER_ANYCOMPARE_HXX
+#define INCLUDED_COMPHELPER_ANYCOMPARE_HXX
#include "comphelper/comphelperdllapi.h"
@@ -214,6 +214,6 @@ namespace comphelper
} // namespace comphelper
//......................................................................................................................
-#endif // COMPHELPER_ANYCOMPARE_HXX
+#endif // INCLUDED_COMPHELPER_ANYCOMPARE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/asyncnotification.hxx b/include/comphelper/asyncnotification.hxx
index 19c1910dbc8f..64bbae4352c8 100644
--- a/include/comphelper/asyncnotification.hxx
+++ b/include/comphelper/asyncnotification.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_ASYNCNOTIFICATION_HXX
-#define COMPHELPER_ASYNCNOTIFICATION_HXX
+#ifndef INCLUDED_COMPHELPER_ASYNCNOTIFICATION_HXX
+#define INCLUDED_COMPHELPER_ASYNCNOTIFICATION_HXX
#include "sal/config.h"
@@ -179,6 +179,6 @@ namespace comphelper
} // namespace comphelper
//........................................................................
-#endif // COMPHELPER_ASYNCNOTIFICATION_HXX
+#endif // INCLUDED_COMPHELPER_ASYNCNOTIFICATION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/attributelist.hxx b/include/comphelper/attributelist.hxx
index dd10e13c70ab..40990f652a71 100644
--- a/include/comphelper/attributelist.hxx
+++ b/include/comphelper/attributelist.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_ATTRIBUTE_LIST_HXX
-#define _COMPHELPER_ATTRIBUTE_LIST_HXX
+#ifndef INCLUDED_COMPHELPER_ATTRIBUTELIST_HXX
+#define INCLUDED_COMPHELPER_ATTRIBUTELIST_HXX
#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <cppuhelper/implbase1.hxx>
@@ -61,6 +61,6 @@ public:
} // namespace comphelper
-#endif // _COMPHELPER_ATTRIBUTE_LIST_HXX
+#endif // INCLUDED_COMPHELPER_ATTRIBUTELIST_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/basicio.hxx b/include/comphelper/basicio.hxx
index 42eea8076e47..9b7389c88847 100644
--- a/include/comphelper/basicio.hxx
+++ b/include/comphelper/basicio.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_BASIC_IO_HXX_
-#define _COMPHELPER_BASIC_IO_HXX_
+#ifndef INCLUDED_COMPHELPER_BASICIO_HXX
+#define INCLUDED_COMPHELPER_BASICIO_HXX
#include <com/sun/star/io/XPersistObject.hpp>
#include <com/sun/star/awt/FontDescriptor.hpp>
@@ -94,6 +94,6 @@ const staruno::Reference<stario::XObjectOutputStream>& operator << (const starun
} // namespace comphelper
//.........................................................................
-#endif // _COMPHELPER_BASIC_IO_HXX_
+#endif // INCLUDED_COMPHELPER_BASICIO_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/broadcasthelper.hxx b/include/comphelper/broadcasthelper.hxx
index d8cf69eeb17b..82559260f599 100644
--- a/include/comphelper/broadcasthelper.hxx
+++ b/include/comphelper/broadcasthelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_BROADCASTHELPER_HXX_
-#define _COMPHELPER_BROADCASTHELPER_HXX_
+#ifndef INCLUDED_COMPHELPER_BROADCASTHELPER_HXX
+#define INCLUDED_COMPHELPER_BROADCASTHELPER_HXX
#include <osl/mutex.hxx>
#include <cppuhelper/interfacecontainer.h>
@@ -58,6 +58,6 @@ namespace comphelper
mutable ::osl::Mutex m_aMutex;
};
}
-#endif // _COMPHELPER_BROADCASTHELPER_HXX_
+#endif // INCLUDED_COMPHELPER_BROADCASTHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/classids.hxx b/include/comphelper/classids.hxx
index 3410207a58d8..3a0da99dc784 100644
--- a/include/comphelper/classids.hxx
+++ b/include/comphelper/classids.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 _COMPHELPER_CLASSIDS_HXX
-#define _COMPHELPER_CLASSIDS_HXX
+#ifndef INCLUDED_COMPHELPER_CLASSIDS_HXX
+#define INCLUDED_COMPHELPER_CLASSIDS_HXX
/*
* StarWriter
diff --git a/include/comphelper/comphelperdllapi.h b/include/comphelper/comphelperdllapi.h
index 88d35f61c359..271e141c3f1b 100644
--- a/include/comphelper/comphelperdllapi.h
+++ b/include/comphelper/comphelperdllapi.h
@@ -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_COMPHELPERDLLAPI_H
-#define INCLUDED_COMPHELPERDLLAPI_H
+#ifndef INCLUDED_COMPHELPER_COMPHELPERDLLAPI_H
+#define INCLUDED_COMPHELPER_COMPHELPERDLLAPI_H
#include "sal/types.h"
@@ -28,6 +28,6 @@
#endif
#define COMPHELPER_DLLPRIVATE SAL_DLLPRIVATE
-#endif /* INCLUDED_COMPHELPERDLLAPI_H */
+#endif // INCLUDED_COMPHELPER_COMPHELPERDLLAPI_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/componentbase.hxx b/include/comphelper/componentbase.hxx
index d3043e7ac697..d71e80569438 100644
--- a/include/comphelper/componentbase.hxx
+++ b/include/comphelper/componentbase.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_COMPONENTBASE_HXX
-#define COMPHELPER_COMPONENTBASE_HXX
+#ifndef INCLUDED_COMPHELPER_COMPONENTBASE_HXX
+#define INCLUDED_COMPHELPER_COMPONENTBASE_HXX
#include "comphelper/comphelperdllapi.h"
#include <cppuhelper/interfacecontainer.hxx>
@@ -149,6 +149,6 @@ namespace comphelper
} // namespace ComponentBase
//........................................................................
-#endif // COMPHELPER_COMPONENTBASE_HXX
+#endif // INCLUDED_COMPHELPER_COMPONENTBASE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/componentguard.hxx b/include/comphelper/componentguard.hxx
index eb1cfbcc24a8..d9651675b9d2 100644
--- a/include/comphelper/componentguard.hxx
+++ b/include/comphelper/componentguard.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_COMPONENTGUARD_HXX
-#define COMPHELPER_COMPONENTGUARD_HXX
+#ifndef INCLUDED_COMPHELPER_COMPONENTGUARD_HXX
+#define INCLUDED_COMPHELPER_COMPONENTGUARD_HXX
#include <com/sun/star/lang/DisposedException.hpp>
@@ -58,6 +58,6 @@ namespace comphelper
} // namespace comphelper
//......................................................................................................................
-#endif // COMPHELPER_COMPONENTGUARD_HXX
+#endif // INCLUDED_COMPHELPER_COMPONENTGUARD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx
index 95fea19b7783..41f3b4e76666 100644
--- a/include/comphelper/componentmodule.hxx
+++ b/include/comphelper/componentmodule.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 COMPHELPER_INC_COMPHELPER_COMPONENTMODULE_HXX
-#define COMPHELPER_INC_COMPHELPER_COMPONENTMODULE_HXX
+#ifndef INCLUDED_COMPHELPER_COMPONENTMODULE_HXX
+#define INCLUDED_COMPHELPER_COMPONENTMODULE_HXX
#include <comphelper/comphelperdllapi.h>
@@ -256,6 +256,6 @@ namespace comphelper
} // namespace comphelper
//........................................................................
-#endif // COMPHELPER_INC_COMPHELPER_COMPONENTMODULE_HXX
+#endif // INCLUDED_COMPHELPER_COMPONENTMODULE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/configurationhelper.hxx b/include/comphelper/configurationhelper.hxx
index b6377c16e37d..9d1a93448ced 100644
--- a/include/comphelper/configurationhelper.hxx
+++ b/include/comphelper/configurationhelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_CONFIGURATIONHELPER_HXX_
-#define _COMPHELPER_CONFIGURATIONHELPER_HXX_
+#ifndef INCLUDED_COMPHELPER_CONFIGURATIONHELPER_HXX
+#define INCLUDED_COMPHELPER_CONFIGURATIONHELPER_HXX
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
@@ -235,6 +235,6 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper
} // namespace comphelper
-#endif // _COMPHELPER_CONFIGURATIONHELPER_HXX_
+#endif // INCLUDED_COMPHELPER_CONFIGURATIONHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/container.hxx b/include/comphelper/container.hxx
index d6c5be927873..27c3d7916507 100644
--- a/include/comphelper/container.hxx
+++ b/include/comphelper/container.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_CONTAINER_HXX_
-#define _COMPHELPER_CONTAINER_HXX_
+#ifndef INCLUDED_COMPHELPER_CONTAINER_HXX
+#define INCLUDED_COMPHELPER_CONTAINER_HXX
#include <vector>
#include "com/sun/star/uno/Reference.hxx"
@@ -74,7 +74,7 @@ protected:
} // namespace comphelper
//.........................................................................
-#endif // _COMPHELPER_CONTAINER_HXX_
+#endif // INCLUDED_COMPHELPER_CONTAINER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/containermultiplexer.hxx b/include/comphelper/containermultiplexer.hxx
index 40265e12f6d8..8903af3e9240 100644
--- a/include/comphelper/containermultiplexer.hxx
+++ b/include/comphelper/containermultiplexer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_CONTAINERMULTIPLEXER_HXX_
-#define _COMPHELPER_CONTAINERMULTIPLEXER_HXX_
+#ifndef INCLUDED_COMPHELPER_CONTAINERMULTIPLEXER_HXX
+#define INCLUDED_COMPHELPER_CONTAINERMULTIPLEXER_HXX
#include <com/sun/star/container/XContainer.hpp>
#include <cppuhelper/implbase1.hxx>
@@ -101,6 +101,6 @@ namespace comphelper
} // namespace dbaui
//.........................................................................
-#endif // _COMPHELPER_CONTAINERMULTIPLEXER_HXX_
+#endif // INCLUDED_COMPHELPER_CONTAINERMULTIPLEXER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/docpasswordhelper.hxx b/include/comphelper/docpasswordhelper.hxx
index 24fd868c0735..991d73bd43af 100644
--- a/include/comphelper/docpasswordhelper.hxx
+++ b/include/comphelper/docpasswordhelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_DOCPASSWORDHELPR_HXX
-#define COMPHELPER_DOCPASSWORDHELPR_HXX
+#ifndef INCLUDED_COMPHELPER_DOCPASSWORDHELPER_HXX
+#define INCLUDED_COMPHELPER_DOCPASSWORDHELPER_HXX
#include <com/sun/star/beans/NamedValue.hpp>
#include "comphelper/comphelperdllapi.h"
diff --git a/include/comphelper/docpasswordrequest.hxx b/include/comphelper/docpasswordrequest.hxx
index ffeaacba5d46..e2260c501bc5 100644
--- a/include/comphelper/docpasswordrequest.hxx
+++ b/include/comphelper/docpasswordrequest.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_DOCPASSWORDREQUEST_HXX
-#define COMPHELPER_DOCPASSWORDREQUEST_HXX
+#ifndef INCLUDED_COMPHELPER_DOCPASSWORDREQUEST_HXX
+#define INCLUDED_COMPHELPER_DOCPASSWORDREQUEST_HXX
#include "comphelper/comphelperdllapi.h"
#include <com/sun/star/task/PasswordRequestMode.hpp>
diff --git a/include/comphelper/documentconstants.hxx b/include/comphelper/documentconstants.hxx
index 2bc00220995f..342e53fd560b 100644
--- a/include/comphelper/documentconstants.hxx
+++ b/include/comphelper/documentconstants.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 _COMPHELPER_DOCUMENTCONSTANTS_HXX
-#define _COMPHELPER_DOCUMENTCONSTANTS_HXX
+#ifndef INCLUDED_COMPHELPER_DOCUMENTCONSTANTS_HXX
+#define INCLUDED_COMPHELPER_DOCUMENTCONSTANTS_HXX
#include <rtl/ustring.hxx>
diff --git a/include/comphelper/documentinfo.hxx b/include/comphelper/documentinfo.hxx
index 48bc39a8cc00..fa3df30435dc 100644
--- a/include/comphelper/documentinfo.hxx
+++ b/include/comphelper/documentinfo.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_DOCUMENTINFO_HXX
-#define COMPHELPER_DOCUMENTINFO_HXX
+#ifndef INCLUDED_COMPHELPER_DOCUMENTINFO_HXX
+#define INCLUDED_COMPHELPER_DOCUMENTINFO_HXX
#include "comphelper/comphelperdllapi.h"
@@ -46,6 +46,6 @@ namespace comphelper {
} // namespace comphelper
//........................................................................
-#endif // COMPHELPER_DOCUMENTINFO_HXX
+#endif // INCLUDED_COMPHELPER_DOCUMENTINFO_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/embeddedobjectcontainer.hxx b/include/comphelper/embeddedobjectcontainer.hxx
index f60506651fca..af2f422a2023 100644
--- a/include/comphelper/embeddedobjectcontainer.hxx
+++ b/include/comphelper/embeddedobjectcontainer.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 _COMPHELPER_OBJECTCONTAINER_HXX_
-#define _COMPHELPER_OBJECTCONTAINER_HXX_
+#ifndef INCLUDED_COMPHELPER_EMBEDDEDOBJECTCONTAINER_HXX
+#define INCLUDED_COMPHELPER_EMBEDDEDOBJECTCONTAINER_HXX
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/include/comphelper/enumhelper.hxx b/include/comphelper/enumhelper.hxx
index 27b20c20fd24..f2d8841ac4fb 100644
--- a/include/comphelper/enumhelper.hxx
+++ b/include/comphelper/enumhelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_ENUMHELPER_HXX_
-#define _COMPHELPER_ENUMHELPER_HXX_
+#ifndef INCLUDED_COMPHELPER_ENUMHELPER_HXX
+#define INCLUDED_COMPHELPER_ENUMHELPER_HXX
#include <vector>
#include <com/sun/star/container/XNameAccess.hpp>
@@ -136,7 +136,7 @@ public:
}
//... namespace comphelper .......................................................
-#endif // _COMPHELPER_ENUMHELPER_HXX_
+#endif // INCLUDED_COMPHELPER_ENUMHELPER_HXX
diff --git a/include/comphelper/eventattachermgr.hxx b/include/comphelper/eventattachermgr.hxx
index a525e7c4ea54..3c9ef129ef51 100644
--- a/include/comphelper/eventattachermgr.hxx
+++ b/include/comphelper/eventattachermgr.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_EVENTATTACHERMGR_HXX_
-#define _COMPHELPER_EVENTATTACHERMGR_HXX_
+#ifndef INCLUDED_COMPHELPER_EVENTATTACHERMGR_HXX
+#define INCLUDED_COMPHELPER_EVENTATTACHERMGR_HXX
#include <com/sun/star/uno/Reference.hxx>
#include "comphelper/comphelperdllapi.h"
@@ -47,6 +47,6 @@ createEventAttacherManager(
}
-#endif // _COMPHELPER_EVENTATTACHERMGR_HXX_
+#endif // INCLUDED_COMPHELPER_EVENTATTACHERMGR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/evtlistenerhlp.hxx b/include/comphelper/evtlistenerhlp.hxx
index c1bb01fa3aa4..3398e303bf39 100644
--- a/include/comphelper/evtlistenerhlp.hxx
+++ b/include/comphelper/evtlistenerhlp.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 COMPHELPER_EVENTLISTENERHELPER_HXX
-#define COMPHELPER_EVENTLISTENERHELPER_HXX
+#ifndef INCLUDED_COMPHELPER_EVTLISTENERHLP_HXX
+#define INCLUDED_COMPHELPER_EVTLISTENERHLP_HXX
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/lang/XEventListener.hpp>
@@ -45,6 +45,6 @@ namespace comphelper
//........................................................................
} // namespace comphelper
//........................................................................
-#endif // COMPHELPER_EVENTLISTENERHELPER_HXX
+#endif // INCLUDED_COMPHELPER_EVTLISTENERHLP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/evtmethodhelper.hxx b/include/comphelper/evtmethodhelper.hxx
index 787a3c4d0002..cf28dfe6ed09 100644
--- a/include/comphelper/evtmethodhelper.hxx
+++ b/include/comphelper/evtmethodhelper.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 COMPHELPER_EVENTMETHODHELPER_HXX
-#define COMPHELPER_EVENTMETHODHELPER_HXX
+#ifndef INCLUDED_COMPHELPER_EVTMETHODHELPER_HXX
+#define INCLUDED_COMPHELPER_EVTMETHODHELPER_HXX
#include <comphelper/sequence.hxx>
//........................................................................
namespace comphelper
diff --git a/include/comphelper/expandmacro.hxx b/include/comphelper/expandmacro.hxx
index d699a1aaf94b..b795357c7785 100644
--- a/include/comphelper/expandmacro.hxx
+++ b/include/comphelper/expandmacro.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef COMPHELPER_EXPANDMACRO_HXX_INCLUDED
-#define COMPHELPER_EXPANDMACRO_HXX_INCLUDED
+#ifndef INCLUDED_COMPHELPER_EXPANDMACRO_HXX
+#define INCLUDED_COMPHELPER_EXPANDMACRO_HXX
#include "rtl/ustring.hxx"
#include "comphelper/comphelperdllapi.h"
diff --git a/include/comphelper/extract.hxx b/include/comphelper/extract.hxx
index 30cbaaefc6c9..2cc12c2abceb 100644
--- a/include/comphelper/extract.hxx
+++ b/include/comphelper/extract.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 _COMPHELPER_EXTRACT_HXX_
-#define _COMPHELPER_EXTRACT_HXX_
+#ifndef INCLUDED_COMPHELPER_EXTRACT_HXX
+#define INCLUDED_COMPHELPER_EXTRACT_HXX
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/uno/XInterface.hpp>
diff --git a/include/comphelper/fileformat.h b/include/comphelper/fileformat.h
index dbd3f32a1f9a..fb9d8175f2e3 100644
--- a/include/comphelper/fileformat.h
+++ b/include/comphelper/fileformat.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_FILEFORMAT_H_
-#define _COMPHELPER_FILEFORMAT_H_
+#ifndef INCLUDED_COMPHELPER_FILEFORMAT_H
+#define INCLUDED_COMPHELPER_FILEFORMAT_H
/* file format versions *************************************************/
diff --git a/include/comphelper/flagguard.hxx b/include/comphelper/flagguard.hxx
index af1f1ea1e4fd..713e624e9b47 100644
--- a/include/comphelper/flagguard.hxx
+++ b/include/comphelper/flagguard.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_FLAGGUARD_HXX
-#define COMPHELPER_FLAGGUARD_HXX
+#ifndef INCLUDED_COMPHELPER_FLAGGUARD_HXX
+#define INCLUDED_COMPHELPER_FLAGGUARD_HXX
#include "comphelper/scopeguard.hxx"
@@ -73,6 +73,6 @@ namespace comphelper
} // namespace comphelper
//......................................................................................................................
-#endif // COMPHELPER_FLAGGUARD_HXX
+#endif // INCLUDED_COMPHELPER_FLAGGUARD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/genericpropertyset.hxx b/include/comphelper/genericpropertyset.hxx
index e46c30a4cad4..359d182b6ed8 100644
--- a/include/comphelper/genericpropertyset.hxx
+++ b/include/comphelper/genericpropertyset.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_GENERICPROPERTYSET_HXX_
-#define _COMPHELPER_GENERICPROPERTYSET_HXX_
+#ifndef INCLUDED_COMPHELPER_GENERICPROPERTYSET_HXX
+#define INCLUDED_COMPHELPER_GENERICPROPERTYSET_HXX
#include <comphelper/propertysetinfo.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -29,6 +29,6 @@ namespace comphelper
COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GenericPropertySet_CreateInstance( PropertySetInfo* pInfo );
}
-#endif // _COMPHELPER_GENERICPROPERTYSET_HXX_
+#endif // INCLUDED_COMPHELPER_GENERICPROPERTYSET_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/guarding.hxx b/include/comphelper/guarding.hxx
index 3931c0284e31..f52650a5da1c 100644
--- a/include/comphelper/guarding.hxx
+++ b/include/comphelper/guarding.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_GUARDING_HXX_
-#define _COMPHELPER_GUARDING_HXX_
+#ifndef INCLUDED_COMPHELPER_GUARDING_HXX
+#define INCLUDED_COMPHELPER_GUARDING_HXX
#include <osl/mutex.hxx>
@@ -51,6 +51,6 @@ typedef ORelease< ::osl::Mutex > MutexRelease;
} // namespace comphelper
//.........................................................................
-#endif // _COMPHELPER_GUARDING_HXX_
+#endif // INCLUDED_COMPHELPER_GUARDING_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/ihwrapnofilter.hxx b/include/comphelper/ihwrapnofilter.hxx
index 0af98b965be8..513bb225731d 100644
--- a/include/comphelper/ihwrapnofilter.hxx
+++ b/include/comphelper/ihwrapnofilter.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_INTERACTIONHANDLERWRAPPER_HXX_
-#define _COMPHELPER_INTERACTIONHANDLERWRAPPER_HXX_
+#ifndef INCLUDED_COMPHELPER_IHWRAPNOFILTER_HXX
+#define INCLUDED_COMPHELPER_IHWRAPNOFILTER_HXX
#include <com/sun/star/task/XInteractionHandler2.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
diff --git a/include/comphelper/implementationreference.hxx b/include/comphelper/implementationreference.hxx
index 7957d6437ff5..4432c2e18272 100644
--- a/include/comphelper/implementationreference.hxx
+++ b/include/comphelper/implementationreference.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_IMPLEMENTATIONREFERENCE_HXX
-#define _COMPHELPER_IMPLEMENTATIONREFERENCE_HXX
+#ifndef INCLUDED_COMPHELPER_IMPLEMENTATIONREFERENCE_HXX
+#define INCLUDED_COMPHELPER_IMPLEMENTATIONREFERENCE_HXX
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/XInterface.hpp>
@@ -262,6 +262,6 @@ namespace comphelper
}
-#endif // _COMPHELPER_IMPLEMENTATIONREFERENCE_HXX
+#endif // INCLUDED_COMPHELPER_IMPLEMENTATIONREFERENCE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/interaction.hxx b/include/comphelper/interaction.hxx
index d72cc2119c4a..68ef19dd1543 100644
--- a/include/comphelper/interaction.hxx
+++ b/include/comphelper/interaction.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_INTERACTION_HXX_
-#define _COMPHELPER_INTERACTION_HXX_
+#ifndef INCLUDED_COMPHELPER_INTERACTION_HXX
+#define INCLUDED_COMPHELPER_INTERACTION_HXX
#include <comphelper/uno3.hxx>
#include <cppuhelper/implbase1.hxx>
@@ -155,7 +155,7 @@ namespace comphelper
} // namespace comphelper
//.........................................................................
-#endif // _COMPHELPER_INTERACTION_HXX_
+#endif // INCLUDED_COMPHELPER_INTERACTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx
index dc61467ccfa5..888508b6b328 100644
--- a/include/comphelper/listenernotification.hxx
+++ b/include/comphelper/listenernotification.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_INC_COMPHELPER_LISTENERNOTIFICATION_HXX
-#define COMPHELPER_INC_COMPHELPER_LISTENERNOTIFICATION_HXX
+#ifndef INCLUDED_COMPHELPER_LISTENERNOTIFICATION_HXX
+#define INCLUDED_COMPHELPER_LISTENERNOTIFICATION_HXX
#include <cppuhelper/interfacecontainer.hxx>
@@ -293,6 +293,6 @@ namespace comphelper
} // namespace comphelper
//........................................................................
-#endif // COMPHELPER_INC_COMPHELPER_LISTENERNOTIFICATION_HXX
+#endif // INCLUDED_COMPHELPER_LISTENERNOTIFICATION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx
index 142db5b5e603..0f53a042111b 100644
--- a/include/comphelper/logging.hxx
+++ b/include/comphelper/logging.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_LOGGING_HXX
-#define COMPHELPER_LOGGING_HXX
+#ifndef INCLUDED_COMPHELPER_LOGGING_HXX
+#define INCLUDED_COMPHELPER_LOGGING_HXX
#include <comphelper/comphelperdllapi.h>
@@ -721,6 +721,6 @@ namespace comphelper
} // namespace comphelper
//........................................................................
-#endif // COMPHELPER_LOGGING_HXX
+#endif // INCLUDED_COMPHELPER_LOGGING_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/makesequence.hxx b/include/comphelper/makesequence.hxx
index bc35657db9a8..19d1e8e7e257 100644
--- a/include/comphelper/makesequence.hxx
+++ b/include/comphelper/makesequence.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_MAKESEQUENCE_HXX_INCLUDED
-#define COMPHELPER_MAKESEQUENCE_HXX_INCLUDED
+#ifndef INCLUDED_COMPHELPER_MAKESEQUENCE_HXX
+#define INCLUDED_COMPHELPER_MAKESEQUENCE_HXX
#include "com/sun/star/uno/Sequence.hxx"
#include "boost/preprocessor/cat.hpp"
@@ -75,6 +75,6 @@ BOOST_PP_REPEAT_FROM_TO(2, BOOST_PP_ADD(COMPHELPER_MAKESEQUENCE_MAX_ARGS, 1),
} // namespace comphelper
-#endif // ! defined(COMPHELPER_MAKESEQUENCE_HXX_INCLUDED)
+#endif // ! defined( INCLUDED_COMPHELPER_MAKESEQUENCE_HXX)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/mediadescriptor.hxx b/include/comphelper/mediadescriptor.hxx
index 5f353e552753..3ca74d95ddf6 100644
--- a/include/comphelper/mediadescriptor.hxx
+++ b/include/comphelper/mediadescriptor.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_MEDIADESCRIPTOR_HXX_
-#define _COMPHELPER_MEDIADESCRIPTOR_HXX_
+#ifndef INCLUDED_COMPHELPER_MEDIADESCRIPTOR_HXX
+#define INCLUDED_COMPHELPER_MEDIADESCRIPTOR_HXX
#include <comphelper/sequenceashashmap.hxx>
#include <rtl/ustring.hxx>
@@ -293,6 +293,6 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
} // namespace comphelper
-#endif // _COMPHELPER_MEDIADESCRIPTOR_HXX_
+#endif // INCLUDED_COMPHELPER_MEDIADESCRIPTOR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/mimeconfighelper.hxx b/include/comphelper/mimeconfighelper.hxx
index 6e2b128d5a23..293d21154603 100644
--- a/include/comphelper/mimeconfighelper.hxx
+++ b/include/comphelper/mimeconfighelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_MIMECONFIGHELPER_HXX_
-#define _COMPHELPER_MIMECONFIGHELPER_HXX_
+#ifndef INCLUDED_COMPHELPER_MIMECONFIGHELPER_HXX
+#define INCLUDED_COMPHELPER_MIMECONFIGHELPER_HXX
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
@@ -136,6 +136,6 @@ public:
}
-#endif // _COMPHELPER_MIMECONFIGHELPER_HXX_
+#endif // INCLUDED_COMPHELPER_MIMECONFIGHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/namecontainer.hxx b/include/comphelper/namecontainer.hxx
index 6ac5aff190fb..1e600ae5eda8 100644
--- a/include/comphelper/namecontainer.hxx
+++ b/include/comphelper/namecontainer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_NAMECONTAINER_HXX_
-#define _COMPHELPER_NAMECONTAINER_HXX_
+#ifndef INCLUDED_COMPHELPER_NAMECONTAINER_HXX
+#define INCLUDED_COMPHELPER_NAMECONTAINER_HXX
#include <com/sun/star/uno/Type.hxx>
#include <com/sun/star/container/XNameContainer.hpp>
@@ -30,6 +30,6 @@ namespace comphelper
NameContainer_createInstance( ::com::sun::star::uno::Type aType );
}
-#endif // _COMPHELPER_NAMECONTAINER_HXX_
+#endif // INCLUDED_COMPHELPER_NAMECONTAINER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/namedvaluecollection.hxx b/include/comphelper/namedvaluecollection.hxx
index 855e9e6bd0e6..c625f24cdcbc 100644
--- a/include/comphelper/namedvaluecollection.hxx
+++ b/include/comphelper/namedvaluecollection.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_NAMEDVALUECOLLECTION_HXX
-#define COMPHELPER_NAMEDVALUECOLLECTION_HXX
+#ifndef INCLUDED_COMPHELPER_NAMEDVALUECOLLECTION_HXX
+#define INCLUDED_COMPHELPER_NAMEDVALUECOLLECTION_HXX
#include <comphelper/comphelperdllapi.h>
@@ -362,6 +362,6 @@ namespace comphelper
} // namespace comphelper
//........................................................................
-#endif // COMPHELPER_NAMEDVALUECOLLECTION_HXX
+#endif // INCLUDED_COMPHELPER_NAMEDVALUECOLLECTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/newarray.hxx b/include/comphelper/newarray.hxx
index b64095ae8ff4..b34dc13332b5 100644
--- a/include/comphelper/newarray.hxx
+++ b/include/comphelper/newarray.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_NEW_ARRAY_HXX
-#define COMPHELPER_NEW_ARRAY_HXX
+#ifndef INCLUDED_COMPHELPER_NEWARRAY_HXX
+#define INCLUDED_COMPHELPER_NEWARRAY_HXX
#include <limits>
#include <new>
@@ -46,6 +46,6 @@ newArray_ex(size_t const n)
} // namespace comphelper
-#endif // COMPHELPER_NEW_ARRAY_HXX
+#endif // INCLUDED_COMPHELPER_NEWARRAY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/numberedcollection.hxx b/include/comphelper/numberedcollection.hxx
index 38f0eaa633a1..351b1014abec 100644
--- a/include/comphelper/numberedcollection.hxx
+++ b/include/comphelper/numberedcollection.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_NUMBEREDCOLLECTION_HXX_
-#define _COMPHELPER_NUMBEREDCOLLECTION_HXX_
+#ifndef INCLUDED_COMPHELPER_NUMBEREDCOLLECTION_HXX
+#define INCLUDED_COMPHELPER_NUMBEREDCOLLECTION_HXX
#include "comphelper/comphelperdllapi.h"
@@ -171,6 +171,6 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex
} // namespace comphelper
-#endif // _COMPHELPER_NUMBEREDCOLLECTION_HXX_
+#endif // INCLUDED_COMPHELPER_NUMBEREDCOLLECTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/numbers.hxx b/include/comphelper/numbers.hxx
index b64fe341da4f..18c7e2e44473 100644
--- a/include/comphelper/numbers.hxx
+++ b/include/comphelper/numbers.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_NUMBERS_HXX_
-#define _COMPHELPER_NUMBERS_HXX_
+#ifndef INCLUDED_COMPHELPER_NUMBERS_HXX
+#define INCLUDED_COMPHELPER_NUMBERS_HXX
#include <com/sun/star/util/XNumberFormats.hpp>
#include <com/sun/star/util/XNumberFormatter.hpp>
@@ -62,6 +62,6 @@ namespace comphelper
} // namespace comphelper
//.........................................................................
-#endif // _COMPHELPER_NUMBERS_HXX_
+#endif // INCLUDED_COMPHELPER_NUMBERS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/officeresourcebundle.hxx b/include/comphelper/officeresourcebundle.hxx
index a326a59d219b..29279ab5b5c6 100644
--- a/include/comphelper/officeresourcebundle.hxx
+++ b/include/comphelper/officeresourcebundle.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_OFFICE_RESOURCE_BUNDLE_HXX
-#define COMPHELPER_OFFICE_RESOURCE_BUNDLE_HXX
+#ifndef INCLUDED_COMPHELPER_OFFICERESOURCEBUNDLE_HXX
+#define INCLUDED_COMPHELPER_OFFICERESOURCEBUNDLE_HXX
#include <comphelper/comphelperdllapi.h>
@@ -89,6 +89,6 @@ namespace comphelper
} // namespace comphelper
//........................................................................
-#endif // COMPHELPER_OFFICE_RESOURCE_BUNDLE_HXX
+#endif // INCLUDED_COMPHELPER_OFFICERESOURCEBUNDLE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/ofopxmlhelper.hxx b/include/comphelper/ofopxmlhelper.hxx
index e054d0dbc909..41d641a652e3 100644
--- a/include/comphelper/ofopxmlhelper.hxx
+++ b/include/comphelper/ofopxmlhelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_OFOPXMLHELPER_HXX
-#define _COMPHELPER_OFOPXMLHELPER_HXX
+#ifndef INCLUDED_COMPHELPER_OFOPXMLHELPER_HXX
+#define INCLUDED_COMPHELPER_OFOPXMLHELPER_HXX
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/beans/StringPair.hpp>
diff --git a/include/comphelper/oslfile2streamwrap.hxx b/include/comphelper/oslfile2streamwrap.hxx
index cdee28870fba..d0ccbef4e05e 100644
--- a/include/comphelper/oslfile2streamwrap.hxx
+++ b/include/comphelper/oslfile2streamwrap.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 _COMPHELPER_STREAM_OSLFILEWRAPPER_HXX_
-#define _COMPHELPER_STREAM_OSLFILEWRAPPER_HXX_
+#ifndef INCLUDED_COMPHELPER_OSLFILE2STREAMWRAP_HXX
+#define INCLUDED_COMPHELPER_OSLFILE2STREAMWRAP_HXX
#include <osl/mutex.hxx>
#include <com/sun/star/io/XOutputStream.hpp>
@@ -75,6 +75,6 @@ private:
} // namespace comphelper
-#endif // _COMPHELPER_STREAM_OSLFILEWRAPPER_HXX_
+#endif // INCLUDED_COMPHELPER_OSLFILE2STREAMWRAP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/processfactory.hxx b/include/comphelper/processfactory.hxx
index a7edbb9cddff..36f54ba4f885 100644
--- a/include/comphelper/processfactory.hxx
+++ b/include/comphelper/processfactory.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
-#define _COMPHELPER_PROCESSFACTORY_HXX_
+#ifndef INCLUDED_COMPHELPER_PROCESSFACTORY_HXX
+#define INCLUDED_COMPHELPER_PROCESSFACTORY_HXX
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/uno/Sequence.hxx>
@@ -71,6 +71,6 @@ getProcessComponentContext();
}
-#endif // _COMPHELPER_PROCESSFACTORY_HXX_
+#endif // INCLUDED_COMPHELPER_PROCESSFACTORY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx
index 3a6ca83e36c1..ecd8f9812975 100644
--- a/include/comphelper/propagg.hxx
+++ b/include/comphelper/propagg.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_PROPERTY_AGGREGATION_HXX_
-#define _COMPHELPER_PROPERTY_AGGREGATION_HXX_
+#ifndef INCLUDED_COMPHELPER_PROPAGG_HXX
+#define INCLUDED_COMPHELPER_PROPAGG_HXX
#include <com/sun/star/uno/XAggregation.hpp>
#include <comphelper/propstate.hxx>
@@ -320,6 +320,6 @@ protected:
} // namespace comphelper
//.........................................................................
-#endif // _COMPHELPER_PROPERTY_AGGREGATION_HXX_
+#endif // INCLUDED_COMPHELPER_PROPAGG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/proparrhlp.hxx b/include/comphelper/proparrhlp.hxx
index 840213e88427..d3085a30591c 100644
--- a/include/comphelper/proparrhlp.hxx
+++ b/include/comphelper/proparrhlp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_
-#define _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_
+#ifndef INCLUDED_COMPHELPER_PROPARRHLP_HXX
+#define INCLUDED_COMPHELPER_PROPARRHLP_HXX
#include <comphelper/stl_types.hxx>
#include <comphelper/propagg.hxx>
@@ -169,7 +169,7 @@ template <class TYPE> inline
}
//... namespace comphelper ................................................
-#endif // _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_
+#endif // INCLUDED_COMPHELPER_PROPARRHLP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/property.hxx b/include/comphelper/property.hxx
index 95fe122d51a6..086565a7d87d 100644
--- a/include/comphelper/property.hxx
+++ b/include/comphelper/property.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_PROPERTY_HXX_
-#define _COMPHELPER_PROPERTY_HXX_
+#ifndef INCLUDED_COMPHELPER_PROPERTY_HXX
+#define INCLUDED_COMPHELPER_PROPERTY_HXX
#include <cppuhelper/proptypehlp.hxx>
#include <comphelper/extract.hxx>
@@ -200,6 +200,6 @@ COMPHELPER_DLLPUBLIC sal_Bool tryPropertyValue(staruno::Any& _rConvertedValue, s
}
//... namespace comphelper .......................................................
-#endif // _COMPHELPER_PROPERTY_HXX_
+#endif // INCLUDED_COMPHELPER_PROPERTY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/propertybag.hxx b/include/comphelper/propertybag.hxx
index 1be13092450d..1327055f03f5 100644
--- a/include/comphelper/propertybag.hxx
+++ b/include/comphelper/propertybag.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_PROPERTYBAG_HXX
-#define COMPHELPER_PROPERTYBAG_HXX
+#ifndef INCLUDED_COMPHELPER_PROPERTYBAG_HXX
+#define INCLUDED_COMPHELPER_PROPERTYBAG_HXX
#include "comphelper/comphelperdllapi.h"
#include <comphelper/propertycontainerhelper.hxx>
@@ -222,6 +222,6 @@ namespace comphelper
} // namespace comphelper
//........................................................................
-#endif // COMPHELPER_PROPERTYBAG_HXX
+#endif // INCLUDED_COMPHELPER_PROPERTYBAG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/propertycontainer.hxx b/include/comphelper/propertycontainer.hxx
index 3d208413a722..4c44310837b6 100644
--- a/include/comphelper/propertycontainer.hxx
+++ b/include/comphelper/propertycontainer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_PROPERTYCONTAINER_HXX_
-#define _COMPHELPER_PROPERTYCONTAINER_HXX_
+#ifndef INCLUDED_COMPHELPER_PROPERTYCONTAINER_HXX
+#define INCLUDED_COMPHELPER_PROPERTYCONTAINER_HXX
#include <comphelper/propertycontainerhelper.hxx>
#include <cppuhelper/propshlp.hxx>
@@ -84,7 +84,7 @@ protected:
} // namespace comphelper
//.........................................................................
-#endif // _COMPHELPER_PROPERTYCONTAINER_HXX_
+#endif // INCLUDED_COMPHELPER_PROPERTYCONTAINER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/propertycontainerhelper.hxx b/include/comphelper/propertycontainerhelper.hxx
index 67eae2994b08..f0b4eef554c0 100644
--- a/include/comphelper/propertycontainerhelper.hxx
+++ b/include/comphelper/propertycontainerhelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_PROPERTYCONTAINERHELPER_HXX
-#define COMPHELPER_PROPERTYCONTAINERHELPER_HXX
+#ifndef INCLUDED_COMPHELPER_PROPERTYCONTAINERHELPER_HXX
+#define INCLUDED_COMPHELPER_PROPERTYCONTAINERHELPER_HXX
#include <cppuhelper/propshlp.hxx>
#include <com/sun/star/uno/Type.hxx>
@@ -198,6 +198,6 @@ private:
} // namespace comphelper
//.........................................................................
-#endif // COMPHELPER_PROPERTYCONTAINERHELPER_HXX
+#endif // INCLUDED_COMPHELPER_PROPERTYCONTAINERHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/propertysethelper.hxx b/include/comphelper/propertysethelper.hxx
index ecc600c37d3c..29793b2cb54a 100644
--- a/include/comphelper/propertysethelper.hxx
+++ b/include/comphelper/propertysethelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_PROPERTYSETHELPER_HXX_
-#define _COMPHELPER_PROPERTYSETHELPER_HXX_
+#ifndef INCLUDED_COMPHELPER_PROPERTYSETHELPER_HXX
+#define INCLUDED_COMPHELPER_PROPERTYSETHELPER_HXX
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
diff --git a/include/comphelper/propertysetinfo.hxx b/include/comphelper/propertysetinfo.hxx
index e0b863e8f2ca..ea11ba07b5f1 100644
--- a/include/comphelper/propertysetinfo.hxx
+++ b/include/comphelper/propertysetinfo.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_PROPERTSETINFO_HXX_
-#define _COMPHELPER_PROPERTSETINFO_HXX_
+#ifndef INCLUDED_COMPHELPER_PROPERTYSETINFO_HXX
+#define INCLUDED_COMPHELPER_PROPERTYSETINFO_HXX
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <cppuhelper/implbase1.hxx>
diff --git a/include/comphelper/propertystatecontainer.hxx b/include/comphelper/propertystatecontainer.hxx
index acd368646628..68ead5bf8c3e 100644
--- a/include/comphelper/propertystatecontainer.hxx
+++ b/include/comphelper/propertystatecontainer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_PROPERTYSTATECONTAINER_HXX
-#define COMPHELPER_PROPERTYSTATECONTAINER_HXX
+#ifndef INCLUDED_COMPHELPER_PROPERTYSTATECONTAINER_HXX
+#define INCLUDED_COMPHELPER_PROPERTYSTATECONTAINER_HXX
#include <comphelper/propertycontainer.hxx>
#include <com/sun/star/beans/XPropertyState.hpp>
@@ -109,6 +109,6 @@ namespace comphelper
} // namespace comphelper
//.........................................................................
-#endif // COMPHELPER_PROPERTYSTATECONTAINER_HXX
+#endif // INCLUDED_COMPHELPER_PROPERTYSTATECONTAINER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/propmultiplex.hxx b/include/comphelper/propmultiplex.hxx
index 28795e57ce8a..ab2c36a1f6b6 100644
--- a/include/comphelper/propmultiplex.hxx
+++ b/include/comphelper/propmultiplex.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_PROPERTY_MULTIPLEX_HXX_
-#define _COMPHELPER_PROPERTY_MULTIPLEX_HXX_
+#ifndef INCLUDED_COMPHELPER_PROPMULTIPLEX_HXX
+#define INCLUDED_COMPHELPER_PROPMULTIPLEX_HXX
#include <comphelper/propstate.hxx>
#include <cppuhelper/implbase1.hxx>
@@ -104,6 +104,6 @@ namespace comphelper
} // namespace comphelper
//.........................................................................
-#endif // _COMPHELPER_PROPERTY_MULTIPLEX_HXX_
+#endif // INCLUDED_COMPHELPER_PROPMULTIPLEX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/propstate.hxx b/include/comphelper/propstate.hxx
index 727f40d96824..0354e68f36b8 100644
--- a/include/comphelper/propstate.hxx
+++ b/include/comphelper/propstate.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_PROPERTY_STATE_HXX_
-#define _COMPHELPER_PROPERTY_STATE_HXX_
+#ifndef INCLUDED_COMPHELPER_PROPSTATE_HXX
+#define INCLUDED_COMPHELPER_PROPSTATE_HXX
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/uno/Sequence.hxx>
@@ -100,6 +100,6 @@ namespace comphelper
} // namespace comphelper
//.........................................................................
-#endif // _COMPHELPER_PROPERTY_STATE_HXX_
+#endif // INCLUDED_COMPHELPER_PROPSTATE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/seekableinput.hxx b/include/comphelper/seekableinput.hxx
index 02c4997a2cb6..603ecc62e943 100644
--- a/include/comphelper/seekableinput.hxx
+++ b/include/comphelper/seekableinput.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 _COMPHELPER_STREAM_SEEKABLEINPUT_HXX_
-#define _COMPHELPER_STREAM_SEEKABLEINPUT_HXX_
+#ifndef INCLUDED_COMPHELPER_SEEKABLEINPUT_HXX
+#define INCLUDED_COMPHELPER_SEEKABLEINPUT_HXX
#include <osl/mutex.hxx>
#include <com/sun/star/uno/Reference.hxx>
diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx
index 9cb122bf8730..3c82e2e237e5 100644
--- a/include/comphelper/seqstream.hxx
+++ b/include/comphelper/seqstream.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 _COMPHELPER_SEQSTREAM_HXX
-#define _COMPHELPER_SEQSTREAM_HXX
+#ifndef INCLUDED_COMPHELPER_SEQSTREAM_HXX
+#define INCLUDED_COMPHELPER_SEQSTREAM_HXX
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Reference.hxx>
@@ -131,7 +131,7 @@ public:
} // namespace comphelper
-#endif //_COMPHELPER_SEQSTREAM_HXX
+#endif // INCLUDED_COMPHELPER_SEQSTREAM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/sequence.hxx b/include/comphelper/sequence.hxx
index 4695042670fc..3d324769a4cc 100644
--- a/include/comphelper/sequence.hxx
+++ b/include/comphelper/sequence.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_SEQUENCE_HXX_
-#define _COMPHELPER_SEQUENCE_HXX_
+#ifndef INCLUDED_COMPHELPER_SEQUENCE_HXX
+#define INCLUDED_COMPHELPER_SEQUENCE_HXX
#include <algorithm>
#include <com/sun/star/uno/Sequence.hxx>
@@ -354,6 +354,6 @@ namespace comphelper
//.........................................................................
-#endif // _COMPHELPER_SEQUENCE_HXX_
+#endif // INCLUDED_COMPHELPER_SEQUENCE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/sequenceashashmap.hxx b/include/comphelper/sequenceashashmap.hxx
index 935f614070ff..9caa63abb7db 100644
--- a/include/comphelper/sequenceashashmap.hxx
+++ b/include/comphelper/sequenceashashmap.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX_
-#define _COMPHELPER_SEQUENCEASHASHMAP_HXX_
+#ifndef INCLUDED_COMPHELPER_SEQUENCEASHASHMAP_HXX
+#define INCLUDED_COMPHELPER_SEQUENCEASHASHMAP_HXX
#include <boost/unordered_map.hpp>
@@ -308,6 +308,6 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
} // namespace comphelper
-#endif // _COMPHELPER_SEQUENCEASHASHMAP_HXX_
+#endif // INCLUDED_COMPHELPER_SEQUENCEASHASHMAP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/sequenceasvector.hxx b/include/comphelper/sequenceasvector.hxx
index 6e3ad171df43..5f1435da62ee 100644
--- a/include/comphelper/sequenceasvector.hxx
+++ b/include/comphelper/sequenceasvector.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_SEQUENCEASVECTOR_HXX_
-#define _COMPHELPER_SEQUENCEASVECTOR_HXX_
+#ifndef INCLUDED_COMPHELPER_SEQUENCEASVECTOR_HXX
+#define INCLUDED_COMPHELPER_SEQUENCEASVECTOR_HXX
#include <vector>
#include <algorithm>
@@ -242,6 +242,6 @@ class SequenceAsVector : public ::std::vector< TElementType >
} // namespace comphelper
-#endif // _COMPHELPER_SEQUENCEASVECTOR_HXX_
+#endif // INCLUDED_COMPHELPER_SEQUENCEASVECTOR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/servicedecl.hxx b/include/comphelper/servicedecl.hxx
index be3b275cf215..f210fcd4fdfa 100644
--- a/include/comphelper/servicedecl.hxx
+++ b/include/comphelper/servicedecl.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 COMPHELPER_SERVICEDECL_HXX_INCLUDED
-#define COMPHELPER_SERVICEDECL_HXX_INCLUDED
+#ifndef INCLUDED_COMPHELPER_SERVICEDECL_HXX
+#define INCLUDED_COMPHELPER_SERVICEDECL_HXX
#include <comphelper/comphelperdllapi.h>
#include <cppuhelper/implbase1.hxx>
@@ -404,6 +404,6 @@ extern "C" \
#define COMPHELPER_SERVICEDECL_EXPORTS8(compName,comp0_,comp1_,comp2_,comp3_,comp4_,comp5_,comp6_,comp7_) \
COMPHELPER_SERVICEDECL_make_exports(compName,(comp0_)(comp1_)(comp2_)(comp3_)(comp4_)(comp5_)(comp6_)(comp7_))
-#endif // ! defined(COMPHELPER_SERVICEDECL_HXX_INCLUDED)
+#endif // ! defined( INCLUDED_COMPHELPER_SERVICEDECL_HXX)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/servicehelper.hxx b/include/comphelper/servicehelper.hxx
index a861e88db2d7..d0f2a261e71b 100644
--- a/include/comphelper/servicehelper.hxx
+++ b/include/comphelper/servicehelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_SERVICEHELPER_HXX_
-#define _COMPHELPER_SERVICEHELPER_HXX_
+#ifndef INCLUDED_COMPHELPER_SERVICEHELPER_HXX
+#define INCLUDED_COMPHELPER_SERVICEHELPER_HXX
#include <rtl/uuid.h>
#include <rtl/instance.hxx>
@@ -102,6 +102,6 @@ sal_Int64 SAL_CALL classname::getSomething( const ::com::sun::star::uno::Sequenc
}
-#endif // _COMPHELPER_SERVICEHELPER_HXX_
+#endif // INCLUDED_COMPHELPER_SERVICEHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/serviceinfohelper.hxx b/include/comphelper/serviceinfohelper.hxx
index b1468b9eab27..f0ff655bc86b 100644
--- a/include/comphelper/serviceinfohelper.hxx
+++ b/include/comphelper/serviceinfohelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_SERVICEINFOHELPER_HXX
-#define COMPHELPER_SERVICEINFOHELPER_HXX
+#ifndef INCLUDED_COMPHELPER_SERVICEINFOHELPER_HXX
+#define INCLUDED_COMPHELPER_SERVICEINFOHELPER_HXX
#include <com/sun/star/lang/XServiceInfo.hpp>
#include "comphelper/comphelperdllapi.h"
diff --git a/include/comphelper/sharedmutex.hxx b/include/comphelper/sharedmutex.hxx
index 8013e7f404aa..9dbe2e72d208 100644
--- a/include/comphelper/sharedmutex.hxx
+++ b/include/comphelper/sharedmutex.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_SHAREDMUTEX_HXX
-#define COMPHELPER_SHAREDMUTEX_HXX
+#ifndef INCLUDED_COMPHELPER_SHAREDMUTEX_HXX
+#define INCLUDED_COMPHELPER_SHAREDMUTEX_HXX
#include "comphelper/comphelperdllapi.h"
@@ -81,6 +81,6 @@ namespace comphelper
} // namespace comphelper
//........................................................................
-#endif // COMPHELPER_SHAREDMUTEX_HXX
+#endif // INCLUDED_COMPHELPER_SHAREDMUTEX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/stillreadwriteinteraction.hxx b/include/comphelper/stillreadwriteinteraction.hxx
index 9397aa72bf64..a3501d7b7a6c 100644
--- a/include/comphelper/stillreadwriteinteraction.hxx
+++ b/include/comphelper/stillreadwriteinteraction.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_STILLREADWRITEINTERACTION_HXX_
-#define _COMPHELPER_STILLREADWRITEINTERACTION_HXX_
+#ifndef INCLUDED_COMPHELPER_STILLREADWRITEINTERACTION_HXX
+#define INCLUDED_COMPHELPER_STILLREADWRITEINTERACTION_HXX
#include <ucbhelper/interceptedinteraction.hxx>
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index a80cd4feac0f..de9e2ff7f5ff 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.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 _COMPHELPER_STLTYPES_HXX_
-#define _COMPHELPER_STLTYPES_HXX_
+#ifndef INCLUDED_COMPHELPER_STL_TYPES_HXX
+#define INCLUDED_COMPHELPER_STL_TYPES_HXX
#include "sal/config.h"
@@ -268,6 +268,6 @@ OutputIter intersperse(
typedef ::std::set< valuetype, comparefct > classname; \
DECLARE_STL_ITERATORS(classname) \
-#endif // _COMPHELPER_STLTYPES_HXX_
+#endif // INCLUDED_COMPHELPER_STL_TYPES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/stlunosequence.hxx b/include/comphelper/stlunosequence.hxx
index c7b776f78d6e..1c61ed8dde3a 100644
--- a/include/comphelper/stlunosequence.hxx
+++ b/include/comphelper/stlunosequence.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_STLUNOITERATOR_HXX
-#define _COMPHELPER_STLUNOITERATOR_HXX
+#ifndef INCLUDED_COMPHELPER_STLUNOSEQUENCE_HXX
+#define INCLUDED_COMPHELPER_STLUNOSEQUENCE_HXX
#include <com/sun/star/uno/Sequence.hxx>
#include <sal/types.h>
diff --git a/include/comphelper/storagehelper.hxx b/include/comphelper/storagehelper.hxx
index 093038e6e5ed..1c5a62c8ad68 100644
--- a/include/comphelper/storagehelper.hxx
+++ b/include/comphelper/storagehelper.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 COMPHELPER_STORAGEHELPER_HXX
-#define COMPHELPER_STORAGEHELPER_HXX
+#ifndef INCLUDED_COMPHELPER_STORAGEHELPER_HXX
+#define INCLUDED_COMPHELPER_STORAGEHELPER_HXX
#include <boost/scoped_ptr.hpp>
diff --git a/include/comphelper/streamsection.hxx b/include/comphelper/streamsection.hxx
index 8f5657aff502..787f6964f625 100644
--- a/include/comphelper/streamsection.hxx
+++ b/include/comphelper/streamsection.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_STREAMSECTION_HXX_
-#define _COMPHELPER_STREAMSECTION_HXX_
+#ifndef INCLUDED_COMPHELPER_STREAMSECTION_HXX
+#define INCLUDED_COMPHELPER_STREAMSECTION_HXX
#include <com/sun/star/io/XMarkableStream.hpp>
#include <com/sun/star/io/XDataInputStream.hpp>
@@ -73,6 +73,6 @@ public:
} // namespace comphelper
-#endif // _COMPHELPER_STREAMSECTION_HXX_
+#endif // INCLUDED_COMPHELPER_STREAMSECTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/synchronousdispatch.hxx b/include/comphelper/synchronousdispatch.hxx
index efeffea6b4eb..1e945171b377 100644
--- a/include/comphelper/synchronousdispatch.hxx
+++ b/include/comphelper/synchronousdispatch.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_SYNCHRONOUSDISPATCH_HXX
-#define _COMPHELPER_SYNCHRONOUSDISPATCH_HXX
+#ifndef INCLUDED_COMPHELPER_SYNCHRONOUSDISPATCH_HXX
+#define INCLUDED_COMPHELPER_SYNCHRONOUSDISPATCH_HXX
#include "comphelper/comphelperdllapi.h"
@@ -61,6 +61,6 @@ namespace comphelper
} // namespace comphelper
//........................................................................
-#endif // _COMPHELPER_SYNCHRONOUSDISPATCH_HXX
+#endif // INCLUDED_COMPHELPER_SYNCHRONOUSDISPATCH_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/syntaxhighlight.hxx b/include/comphelper/syntaxhighlight.hxx
index 7ad9e2af6ab0..dc1631ac6d63 100644
--- a/include/comphelper/syntaxhighlight.hxx
+++ b/include/comphelper/syntaxhighlight.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 _COMPHELPER_SYNTAXHIGHLIGHT_HXX
-#define _COMPHELPER_SYNTAXHIGHLIGHT_HXX
+#ifndef INCLUDED_COMPHELPER_SYNTAXHIGHLIGHT_HXX
+#define INCLUDED_COMPHELPER_SYNTAXHIGHLIGHT_HXX
#include <vector>
#include <rtl/ustring.hxx>
diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx
index f9a1506e88c6..8125f818c3d7 100644
--- a/include/comphelper/types.hxx
+++ b/include/comphelper/types.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_TYPES_HXX_
-#define _COMPHELPER_TYPES_HXX_
+#ifndef INCLUDED_COMPHELPER_TYPES_HXX
+#define INCLUDED_COMPHELPER_TYPES_HXX
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
@@ -169,6 +169,6 @@ namespace comphelper
} // namespace comphelper
//.........................................................................
-#endif // _COMPHELPER_TYPES_HXX_
+#endif // INCLUDED_COMPHELPER_TYPES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/uno3.hxx b/include/comphelper/uno3.hxx
index 1b83c73f4f25..7cf2ef8a6847 100644
--- a/include/comphelper/uno3.hxx
+++ b/include/comphelper/uno3.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMPHELPER_UNO3_HXX_
-#define _COMPHELPER_UNO3_HXX_
+#ifndef INCLUDED_COMPHELPER_UNO3_HXX
+#define INCLUDED_COMPHELPER_UNO3_HXX
#include <osl/interlck.h>
#include <rtl/instance.hxx>
@@ -270,6 +270,6 @@ namespace comphelper
} // namespace comphelper
//.........................................................................
-#endif // _COMPHELPER_UNO3_HXX_
+#endif // INCLUDED_COMPHELPER_UNO3_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/unwrapargs.hxx b/include/comphelper/unwrapargs.hxx
index c4885f3883d9..97ef629a31d3 100644
--- a/include/comphelper/unwrapargs.hxx
+++ b/include/comphelper/unwrapargs.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_UNWRAPARGS_HXX_INCLUDED
-#define COMPHELPER_UNWRAPARGS_HXX_INCLUDED
+#ifndef INCLUDED_COMPHELPER_UNWRAPARGS_HXX
+#define INCLUDED_COMPHELPER_UNWRAPARGS_HXX
#include "rtl/ustrbuf.hxx"
#include "com/sun/star/uno/Sequence.hxx"
@@ -133,6 +133,6 @@ BOOST_PP_REPEAT(COMPHELPER_UNWRAPARGS_MAX_ARGS, COMPHELPER_UNWRAPARGS_make, ~)
} // namespace comphelper
-#endif // ! defined(COMPHELPER_UNWRAPARGS_HXX_INCLUDED)
+#endif // ! defined( INCLUDED_COMPHELPER_UNWRAPARGS_HXX)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/weak.hxx b/include/comphelper/weak.hxx
index 126078adbf59..633f334fedba 100644
--- a/include/comphelper/weak.hxx
+++ b/include/comphelper/weak.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 _COMPHELPER_WEAK_HXX_
-#define _COMPHELPER_WEAK_HXX_
+#ifndef INCLUDED_COMPHELPER_WEAK_HXX
+#define INCLUDED_COMPHELPER_WEAK_HXX
#include "comphelper/comphelperdllapi.h"
diff --git a/include/comphelper/weakeventlistener.hxx b/include/comphelper/weakeventlistener.hxx
index 33defc8a36c9..608d75ba3c60 100644
--- a/include/comphelper/weakeventlistener.hxx
+++ b/include/comphelper/weakeventlistener.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPHELPER_WEAKEVENTLISTENER_HXX
-#define COMPHELPER_WEAKEVENTLISTENER_HXX
+#ifndef INCLUDED_COMPHELPER_WEAKEVENTLISTENER_HXX
+#define INCLUDED_COMPHELPER_WEAKEVENTLISTENER_HXX
#include <cppuhelper/compbase1.hxx>
#include <com/sun/star/lang/XComponent.hpp>
@@ -176,7 +176,7 @@ namespace comphelper
} // namespace comphelper
//.........................................................................
-#endif// COMPHELPER_WEAKEVENTLISTENER_HXX
+#endif // INCLUDED_COMPHELPER_WEAKEVENTLISTENER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/xmltools.hxx b/include/comphelper/xmltools.hxx
index d8287dd4a89b..5f5bec9b94ad 100644
--- a/include/comphelper/xmltools.hxx
+++ b/include/comphelper/xmltools.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _XMLCHAFF_HXX
-#define _XMLCHAFF_HXX
+#ifndef INCLUDED_COMPHELPER_XMLTOOLS_HXX
+#define INCLUDED_COMPHELPER_XMLTOOLS_HXX
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>