fixincludeguards.sh: shell

Change-Id: I987c54b15c271fc80b7efd25933e13950f974423

shell/inc/internal/basereader.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef BASEREADER_HXX_INCLUDED
-#define BASEREADER_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_BASEREADER_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_BASEREADER_HXX
 
 #include "internal/global.hxx"
 #include "internal/types.hxx"

shell/inc/internal/columninfo.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COLUMNINFO_HXX_INCLUDED
-#define COLUMNINFO_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_COLUMNINFO_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_COLUMNINFO_HXX
 
 #if defined _MSC_VER
 #pragma warning(push, 1)

shell/inc/internal/config.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONFIG_HXX_INCLUDED
-#define CONFIG_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_CONFIG_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_CONFIG_HXX
 
 #ifdef _MSC_VER
 #pragma warning (disable : 4786 4503 4917)

shell/inc/internal/contentreader.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONTENTREADER_HXX_INCLUDED
-#define CONTENTREADER_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_CONTENTREADER_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_CONTENTREADER_HXX
 
 #include "internal/basereader.hxx"
 

shell/inc/internal/fileextensions.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FILEEXTENSIONS_HXX_INCLUDED
-#define FILEEXTENSIONS_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_FILEEXTENSIONS_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_FILEEXTENSIONS_HXX
 
 #include "internal/global.hxx"
 

shell/inc/internal/global.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef GLOBAL_HXX_INCLUDED
-#define GLOBAL_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_GLOBAL_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_GLOBAL_HXX
 
 #if defined _MSC_VER
 #pragma warning(push, 1)

shell/inc/internal/i_xml_parser_event_handler.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef I_XML_PARSER_EVENT_HANDLER_HXX_INCLUDED
-#define I_XML_PARSER_EVENT_HANDLER_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_I_XML_PARSER_EVENT_HANDLER_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_I_XML_PARSER_EVENT_HANDLER_HXX
 
 #include <string>
 #include <map>

shell/inc/internal/infotips.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INFOTIPS_HXX_INCLUDED
-#define INFOTIPS_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_INFOTIPS_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_INFOTIPS_HXX
 
 #if defined _MSC_VER
 #pragma warning(push, 1)

shell/inc/internal/iso8601_converter.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef ISO8601_CONVERTER_HXX_INCLUDED
-#define ISO8601_CONVERTER_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_ISO8601_CONVERTER_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_ISO8601_CONVERTER_HXX
 
 #include <string>
 

shell/inc/internal/metainforeader.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef METAINFOREADER_HXX_INCLUDED
-#define METAINFOREADER_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_METAINFOREADER_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_METAINFOREADER_HXX
 
 #include "internal/basereader.hxx"
 #include "internal/types.hxx"

shell/inc/internal/propertyhdl.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef PROPERTYHDL_HXX_INCLUDED
-#define PROPERTYHDL_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_PROPERTYHDL_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_PROPERTYHDL_HXX
 
 #if defined _MSC_VER
 #pragma warning(push, 1)

shell/inc/internal/propsheets.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef PROPSHEETS_HXX_INCLUDED
-#define PROPSHEETS_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_PROPSHEETS_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_PROPSHEETS_HXX
 
 #include "internal/metainforeader.hxx"
 

shell/inc/internal/registry.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef REGISTRY_HXX_INCLUDED
-#define REGISTRY_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_REGISTRY_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_REGISTRY_HXX
 
 //-----------------------------
 // registry helper functions

shell/inc/internal/resource.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RESOURCE_H_INCLUDED
-#define RESOURCE_H_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_RESOURCE_H
+#define INCLUDED_SHELL_INC_INTERNAL_RESOURCE_H
 
 #define MANIFEST_RESOURCE_ID               2
 #define IDD_PROPPAGE_STATISTICS          101

shell/inc/internal/shlxthdl.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SHLXTHDL_HXX_INCLUDED
-#define SHLXTHDL_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_SHLXTHDL_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_SHLXTHDL_HXX
 
 #if defined _MSC_VER
 #pragma warning(push, 1)

shell/inc/internal/stream_helper.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef STREAM_HELPER_HXX_INCLUDED
-#define STREAM_HELPER_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_STREAM_HELPER_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_STREAM_HELPER_HXX
 
 #include "internal/types.hxx"
 

shell/inc/internal/thumbviewer.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef THUMBVIEWER_HXX_INCLUDED
-#define THUMBVIEWER_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_THUMBVIEWER_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_THUMBVIEWER_HXX
 
 #if defined _MSC_VER
 #pragma warning(push, 1)

shell/inc/internal/types.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef TYPES_HXX_INCLUDED
-#define TYPES_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_TYPES_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_TYPES_HXX
 
 #include <string>
 #include <map>

