diff options
author | Andras Timar <atimar@suse.com> | 2011-09-21 19:27:44 +0200 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2011-09-21 20:34:57 +0200 |
commit | b57f55cf23ef11d446330fbbadd18803b5cbcc98 (patch) | |
tree | a5c90905e63f5b82862f202b78c5de4803a7629c /l10ntools/inc | |
parent | e6a2e730e8c1b651674531479c4b5dc5c42a7768 (diff) |
remove unused (and buggy) language fallback functionality
Fallback to en-US is done in translations module. Fallback to
other languages is not supported, but if we ever needed it, it
would be easier to solve the problem in a script language
instead of C++ in translations module.
Diffstat (limited to 'l10ntools/inc')
-rw-r--r-- | l10ntools/inc/export.hxx | 8 | ||||
-rw-r--r-- | l10ntools/inc/helpmerge.hxx | 5 | ||||
-rw-r--r-- | l10ntools/inc/lngmerge.hxx | 1 | ||||
-rw-r--r-- | l10ntools/inc/xmlparse.hxx | 1 |
4 files changed, 0 insertions, 15 deletions
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx index 8c42647d4bbc..520654070723 100644 --- a/l10ntools/inc/export.hxx +++ b/l10ntools/inc/export.hxx @@ -181,7 +181,6 @@ public: sal_uInt16 nTitleRefId; ByteString sTextTyp; - ByteStringHashMap aFallbackData; ByteStringHashMap aMergedLanguages; ExportList *pStringList; @@ -193,8 +192,6 @@ public: ByteString sPForm; void Dump(); - void addFallbackData( ByteString& sId , const ByteString& sText ); - bool getFallbackData( ByteString& sId , ByteString& sText); void addMergedLanguage(rtl::OString& rLang); bool isMerged(rtl::OString& rLang); @@ -353,9 +350,6 @@ public: static void getRandomName( const ByteString& sPrefix , ByteString& sRandStr , const ByteString& sPostfix ); static void getCurrentDir( std::string& dir ); - static ByteString GetFallbackLanguage( const ByteString nLanguage ); - static void FillInFallbacks( ResData *pResData ); - static void FillInListFallbacks( ExportList *pList, const ByteString &nSource, const ByteString &nFallback ); static ByteString GetTimeStamp(); static sal_Bool ConvertLineEnds( ByteString sSource, ByteString sDestination ); static ByteString GetNativeFile( ByteString sSource ); @@ -376,8 +370,6 @@ private: ByteString FullId(); // creates cur. GID - bool PairedListFallback( ByteString& sText , ResData& aResData ); - ByteString GetPairedListID ( const ByteString& sText ); ByteString GetPairedListString ( const ByteString& sText ); ByteString StripList ( const ByteString& sText ); diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx index 25536244e357..a160b158091b 100644 --- a/l10ntools/inc/helpmerge.hxx +++ b/l10ntools/inc/helpmerge.hxx @@ -32,7 +32,6 @@ #include <rtl/ustrbuf.hxx> #include <rtl/strbuf.hxx> #include <memory> /* auto_ptr */ -#include "tools/isofallback.hxx" #define MOVEFILE_REPLACE_EXISTING 0x01 @@ -44,10 +43,6 @@ private: bool bUTF8; bool bHasInputList; -/// Copy fallback language String (ENUS,DE) into position of the numeric language iso code -/// @PRECOND 0 < langIdx_in < MAX_IDX - static void FillInFallbacks( LangHashMap& rElem_out, ByteString sLangIdx_in ); - #if OSL_DEBUG_LEVEL > 2 /// Debugmethod, prints the content of the map to stdout static void Dump(LangHashMap* rElem_in , const ByteString sKey_in); diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx index 8aaf98d3d782..e658817c3e16 100644 --- a/l10ntools/inc/lngmerge.hxx +++ b/l10ntools/inc/lngmerge.hxx @@ -53,7 +53,6 @@ private: bool bQuiet; std::vector<ByteString> aLanguages; - void FillInFallbacks( ByteStringHashMap Text ); bool isNextGroup( ByteString &sGroup_out , ByteString &sLine_in); void ReadLine( const ByteString &sLine_in , ByteStringHashMap &rText_inout ); void WriteSDF( SvFileStream &aSDFStream , ByteStringHashMap &rText_inout , diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx index b2603c0e5c09..1c5f0d06735e 100644 --- a/l10ntools/inc/xmlparse.hxx +++ b/l10ntools/inc/xmlparse.hxx @@ -36,7 +36,6 @@ #include "tools/string.hxx" #define ENABLE_BYTESTRING_STREAM_OPERATORS #include "tools/stream.hxx" -#include "tools/isofallback.hxx" #include "export.hxx" #include "xmlutil.hxx" |