[Libreoffice-commits] core.git: l10ntools/inc lotuswordpro/source rsc/inc

Jens Carl j.carl43 at gmx.de
Sun Jun 1 09:05:40 PDT 2014


 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(-)

New commits:
commit 7610a80ad1a47f2401b4d6aca9d4f77e5be7c630
Author: Jens Carl <j.carl43 at gmx.de>
Date:   Fri May 30 20:32:57 2014 +0000

    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 <thomas at arnhold.org>
    Tested-by: Thomas Arnhold <thomas at arnhold.org>

diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx
index 604817f..9787d18 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 <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -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 7db1dec..bc2f7fb 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<T, ::detail::has_clone<T>::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 41369f6..3d6e52c 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 <assert.h>
 #include <tools/stream.hxx>
 #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 e810aab..5611ae8 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 <tools/stream.hxx>
 #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 60230c6..2eeee52 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 <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/factory.hxx>
@@ -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 97b97fa..7626daf 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 fc40e3f..dd7b511 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 3ec3a18..46cd468 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 <boost/unordered_set.hpp>
 #include <rtl/strbuf.hxx>
 #include <rtl/string.hxx>
@@ -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: */


More information about the Libreoffice-commits mailing list