shell/inc/internal/utilities.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef UTILITIES_HXX_INCLUDED
-#define UTILITIES_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_UTILITIES_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_UTILITIES_HXX
 
 #include <malloc.h>
 #if defined _MSC_VER

shell/inc/internal/xml_parser.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XML_PARSER_HXX_
-#define _XML_PARSER_HXX_
+#ifndef INCLUDED_SHELL_INC_INTERNAL_XML_PARSER_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_XML_PARSER_HXX
 
 #include <expat.h>
 #include <stdexcept>

shell/inc/internal/zipfile.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef ZIPFILE_HXX_INCLUDED
-#define ZIPFILE_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_ZIPFILE_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_ZIPFILE_HXX
 
 #ifndef _WINDOWS
 #define _WINDOWS

shell/source/backends/macbe/macbackend.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MACBACKEND_HXX_
-#define _MACBACKEND_HXX_
+#ifndef INCLUDED_SHELL_SOURCE_BACKENDS_MACBE_MACBACKEND_HXX
+#define INCLUDED_SHELL_SOURCE_BACKENDS_MACBE_MACBACKEND_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -126,6 +126,6 @@ protected:
     ~MacOSXBackend(void);
 };
 
-#endif // _MACBACKEND_HXX_
+#endif // INCLUDED_SHELL_SOURCE_BACKENDS_MACBE_MACBACKEND_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

shell/source/cmdmail/cmdmailmsg.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CMDMAILMSG_HXX_
-#define _CMDMAILMSG_HXX_
+#ifndef INCLUDED_SHELL_SOURCE_CMDMAIL_CMDMAILMSG_HXX
+#define INCLUDED_SHELL_SOURCE_CMDMAIL_CMDMAILMSG_HXX
 
 #include <cppuhelper/implbase2.hxx>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>

shell/source/cmdmail/cmdmailsuppl.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CMDMAILSUPPL_HXX_
-#define _CMDMAILSUPPL_HXX_
+#ifndef INCLUDED_SHELL_SOURCE_CMDMAIL_CMDMAILSUPPL_HXX
+#define INCLUDED_SHELL_SOURCE_CMDMAIL_CMDMAILSUPPL_HXX
 
 #include <cppuhelper/implbase3.hxx>
 #include <osl/mutex.hxx>

shell/source/sessioninstall/SyncDbusSessionHelper.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef SHELL_SESSIONINSTALL_SYNCDBUSSESSIONHELPER_HXX
-#define SHELL_SESSIONINSTALL_SYNCDBUSSESSIONHELPER_HXX
+#ifndef INCLUDED_SHELL_SOURCE_SESSIONINSTALL_SYNCDBUSSESSIONHELPER_HXX
+#define INCLUDED_SHELL_SOURCE_SESSIONINSTALL_SYNCDBUSSESSIONHELPER_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -56,5 +56,5 @@ namespace shell { namespace sessioninstall
     };
 }}
 
-#endif // SHELL_SESSIONINSTALL_SYNCDBUSSESSIONHELPER_HXX
+#endif // INCLUDED_SHELL_SOURCE_SESSIONINSTALL_SYNCDBUSSESSIONHELPER_HXX
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

shell/source/tools/lngconvex/cmdline.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CMDLINE_HXX_
-#define _CMDLINE_HXX_
+#ifndef INCLUDED_SHELL_SOURCE_TOOLS_LNGCONVEX_CMDLINE_HXX
+#define INCLUDED_SHELL_SOURCE_TOOLS_LNGCONVEX_CMDLINE_HXX
 
 #include "defs.hxx"
 

shell/source/tools/lngconvex/defs.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DEFS_HXX_
-#define _DEFS_HXX_
+#ifndef INCLUDED_SHELL_SOURCE_TOOLS_LNGCONVEX_DEFS_HXX
+#define INCLUDED_SHELL_SOURCE_TOOLS_LNGCONVEX_DEFS_HXX
 
 #include <vector>
 #include <string>

shell/source/unix/exec/shellexec.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SHELLEXEC_HXX_
-#define _SHELLEXEC_HXX_
+#ifndef INCLUDED_SHELL_SOURCE_UNIX_EXEC_SHELLEXEC_HXX
+#define INCLUDED_SHELL_SOURCE_UNIX_EXEC_SHELLEXEC_HXX
 
 #include <cppuhelper/implbase2.hxx>
 #include <osl/mutex.hxx>

shell/source/unix/sysshell/recently_used_file.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_RECENTLY_USED_FILE_HXX
-#define INCLUDED_RECENTLY_USED_FILE_HXX
+#ifndef INCLUDED_SHELL_SOURCE_UNIX_SYSSHELL_RECENTLY_USED_FILE_HXX
+#define INCLUDED_SHELL_SOURCE_UNIX_SYSSHELL_RECENTLY_USED_FILE_HXX
 
 #include <stdio.h>
 #include <unistd.h>
