summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/ucbhelper/activedatasink.hxx6
-rw-r--r--include/ucbhelper/activedatastreamer.hxx6
-rw-r--r--include/ucbhelper/cancelcommandexecution.hxx6
-rw-r--r--include/ucbhelper/commandenvironment.hxx6
-rw-r--r--include/ucbhelper/content.hxx6
-rw-r--r--include/ucbhelper/contenthelper.hxx6
-rw-r--r--include/ucbhelper/contentidentifier.hxx6
-rw-r--r--include/ucbhelper/contentinfo.hxx6
-rw-r--r--include/ucbhelper/fd_inputstream.hxx4
-rw-r--r--include/ucbhelper/fileidentifierconverter.hxx6
-rw-r--r--include/ucbhelper/interactionrequest.hxx6
-rw-r--r--include/ucbhelper/interceptedinteraction.hxx6
-rw-r--r--include/ucbhelper/macros.hxx6
-rw-r--r--include/ucbhelper/propertyvalueset.hxx6
-rw-r--r--include/ucbhelper/providerhelper.hxx6
-rw-r--r--include/ucbhelper/proxydecider.hxx6
-rw-r--r--include/ucbhelper/registerucb.hxx6
-rw-r--r--include/ucbhelper/resultset.hxx6
-rw-r--r--include/ucbhelper/resultsethelper.hxx6
-rw-r--r--include/ucbhelper/resultsetmetadata.hxx6
-rw-r--r--include/ucbhelper/simpleauthenticationrequest.hxx6
-rw-r--r--include/ucbhelper/simplecertificatevalidationrequest.hxx6
-rw-r--r--include/ucbhelper/simpleinteractionrequest.hxx6
-rw-r--r--include/ucbhelper/simpleioerrorrequest.hxx6
-rw-r--r--include/ucbhelper/simplenameclashresolverequest.hxx6
-rw-r--r--include/ucbhelper/std_inputstream.hxx4
-rw-r--r--include/ucbhelper/std_outputstream.hxx4
-rw-r--r--include/ucbhelper/ucbhelperdllapi.h6
-rw-r--r--include/uno/any2.h4
-rw-r--r--include/uno/current_context.h4
-rw-r--r--include/uno/current_context.hxx4
-rw-r--r--include/uno/data.h4
-rw-r--r--include/uno/dispatcher.h4
-rw-r--r--include/uno/environment.h4
-rw-r--r--include/uno/environment.hxx4
-rw-r--r--include/uno/lbnames.h4
-rw-r--r--include/uno/mapping.h4
-rw-r--r--include/uno/mapping.hxx4
-rw-r--r--include/uno/sequence2.h4
-rw-r--r--include/unotest/bootstrapfixturebase.hxx4
-rw-r--r--include/unotest/gettestargument.hxx4
-rw-r--r--include/unotest/officeconnection.hxx4
-rw-r--r--include/unotest/toabsolutefileurl.hxx4
-rw-r--r--include/unotest/uniquepipename.hxx4
-rw-r--r--include/unotools/accessiblerelationsethelper.hxx4
-rw-r--r--include/unotools/accessiblestatesethelper.hxx4
-rw-r--r--include/unotools/atom.hxx4
-rw-r--r--include/unotools/bootstrap.hxx4
-rw-r--r--include/unotools/calendarwrapper.hxx4
-rw-r--r--include/unotools/charclass.hxx6
-rw-r--r--include/unotools/closeveto.hxx6
-rw-r--r--include/unotools/cmdoptions.hxx6
-rw-r--r--include/unotools/collatorwrapper.hxx6
-rw-r--r--include/unotools/compatibility.hxx6
-rw-r--r--include/unotools/componentresmodule.hxx6
-rw-r--r--include/unotools/configitem.hxx6
-rw-r--r--include/unotools/confignode.hxx6
-rw-r--r--include/unotools/configpaths.hxx6
-rw-r--r--include/unotools/configvaluecontainer.hxx6
-rw-r--r--include/unotools/datetime.hxx6
-rw-r--r--include/unotools/defaultoptions.hxx6
-rw-r--r--include/unotools/desktopterminationobserver.hxx6
-rw-r--r--include/unotools/docinfohelper.hxx6
-rw-r--r--include/unotools/dynamicmenuoptions.hxx6
-rw-r--r--include/unotools/eventcfg.hxx6
-rw-r--r--include/unotools/eventlisteneradapter.hxx6
-rw-r--r--include/unotools/extendedsecurityoptions.hxx6
-rw-r--r--include/unotools/fltrcfg.hxx4
-rw-r--r--include/unotools/fontcfg.hxx6
-rw-r--r--include/unotools/fontcvt.hxx6
-rw-r--r--include/unotools/fontdefs.hxx4
-rw-r--r--include/unotools/fontoptions.hxx6
-rw-r--r--include/unotools/historyoptions.hxx6
-rw-r--r--include/unotools/idhelper.hxx6
-rw-r--r--include/unotools/intlwrapper.hxx6
-rw-r--r--include/unotools/itemholderbase.hxx6
-rw-r--r--include/unotools/lingucfg.hxx4
-rw-r--r--include/unotools/linguprops.hxx4
-rw-r--r--include/unotools/localedatawrapper.hxx6
-rw-r--r--include/unotools/localfilehelper.hxx4
-rw-r--r--include/unotools/localisationoptions.hxx6
-rw-r--r--include/unotools/misccfg.hxx4
-rw-r--r--include/unotools/moduleoptions.hxx6
-rw-r--r--include/unotools/nativenumberwrapper.hxx6
-rw-r--r--include/unotools/numberformatcodewrapper.hxx6
-rw-r--r--include/unotools/options.hxx4
-rw-r--r--include/unotools/optionsdlg.hxx4
-rw-r--r--include/unotools/pathoptions.hxx6
-rw-r--r--include/unotools/printwarningoptions.hxx6
-rw-r--r--include/unotools/progresshandlerwrap.hxx6
-rw-r--r--include/unotools/saveopt.hxx4
-rw-r--r--include/unotools/searchopt.hxx4
-rw-r--r--include/unotools/securityoptions.hxx6
-rw-r--r--include/unotools/sharedunocomponent.hxx6
-rw-r--r--include/unotools/streamhelper.hxx4
-rw-r--r--include/unotools/streamsection.hxx6
-rw-r--r--include/unotools/streamwrap.hxx7
-rw-r--r--include/unotools/syslocaleoptions.hxx6
-rw-r--r--include/unotools/tempfile.hxx4
-rw-r--r--include/unotools/textsearch.hxx4
-rw-r--r--include/unotools/transliterationwrapper.hxx4
-rw-r--r--include/unotools/ucbhelper.hxx4
-rw-r--r--include/unotools/ucblockbytes.hxx4
-rw-r--r--include/unotools/ucbstreamhelper.hxx4
-rw-r--r--include/unotools/unotoolsdllapi.h6
-rw-r--r--include/unotools/useroptions.hxx6
-rw-r--r--include/unotools/viewoptions.hxx6
-rw-r--r--include/unotools/xmlaccelcfg.hxx6
108 files changed, 284 insertions, 283 deletions
diff --git a/include/ucbhelper/activedatasink.hxx b/include/ucbhelper/activedatasink.hxx
index f58fef55a4c9..4a98ff186b69 100644
--- a/include/ucbhelper/activedatasink.hxx
+++ b/include/ucbhelper/activedatasink.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UCBHELPER_ACTIVEDATASINK_HXX
-#define _UCBHELPER_ACTIVEDATASINK_HXX
+#ifndef INCLUDED_UCBHELPER_ACTIVEDATASINK_HXX
+#define INCLUDED_UCBHELPER_ACTIVEDATASINK_HXX
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/io/XActiveDataSink.hpp>
@@ -64,6 +64,6 @@ public:
} /* namespace ucbhelper */
-#endif /* !_UCBHELPER_ACTIVEDATASINK_HXX */
+#endif /* ! INCLUDED_UCBHELPER_ACTIVEDATASINK_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/ucbhelper/activedatastreamer.hxx b/include/ucbhelper/activedatastreamer.hxx
index 2f84ff7543e0..621428d7197f 100644
--- a/include/ucbhelper/activedatastreamer.hxx
+++ b/include/ucbhelper/activedatastreamer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UCBHELPER_ACTIVEDATASTREAMER_HXX
-#define _UCBHELPER_ACTIVEDATASTREAMER_HXX
+#ifndef INCLUDED_UCBHELPER_ACTIVEDATASTREAMER_HXX
+#define INCLUDED_UCBHELPER_ACTIVEDATASTREAMER_HXX
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/io/XActiveDataStreamer.hpp>
@@ -59,6 +59,6 @@ public:
} /* namespace ucbhelper */
-#endif /* !_UCBHELPER_ACTIVEDATASTREAMER_HXX */
+#endif /* ! INCLUDED_UCBHELPER_ACTIVEDATASTREAMER_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/ucbhelper/cancelcommandexecution.hxx b/include/ucbhelper/cancelcommandexecution.hxx
index 67e000b33fb3..3d2cfb166eac 100644
--- a/include/ucbhelper/cancelcommandexecution.hxx
+++ b/include/ucbhelper/cancelcommandexecution.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UCBHELPER_CANCELCOMMANDEXECUTION_HXX_
-#define _UCBHELPER_CANCELCOMMANDEXECUTION_HXX_
+#ifndef INCLUDED_UCBHELPER_CANCELCOMMANDEXECUTION_HXX
+#define INCLUDED_UCBHELPER_CANCELCOMMANDEXECUTION_HXX
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Exception.hpp>
@@ -99,6 +99,6 @@ UCBHELPER_DLLPUBLIC void cancelCommandExecution( const com::sun::star::ucb::IOEr
throw( com::sun::star::uno::Exception );
}
-#endif // _UCBHELPER_CANCELCOMMANDEXECUTION_HXX_
+#endif // INCLUDED_UCBHELPER_CANCELCOMMANDEXECUTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/ucbhelper/commandenvironment.hxx b/include/ucbhelper/commandenvironment.hxx
index 01883eee335e..d1d89cc40ad8 100644
--- a/include/ucbhelper/commandenvironment.hxx
+++ b/include/ucbhelper/commandenvironment.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UCBHELPER_COMMANDENVIRONMENT_HXX
-#define _UCBHELPER_COMMANDENVIRONMENT_HXX
+#ifndef INCLUDED_UCBHELPER_COMMANDENVIRONMENT_HXX
+#define INCLUDED_UCBHELPER_COMMANDENVIRONMENT_HXX
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
@@ -89,6 +89,6 @@ public:
} /* namespace ucbhelper */
-#endif /* !_UCBHELPER_COMMANDENVIRONMENT_HXX */
+#endif /* ! INCLUDED_UCBHELPER_COMMANDENVIRONMENT_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/ucbhelper/content.hxx b/include/ucbhelper/content.hxx
index b09680299fce..3308a8e23526 100644
--- a/include/ucbhelper/content.hxx
+++ b/include/ucbhelper/content.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 _UCBHELPER_CONTENT_HXX
-#define _UCBHELPER_CONTENT_HXX
+#ifndef INCLUDED_UCBHELPER_CONTENT_HXX
+#define INCLUDED_UCBHELPER_CONTENT_HXX
#include "rtl/ref.hxx"
#include <com/sun/star/ucb/ContentCreationException.hpp>
@@ -716,6 +716,6 @@ public:
} /* namespace ucbhelper */
-#endif /* !_UCBHELPER_CONTENT_HXX */
+#endif /* ! INCLUDED_UCBHELPER_CONTENT_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx
index e903d97f193a..f89941d6cc1b 100644
--- a/include/ucbhelper/contenthelper.hxx
+++ b/include/ucbhelper/contenthelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UCBHELPER_CONTENTHELPER_HXX
-#define _UCBHELPER_CONTENTHELPER_HXX
+#ifndef INCLUDED_UCBHELPER_CONTENTHELPER_HXX
+#define INCLUDED_UCBHELPER_CONTENTHELPER_HXX
#include <com/sun/star/beans/XPropertyContainer.hpp>
#include <com/sun/star/beans/XPropertiesChangeNotifier.hpp>
@@ -499,6 +499,6 @@ public:
} // namespace ucbhelper
-#endif /* !_UCBHELPER_CONTENTHELPER_HXX */
+#endif /* ! INCLUDED_UCBHELPER_CONTENTHELPER_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/ucbhelper/contentidentifier.hxx b/include/ucbhelper/contentidentifier.hxx
index 4aa5459806f1..16d87b3e08d7 100644
--- a/include/ucbhelper/contentidentifier.hxx
+++ b/include/ucbhelper/contentidentifier.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UCBHELPER_CONTENTIDENTIFIER_HXX
-#define _UCBHELPER_CONTENTIDENTIFIER_HXX
+#ifndef INCLUDED_UCBHELPER_CONTENTIDENTIFIER_HXX
+#define INCLUDED_UCBHELPER_CONTENTIDENTIFIER_HXX
#include <cppuhelper/weak.hxx>
#include <com/sun/star/lang/XTypeProvider.hpp>
@@ -79,6 +79,6 @@ private:
} /* namespace ucbhelper */
-#endif /* !_UCBHELPER_CONTENTIDENTIFIER_HXX */
+#endif /* ! INCLUDED_UCBHELPER_CONTENTIDENTIFIER_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/ucbhelper/contentinfo.hxx b/include/ucbhelper/contentinfo.hxx
index 347c86304359..ca3c5e974868 100644
--- a/include/ucbhelper/contentinfo.hxx
+++ b/include/ucbhelper/contentinfo.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UCBHELPER_CONTENTINFO_HXX
-#define _UCBHELPER_CONTENTINFO_HXX
+#ifndef INCLUDED_UCBHELPER_CONTENTINFO_HXX
+#define INCLUDED_UCBHELPER_CONTENTINFO_HXX
#include <com/sun/star/ucb/XCommandInfo.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
@@ -157,6 +157,6 @@ public:
} // namespace ucbhelper
-#endif /* !_UCBHELPER_CONTENTINFO_HXX */
+#endif /* ! INCLUDED_UCBHELPER_CONTENTINFO_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/ucbhelper/fd_inputstream.hxx b/include/ucbhelper/fd_inputstream.hxx
index 6246af048780..fcb7c4e68c5c 100644
--- a/include/ucbhelper/fd_inputstream.hxx
+++ b/include/ucbhelper/fd_inputstream.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UCBHELPER_FD_INPUTSTREAM_HXX_
-#define _UCBHELPER_FD_INPUTSTREAM_HXX_
+#ifndef INCLUDED_UCBHELPER_FD_INPUTSTREAM_HXX
+#define INCLUDED_UCBHELPER_FD_INPUTSTREAM_HXX
#include <rtl/ustring.hxx>
#include <osl/mutex.hxx>
diff --git a/include/ucbhelper/fileidentifierconverter.hxx b/include/ucbhelper/fileidentifierconverter.hxx
index 052a7413bf93..3b0953cca674 100644
--- a/include/ucbhelper/fileidentifierconverter.hxx
+++ b/include/ucbhelper/fileidentifierconverter.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UCBHELPER_FILEIDENTIFIERCONVERTER_HXX_
-#define _UCBHELPER_FILEIDENTIFIERCONVERTER_HXX_
+#ifndef INCLUDED_UCBHELPER_FILEIDENTIFIERCONVERTER_HXX
+#define INCLUDED_UCBHELPER_FILEIDENTIFIERCONVERTER_HXX
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/RuntimeException.hpp>
@@ -109,6 +109,6 @@ getSystemPathFromFileURL(
}
-#endif // _UCBHELPER_FILEIDENTIFIERCONVERTER_HXX_
+#endif // INCLUDED_UCBHELPER_FILEIDENTIFIERCONVERTER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx
index 6de19931238c..afb144b84d41 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UCBHELPER_INTERATIONREQUEST_HXX
-#define _UCBHELPER_INTERATIONREQUEST_HXX
+#ifndef INCLUDED_UCBHELPER_INTERACTIONREQUEST_HXX
+#define INCLUDED_UCBHELPER_INTERACTIONREQUEST_HXX
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/task/XInteractionRequest.hpp>
@@ -716,6 +716,6 @@ public:
} // namespace ucbhelper
-#endif /* !_UCBHELPER_INTERATIONREQUEST_HXX */
+#endif /* ! INCLUDED_UCBHELPER_INTERACTIONREQUEST_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/ucbhelper/interceptedinteraction.hxx b/include/ucbhelper/interceptedinteraction.hxx
index 28a2c38f3813..06d6ef55f158 100644
--- a/include/ucbhelper/interceptedinteraction.hxx
+++ b/include/ucbhelper/interceptedinteraction.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UCBHELPER_INTERCEPTEDINTERACTION_HXX_
-#define _UCBHELPER_INTERCEPTEDINTERACTION_HXX_
+#ifndef INCLUDED_UCBHELPER_INTERCEPTEDINTERACTION_HXX
+#define INCLUDED_UCBHELPER_INTERCEPTEDINTERACTION_HXX
#include <vector>
@@ -329,6 +329,6 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
} // namespace ucbhelper
-#endif // _UCBHELPER_INTERCEPTEDINTERACTION_HXX_
+#endif // INCLUDED_UCBHELPER_INTERCEPTEDINTERACTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index 2f31e3098545..1c8a7af7635d 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UCBHELPER_MACROS_HXX
-#define _UCBHELPER_MACROS_HXX
+#ifndef INCLUDED_UCBHELPER_MACROS_HXX
+#define INCLUDED_UCBHELPER_MACROS_HXX
#include <sal/types.h>
#include <cppuhelper/queryinterface.hxx>
@@ -756,6 +756,6 @@ Class::getSupportedServiceNames_Static() \
return aSNS; \
}
-#endif /* !_UCBHELPER_MACROS_HXX */
+#endif /* ! INCLUDED_UCBHELPER_MACROS_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx
index 91459e828ef3..ea5aec2cd868 100644
--- a/include/ucbhelper/propertyvalueset.hxx
+++ b/include/ucbhelper/propertyvalueset.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UCBHELPER_PROPERTYVALUESET_HXX
-#define _UCBHELPER_PROPERTYVALUESET_HXX
+#ifndef INCLUDED_UCBHELPER_PROPERTYVALUESET_HXX
+#define INCLUDED_UCBHELPER_PROPERTYVALUESET_HXX
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/sdbc/XColumnLocate.hpp>
@@ -270,6 +270,6 @@ public:
}
-#endif /* !_UCBHELPER_PROPERTYVALUESET_HXX */
+#endif /* ! INCLUDED_UCBHELPER_PROPERTYVALUESET_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx
index 43135a427f18..3f8bf0a7c203 100644
--- a/include/ucbhelper/providerhelper.hxx
+++ b/include/ucbhelper/providerhelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UCBHELPER_PROVIDERHELPER_HXX
-#define _UCBHELPER_PROVIDERHELPER_HXX
+#ifndef INCLUDED_UCBHELPER_PROVIDERHELPER_HXX
+#define INCLUDED_UCBHELPER_PROVIDERHELPER_HXX
#include <list>
#include <com/sun/star/ucb/XContentProvider.hpp>
@@ -271,6 +271,6 @@ public:
} // namespace ucbhelper
-#endif /* !_UCBHELPER_PROVIDERHELPER_HXX */
+#endif /* ! INCLUDED_UCBHELPER_PROVIDERHELPER_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/ucbhelper/proxydecider.hxx b/include/ucbhelper/proxydecider.hxx
index e3ec58180a00..b1525af573fb 100644
--- a/include/ucbhelper/proxydecider.hxx
+++ b/include/ucbhelper/proxydecider.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UCBHELPER_PROXYDECIDER_HXX
-#define _UCBHELPER_PROXYDECIDER_HXX
+#ifndef INCLUDED_UCBHELPER_PROXYDECIDER_HXX
+#define INCLUDED_UCBHELPER_PROXYDECIDER_HXX
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Reference.hxx>
@@ -133,6 +133,6 @@ private:
} // namespace ucbhelper
-#endif /* !_UCBHELPER_PROXYDECIDER_HXX */
+#endif /* ! INCLUDED_UCBHELPER_PROXYDECIDER_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/ucbhelper/registerucb.hxx b/include/ucbhelper/registerucb.hxx
index b50d2f6165da..fe4a1acc9070 100644
--- a/include/ucbhelper/registerucb.hxx
+++ b/include/ucbhelper/registerucb.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UCBHELPER_REGISTERUCB_HXX_
-#define _UCBHELPER_REGISTERUCB_HXX_
+#ifndef INCLUDED_UCBHELPER_REGISTERUCB_HXX
+#define INCLUDED_UCBHELPER_REGISTERUCB_HXX
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/uno/Reference.h>
@@ -101,6 +101,6 @@ UCBHELPER_DLLPUBLIC bool registerAtUcb(
throw (com::sun::star::uno::RuntimeException);
}
-#endif // _UCBHELPER_REGISTERUCB_HXX_
+#endif // INCLUDED_UCBHELPER_REGISTERUCB_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index 36f51108c131..8efb26d8c4ac 100644
--- a/include/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UCBHELPER_RESULTSET_HXX
-#define _UCBHELPER_RESULTSET_HXX
+#ifndef INCLUDED_UCBHELPER_RESULTSET_HXX
+#define INCLUDED_UCBHELPER_RESULTSET_HXX
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -568,6 +568,6 @@ public:
}
-#endif /* !_UCBHELPER_RESULTSET_HXX */
+#endif /* ! INCLUDED_UCBHELPER_RESULTSET_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx
index 80dd0581652d..411124d2965a 100644
--- a/include/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UCBHELPER_RESULTSETHELPER_HXX
-#define _UCBHELPER_RESULTSETHELPER_HXX
+#ifndef INCLUDED_UCBHELPER_RESULTSETHELPER_HXX
+#define INCLUDED_UCBHELPER_RESULTSETHELPER_HXX
#include <osl/mutex.hxx>
#include <com/sun/star/lang/XTypeProvider.hpp>
@@ -199,6 +199,6 @@ public:
}
-#endif /* !_UCBHELPER_RESULTSETHELPER_HXX */
+#endif /* ! INCLUDED_UCBHELPER_RESULTSETHELPER_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx
index 35996657553a..7497df5edc71 100644
--- a/include/ucbhelper/resultsetmetadata.hxx
+++ b/include/ucbhelper/resultsetmetadata.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UCBHELPER_RESULTSETMETADATA_HXX
-#define _UCBHELPER_RESULTSETMETADATA_HXX
+#ifndef INCLUDED_UCBHELPER_RESULTSETMETADATA_HXX
+#define INCLUDED_UCBHELPER_RESULTSETMETADATA_HXX
#include <vector>
#include <com/sun/star/uno/Reference.hxx>
@@ -465,6 +465,6 @@ public:
} // namespace ucbhelper
-#endif /* !_UCBHELPER_RESULTSETMETADATA_HXX */
+#endif /* ! INCLUDED_UCBHELPER_RESULTSETMETADATA_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/ucbhelper/simpleauthenticationrequest.hxx b/include/ucbhelper/simpleauthenticationrequest.hxx
index 7a084265003c..40a41f4baeff 100644
--- a/include/ucbhelper/simpleauthenticationrequest.hxx
+++ b/include/ucbhelper/simpleauthenticationrequest.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UCBHELPER_SIMPLEAUTHENTICATIONREQUEST_HXX
-#define _UCBHELPER_SIMPLEAUTHENTICATIONREQUEST_HXX
+#ifndef INCLUDED_UCBHELPER_SIMPLEAUTHENTICATIONREQUEST_HXX
+#define INCLUDED_UCBHELPER_SIMPLEAUTHENTICATIONREQUEST_HXX
#include <rtl/ref.hxx>
#include <ucbhelper/interactionrequest.hxx>
@@ -144,6 +144,6 @@ public:
} // namespace ucbhelper
-#endif /* !_UCBHELPER_SIMPLEAUTHENTICATIONREQUEST_HXX */
+#endif /* ! INCLUDED_UCBHELPER_SIMPLEAUTHENTICATIONREQUEST_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/ucbhelper/simplecertificatevalidationrequest.hxx b/include/ucbhelper/simplecertificatevalidationrequest.hxx
index 3f761153582b..078bf2606353 100644
--- a/include/ucbhelper/simplecertificatevalidationrequest.hxx
+++ b/include/ucbhelper/simplecertificatevalidationrequest.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UCBHELPER_SIMPLECERTIFICATEVALIDATIONREQUEST_HXX
-#define _UCBHELPER_SIMPLECERTIFICATEVALIDATIONREQUEST_HXX
+#ifndef INCLUDED_UCBHELPER_SIMPLECERTIFICATEVALIDATIONREQUEST_HXX
+#define INCLUDED_UCBHELPER_SIMPLECERTIFICATEVALIDATIONREQUEST_HXX
#include <rtl/ref.hxx>
#include <ucbhelper/interactionrequest.hxx>
@@ -58,6 +58,6 @@ public:
} // namespace ucbhelper
-#endif /* !_UCBHELPER_SIMPLECERTIFICATEVALIDATIONREQUEST_HXX */
+#endif /* ! INCLUDED_UCBHELPER_SIMPLECERTIFICATEVALIDATIONREQUEST_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/ucbhelper/simpleinteractionrequest.hxx b/include/ucbhelper/simpleinteractionrequest.hxx
index 746aaf284bd6..11ba26e94ccb 100644
--- a/include/ucbhelper/simpleinteractionrequest.hxx
+++ b/include/ucbhelper/simpleinteractionrequest.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UCBHELPER_SIMPLEINTERACTIONREQUEST_HXX
-#define _UCBHELPER_SIMPLEINTERACTIONREQUEST_HXX
+#ifndef INCLUDED_UCBHELPER_SIMPLEINTERACTIONREQUEST_HXX
+#define INCLUDED_UCBHELPER_SIMPLEINTERACTIONREQUEST_HXX
#include <ucbhelper/interactionrequest.hxx>
#include "ucbhelper/ucbhelperdllapi.h"
@@ -85,6 +85,6 @@ public:
} // namespace ucbhelper
-#endif /* !_UCBHELPER_SIMPLEINTERACTIONREQUEST_HXX */
+#endif /* ! INCLUDED_UCBHELPER_SIMPLEINTERACTIONREQUEST_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/ucbhelper/simpleioerrorrequest.hxx b/include/ucbhelper/simpleioerrorrequest.hxx
index d4c9c5277316..87ce17c45a74 100644
--- a/include/ucbhelper/simpleioerrorrequest.hxx
+++ b/include/ucbhelper/simpleioerrorrequest.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UCBHELPER_SIMPLEIOERRORREQUEST_HXX
-#define _UCBHELPER_SIMPLEIOERRORREQUEST_HXX
+#ifndef INCLUDED_UCBHELPER_SIMPLEIOERRORREQUEST_HXX
+#define INCLUDED_UCBHELPER_SIMPLEIOERRORREQUEST_HXX
#include <com/sun/star/ucb/IOErrorCode.hpp>
#include <ucbhelper/interactionrequest.hxx>
@@ -64,6 +64,6 @@ public:
} // namespace ucbhelper
-#endif /* !_UCBHELPER_SIMPLEIOERRORREQUEST_HXX */
+#endif /* ! INCLUDED_UCBHELPER_SIMPLEIOERRORREQUEST_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/ucbhelper/simplenameclashresolverequest.hxx b/include/ucbhelper/simplenameclashresolverequest.hxx
index be789fd6a148..512775bd3ab7 100644
--- a/include/ucbhelper/simplenameclashresolverequest.hxx
+++ b/include/ucbhelper/simplenameclashresolverequest.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UCBHELPER_SIMPLENAMECLASHRESOLVEREQUEST_HXX
-#define _UCBHELPER_SIMPLENAMECLASHRESOLVEREQUEST_HXX
+#ifndef INCLUDED_UCBHELPER_SIMPLENAMECLASHRESOLVEREQUEST_HXX
+#define INCLUDED_UCBHELPER_SIMPLENAMECLASHRESOLVEREQUEST_HXX
#include <rtl/ref.hxx>
#include <ucbhelper/interactionrequest.hxx>
@@ -72,6 +72,6 @@ public:
} // namespace ucbhelper
-#endif /* !_UCBHELPER_SIMPLENAMECLASHRESOLVEREQUEST_HXX */
+#endif /* ! INCLUDED_UCBHELPER_SIMPLENAMECLASHRESOLVEREQUEST_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/ucbhelper/std_inputstream.hxx b/include/ucbhelper/std_inputstream.hxx
index 92c9577519bc..a9dc2163dd5b 100644
--- a/include/ucbhelper/std_inputstream.hxx
+++ b/include/ucbhelper/std_inputstream.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _UCBHELPER_STD_INPUTSTREAM_HXX_
-#define _UCBHELPER_STD_INPUTSTREAM_HXX_
+#ifndef INCLUDED_UCBHELPER_STD_INPUTSTREAM_HXX
+#define INCLUDED_UCBHELPER_STD_INPUTSTREAM_HXX
#include <boost/shared_ptr.hpp>
#include <istream>
diff --git a/include/ucbhelper/std_outputstream.hxx b/include/ucbhelper/std_outputstream.hxx
index d0ad4a660248..9631b98d740c 100644
--- a/include/ucbhelper/std_outputstream.hxx
+++ b/include/ucbhelper/std_outputstream.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _UCBHELPER_STD_OUTPUTSTREAM_HXX_
-#define _UCBHELPER_STD_OUTPUTSTREAM_HXX_
+#ifndef INCLUDED_UCBHELPER_STD_OUTPUTSTREAM_HXX
+#define INCLUDED_UCBHELPER_STD_OUTPUTSTREAM_HXX
#include <boost/shared_ptr.hpp>
#include <ostream>
diff --git a/include/ucbhelper/ucbhelperdllapi.h b/include/ucbhelper/ucbhelperdllapi.h
index b129f163de8f..94522acb98c5 100644
--- a/include/ucbhelper/ucbhelperdllapi.h
+++ b/include/ucbhelper/ucbhelperdllapi.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UCBHELPERDLLAPI_H
-#define INCLUDED_UCBHELPERDLLAPI_H
+#ifndef INCLUDED_UCBHELPER_UCBHELPERDLLAPI_H
+#define INCLUDED_UCBHELPER_UCBHELPERDLLAPI_H
#include "sal/types.h"
@@ -29,6 +29,6 @@
#endif
#define UCBHELPER_DLLPRIVATE SAL_DLLPRIVATE
-#endif /* INCLUDED_UCBHELPERDLLAPI_H */
+#endif // INCLUDED_UCBHELPER_UCBHELPERDLLAPI_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/uno/any2.h b/include/uno/any2.h
index e18087a165e5..49a0d35e4c8b 100644
--- a/include/uno/any2.h
+++ b/include/uno/any2.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 _UNO_ANY2_H_
-#define _UNO_ANY2_H_
+#ifndef INCLUDED_UNO_ANY2_H
+#define INCLUDED_UNO_ANY2_H
#include <cppu/cppudllapi.h>
#include <uno/data.h>
diff --git a/include/uno/current_context.h b/include/uno/current_context.h
index 18adfe84b45e..7dbb41452888 100644
--- a/include/uno/current_context.h
+++ b/include/uno/current_context.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 _UNO_CURRENT_CONTEXT_H_
-#define _UNO_CURRENT_CONTEXT_H_
+#ifndef INCLUDED_UNO_CURRENT_CONTEXT_H
+#define INCLUDED_UNO_CURRENT_CONTEXT_H
#include <cppu/cppudllapi.h>
#include <rtl/ustring.h>
diff --git a/include/uno/current_context.hxx b/include/uno/current_context.hxx
index dbade9c04cca..3019006e4e33 100644
--- a/include/uno/current_context.hxx
+++ b/include/uno/current_context.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 _UNO_CURRENT_CONTEXT_HXX_
-#define _UNO_CURRENT_CONTEXT_HXX_
+#ifndef INCLUDED_UNO_CURRENT_CONTEXT_HXX
+#define INCLUDED_UNO_CURRENT_CONTEXT_HXX
#include <uno/current_context.h>
diff --git a/include/uno/data.h b/include/uno/data.h
index 9454ba9012d5..ea3ab5f3b277 100644
--- a/include/uno/data.h
+++ b/include/uno/data.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 _UNO_DATA_H_
-#define _UNO_DATA_H_
+#ifndef INCLUDED_UNO_DATA_H
+#define INCLUDED_UNO_DATA_H
#include <cppu/cppudllapi.h>
diff --git a/include/uno/dispatcher.h b/include/uno/dispatcher.h
index 4008f7c1e360..058ad964ccf7 100644
--- a/include/uno/dispatcher.h
+++ b/include/uno/dispatcher.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 _UNO_DISPATCHER_H_
-#define _UNO_DISPATCHER_H_
+#ifndef INCLUDED_UNO_DISPATCHER_H
+#define INCLUDED_UNO_DISPATCHER_H
#include <sal/types.h>
#include <rtl/ustring.h>
diff --git a/include/uno/environment.h b/include/uno/environment.h
index 35933ef956f5..f9ab4e68cae9 100644
--- a/include/uno/environment.h
+++ b/include/uno/environment.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 _UNO_ENVIRONMENT_H_
-#define _UNO_ENVIRONMENT_H_
+#ifndef INCLUDED_UNO_ENVIRONMENT_H
+#define INCLUDED_UNO_ENVIRONMENT_H
#include <cppu/cppudllapi.h>
#include <rtl/ustring.h>
diff --git a/include/uno/environment.hxx b/include/uno/environment.hxx
index 272a069d331f..48c28504a5cd 100644
--- a/include/uno/environment.hxx
+++ b/include/uno/environment.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 _UNO_ENVIRONMENT_HXX_
-#define _UNO_ENVIRONMENT_HXX_
+#ifndef INCLUDED_UNO_ENVIRONMENT_HXX
+#define INCLUDED_UNO_ENVIRONMENT_HXX
#include <rtl/alloc.h>
#include <rtl/ustring.hxx>
diff --git a/include/uno/lbnames.h b/include/uno/lbnames.h
index dcae196ece60..bc2afa6cccbd 100644
--- a/include/uno/lbnames.h
+++ b/include/uno/lbnames.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 _UNO_LBNAMES_H_
-#define _UNO_LBNAMES_H_
+#ifndef INCLUDED_UNO_LBNAMES_H
+#define INCLUDED_UNO_LBNAMES_H
/* I assume "LB" means "Language Binding" */
diff --git a/include/uno/mapping.h b/include/uno/mapping.h
index fd6c4527c058..7673514e0a2d 100644
--- a/include/uno/mapping.h
+++ b/include/uno/mapping.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 _UNO_MAPPING_H_
-#define _UNO_MAPPING_H_
+#ifndef INCLUDED_UNO_MAPPING_H
+#define INCLUDED_UNO_MAPPING_H
#include <cppu/cppudllapi.h>
#include <rtl/ustring.h>
diff --git a/include/uno/mapping.hxx b/include/uno/mapping.hxx
index 4c9d4e9c694e..7d3bf396d1df 100644
--- a/include/uno/mapping.hxx
+++ b/include/uno/mapping.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 _UNO_MAPPING_HXX_
-#define _UNO_MAPPING_HXX_
+#ifndef INCLUDED_UNO_MAPPING_HXX
+#define INCLUDED_UNO_MAPPING_HXX
#include <cppu/macros.hxx>
#include <rtl/alloc.h>
diff --git a/include/uno/sequence2.h b/include/uno/sequence2.h
index 304eefc9f746..42208f0f8bab 100644
--- a/include/uno/sequence2.h
+++ b/include/uno/sequence2.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 _UNO_SEQUENCE2_H_
-#define _UNO_SEQUENCE2_H_
+#ifndef INCLUDED_UNO_SEQUENCE2_H
+#define INCLUDED_UNO_SEQUENCE2_H
#include <cppu/cppudllapi.h>
#include <uno/data.h>
diff --git a/include/unotest/bootstrapfixturebase.hxx b/include/unotest/bootstrapfixturebase.hxx
index 3753350f7e21..556204becc61 100644
--- a/include/unotest/bootstrapfixturebase.hxx
+++ b/include/unotest/bootstrapfixturebase.hxx
@@ -6,8 +6,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_UNOUNOTEST_BOOTSTRAPFIXTUREBASE_HXX
-#define INCLUDED_UNOUNOTEST_BOOTSTRAPFIXTUREBASE_HXX
+#ifndef INCLUDED_UNOTEST_BOOTSTRAPFIXTUREBASE_HXX
+#define INCLUDED_UNOTEST_BOOTSTRAPFIXTUREBASE_HXX
#include <sal/config.h>
diff --git a/include/unotest/gettestargument.hxx b/include/unotest/gettestargument.hxx
index 3364c5666600..5fe9ae5394f9 100644
--- a/include/unotest/gettestargument.hxx
+++ b/include/unotest/gettestargument.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_TEST_GETTESTARGUMENT_HXX
-#define INCLUDED_TEST_GETTESTARGUMENT_HXX
+#ifndef INCLUDED_UNOTEST_GETTESTARGUMENT_HXX
+#define INCLUDED_UNOTEST_GETTESTARGUMENT_HXX
#include "sal/config.h"
diff --git a/include/unotest/officeconnection.hxx b/include/unotest/officeconnection.hxx
index edef6628ab3a..edfafc5f1470 100644
--- a/include/unotest/officeconnection.hxx
+++ b/include/unotest/officeconnection.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_TEST_OFFICECONNECTION_HXX
-#define INCLUDED_TEST_OFFICECONNECTION_HXX
+#ifndef INCLUDED_UNOTEST_OFFICECONNECTION_HXX
+#define INCLUDED_UNOTEST_OFFICECONNECTION_HXX
#include "sal/config.h"
diff --git a/include/unotest/toabsolutefileurl.hxx b/include/unotest/toabsolutefileurl.hxx
index 1f68c665ed33..adbe7d8b2c0f 100644
--- a/include/unotest/toabsolutefileurl.hxx
+++ b/include/unotest/toabsolutefileurl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_TEST_TOABSOLUTEFILEURL_HXX
-#define INCLUDED_TEST_TOABSOLUTEFILEURL_HXX
+#ifndef INCLUDED_UNOTEST_TOABSOLUTEFILEURL_HXX
+#define INCLUDED_UNOTEST_TOABSOLUTEFILEURL_HXX
#include "sal/config.h"
diff --git a/include/unotest/uniquepipename.hxx b/include/unotest/uniquepipename.hxx
index 732856228d6a..d67888ad98b3 100644
--- a/include/unotest/uniquepipename.hxx
+++ b/include/unotest/uniquepipename.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_TEST_UNIQUEPIPENAME_HXX
-#define INCLUDED_TEST_UNIQUEPIPENAME_HXX
+#ifndef INCLUDED_UNOTEST_UNIQUEPIPENAME_HXX
+#define INCLUDED_UNOTEST_UNIQUEPIPENAME_HXX
#include "sal/config.h"
diff --git a/include/unotools/accessiblerelationsethelper.hxx b/include/unotools/accessiblerelationsethelper.hxx
index 7135008f9d6e..2d4fb57ab42e 100644
--- a/include/unotools/accessiblerelationsethelper.hxx
+++ b/include/unotools/accessiblerelationsethelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UTL_ACCESSIBLERELATIONSETHELPER_HXX_
-#define _UTL_ACCESSIBLERELATIONSETHELPER_HXX_
+#ifndef INCLUDED_UNOTOOLS_ACCESSIBLERELATIONSETHELPER_HXX
+#define INCLUDED_UNOTOOLS_ACCESSIBLERELATIONSETHELPER_HXX
#include "unotools/unotoolsdllapi.h"
diff --git a/include/unotools/accessiblestatesethelper.hxx b/include/unotools/accessiblestatesethelper.hxx
index 60470e8eb6a9..4e4622b0c9b0 100644
--- a/include/unotools/accessiblestatesethelper.hxx
+++ b/include/unotools/accessiblestatesethelper.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 _UTL_ACCESSIBLESTATESETHELPER_HXX_
-#define _UTL_ACCESSIBLESTATESETHELPER_HXX_
+#ifndef INCLUDED_UNOTOOLS_ACCESSIBLESTATESETHELPER_HXX
+#define INCLUDED_UNOTOOLS_ACCESSIBLESTATESETHELPER_HXX
#include "unotools/unotoolsdllapi.h"
diff --git a/include/unotools/atom.hxx b/include/unotools/atom.hxx
index 5b8f193d604f..b9ca11e6bda7 100644
--- a/include/unotools/atom.hxx
+++ b/include/unotools/atom.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 _UTL_ATOM_HXX_
-#define _UTL_ATOM_HXX_
+#ifndef INCLUDED_UNOTOOLS_ATOM_HXX
+#define INCLUDED_UNOTOOLS_ATOM_HXX
#include "unotools/unotoolsdllapi.h"
#include <rtl/ustring.hxx>
diff --git a/include/unotools/bootstrap.hxx b/include/unotools/bootstrap.hxx
index ebbe582127bd..93d009a857a3 100644
--- a/include/unotools/bootstrap.hxx
+++ b/include/unotools/bootstrap.hxx
@@ -18,8 +18,8 @@
*/
#include "unotools/unotoolsdllapi.h"
-#ifndef _UTL_BOOTSTRAP_HXX
-#define _UTL_BOOTSTRAP_HXX
+#ifndef INCLUDED_UNOTOOLS_BOOTSTRAP_HXX
+#define INCLUDED_UNOTOOLS_BOOTSTRAP_HXX
#include <rtl/ustring.hxx>
diff --git a/include/unotools/calendarwrapper.hxx b/include/unotools/calendarwrapper.hxx
index 2f3c48f4cc23..ff9c4f67a290 100644
--- a/include/unotools/calendarwrapper.hxx
+++ b/include/unotools/calendarwrapper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UNOTOOLS_CALENDARWRAPPER_HXX
-#define _UNOTOOLS_CALENDARWRAPPER_HXX
+#ifndef INCLUDED_UNOTOOLS_CALENDARWRAPPER_HXX
+#define INCLUDED_UNOTOOLS_CALENDARWRAPPER_HXX
#include <tools/datetime.hxx>
#include <com/sun/star/uno/Reference.hxx>
diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx
index 230a5b2c5057..f86f47b49be4 100644
--- a/include/unotools/charclass.hxx
+++ b/include/unotools/charclass.hxx
@@ -19,8 +19,8 @@
#include "unotools/unotoolsdllapi.h"
-#ifndef _UNOTOOLS_CHARCLASS_HXX
-#define _UNOTOOLS_CHARCLASS_HXX
+#ifndef INCLUDED_UNOTOOLS_CHARCLASS_HXX
+#define INCLUDED_UNOTOOLS_CHARCLASS_HXX
#include <boost/noncopyable.hpp>
#include <i18nlangtag/languagetag.hxx>
@@ -222,6 +222,6 @@ private:
const ::com::sun::star::lang::Locale & getMyLocale() const;
};
-#endif // _UNOTOOLS_CHARCLASS_HXX
+#endif // INCLUDED_UNOTOOLS_CHARCLASS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/closeveto.hxx b/include/unotools/closeveto.hxx
index 21d381c5094b..aa03500bf509 100644
--- a/include/unotools/closeveto.hxx
+++ b/include/unotools/closeveto.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef UNOTOOLS_CLOSEVETO_HXX
-#define UNOTOOLS_CLOSEVETO_HXX
+#ifndef INCLUDED_UNOTOOLS_CLOSEVETO_HXX
+#define INCLUDED_UNOTOOLS_CLOSEVETO_HXX
#include "unotools/unotoolsdllapi.h"
@@ -55,6 +55,6 @@ namespace utl
} // namespace dbaui
//......................................................................................................................
-#endif // UNOTOOLS_CLOSEVETO_HXX
+#endif // INCLUDED_UNOTOOLS_CLOSEVETO_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/cmdoptions.hxx b/include/unotools/cmdoptions.hxx
index a11aa1ca1e77..c00e2d1807fa 100644
--- a/include/unotools/cmdoptions.hxx
+++ b/include/unotools/cmdoptions.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_unotools_CMDOPTIONS_HXX
-#define INCLUDED_unotools_CMDOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_CMDOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_CMDOPTIONS_HXX
#include "unotools/unotoolsdllapi.h"
#include <sal/types.h>
@@ -162,6 +162,6 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtCommandOptions : public utl::detail:
}; // class SvtCmdOptions
-#endif // #ifndef INCLUDED_unotools_CMDOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_CMDOPTIONS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/collatorwrapper.hxx b/include/unotools/collatorwrapper.hxx
index c73be3518569..fbc645167957 100644
--- a/include/unotools/collatorwrapper.hxx
+++ b/include/unotools/collatorwrapper.hxx
@@ -18,8 +18,8 @@
*/
#include "unotools/unotoolsdllapi.h"
-#ifndef _UNOTOOLS_COLLATORWRAPPER_HXX
-#define _UNOTOOLS_COLLATORWRAPPER_HXX
+#ifndef INCLUDED_UNOTOOLS_COLLATORWRAPPER_HXX
+#define INCLUDED_UNOTOOLS_COLLATORWRAPPER_HXX
#include <com/sun/star/i18n/XCollator.hpp>
@@ -69,6 +69,6 @@ class UNOTOOLS_DLLPUBLIC CollatorWrapper
CollatorWrapper();
};
-#endif /* _UNOTOOLS_COLLATORWRAPPER_HXX */
+#endif // INCLUDED_UNOTOOLS_COLLATORWRAPPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/compatibility.hxx b/include/unotools/compatibility.hxx
index 18c97ae2e14f..3e1b974a1c18 100644
--- a/include/unotools/compatibility.hxx
+++ b/include/unotools/compatibility.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_unotools_COMPATIBILITY_HXX
-#define INCLUDED_unotools_COMPATIBILITY_HXX
+#ifndef INCLUDED_UNOTOOLS_COMPATIBILITY_HXX
+#define INCLUDED_UNOTOOLS_COMPATIBILITY_HXX
#include "unotools/unotoolsdllapi.h"
#include <sal/types.h>
@@ -235,6 +235,6 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options
}; // class SvtCompatibilityOptions
-#endif // #ifndef INCLUDED_unotools_COMPATIBILITY_HXX
+#endif // INCLUDED_UNOTOOLS_COMPATIBILITY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/componentresmodule.hxx b/include/unotools/componentresmodule.hxx
index 92116cb71db2..64f4c886fa30 100644
--- a/include/unotools/componentresmodule.hxx
+++ b/include/unotools/componentresmodule.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 UNOTOOLS_INC_UNOTOOLS_COMPONENTRESMODULE_HXX
-#define UNOTOOLS_INC_UNOTOOLS_COMPONENTRESMODULE_HXX
+#ifndef INCLUDED_UNOTOOLS_COMPONENTRESMODULE_HXX
+#define INCLUDED_UNOTOOLS_COMPONENTRESMODULE_HXX
#include <comphelper/componentmodule.hxx>
#include <unotools/unotoolsdllapi.h>
@@ -175,6 +175,6 @@ namespace utl
} // namespace utl
//........................................................................
-#endif // UNOTOOLS_INC_UNOTOOLS_COMPONENTRESMODULE_HXX
+#endif // INCLUDED_UNOTOOLS_COMPONENTRESMODULE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx
index f9427229957f..552da5f435c3 100644
--- a/include/unotools/configitem.hxx
+++ b/include/unotools/configitem.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UTL_CONFIGITEM_HXX_
-#define _UTL_CONFIGITEM_HXX_
+#ifndef INCLUDED_UNOTOOLS_CONFIGITEM_HXX
+#define INCLUDED_UNOTOOLS_CONFIGITEM_HXX
#include <sal/types.h>
#include <rtl/ustring.hxx>
@@ -179,6 +179,6 @@ namespace utl
sal_Bool IsValidConfigMgr() const;
};
}//namespace utl
-#endif //_UTL_CONFIGITEM_HXX_
+#endif // INCLUDED_UNOTOOLS_CONFIGITEM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx
index 60f749664952..a2240a3d3ac7 100644
--- a/include/unotools/confignode.hxx
+++ b/include/unotools/confignode.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 _UNOTOOLS_CONFIGNODE_HXX_
-#define _UNOTOOLS_CONFIGNODE_HXX_
+#ifndef INCLUDED_UNOTOOLS_CONFIGNODE_HXX
+#define INCLUDED_UNOTOOLS_CONFIGNODE_HXX
#include "unotools/unotoolsdllapi.h"
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
@@ -320,6 +320,6 @@ namespace utl
} // namespace utl
//........................................................................
-#endif // _UNOTOOLS_CONFIGNODE_HXX_
+#endif // INCLUDED_UNOTOOLS_CONFIGNODE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/configpaths.hxx b/include/unotools/configpaths.hxx
index d3e400ae1158..1e46a43de410 100644
--- a/include/unotools/configpaths.hxx
+++ b/include/unotools/configpaths.hxx
@@ -18,8 +18,8 @@
*/
#include "unotools/unotoolsdllapi.h"
-#ifndef UNOTOOLS_CONFIGPATHS_HXX_INCLUDED
-#define UNOTOOLS_CONFIGPATHS_HXX_INCLUDED
+#ifndef INCLUDED_UNOTOOLS_CONFIGPATHS_HXX
+#define INCLUDED_UNOTOOLS_CONFIGPATHS_HXX
#include <sal/types.h>
#include <rtl/ustring.hxx>
@@ -165,6 +165,6 @@ namespace utl
} // namespace utl
//----------------------------------------------------------------------------
-#endif // UNOTOOLS_CONFIGPATHS_HXX_INCLUDED
+#endif // INCLUDED_UNOTOOLS_CONFIGPATHS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/configvaluecontainer.hxx b/include/unotools/configvaluecontainer.hxx
index 2fa95c337bd0..c510d0faf9f0 100644
--- a/include/unotools/configvaluecontainer.hxx
+++ b/include/unotools/configvaluecontainer.hxx
@@ -18,8 +18,8 @@
*/
#include "unotools/unotoolsdllapi.h"
-#ifndef UNOTOOLS_CONFIGVALUECONTAINER_HXX
-#define UNOTOOLS_CONFIGVALUECONTAINER_HXX
+#ifndef INCLUDED_UNOTOOLS_CONFIGVALUECONTAINER_HXX
+#define INCLUDED_UNOTOOLS_CONFIGVALUECONTAINER_HXX
#include <com/sun/star/uno/XComponentContext.hpp>
#include <osl/mutex.hxx>
@@ -178,6 +178,6 @@ namespace utl
} // namespace utl
//.........................................................................
-#endif // UNOTOOLS_CONFIGVALUECONTAINER_HXX
+#endif // INCLUDED_UNOTOOLS_CONFIGVALUECONTAINER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/datetime.hxx b/include/unotools/datetime.hxx
index dfc0ab139825..bca409dafe35 100644
--- a/include/unotools/datetime.hxx
+++ b/include/unotools/datetime.hxx
@@ -20,8 +20,8 @@
//= conversions UNO3.TimeClass <-> Tools.TimeClass (Date/Time/DateTime)
#include "unotools/unotoolsdllapi.h"
-#ifndef _UNOTOOLS_DATETIME_HXX_
-#define _UNOTOOLS_DATETIME_HXX_
+#ifndef INCLUDED_UNOTOOLS_DATETIME_HXX
+#define INCLUDED_UNOTOOLS_DATETIME_HXX
#include <com/sun/star/util/Date.hpp>
#include <com/sun/star/util/Time.hpp>
@@ -54,6 +54,6 @@ namespace utl
} // namespace utl
//.........................................................................
-#endif // _UNOTOOLS_DATETIME_HXX_
+#endif // INCLUDED_UNOTOOLS_DATETIME_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/defaultoptions.hxx b/include/unotools/defaultoptions.hxx
index 692c1463010e..08063f8023d8 100644
--- a/include/unotools/defaultoptions.hxx
+++ b/include/unotools/defaultoptions.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_unotools_DEFAULTOPTIONS_HXX
-#define INCLUDED_unotools_DEFAULTOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_DEFAULTOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_DEFAULTOPTIONS_HXX
#include "unotools/unotoolsdllapi.h"
#include <rtl/ustring.hxx>
@@ -42,6 +42,6 @@ public:
OUString GetDefaultPath( sal_uInt16 nId ) const;
};
-#endif // #ifndef INCLUDED_unotools_DEFAULTOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_DEFAULTOPTIONS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/desktopterminationobserver.hxx b/include/unotools/desktopterminationobserver.hxx
index 786105efe142..9f637fa954d7 100644
--- a/include/unotools/desktopterminationobserver.hxx
+++ b/include/unotools/desktopterminationobserver.hxx
@@ -18,8 +18,8 @@
*/
#include "unotools/unotoolsdllapi.h"
-#ifndef UNOTOOLS_INC_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX
-#define UNOTOOLS_INC_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX
+#ifndef INCLUDED_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX
+#define INCLUDED_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX
//........................................................................
namespace utl
@@ -67,6 +67,6 @@ namespace utl
} // namespace utl
//........................................................................
-#endif // UNOTOOLS_INC_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX
+#endif // INCLUDED_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/docinfohelper.hxx b/include/unotools/docinfohelper.hxx
index be32c3bfc7c9..c82dac3ea8e2 100644
--- a/include/unotools/docinfohelper.hxx
+++ b/include/unotools/docinfohelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UNOTOOLS_DOCINFOHELPER_HXX_
-#define _UNOTOOLS_DOCINFOHELPER_HXX_
+#ifndef INCLUDED_UNOTOOLS_DOCINFOHELPER_HXX
+#define INCLUDED_UNOTOOLS_DOCINFOHELPER_HXX
#include <unotools/unotoolsdllapi.h>
#include <rtl/ustring.hxx>
@@ -35,6 +35,6 @@ public:
} // namespace utl
-#endif // _UNOTOOLS_DOCINFOHELPER_HXX_
+#endif // INCLUDED_UNOTOOLS_DOCINFOHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/dynamicmenuoptions.hxx b/include/unotools/dynamicmenuoptions.hxx
index 91784e5d91f8..ac6f9e7f4133 100644
--- a/include/unotools/dynamicmenuoptions.hxx
+++ b/include/unotools/dynamicmenuoptions.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_unotools_DYNAMICMENUOPTIONS_HXX
-#define INCLUDED_unotools_DYNAMICMENUOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_DYNAMICMENUOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_DYNAMICMENUOPTIONS_HXX
#include "unotools/unotoolsdllapi.h"
#include <sal/types.h>
@@ -133,6 +133,6 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtDynamicMenuOptions : public utl::det
}; // class SvtDynamicMenuOptions
-#endif // #ifndef INCLUDED_unotools_DYNAMICMENUOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_DYNAMICMENUOPTIONS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/eventcfg.hxx b/include/unotools/eventcfg.hxx
index 2ea72642805a..5feb640f8718 100644
--- a/include/unotools/eventcfg.hxx
+++ b/include/unotools/eventcfg.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 _EVENTCFG_HXX
-#define _EVENTCFG_HXX
+#ifndef INCLUDED_UNOTOOLS_EVENTCFG_HXX
+#define INCLUDED_UNOTOOLS_EVENTCFG_HXX
#include "unotools/unotoolsdllapi.h"
#include <unotools/configitem.hxx>
@@ -108,6 +108,6 @@ class UNOTOOLS_DLLPUBLIC GlobalEventConfig:
static sal_Int32 m_nRefCount;
};
-#endif // _EVENTCFG_HXX
+#endif // INCLUDED_UNOTOOLS_EVENTCFG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/eventlisteneradapter.hxx b/include/unotools/eventlisteneradapter.hxx
index 89fe74782e34..138b4f5fb86e 100644
--- a/include/unotools/eventlisteneradapter.hxx
+++ b/include/unotools/eventlisteneradapter.hxx
@@ -18,8 +18,8 @@
*/
#include "unotools/unotoolsdllapi.h"
-#ifndef _UNOTOOLS_EVENTLISTENERADAPTER_HXX_
-#define _UNOTOOLS_EVENTLISTENERADAPTER_HXX_
+#ifndef INCLUDED_UNOTOOLS_EVENTLISTENERADAPTER_HXX
+#define INCLUDED_UNOTOOLS_EVENTLISTENERADAPTER_HXX
#include <com/sun/star/lang/XComponent.hpp>
//.........................................................................
@@ -59,6 +59,6 @@ namespace utl
} // namespace utl
//.........................................................................
-#endif // _UNOTOOLS_EVENTLISTENERADAPTER_HXX_
+#endif // INCLUDED_UNOTOOLS_EVENTLISTENERADAPTER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/extendedsecurityoptions.hxx b/include/unotools/extendedsecurityoptions.hxx
index 245f87e0d50f..405f75c94e1a 100644
--- a/include/unotools/extendedsecurityoptions.hxx
+++ b/include/unotools/extendedsecurityoptions.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_unotools_EXTENDEDSECURITYOPTIONS_HXX
-#define INCLUDED_unotools_EXTENDEDSECURITYOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_EXTENDEDSECURITYOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_EXTENDEDSECURITYOPTIONS_HXX
#include "unotools/unotoolsdllapi.h"
#include <sal/types.h>
@@ -116,6 +116,6 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtExtendedSecurityOptions : public utl
}; // class SvtExtendedSecurityOptions
-#endif // #ifndef INCLUDED_unotools_EXTENDEDSECURITYOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_EXTENDEDSECURITYOPTIONS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/fltrcfg.hxx b/include/unotools/fltrcfg.hxx
index 71425a3e62c3..5257c819cfa5 100644
--- a/include/unotools/fltrcfg.hxx
+++ b/include/unotools/fltrcfg.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 _SVT_FLTRCFG_HXX
-#define _SVT_FLTRCFG_HXX
+#ifndef INCLUDED_UNOTOOLS_FLTRCFG_HXX
+#define INCLUDED_UNOTOOLS_FLTRCFG_HXX
// -----------------------------------------------------------------------
diff --git a/include/unotools/fontcfg.hxx b/include/unotools/fontcfg.hxx
index e33397f289c6..0bae1e42c2b5 100644
--- a/include/unotools/fontcfg.hxx
+++ b/include/unotools/fontcfg.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 _UNOTOOLS_FONTCFG_HXX
-#define _UNOTOOLS_FONTCFG_HXX
+#ifndef INCLUDED_UNOTOOLS_FONTCFG_HXX
+#define INCLUDED_UNOTOOLS_FONTCFG_HXX
#include <i18nlangtag/languagetag.hxx>
#include <unotools/unotoolsdllapi.h>
@@ -183,6 +183,6 @@ public:
} // namespace utl
-#endif // _UNOTOOLS_FONTCFG_HXX
+#endif // INCLUDED_UNOTOOLS_FONTCFG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/fontcvt.hxx b/include/unotools/fontcvt.hxx
index 216ebcac101b..2beda5d8a77b 100644
--- a/include/unotools/fontcvt.hxx
+++ b/include/unotools/fontcvt.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UNOTOOLS_FONTCVT_HXX
-#define _UNOTOOLS_FONTCVT_HXX
+#ifndef INCLUDED_UNOTOOLS_FONTCVT_HXX
+#define INCLUDED_UNOTOOLS_FONTCVT_HXX
#include <unotools/unotoolsdllapi.h>
#include <rtl/ustring.hxx>
@@ -69,6 +69,6 @@ public:
//The users of this might want to make a distinction between failed characters
//which were inside and those outside the unicode private area.
UNOTOOLS_DLLPUBLIC StarSymbolToMSMultiFont *CreateStarSymbolToMSMultiFont(bool bPerfectOnly=false);
-#endif // _UNOTOOLS_FONTCVT_HXX
+#endif // INCLUDED_UNOTOOLS_FONTCVT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/fontdefs.hxx b/include/unotools/fontdefs.hxx
index 1e88372a1548..68d35f06aba7 100644
--- a/include/unotools/fontdefs.hxx
+++ b/include/unotools/fontdefs.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 _UNOTOOLS_FONTDEFS_HXX
-#define _UNOTOOLS_FONTDEFS_HXX
+#ifndef INCLUDED_UNOTOOLS_FONTDEFS_HXX
+#define INCLUDED_UNOTOOLS_FONTDEFS_HXX
#include <unotools/unotoolsdllapi.h>
#include <sal/types.h>
diff --git a/include/unotools/fontoptions.hxx b/include/unotools/fontoptions.hxx
index 1f192624ed61..2a3bbf872fba 100644
--- a/include/unotools/fontoptions.hxx
+++ b/include/unotools/fontoptions.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_unotools_FONTOPTIONS_HXX
-#define INCLUDED_unotools_FONTOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_FONTOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_FONTOPTIONS_HXX
#include "unotools/unotoolsdllapi.h"
#include <sal/types.h>
@@ -124,6 +124,6 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtFontOptions : public utl::detail::Op
}; // class SvtFontOptions
-#endif // #ifndef INCLUDED_unotools_FONTOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_FONTOPTIONS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/historyoptions.hxx b/include/unotools/historyoptions.hxx
index 137acd6abe53..0c7d423dc426 100644
--- a/include/unotools/historyoptions.hxx
+++ b/include/unotools/historyoptions.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_SVTOOLS_HISTORYOPTIONS_HXX
-#define INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_HISTORYOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_HISTORYOPTIONS_HXX
#include "unotools/unotoolsdllapi.h"
#include <sal/types.h>
@@ -199,6 +199,6 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtHistoryOptions : public utl::detail:
}; // class SvtHistoryOptions
-#endif // #ifndef INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_HISTORYOPTIONS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/idhelper.hxx b/include/unotools/idhelper.hxx
index b96c27e8ac0d..e0f8fd3af8fd 100644
--- a/include/unotools/idhelper.hxx
+++ b/include/unotools/idhelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UNOTOOLS_ID_HELPER_HXX_
-#define _UNOTOOLS_ID_HELPER_HXX_
+#ifndef INCLUDED_UNOTOOLS_IDHELPER_HXX
+#define INCLUDED_UNOTOOLS_IDHELPER_HXX
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/lang/XTypeProvider.hpp>
@@ -194,6 +194,6 @@ void classname::implCreateMap() \
\
-#endif // _UNOTOOLS_ID_HELPER_HXX_
+#endif // INCLUDED_UNOTOOLS_IDHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/intlwrapper.hxx b/include/unotools/intlwrapper.hxx
index 9165be22b414..7030f11d9568 100644
--- a/include/unotools/intlwrapper.hxx
+++ b/include/unotools/intlwrapper.hxx
@@ -18,8 +18,8 @@
*/
#include "unotools/unotoolsdllapi.h"
-#ifndef _UNOTOOLS_INTLWRAPPER_HXX
-#define _UNOTOOLS_INTLWRAPPER_HXX
+#ifndef INCLUDED_UNOTOOLS_INTLWRAPPER_HXX
+#define INCLUDED_UNOTOOLS_INTLWRAPPER_HXX
#include <unotools/charclass.hxx>
#include <unotools/localedatawrapper.hxx>
#include <unotools/calendarwrapper.hxx>
@@ -93,6 +93,6 @@ public:
}
};
-#endif // _UNOTOOLS_INTLWRAPPER_HXX
+#endif // INCLUDED_UNOTOOLS_INTLWRAPPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/itemholderbase.hxx b/include/unotools/itemholderbase.hxx
index 831cba4a4a72..7b153f637252 100644
--- a/include/unotools/itemholderbase.hxx
+++ b/include/unotools/itemholderbase.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_unotools_ITEMHOLDERBASE_HXX_
-#define INCLUDED_unotools_ITEMHOLDERBASE_HXX_
+#ifndef INCLUDED_UNOTOOLS_ITEMHOLDERBASE_HXX
+#define INCLUDED_UNOTOOLS_ITEMHOLDERBASE_HXX
#include <vector>
#include <osl/mutex.hxx>
@@ -99,6 +99,6 @@ struct TItemInfo
typedef ::std::vector< TItemInfo > TItems;
-#endif // INCLUDED_unotools_ITEMHOLDERBASE_HXX_
+#endif // INCLUDED_UNOTOOLS_ITEMHOLDERBASE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx
index 1dc24c605702..412f3bedf40b 100644
--- a/include/unotools/lingucfg.hxx
+++ b/include/unotools/lingucfg.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _unotools_LINGUCFG_HXX_
-#define _unotools_LINGUCFG_HXX_
+#ifndef INCLUDED_UNOTOOLS_LINGUCFG_HXX
+#define INCLUDED_UNOTOOLS_LINGUCFG_HXX
#include "unotools/unotoolsdllapi.h"
#include <com/sun/star/beans/PropertyValues.hpp>
diff --git a/include/unotools/linguprops.hxx b/include/unotools/linguprops.hxx
index 85cf64b3d31c..b54b44e2ac45 100644
--- a/include/unotools/linguprops.hxx
+++ b/include/unotools/linguprops.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _unotools_LINGUPROPS_HXX_
-#define _unotools_LINGUPROPS_HXX_
+#ifndef INCLUDED_UNOTOOLS_LINGUPROPS_HXX
+#define INCLUDED_UNOTOOLS_LINGUPROPS_HXX
// UNO property names for general options
diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx
index a198163831f7..f43daa72a603 100644
--- a/include/unotools/localedatawrapper.hxx
+++ b/include/unotools/localedatawrapper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UNOTOOLS_LOCALEDATAWRAPPER_HXX
-#define _UNOTOOLS_LOCALEDATAWRAPPER_HXX
+#ifndef INCLUDED_UNOTOOLS_LOCALEDATAWRAPPER_HXX
+#define INCLUDED_UNOTOOLS_LOCALEDATAWRAPPER_HXX
#include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>
@@ -357,6 +357,6 @@ private:
};
-#endif // _UNOTOOLS_LOCALEDATAWRAPPER_HXX
+#endif // INCLUDED_UNOTOOLS_LOCALEDATAWRAPPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/localfilehelper.hxx b/include/unotools/localfilehelper.hxx
index 77ead6b8a523..9028ff8f0847 100644
--- a/include/unotools/localfilehelper.hxx
+++ b/include/unotools/localfilehelper.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 _UNOTOOLS_LOCALFILEHELPER_HXX
-#define _UNOTOOLS_LOCALFILEHELPER_HXX
+#ifndef INCLUDED_UNOTOOLS_LOCALFILEHELPER_HXX
+#define INCLUDED_UNOTOOLS_LOCALFILEHELPER_HXX
#include <com/sun/star/uno/Sequence.hxx>
#include "unotools/unotoolsdllapi.h"
diff --git a/include/unotools/localisationoptions.hxx b/include/unotools/localisationoptions.hxx
index 96b2e97a9341..90745010a6f1 100644
--- a/include/unotools/localisationoptions.hxx
+++ b/include/unotools/localisationoptions.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_unotools_LOCALISATIONOPTIONS_HXX
-#define INCLUDED_unotools_LOCALISATIONOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_LOCALISATIONOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_LOCALISATIONOPTIONS_HXX
#include <sal/types.h>
#include "unotools/unotoolsdllapi.h"
@@ -131,6 +131,6 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtLocalisationOptions : public utl::de
}; // class SvtLocalisationOptions
-#endif // #ifndef INCLUDED_unotools_LOCALISATIONOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_LOCALISATIONOPTIONS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/misccfg.hxx b/include/unotools/misccfg.hxx
index 7759b31ed24a..aa208c631f97 100644
--- a/include/unotools/misccfg.hxx
+++ b/include/unotools/misccfg.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 _UTL_MISCCFG_HXX
-#define _UTL_MISCCFG_HXX
+#ifndef INCLUDED_UNOTOOLS_MISCCFG_HXX
+#define INCLUDED_UNOTOOLS_MISCCFG_HXX
#include "unotools/unotoolsdllapi.h"
#include "tools/solar.h"
diff --git a/include/unotools/moduleoptions.hxx b/include/unotools/moduleoptions.hxx
index 98f4d86e654f..dd42e2bffbea 100644
--- a/include/unotools/moduleoptions.hxx
+++ b/include/unotools/moduleoptions.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
-#define INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_MODULEOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_MODULEOPTIONS_HXX
#include "unotools/unotoolsdllapi.h"
#include <salhelper/singletonref.hxx>
@@ -203,6 +203,6 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail::
}; // class SvtModuleOptions
-#endif // #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_MODULEOPTIONS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/nativenumberwrapper.hxx b/include/unotools/nativenumberwrapper.hxx
index 252a48d85a13..2c6e079ab45a 100644
--- a/include/unotools/nativenumberwrapper.hxx
+++ b/include/unotools/nativenumberwrapper.hxx
@@ -18,8 +18,8 @@
*/
#include "unotools/unotoolsdllapi.h"
-#ifndef _UNOTOOLS_NATIVENUMBERWRAPPER_HXX
-#define _UNOTOOLS_NATIVENUMBERWRAPPER_HXX
+#ifndef INCLUDED_UNOTOOLS_NATIVENUMBERWRAPPER_HXX
+#define INCLUDED_UNOTOOLS_NATIVENUMBERWRAPPER_HXX
#include <com/sun/star/i18n/XNativeNumberSupplier.hpp>
namespace com { namespace sun { namespace star {
@@ -59,6 +59,6 @@ public:
};
-#endif // _UNOTOOLS_NATIVENUMBERWRAPPER_HXX
+#endif // INCLUDED_UNOTOOLS_NATIVENUMBERWRAPPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/numberformatcodewrapper.hxx b/include/unotools/numberformatcodewrapper.hxx
index 82e254e7ea1d..ee7a14f07d3a 100644
--- a/include/unotools/numberformatcodewrapper.hxx
+++ b/include/unotools/numberformatcodewrapper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UNOTOOLS_NUMBERFORMATCODEWRAPPER_HXX
-#define _UNOTOOLS_NUMBERFORMATCODEWRAPPER_HXX
+#ifndef INCLUDED_UNOTOOLS_NUMBERFORMATCODEWRAPPER_HXX
+#define INCLUDED_UNOTOOLS_NUMBERFORMATCODEWRAPPER_HXX
#include <com/sun/star/i18n/XNumberFormatCode.hpp>
#include "unotools/unotoolsdllapi.h"
@@ -63,6 +63,6 @@ public:
};
-#endif // _UNOTOOLS_NUMBERFORMATCODEWRAPPER_HXX
+#endif // INCLUDED_UNOTOOLS_NUMBERFORMATCODEWRAPPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/options.hxx b/include/unotools/options.hxx
index 5a37b026fb63..6bacefe03fc0 100644
--- a/include/unotools/options.hxx
+++ b/include/unotools/options.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_unotools_OPTIONS_HXX
-#define INCLUDED_unotools_OPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_OPTIONS_HXX
+#define INCLUDED_UNOTOOLS_OPTIONS_HXX
#include "sal/config.h"
#include "unotools/unotoolsdllapi.h"
diff --git a/include/unotools/optionsdlg.hxx b/include/unotools/optionsdlg.hxx
index ba28032a49ea..a3fc1f85b2ab 100644
--- a/include/unotools/optionsdlg.hxx
+++ b/include/unotools/optionsdlg.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_unotools_OPTIONSDLG_HXX
-#define INCLUDED_unotools_OPTIONSDLG_HXX
+#ifndef INCLUDED_UNOTOOLS_OPTIONSDLG_HXX
+#define INCLUDED_UNOTOOLS_OPTIONSDLG_HXX
#include "unotools/unotoolsdllapi.h"
#include <rtl/ustring.hxx>
diff --git a/include/unotools/pathoptions.hxx b/include/unotools/pathoptions.hxx
index d1d6bd9f45de..6952e21c5848 100644
--- a/include/unotools/pathoptions.hxx
+++ b/include/unotools/pathoptions.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_unotools_PATHOPTIONS_HXX
-#define INCLUDED_unotools_PATHOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_PATHOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_PATHOPTIONS_HXX
#include "unotools/unotoolsdllapi.h"
#include <i18nlangtag/languagetag.hxx>
@@ -124,6 +124,6 @@ public:
bool IsReadonly() const;
};
-#endif // #ifndef INCLUDED_unotools_PATHOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_PATHOPTIONS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/printwarningoptions.hxx b/include/unotools/printwarningoptions.hxx
index 61b79ee2eb45..b32adabb2739 100644
--- a/include/unotools/printwarningoptions.hxx
+++ b/include/unotools/printwarningoptions.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_unotools_PRINTWARNINGOPTIONS_HXX
-#define INCLUDED_unotools_PRINTWARNINGOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_PRINTWARNINGOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_PRINTWARNINGOPTIONS_HXX
#include "unotools/unotoolsdllapi.h"
#include <sal/types.h>
@@ -116,6 +116,6 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtPrintWarningOptions : public utl::de
}; // class SvtPrintWarningOptions
-#endif // #ifndef INCLUDED_unotools_PRINTWARNINGOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_PRINTWARNINGOPTIONS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/progresshandlerwrap.hxx b/include/unotools/progresshandlerwrap.hxx
index fc640dc4c4a9..04faadf24258 100644
--- a/include/unotools/progresshandlerwrap.hxx
+++ b/include/unotools/progresshandlerwrap.hxx
@@ -18,8 +18,8 @@
*/
#include "unotools/unotoolsdllapi.h"
-#ifndef _UTL_PROGRESSHANDLERWRAP_HXX_
-#define _UTL_PROGRESSHANDLERWRAP_HXX_
+#ifndef INCLUDED_UNOTOOLS_PROGRESSHANDLERWRAP_HXX
+#define INCLUDED_UNOTOOLS_PROGRESSHANDLERWRAP_HXX
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/task/XStatusIndicator.hpp>
#include <com/sun/star/ucb/XProgressHandler.hpp>
@@ -45,6 +45,6 @@ public:
} // namespace utl
-#endif // _UTL_PROGRESSHANDLERWRAP_HXX_
+#endif // INCLUDED_UNOTOOLS_PROGRESSHANDLERWRAP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/saveopt.hxx b/include/unotools/saveopt.hxx
index 771c7210d09c..e51b25d956f1 100644
--- a/include/unotools/saveopt.hxx
+++ b/include/unotools/saveopt.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_unotools_SAVEOPT_HXX
-#define INCLUDED_unotools_SAVEOPT_HXX
+#ifndef INCLUDED_UNOTOOLS_SAVEOPT_HXX
+#define INCLUDED_UNOTOOLS_SAVEOPT_HXX
#include "unotools/unotoolsdllapi.h"
#include <unotools/options.hxx>
diff --git a/include/unotools/searchopt.hxx b/include/unotools/searchopt.hxx
index a808c88eb28f..56bb0eb18c61 100644
--- a/include/unotools/searchopt.hxx
+++ b/include/unotools/searchopt.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SVT_SEARCHOPT_HXX_
-#define _SVT_SEARCHOPT_HXX_
+#ifndef INCLUDED_UNOTOOLS_SEARCHOPT_HXX
+#define INCLUDED_UNOTOOLS_SEARCHOPT_HXX
#include "unotools/unotoolsdllapi.h"
#include "tools/solar.h"
diff --git a/include/unotools/securityoptions.hxx b/include/unotools/securityoptions.hxx
index 9b8f3807ba50..eb6464729f8d 100644
--- a/include/unotools/securityoptions.hxx
+++ b/include/unotools/securityoptions.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_unotools_SECURITYOPTIONS_HXX
-#define INCLUDED_unotools_SECURITYOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_SECURITYOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_SECURITYOPTIONS_HXX
#include "unotools/unotoolsdllapi.h"
#include <sal/types.h>
@@ -256,6 +256,6 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail
}; // class SvtSecurityOptions
-#endif // #ifndef INCLUDED_unotools_SECURITYOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_SECURITYOPTIONS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/sharedunocomponent.hxx b/include/unotools/sharedunocomponent.hxx
index a8bb97ea9005..bf0bc405e7c4 100644
--- a/include/unotools/sharedunocomponent.hxx
+++ b/include/unotools/sharedunocomponent.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef UNOTOOLS_INC_SHAREDUNOCOMPONENT_HXX
-#define UNOTOOLS_INC_SHAREDUNOCOMPONENT_HXX
+#ifndef INCLUDED_UNOTOOLS_SHAREDUNOCOMPONENT_HXX
+#define INCLUDED_UNOTOOLS_SHAREDUNOCOMPONENT_HXX
#include "unotoolsdllapi.h"
@@ -353,6 +353,6 @@ namespace utl
} // namespace utl
//............................................................................
-#endif // UNOTOOLS_INC_SHAREDUNOCOMPONENT_HXX
+#endif // INCLUDED_UNOTOOLS_SHAREDUNOCOMPONENT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/streamhelper.hxx b/include/unotools/streamhelper.hxx
index 60e16a28767a..ea4fb8c1fef3 100644
--- a/include/unotools/streamhelper.hxx
+++ b/include/unotools/streamhelper.hxx
@@ -18,8 +18,8 @@
*/
#include "unotools/unotoolsdllapi.h"
-#ifndef _UNOTOOLS_STREAMHELPER_HXX_
-#define _UNOTOOLS_STREAMHELPER_HXX_
+#ifndef INCLUDED_UNOTOOLS_STREAMHELPER_HXX
+#define INCLUDED_UNOTOOLS_STREAMHELPER_HXX
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XSeekable.hpp>
#include <osl/mutex.hxx>
diff --git a/include/unotools/streamsection.hxx b/include/unotools/streamsection.hxx
index 66d015e83aab..4fbfe61edb38 100644
--- a/include/unotools/streamsection.hxx
+++ b/include/unotools/streamsection.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UNOTOOLS_STREAMSECTION_HXX_
-#define _UNOTOOLS_STREAMSECTION_HXX_
+#ifndef INCLUDED_UNOTOOLS_STREAMSECTION_HXX
+#define INCLUDED_UNOTOOLS_STREAMSECTION_HXX
#include <com/sun/star/io/XMarkableStream.hpp>
#include <com/sun/star/io/XDataInputStream.hpp>
@@ -72,7 +72,7 @@ public:
} // namespace utl
-#endif // _UNOTOOLS_STREAMSECTION_HXX_
+#endif // INCLUDED_UNOTOOLS_STREAMSECTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx
index d4d08cad406e..5b0aa67105f6 100644
--- a/include/unotools/streamwrap.hxx
+++ b/include/unotools/streamwrap.hxx
@@ -18,8 +18,9 @@
*/
#include "unotools/unotoolsdllapi.h"
-#ifndef _UTL_STREAM_WRAPPER_HXX_
-#define _UTL_STREAM_WRAPPER_HXX_
+#ifndef INCLUDED_UNOTOOLS_STREAMWRAP_HXX
+#define INCLUDED_UNOTOOLS_STREAMWRAP_HXX
+
#include <osl/mutex.hxx>
#include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/io/XInputStream.hpp>
@@ -168,6 +169,6 @@ public:
}
// namespace utl
-#endif // _UTL_STREAM_WRAPPER_HXX_
+#endif // INCLUDED_UNOTOOLS_STREAMWRAP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/syslocaleoptions.hxx b/include/unotools/syslocaleoptions.hxx
index 9bf0578ee10f..0d528b54b6c6 100644
--- a/include/unotools/syslocaleoptions.hxx
+++ b/include/unotools/syslocaleoptions.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVTOOLS_SYSLOCALEOPTIONS_HXX
-#define INCLUDED_SVTOOLS_SYSLOCALEOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_SYSLOCALEOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_SYSLOCALEOPTIONS_HXX
#include "unotools/unotoolsdllapi.h"
#include <sal/types.h>
@@ -171,6 +171,6 @@ public:
bool IsReadOnly( EOption eOption ) const;
};
-#endif // INCLUDED_SVTOOLS_SYSLOCALEOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_SYSLOCALEOPTIONS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/tempfile.hxx b/include/unotools/tempfile.hxx
index 9efe45a3fb9f..e1281f0d2bf2 100644
--- a/include/unotools/tempfile.hxx
+++ b/include/unotools/tempfile.hxx
@@ -18,8 +18,8 @@
*/
#include "unotools/unotoolsdllapi.h"
-#ifndef _UNOTOOLS_TEMPFILE_HXX
-#define _UNOTOOLS_TEMPFILE_HXX
+#ifndef INCLUDED_UNOTOOLS_TEMPFILE_HXX
+#define INCLUDED_UNOTOOLS_TEMPFILE_HXX
#include <tools/stream.hxx>
diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx
index 0880c13ff3f4..7b218e11f67d 100644
--- a/include/unotools/textsearch.hxx
+++ b/include/unotools/textsearch.hxx
@@ -18,8 +18,8 @@
*/
#include "unotools/unotoolsdllapi.h"
-#ifndef _UNOTOOLS_TEXTSEARCH_HXX
-#define _UNOTOOLS_TEXTSEARCH_HXX
+#ifndef INCLUDED_UNOTOOLS_TEXTSEARCH_HXX
+#define INCLUDED_UNOTOOLS_TEXTSEARCH_HXX
#include <i18nlangtag/lang.h>
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Reference.h>
diff --git a/include/unotools/transliterationwrapper.hxx b/include/unotools/transliterationwrapper.hxx
index fbc845b218be..af05f210a48c 100644
--- a/include/unotools/transliterationwrapper.hxx
+++ b/include/unotools/transliterationwrapper.hxx
@@ -18,8 +18,8 @@
*/
#include "unotools/unotoolsdllapi.h"
-#ifndef _UNOTOOLS_TRANSLITERATIONWRAPPER_HXX
-#define _UNOTOOLS_TRANSLITERATIONWRAPPER_HXX
+#ifndef INCLUDED_UNOTOOLS_TRANSLITERATIONWRAPPER_HXX
+#define INCLUDED_UNOTOOLS_TRANSLITERATIONWRAPPER_HXX
#include <rtl/ustring.hxx>
#include <tools/solar.h>
#include <i18nlangtag/languagetag.hxx>
diff --git a/include/unotools/ucbhelper.hxx b/include/unotools/ucbhelper.hxx
index fe29a3a54201..998fe82c5b3c 100644
--- a/include/unotools/ucbhelper.hxx
+++ b/include/unotools/ucbhelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UNOTOOLS_UCBHELPER_HXX
-#define _UNOTOOLS_UCBHELPER_HXX
+#ifndef INCLUDED_UNOTOOLS_UCBHELPER_HXX
+#define INCLUDED_UNOTOOLS_UCBHELPER_HXX
#include "sal/config.h"
diff --git a/include/unotools/ucblockbytes.hxx b/include/unotools/ucblockbytes.hxx
index 6df93af9e7b9..2258fe19d38b 100644
--- a/include/unotools/ucblockbytes.hxx
+++ b/include/unotools/ucblockbytes.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 _UNTOOLS_UCBLOCKBYTES_HXX
-#define _UNTOOLS_UCBLOCKBYTES_HXX
+#ifndef INCLUDED_UNOTOOLS_UCBLOCKBYTES_HXX
+#define INCLUDED_UNOTOOLS_UCBLOCKBYTES_HXX
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/include/unotools/ucbstreamhelper.hxx b/include/unotools/ucbstreamhelper.hxx
index 4a48a21a2820..eb814b4128a0 100644
--- a/include/unotools/ucbstreamhelper.hxx
+++ b/include/unotools/ucbstreamhelper.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 _UNTOOLS_UCBSTREAMHELPER_HXX
-#define _UNTOOLS_UCBSTREAMHELPER_HXX
+#ifndef INCLUDED_UNOTOOLS_UCBSTREAMHELPER_HXX
+#define INCLUDED_UNOTOOLS_UCBSTREAMHELPER_HXX
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/io/XInputStream.hpp>
diff --git a/include/unotools/unotoolsdllapi.h b/include/unotools/unotoolsdllapi.h
index a08f54ce8a5a..5d7e76a3a3dd 100644
--- a/include/unotools/unotoolsdllapi.h
+++ b/include/unotools/unotoolsdllapi.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UNOTOOLSDLLAPI_H
-#define INCLUDED_UNOTOOLSDLLAPI_H
+#ifndef INCLUDED_UNOTOOLS_UNOTOOLSDLLAPI_H
+#define INCLUDED_UNOTOOLS_UNOTOOLSDLLAPI_H
#include "sal/types.h"
@@ -29,6 +29,6 @@
#endif
#define UNOTOOLS_DLLPRIVATE SAL_DLLPRIVATE
-#endif /* INCLUDED_UNOTOOLSDLLAPI_H */
+#endif // INCLUDED_UNOTOOLS_UNOTOOLSDLLAPI_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/useroptions.hxx b/include/unotools/useroptions.hxx
index 77b71ee90bd1..10aa5c7be657 100644
--- a/include/unotools/useroptions.hxx
+++ b/include/unotools/useroptions.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_unotools_USEROPTIONS_HXX
-#define INCLUDED_unotools_USEROPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_USEROPTIONS_HXX
+#define INCLUDED_UNOTOOLS_USEROPTIONS_HXX
#include "unotools/unotoolsdllapi.h"
#include <unotools/configitem.hxx>
@@ -92,6 +92,6 @@ private:
class ChangeListener;
};
-#endif // #ifndef INCLUDED_unotools_USEROPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_USEROPTIONS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx
index bcbca0909cb5..9e17357db723 100644
--- a/include/unotools/viewoptions.hxx
+++ b/include/unotools/viewoptions.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_unotools_VIEWOPTIONS_HXX
-#define INCLUDED_unotools_VIEWOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_VIEWOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_VIEWOPTIONS_HXX
#include "unotools/unotoolsdllapi.h"
#include <com/sun/star/uno/Sequence.hxx>
@@ -313,6 +313,6 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op
}; // class SvtViewOptions
-#endif // #ifndef INCLUDED_unotools_VIEWOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_VIEWOPTIONS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/xmlaccelcfg.hxx b/include/unotools/xmlaccelcfg.hxx
index e9b582bee924..eac33424844f 100644
--- a/include/unotools/xmlaccelcfg.hxx
+++ b/include/unotools/xmlaccelcfg.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_unotools_XMLACCELCFG_HXX
-#define INCLUDED_unotools_XMLACCELCFG_HXX
+#ifndef INCLUDED_UNOTOOLS_XMLACCELCFG_HXX
+#define INCLUDED_UNOTOOLS_XMLACCELCFG_HXX
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <cppuhelper/weak.hxx>
@@ -85,6 +85,6 @@ class OReadAccelatorDocumentHandler : public ::com::sun::star::xml::sax::XDocume
SvtAcceleratorItemList& m_aReadAcceleratorList;
};
-#endif // INCLUDED_unotools_XMLACCELCFG_HXX
+#endif // INCLUDED_UNOTOOLS_XMLACCELCFG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */