[Libreoffice-commits] .: l10ntools/Executable_gsicheck.mk l10ntools/inc l10ntools/source l10ntools/StaticLibrary_transex.mk
l10ntools/Executable_gsicheck.mk |6
l10ntools/StaticLibrary_transex.mk |2
l10ntools/inc/export.hxx | 23 -
l10ntools/inc/gsicheck.hxx | 34 --
l10ntools/source/gsicheck.cxx | 454 +++-
l10ntools/source/gsimain.cxx | 456 -
l10ntools/source/helpmerge.cxx | 10
l10ntools/source/merge.cxx |9
8 files changed, 443 insertions(+), 551 deletions(-)
New commits:
commit 8b97644bab0e9106b798a5b8969aa796e558ef3f
Author: Andras Timar
Date: Fri Sep 28 13:57:36 2012 +0200
Revert "fdo#52246 let helpex use gsicheck's tag checker"
This reverts commit e3b927787f3643f9e584cc80c974d5f907a94858.
There will be a better solution in feature/killsdf soon.
Conflicts:
l10ntools/inc/gsicheck.hxx
l10ntools/source/gsicheck.cxx
l10ntools/source/gsimain.cxx
Change-Id: I5d12f4ee069d7024345d78c45fb1587cb006c922
diff --git a/l10ntools/Executable_gsicheck.mk b/l10ntools/Executable_gsicheck.mk
index fceb61a..917c00f 100644
--- a/l10ntools/Executable_gsicheck.mk
+++ b/l10ntools/Executable_gsicheck.mk
@@ -34,12 +34,10 @@ $(eval $(call gb_Executable_set_include,gsicheck,\
$(eval $(call gb_Executable_use_libraries,gsicheck,\
sal \
))
-$(eval $(call gb_Executable_use_static_libraries,gsicheck,\
-transex \
-))
$(eval $(call gb_Executable_add_exception_objects,gsicheck,\
-l10ntools/source/gsimain \
+l10ntools/source/gsicheck \
+l10ntools/source/tagtest \
))
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/l10ntools/StaticLibrary_transex.mk
b/l10ntools/StaticLibrary_transex.mk
index f9dd165..e8c84b7 100644
--- a/l10ntools/StaticLibrary_transex.mk
+++ b/l10ntools/StaticLibrary_transex.mk
@@ -37,8 +37,6 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,transex,\
l10ntools/source/merge \
l10ntools/source/file \
l10ntools/source/directory \
-l10ntools/source/tagtest \
-l10ntools/source/gsicheck \
))
# vim: set noet sw=4 ts=4:
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index d11d06f..be24360 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -71,9 +71,6 @@ typedef boost::unordered_map
typedef boost::unordered_map
MergeDataHashMap;
-typedef boost::unordered_map
-LineNumberHashMap;
-
#define SOURCE_LANGUAGE rtl::OString(RTL_CONSTASCII_STRINGPARAM("en-US"))
#define X_COMMENT rtl::OString(RTL_CONSTASCII_STRINGPARAM("x-comment"))
#define LIST_REFID "LIST_REFID"
@@ -377,36 +374,23 @@ private:
OStringBoolHashMap bQuickHelpTextFirst;
OStringHashMap sTitle;
OStringBoolHashMap bTitleFirst;
-OStringHashMap sSDFLine;
-LineNumberHashMap nLine;
public:
PFormEntrys( const rtl::OString &rPForm ) : data_( rPForm ) {};
void InsertEntry(const rtl::OString &rId, const rtl::OString &rText,
-const rtl::OString &rQuickHelpText, const rtl::OString &rTitle,
-const rtl::OString &rSDFLine, const std::size_t nLineIn)
+const rtl::OString &rQuickHelpText, const rtl::OString &rTitle)
{
+
sText[ rId ] = rText;
bTextFirst[ rId ] = true;
sQuickHelpText[ rId ] = rQuickHelpText;
bQuickHelpTextFirst[ rId ] = true;
sTitle[ rId ] = rTitle;
bTitleFirst[ rId ] = true;
-sSDFLine[ rId ] = rSDFLine;
-nLine[ rId ] = nLineIn;
}
sal_Bool GetText( rtl::OString &rReturn, sal_uInt16 nTyp, const
rtl::OString &nLangIndex, sal_Bool bDel = sal_False );
sal_Bool GetTransex3Text( rtl::OString &rReturn, sal_uInt16 nTyp, const
rtl::OString &nLangIndex, sal_Bool bDel = sal_False );
-rtl::OString & GetSDF(const rtl::OString &nLangIndex)
-{
-return sSDFLine[nLangIndex];
-}
-
-std::size_t GetNLine(const rtl::OString &nLangIndex)
-{
-return nLine[nLangIndex];
-}
};
//
@@ -459,8 +443,7 @@ class MergeDataFile
const rtl::OString &rLID, const rtl::OString &rPFO,
const rtl::OString &nLang, const rtl::OString &rTEXT,
const rtl::OString &rQHTEXT, const rtl::OString &rTITLE,
-const rtl::OString &sFilename, bool bCaseSensitive,
-const rtl::OString &rSDF, std::size_t nLine);
+const rtl::OString &sFilename, bool bCaseSensitive);
public:
explicit MergeDataFile(const rtl::OString &rFileName,
const rtl::OString& rFile, bool bCaseSensitive);
diff --git a/l10ntools/inc/gsicheck.hxx b/l10ntools/inc/gsicheck.hxx
index a33796c..467925e 100644
--- a/l10ntools/inc/gsicheck.hxx
+++ b/l10ntools/inc/gsicheck.hxx
@@ -33,7 +33,6 @@
#include
#include
-#include
#include "tagtest.hxx"
@@ -132,39 +131,6 @@ public:
void WriteFixed( LazyStream &aFixOut );
};
-sal_Bool check(rtl::OString s,std::size_t nLine);
-
-void PrintMessage( rtl::OString const & aType, rtl::OString const & aMsg,
rtl::OString
[Libreoffice-commits] .: l10ntools/Executable_gsicheck.mk l10ntools/inc l10ntools/source l10ntools/StaticLibrary_transex.mk
l10ntools/Executable_gsicheck.mk |6
l10ntools/StaticLibrary_transex.mk |2
l10ntools/inc/export.hxx | 23 +
l10ntools/inc/gsicheck.hxx | 60
l10ntools/source/gsicheck.cxx | 456 +
l10ntools/source/gsimain.cxx | 437 +++
l10ntools/source/helpmerge.cxx | 10
l10ntools/source/merge.cxx |9
8 files changed, 558 insertions(+), 445 deletions(-)
New commits:
commit 4ced2d99db7ac1be3af8c114757abf3caae1b555
Author: Andras Bartek
Date: Thu Sep 6 21:11:23 2012 +0200
fdo#52246 let helpex use gsicheck's tag checker
So the build will not break on translations errors in help.
English segment will be used, when the localized segment
has fatal error in it, e.g. a tag error that results in
invalid xml.
Change-Id: I8a74649d1f00f6379a7244f2582d27b8a437cd2f
diff --git a/l10ntools/Executable_gsicheck.mk b/l10ntools/Executable_gsicheck.mk
index 917c00f..fceb61a 100644
--- a/l10ntools/Executable_gsicheck.mk
+++ b/l10ntools/Executable_gsicheck.mk
@@ -34,10 +34,12 @@ $(eval $(call gb_Executable_set_include,gsicheck,\
$(eval $(call gb_Executable_use_libraries,gsicheck,\
sal \
))
+$(eval $(call gb_Executable_use_static_libraries,gsicheck,\
+transex \
+))
$(eval $(call gb_Executable_add_exception_objects,gsicheck,\
-l10ntools/source/gsicheck \
-l10ntools/source/tagtest \
+l10ntools/source/gsimain \
))
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/l10ntools/StaticLibrary_transex.mk
b/l10ntools/StaticLibrary_transex.mk
index e8c84b7..f9dd165 100644
--- a/l10ntools/StaticLibrary_transex.mk
+++ b/l10ntools/StaticLibrary_transex.mk
@@ -37,6 +37,8 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,transex,\
l10ntools/source/merge \
l10ntools/source/file \
l10ntools/source/directory \
+l10ntools/source/tagtest \
+l10ntools/source/gsicheck \
))
# vim: set noet sw=4 ts=4:
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index a1c66e3..8e4be09 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -71,6 +71,9 @@ typedef boost::unordered_map
typedef boost::unordered_map
MergeDataHashMap;
+typedef boost::unordered_map
+LineNumberHashMap;
+
#define SOURCE_LANGUAGE rtl::OString(RTL_CONSTASCII_STRINGPARAM("en-US"))
#define X_COMMENT rtl::OString(RTL_CONSTASCII_STRINGPARAM("x-comment"))
#define LIST_REFID "LIST_REFID"
@@ -374,23 +377,36 @@ private:
OStringBoolHashMap bQuickHelpTextFirst;
OStringHashMap sTitle;
OStringBoolHashMap bTitleFirst;
+OStringHashMap sSDFLine;
+LineNumberHashMap nLine;
public:
PFormEntrys( const rtl::OString &rPForm ) : data_( rPForm ) {};
void InsertEntry(const rtl::OString &rId, const rtl::OString &rText,
-const rtl::OString &rQuickHelpText, const rtl::OString &rTitle)
+const rtl::OString &rQuickHelpText, const rtl::OString &rTitle,
+const rtl::OString &rSDFLine, const std::size_t nLineIn)
{
-
sText[ rId ] = rText;
bTextFirst[ rId ] = true;
sQuickHelpText[ rId ] = rQuickHelpText;
bQuickHelpTextFirst[ rId ] = true;
sTitle[ rId ] = rTitle;
bTitleFirst[ rId ] = true;
+sSDFLine[ rId ] = rSDFLine;
+nLine[ rId ] = nLineIn;
}
sal_Bool GetText( rtl::OString &rReturn, sal_uInt16 nTyp, const
rtl::OString &nLangIndex, sal_Bool bDel = sal_False );
sal_Bool GetTransex3Text( rtl::OString &rReturn, sal_uInt16 nTyp, const
rtl::OString &nLangIndex, sal_Bool bDel = sal_False );
+rtl::OString & GetSDF(const rtl::OString &nLangIndex)
+{
+return sSDFLine[nLangIndex];
+}
+
+std::size_t GetNLine(const rtl::OString &nLangIndex)
+{
+return nLine[nLangIndex];
+}
};
//
@@ -444,7 +460,8 @@ class MergeDataFile
const rtl::OString &rLID, const rtl::OString &rPFO,
const rtl::OString &nLang, const rtl::OString &rTEXT,
const rtl::OString &rQHTEXT, const rtl::OString &rTITLE,
-const rtl::OString &sFilename, bool bCaseSensitive);
+const rtl::OString &sFilename, bool bCaseSensitive,
+const rtl::OString &rSDF, std::size_t nLine);
public:
explicit MergeDataFile(const rtl::OString &rFileName,
const rtl::OString& rFile, bool bCaseSensitive);
diff --git a/l10ntools/inc/gsicheck.hxx b/l10ntools/inc/gsicheck.hxx
index 467925e..266ea96 100644
--- a/l10ntools/inc/gsicheck.hxx
+++ b/l10ntools/inc/gsicheck.hxx
@@ -33,6 +33,7 @@
#include
#include
+#include
#include "tagtest.hxx"
@@ -131,6 +132,65 @@ public:
void WriteFixed( LazyStream &aFixOut );
};
+sal_Bool check(rtl::OString s,std::size_t nLine);
+
+void PrintMessage( rtl::OString const & aType, rtl::OString const & aMsg,
rtl::OString const & aPrefix,
+ rtl::OString const & aContext,