@@ -56,6 +56,6 @@ private:
     FILE* file_;
 };
 
-#endif // INCLUDED_RECENTLY_USED_FILE_HXX
+#endif // INCLUDED_SHELL_SOURCE_UNIX_SYSSHELL_RECENTLY_USED_FILE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

shell/source/win32/SysShExec.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SYSSHEXEC_HXX_
-#define _SYSSHEXEC_HXX_
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_SYSSHEXEC_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_SYSSHEXEC_HXX
 
 #include <cppuhelper/compbase2.hxx>
 #include <osl/mutex.hxx>

shell/source/win32/ooofilereader/autostyletag.hxx

@@ -18,8 +18,8 @@
  */
 
 
-#ifndef AUTOSTYLETAG_HXX_INCLUDED
-#define AUTOSTYLETAG_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_AUTOSTYLETAG_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_AUTOSTYLETAG_HXX
 
 #include "itag.hxx"
 

shell/source/win32/ooofilereader/dummytag.hxx

@@ -18,8 +18,8 @@
  */
 
 
-#ifndef DUMMYTAG_HXX_INCLUDED
-#define DUMMYTAG_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_DUMMYTAG_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_DUMMYTAG_HXX
 
 #include "itag.hxx"
 

shell/source/win32/ooofilereader/itag.hxx

@@ -18,8 +18,8 @@
  */
 
 
-#ifndef ITAG_HXX_INCLUDED
-#define ITAG_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_ITAG_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_ITAG_HXX
 
 #include "internal/config.hxx"
 #include "internal/types.hxx"

shell/source/win32/ooofilereader/keywordstag.hxx

@@ -18,8 +18,8 @@
  */
 
 
-#ifndef KEYWORDSTAG_HXX_INCLUDED
-#define KEYWORDSTAG_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_KEYWORDSTAG_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_KEYWORDSTAG_HXX
 
 #include "itag.hxx"
 

shell/source/win32/ooofilereader/simpletag.hxx

@@ -18,8 +18,8 @@
  */
 
 
-#ifndef SIMPLETAG_HXX_INCLUDED
-#define SIMPLETAG_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_SIMPLETAG_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_SIMPLETAG_HXX
 
 #include "itag.hxx"
 

shell/source/win32/shlxthandler/classfactory.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CLASSFACTORY_HXX_INCLUDED
-#define CLASSFACTORY_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_CLASSFACTORY_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_CLASSFACTORY_HXX
 
 #if defined _MSC_VER
 #pragma warning(push, 1)

shell/source/win32/shlxthandler/propsheets/document_statistic.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOCUMENT_STATISTIC_HXX_INCLUDED
-#define DOCUMENT_STATISTIC_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_PROPSHEETS_DOCUMENT_STATISTIC_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_PROPSHEETS_DOCUMENT_STATISTIC_HXX
 
 #include <utility>
 #include <string>

shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef LISTVIEWBUILDER_HXX_INCLUDED
-#define LISTVIEWBUILDER_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_PROPSHEETS_LISTVIEWBUILDER_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_PROPSHEETS_LISTVIEWBUILDER_HXX
 
 #if defined _MSC_VER
 #pragma warning(push, 1)

shell/source/win32/simplemail/simplemapi.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SIMPLEMAPI_HXX
-#define INCLUDED_SIMPLEMAPI_HXX
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SIMPLEMAPI_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SIMPLEMAPI_HXX
 
 #define WIN32_LEAN_AND_MEAN
 #if defined _MSC_VER

shell/source/win32/simplemail/smplmailclient.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SMPLMAILCLIENT_HXX_
-#define _SMPLMAILCLIENT_HXX_
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILCLIENT_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILCLIENT_HXX
 
 #include <cppuhelper/compbase1.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>

shell/source/win32/simplemail/smplmailmsg.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SMPLMAILMSG_HXX_
-#define _SMPLMAILMSG_HXX_
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILMSG_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILMSG_HXX
 
 #include <cppuhelper/compbase1.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>

shell/source/win32/simplemail/smplmailsuppl.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SMPLMAILSUPPL_HXX_
-#define _SMPLMAILSUPPL_HXX_
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILSUPPL_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILSUPPL_HXX
 
 #include <cppuhelper/compbase2.hxx>
 #include <osl/mutex.hxx>

shell/source/win32/zipfile/zipexcptn.hxx

@@ -19,8 +19,8 @@
 
 // ZipException.h: interface for the ZipException class.
 
-#ifndef ZIPEXCPTN_HXX_INCLUDED
-#define ZIPEXCPTN_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_ZIPFILE_ZIPEXCPTN_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_ZIPFILE_ZIPEXCPTN_HXX
 
 #include <stdexcept>