summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--l10ntools/inc/cfgmerge.hxx4
-rw-r--r--l10ntools/inc/common.hxx4
-rw-r--r--l10ntools/inc/export.hxx6
-rw-r--r--l10ntools/inc/helper.hxx4
-rw-r--r--l10ntools/inc/lngmerge.hxx6
-rw-r--r--l10ntools/inc/po.hxx6
-rw-r--r--l10ntools/inc/propmerge.hxx6
-rw-r--r--l10ntools/inc/stringmerge.hxx6
-rw-r--r--l10ntools/inc/tokens.h4
-rw-r--r--l10ntools/inc/treemerge.hxx6
-rw-r--r--l10ntools/inc/xmlparse.hxx6
-rw-r--r--l10ntools/inc/xrmmerge.hxx6
12 files changed, 32 insertions, 32 deletions
diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index 03addd1ada04..6d8a92f5eb46 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CFG_MERGE_HXX
-#define _CFG_MERGE_HXX
+#ifndef INCLUDED_L10NTOOLS_INC_CFGMERGE_HXX
+#define INCLUDED_L10NTOOLS_INC_CFGMERGE_HXX
#include "sal/config.h"
diff --git a/l10ntools/inc/common.hxx b/l10ntools/inc/common.hxx
index 047d2f4f00b2..f9cd72d955a1 100644
--- a/l10ntools/inc/common.hxx
+++ b/l10ntools/inc/common.hxx
@@ -9,8 +9,8 @@
// Methods used by all of executables
-#ifndef INCLUDED_L10NTOOLS_SOURCE_COMMON_HXX
-#define INCLUDED_L10NTOOLS_SOURCE_COMMON_HXX
+#ifndef INCLUDED_L10NTOOLS_INC_COMMON_HXX
+#define INCLUDED_L10NTOOLS_INC_COMMON_HXX
#include "sal/config.h"
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index b9d260375d1c..a0606f74bf3f 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _EXPORT_HXX
-#define _EXPORT_HXX
+#ifndef INCLUDED_L10NTOOLS_INC_EXPORT_HXX
+#define INCLUDED_L10NTOOLS_INC_EXPORT_HXX
#include "sal/config.h"
#include "po.hxx"
@@ -423,6 +423,6 @@ private:
inline void Pop( std::queue<QueueEntry>& aQueue );
};
-#endif // _EXPORT_HXX
+#endif // INCLUDED_L10NTOOLS_INC_EXPORT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/inc/helper.hxx b/l10ntools/inc/helper.hxx
index 936010343f8f..72391f799249 100644
--- a/l10ntools/inc/helper.hxx
+++ b/l10ntools/inc/helper.hxx
@@ -9,8 +9,8 @@
// Helper string methods
-#ifndef INCLUDED_L10NTOOLS_SOURCE_HELPER_HXX
-#define INCLUDED_L10NTOOLS_SOURCE_HELPER_HXX
+#ifndef INCLUDED_L10NTOOLS_INC_HELPER_HXX
+#define INCLUDED_L10NTOOLS_INC_HELPER_HXX
#include "sal/config.h"
#include "sal/types.h"
diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx
index 968bb3e4cd12..ab3cfa2d787b 100644
--- a/l10ntools/inc/lngmerge.hxx
+++ b/l10ntools/inc/lngmerge.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef LNGMERGE_INCLUDED
-#define LNGMERGE_INCLUDED
+#ifndef INCLUDED_L10NTOOLS_INC_LNGMERGE_HXX
+#define INCLUDED_L10NTOOLS_INC_LNGMERGE_HXX
#include "sal/config.h"
@@ -64,6 +64,6 @@ public:
const OString &rLanguage );
};
-#endif // LNGMERGE_INCLUDED
+#endif // INCLUDED_L10NTOOLS_INC_LNGMERGE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index 1ec3b33e7861..e1a584d99311 100644
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _PO_INCLUDED
-#define _PO_INCLUDED
+#ifndef INCLUDED_L10NTOOLS_INC_PO_HXX
+#define INCLUDED_L10NTOOLS_INC_PO_HXX
#include <fstream>
#include <rtl/string.hxx>
@@ -135,6 +135,6 @@ public:
void readEntry(PoEntry& rPo);
};
-#endif // _PO_INCLUDED
+#endif // INCLUDED_L10NTOOLS_INC_PO_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/inc/propmerge.hxx b/l10ntools/inc/propmerge.hxx
index b4289655ecd8..7e9eb594da2a 100644
--- a/l10ntools/inc/propmerge.hxx
+++ b/l10ntools/inc/propmerge.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _PROPMERGE_INCLUDED
-#define _PROPMERGE_INCLUDED
+#ifndef INCLUDED_L10NTOOLS_INC_PROPMERGE_HXX
+#define INCLUDED_L10NTOOLS_INC_PROPMERGE_HXX
#include <rtl/string.hxx>
#include <vector>
@@ -39,5 +39,5 @@ public:
void Merge( const OString &rMergeSrc, const OString &rDestinationFile );
};
-#endif // _PROPMERGE_INCLUDED
+#endif // INCLUDED_L10NTOOLS_INC_PROPMERGE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/inc/stringmerge.hxx b/l10ntools/inc/stringmerge.hxx
index be18904be48f..626da773d29a 100644
--- a/l10ntools/inc/stringmerge.hxx
+++ b/l10ntools/inc/stringmerge.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _STRINGMERGE_INCLUDED
-#define _STRINGMERGE_INCLUDED
+#ifndef INCLUDED_L10NTOOLS_INC_STRINGMERGE_HXX
+#define INCLUDED_L10NTOOLS_INC_STRINGMERGE_HXX
#include <libxml/tree.h>
#include <rtl/string.hxx>
@@ -37,5 +37,5 @@ public:
const OString &rMergeSrc, const OString &rDestinationFile );
};
-#endif //_STRINGMERGE_INCLUDED
+#endif // INCLUDED_L10NTOOLS_INC_STRINGMERGE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/inc/tokens.h b/l10ntools/inc/tokens.h
index 694bead2dd10..da340b6e7334 100644
--- a/l10ntools/inc/tokens.h
+++ b/l10ntools/inc/tokens.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOKENS_H
-#define _TOKENS_H
+#ifndef INCLUDED_L10NTOOLS_INC_TOKENS_H
+#define INCLUDED_L10NTOOLS_INC_TOKENS_H
/*------------------------------------------------------ */
/*------------------------------------------------------ */
diff --git a/l10ntools/inc/treemerge.hxx b/l10ntools/inc/treemerge.hxx
index c98b77b07ec5..63791b4655a9 100644
--- a/l10ntools/inc/treemerge.hxx
+++ b/l10ntools/inc/treemerge.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _TREEMERGE_INCLUDED
-#define _TREEMERGE_INCLUDED
+#ifndef INCLUDED_L10NTOOLS_INC_TREEMERGE_HXX
+#define INCLUDED_L10NTOOLS_INC_TREEMERGE_HXX
#include <libxml/tree.h>
#include <rtl/string.hxx>
@@ -42,6 +42,6 @@ public:
const OString &rXhpRoot );
};
-#endif // _TREEMERGE_INCLUDED
+#endif // INCLUDED_L10NTOOLS_INC_TREEMERGE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index 5ce765681500..547ffcea7102 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef BOOTSTRP_XMLPARSE_HXX
-#define BOOTSTRP_XMLPARSE_HXX
+#ifndef INCLUDED_L10NTOOLS_INC_XMLPARSE_HXX
+#define INCLUDED_L10NTOOLS_INC_XMLPARSE_HXX
#include "sal/config.h"
@@ -386,6 +386,6 @@ public:
const XMLError &GetError() const { return m_aErrorInformation; }
};
-#endif // BOOTSTRP_XMLPARSE_HXX
+#endif // INCLUDED_L10NTOOLS_INC_XMLPARSE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/inc/xrmmerge.hxx b/l10ntools/inc/xrmmerge.hxx
index f5de9af9bc2e..7c593c227869 100644
--- a/l10ntools/inc/xrmmerge.hxx
+++ b/l10ntools/inc/xrmmerge.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef XRMMERGE_INCLUDED
-#define XRMMERGE_INCLUDED
+#ifndef INCLUDED_L10NTOOLS_INC_XRMMERGE_HXX
+#define INCLUDED_L10NTOOLS_INC_XRMMERGE_HXX
#include "sal/config.h"
@@ -134,6 +134,6 @@ public:
virtual ~XRMResMerge();
};
-#endif // XRMMERGE_INCLUDED
+#endif // INCLUDED_L10NTOOLS_INC_XRMMERGE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */