From 7610a80ad1a47f2401b4d6aca9d4f77e5be7c630 Mon Sep 17 00:00:00 2001 From: Jens Carl Date: Fri, 30 May 2014 20:32:57 +0000 Subject: fdo#68849: Add header guards to all include files Added header guards to files in directories l10ntools/, lotuswordpro/, and rsc/ Change-Id: I9c034d4bb5c92d78378bda4658d43a8b603d5281 Reviewed-on: https://gerrit.libreoffice.org/9581 Reviewed-by: Thomas Arnhold Tested-by: Thomas Arnhold --- l10ntools/inc/helpmerge.hxx | 5 +++++ lotuswordpro/source/filter/clone.hxx | 5 +++++ lotuswordpro/source/filter/lwpsdwfileloader.hxx | 6 ++++++ lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx | 6 ++++++ lotuswordpro/source/filter/lwpunoheader.hxx | 5 +++++ lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx | 7 ++++--- rsc/inc/rscarray.hxx | 3 ++- rsc/inc/rsclex.hxx | 5 +++++ 8 files changed, 38 insertions(+), 4 deletions(-) diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx index 604817fddf19..9787d18bf84a 100644 --- a/l10ntools/inc/helpmerge.hxx +++ b/l10ntools/inc/helpmerge.hxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_L10NTOOLS_INC_HELPMERGE_HXX +#define INCLUDED_L10NTOOLS_INC_HELPMERGE_HXX + #include "xmlparse.hxx" #include #include @@ -56,4 +59,6 @@ private: void ProcessHelp( LangHashMap* aLangHM , const OString& sCur , ResData *pResData , MergeDataFile* pMergeDataFile ); }; +#endif // INCLUDED_L10NTOOLS_INC_HELPMERGE_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/clone.hxx b/lotuswordpro/source/filter/clone.hxx index 7db1dec0e1dd..bc2f7fb71e84 100644 --- a/lotuswordpro/source/filter/clone.hxx +++ b/lotuswordpro/source/filter/clone.hxx @@ -7,6 +7,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_CLONE_HXX +#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_CLONE_HXX + namespace detail { @@ -63,4 +66,6 @@ T* clone(T* const other) return other ? ::detail::cloner::value>::clone(other) : 0; } +#endif // INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_CLONE_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpsdwfileloader.hxx b/lotuswordpro/source/filter/lwpsdwfileloader.hxx index 41369f6c6af8..3d6e52c9c501 100644 --- a/lotuswordpro/source/filter/lwpsdwfileloader.hxx +++ b/lotuswordpro/source/filter/lwpsdwfileloader.hxx @@ -58,6 +58,10 @@ * Mar 2005 revised for new processing procedure. * Jan 2005 created ****************************************************************************/ + +#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSDWFILELOADER_HXX +#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSDWFILELOADER_HXX + #include #include #include "lwpheader.hxx" @@ -83,4 +87,6 @@ public: // end add }; +#endif // INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSDWFILELOADER_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx index e810aabfcf25..5611ae8634c4 100644 --- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx +++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx @@ -58,6 +58,10 @@ * Mar 2005 revised for new processing procedure. * Jan 2005 created ****************************************************************************/ + +#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSDWGROUPLOADERV0102_HXX +#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSDWGROUPLOADERV0102_HXX + #include #include "lwpheader.hxx" #include "assert.h" @@ -86,4 +90,6 @@ public: // end add }; +#endif // INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSDWGROUPLOADERV0102_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpunoheader.hxx b/lotuswordpro/source/filter/lwpunoheader.hxx index 60230c6f9352..2eeee520d984 100644 --- a/lotuswordpro/source/filter/lwpunoheader.hxx +++ b/lotuswordpro/source/filter/lwpunoheader.hxx @@ -62,6 +62,9 @@ Jan 2005 Created ************************************************************************/ +#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPUNOHEADER_HXX +#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPUNOHEADER_HXX + #include #include #include @@ -74,4 +77,6 @@ #include "xfilter/xfglobal.hxx" +#endif // INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPUNOHEADER_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx b/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx index 97b97fad4123..7626daf324e8 100644 --- a/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx @@ -57,8 +57,9 @@ * @file * Style of Fontwork object. ************************************************************************/ - #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFONTWORKSTYLE_HXX - #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFONTWORKSTYLE_HXX + +#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFONTWORKSTYLE_HXX +#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFONTWORKSTYLE_HXX #include "xfstyle.hxx" @@ -150,6 +151,6 @@ inline enumXFFWShadow XFFontWorkStyle::GetShadowType() const return m_eShadowType; } -#endif +#endif // INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFONTWORKSTYLE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx index fc40e3fbf357..dd7b511884e9 100644 --- a/rsc/inc/rscarray.hxx +++ b/rsc/inc/rscarray.hxx @@ -16,6 +16,7 @@ * 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_RSC_INC_RSCARRAY_HXX #define INCLUDED_RSC_INC_RSCARRAY_HXX @@ -119,6 +120,6 @@ public: virtual RSCCLASS_TYPE GetClassType() const SAL_OVERRIDE; }; -#endif //_RSCARRAY +#endif // INCLUDED_RSC_INC_RSCARRAY_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rsclex.hxx b/rsc/inc/rsclex.hxx index 3ec3a181ede8..46cd468a7d84 100644 --- a/rsc/inc/rsclex.hxx +++ b/rsc/inc/rsclex.hxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_RSC_INC_RSCLEX_HXX +#define INCLUDED_RSC_INC_RSCLEX_HXX + #include #include #include @@ -112,4 +115,6 @@ extern RscExpression * pExp; extern ObjectStack S; extern StringContainer* pStringContainer; +#endif // INCLUDED_RSC_INC_RSCLEX_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit