[Libreoffice-commits] core.git: i18npool/inc i18npool/source

[Tor Lillqvist]

 i18npool/inc/chartonum.hxx                        |    7 ++++---
 i18npool/inc/numtochar.hxx                        |    7 ++++---
 i18npool/inc/numtotext_cjk.hxx                    |    7 ++++---
 i18npool/inc/texttonum.hxx                        |    7 ++++---
 i18npool/source/nativenumber/data/numberchar.h    |    7 ++++---
 i18npool/source/transliteration/data/numberchar.h |    9 ++++-----
 6 files changed, 24 insertions(+), 20 deletions(-)

New commits:
commit dc17d5c6e467cc809a92c16bc688fb54f11b143b
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Apr 23 09:56:06 2014 +0300

    Use our canonical header guard naming
    
    Change-Id: I06c9c55f75dc13893e29ec6cc96726a60c34846c

diff --git a/i18npool/inc/chartonum.hxx b/i18npool/inc/chartonum.hxx
index 2a2e2c2..27107fd 100644
--- a/i18npool/inc/chartonum.hxx
+++ b/i18npool/inc/chartonum.hxx
@@ -16,8 +16,9 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _L10N_TRANSLITERATION_CHARTONUM_HXX_
-#define _L10N_TRANSLITERATION_CHARTONUM_HXX_
+
+#ifndef INCLUDED_I18NPOOL_INC_CHARTONUM_HXX
+#define INCLUDED_I18NPOOL_INC_CHARTONUM_HXX
 
 #include <transliteration_Numeric.hxx>
 
@@ -49,6 +50,6 @@ TRANSLITERATION_CHARTONUM(_th)
 
 } } } }
 
-#endif // _L10N_TRANSLITERATION_CHARTONUM_HXX_
+#endif // INCLUDED_I18NPOOL_INC_CHARTONUM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/numtochar.hxx b/i18npool/inc/numtochar.hxx
index e64e520..f7dbd92 100644
--- a/i18npool/inc/numtochar.hxx
+++ b/i18npool/inc/numtochar.hxx
@@ -16,8 +16,9 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _L10N_TRANSLITERATION_NUMTOCHAR_HXX_
-#define _L10N_TRANSLITERATION_NUMTOCHAR_HXX_
+
+#ifndef INCLUDED_I18NPOOL_INC_NUMTOCHAR_HXX
+#define INCLUDED_I18NPOOL_INC_NUMTOCHAR_HXX
 
 #include <transliteration_Numeric.hxx>
 
@@ -50,6 +51,6 @@ TRANSLITERATION_NUMTOCHAR(Halfwidth)
 
 } } } }
 
-#endif // _L10N_TRANSLITERATION_NUMTOCHAR_HXX_
+#endif // INCLUDED_I18NPOOL_INC_NUMTOCHAR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/numtotext_cjk.hxx b/i18npool/inc/numtotext_cjk.hxx
index dfdcf83..56aeebe 100644
--- a/i18npool/inc/numtotext_cjk.hxx
+++ b/i18npool/inc/numtotext_cjk.hxx
@@ -16,8 +16,9 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _L10N_TRANSLITERATION_NUMTOTEXT_CJK_HXX_
-#define _L10N_TRANSLITERATION_NUMTOTEXT_CJK_HXX_
+
+#ifndef INCLUDED_I18NPOOL_INC_NUMTOTEXT_CJK_HXX
+#define INCLUDED_I18NPOOL_INC_NUMTOTEXT_CJK_HXX
 
 #include <transliteration_Numeric.hxx>
 
@@ -65,6 +66,6 @@ TRANSLITERATION_NUMTOTEXT_CJK ( HangulCircledSyllable_ko )
 
 } } } }
 
-#endif // _L10N_TRANSLITERATION_NUMTOTEXT_HXX_
+#endif // INCLUDED_I18NPOOL_INC_NUMTOTEXT_CJK_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/texttonum.hxx b/i18npool/inc/texttonum.hxx
index cb74803..ab570ec 100644
--- a/i18npool/inc/texttonum.hxx
+++ b/i18npool/inc/texttonum.hxx
@@ -16,8 +16,9 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _L10N_TRANSLITERATION_TEXTTONUM_HXX_
-#define _L10N_TRANSLITERATION_TEXTTONUM_HXX_
+
+#ifndef INCLUDED_I18NPOOL_INC_TEXTTONUM_HXX
+#define INCLUDED_I18NPOOL_INC_TEXTTONUM_HXX
 
 #include <transliteration_Numeric.hxx>
 
@@ -47,6 +48,6 @@ TRANSLITERATION_TEXTTONUM(KanjiLongTraditional_ja_JP)
 
 } } } }
 
-#endif // _L10N_TRANSLITERATION_TEXTTONUM_HXX_
+#endif // INCLUDED_I18NPOOL_INC_TEXTTONUM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/nativenumber/data/numberchar.h b/i18npool/source/nativenumber/data/numberchar.h
index 48d0285..5b28a6c 100644
--- a/i18npool/source/nativenumber/data/numberchar.h
+++ b/i18npool/source/nativenumber/data/numberchar.h
@@ -16,8 +16,9 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _L10N_TRANSLITERATION_NUMTOCHAR_H_
-#define _L10N_TRANSLITERATION_NUMTOCHAR_H_
+
+#ifndef INCLUDED_I18NPOOL_SOURCE_NATIVENUMBER_DATA_NUMBERCHAR_H
+#define INCLUDED_I18NPOOL_SOURCE_NATIVENUMBER_DATA_NUMBERCHAR_H
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
@@ -266,6 +267,6 @@ typedef struct {
 
 } } } }
 
-#endif // _L10N_TRANSLITERATION_NUMTOCHAR_H_
+#endif // INCLUDED_I18NPOOL_SOURCE_NATIVENUMBER_DATA_NUMBERCHAR_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/data/numberchar.h b/i18npool/source/transliteration/data/numberchar.h
index c9cbd38..75dbfa1 100644
--- a/i18npool/source/transliteration/data/numberchar.h
+++ b/i18npool/source/transliteration/data/numberchar.h
@@ -16,8 +16,9 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _L10N_TRANSLITERATION_NUMTOCHAR_H_
-#define _L10N_TRANSLITERATION_NUMTOCHAR_H_
+
+#ifndef INCLUDED_I18NPOOL_SOURCE_TRANSLITERATION_DATA_NUMBERCHAR_H
+#define INCLUDED_I18NPOOL_SOURCE_TRANSLITERATION_DATA_NUMBERCHAR_H
 
 #include <sal/types.h>
 
@@ -77,12 +78,10 @@ const sal_Int16 Multiplier_Count    = 7;
 
 const sal_Int16 ExponentCount_CJK   = 6;
 
-
 const sal_Int16 ExponentCount_short_CJK     = 2;
 
-
 } } } }
 
-#endif // _L10N_TRANSLITERATION_NUMTOCHAR_H_
+#endif // INCLUDED_I18NPOOL_SOURCE_TRANSLITERATION_DATA_NUMBERCHAR_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */