diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2013-03-31 20:11:57 +0200 |
|---|---|---|
| committer | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2013-03-31 20:25:13 +0200 |
| commit | ce51bf1a6ef36bbd1eea751add342cae6f1004d2 (patch) | |
| tree | fedd6cb9efdd0a90306316bda580ace87b78b0b4 /l10ntools/inc | |
| parent | 6ea8d4a55c3693d75da32af7e9a40a79bac99fa7 (diff) | |
Make a bit cleaner transformation of help strings
*Not escape tags and double quots in tags,
but find tags(icu regexp) when merge and
use this infromation to make strings valid.
*Define a new Quot function for helpex,
which works with icu UnicodeCharacter.
*Move tag search to xmlparse.cxx and use icu
just in helpex.
*QuotHTML not unescape just replace xml charcters.
(unescaping is also useless in uimerge.cxx)
*Move UnQuotHTML() to helper.
(was used it in xmlparse.cxx and cfgmerge.cxx)
*Use UnQuotHTML() in uimerge.cxx too.
Change-Id: Ice8940ef69279709a1c5d84c6ae1b0d62a71ca76
Diffstat (limited to 'l10ntools/inc')
| -rw-r--r-- | l10ntools/inc/helper.hxx | 3 | ||||
| -rw-r--r-- | l10ntools/inc/xmlparse.hxx | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/l10ntools/inc/helper.hxx b/l10ntools/inc/helper.hxx index 4dd2dd137937..1292f44ec957 100644 --- a/l10ntools/inc/helper.hxx +++ b/l10ntools/inc/helper.hxx @@ -25,7 +25,8 @@ namespace helper { -OString QuotHTML(const rtl::OString &rString); +OString QuotHTML( const OString &rString ); +OString UnQuotHTML( const OString& rString ); bool isWellFormedXML( OString const & text ); diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx index 7a758727c5f6..55867d3f70ab 100644 --- a/l10ntools/inc/xmlparse.hxx +++ b/l10ntools/inc/xmlparse.hxx @@ -229,11 +229,11 @@ protected: class XMLUtil{ public: - /// Quot the XML characters and replace \n \t - static void QuotHTML( rtl::OUString &rString ); + /// Quot the XML characters + static OUString QuotHTML( const OUString& rString ); - /// UnQuot the XML characters and restore \n \t - static void UnQuotHTML ( rtl::OUString &rString ); + /// UnQuot the XML characters + static OUString UnQuotHTML( const OUString &rString ); }; |