diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-02-10 21:53:20 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-02-10 21:53:49 +0100 |
| commit | b57f88ce679bba4758db98ab130548db224b6a1f (patch) | |
| tree | 31ee2b9eccc422f3cf4de7167e5ebb4865d4e8a1 /l10ntools/inc | |
| parent | 6396ab80dbb0fd60536c42e9c66b568f1e31418a (diff) | |
Various more l10ntools clean up
Diffstat (limited to 'l10ntools/inc')
| -rw-r--r-- | l10ntools/inc/export.hxx | 12 | ||||
| -rw-r--r-- | l10ntools/inc/lngmerge.hxx | 8 |
2 files changed, 9 insertions, 11 deletions
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx index e6d005707115..ff6a960da0be 100644 --- a/l10ntools/inc/export.hxx +++ b/l10ntools/inc/export.hxx @@ -34,8 +34,6 @@ #include <cstddef> #include <fstream> -#include <comphelper/string.hxx> - #ifndef L10NTOOLS_DIRECTORY_HXX #define L10NTOOLS_DIRECTORY_HXX #include <l10ntools/directory.hxx> @@ -56,6 +54,8 @@ #include <direct.h> #endif +#include "helper.hxx" + #define NO_TRANSLATE_ISO "x-no-translate" class PFormEntrys; @@ -196,8 +196,8 @@ public: pPairedList( NULL ), sPForm( rPF ) { - sGId = comphelper::string::remove(sGId, '\r'); - sPForm = comphelper::string::remove(sPForm, '\r'); + helper::searchAndReplaceAll(&sGId, "\r", rtl::OString()); + helper::searchAndReplaceAll(&sPForm, "\r", rtl::OString()); } ResData(const rtl::OString &rPF, const rtl::OString &rGId , const rtl::OString &rFilename) @@ -227,8 +227,8 @@ public: pPairedList( NULL ), sPForm( rPF ) { - sGId = comphelper::string::remove(sGId, '\r'); - sPForm = comphelper::string::remove(sPForm, '\r'); + helper::searchAndReplaceAll(&sGId, "\r", rtl::OString()); + helper::searchAndReplaceAll(&sPForm, "\r", rtl::OString()); } }; diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx index 99c852d9bac5..9649c34abe18 100644 --- a/l10ntools/inc/lngmerge.hxx +++ b/l10ntools/inc/lngmerge.hxx @@ -36,11 +36,9 @@ typedef std::vector< rtl::OString* > LngLineList; #define LNG_OK 0x0000 -#define LNG_FILE_NOTFOUND 0x0001 -#define LNG_COULD_NOT_OPEN 0x0002 -#define SDF_OK 0x0003 -#define SDF_FILE_NOTFOUND 0x0004 -#define SDF_COULD_NOT_OPEN 0x0005 +#define LNG_COULD_NOT_OPEN 0x0001 +#define SDF_OK 0x0002 +#define SDF_COULD_NOT_OPEN 0x0003 // // class LngParser |