You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/03/22 15:29:43 UTC

svn commit: r1459800 - /openoffice/branches/l10n/main/l10ntools/source/gConUlfWrap.cxx

Author: jani
Date: Fri Mar 22 14:29:43 2013
New Revision: 1459800

URL: http://svn.apache.org/r1459800
Log:
added ulf merge

Modified:
    openoffice/branches/l10n/main/l10ntools/source/gConUlfWrap.cxx

Modified: openoffice/branches/l10n/main/l10ntools/source/gConUlfWrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConUlfWrap.cxx?rev=1459800&r1=1459799&r2=1459800&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConUlfWrap.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConUlfWrap.cxx Fri Mar 22 14:29:43 2013
@@ -83,7 +83,7 @@ void convert_ulf::setText(char *syyText,
 /**********************   I M P L E M E N T A T I O N   **********************/
 void convert_ulf::setValue(char *syyText)
 {
-  std::string sText = copySource(syyText);
+  std::string sLang, sText = copySource(syyText);
   int         nL;
 
   sText.erase(0,1);
@@ -91,4 +91,15 @@ void convert_ulf::setValue(char *syyText
   sText.erase(nL);
 
   mcMemory.setSourceKey(miLineNo, msSourceFile, msKey, sText);
+  if (mbMergeMode)
+  {
+    // prepare to read all languages
+    mcMemory.prepareMerge();
+    for (; mcMemory.getMergeLang(sLang, sText);)
+    {
+      // Prepare tag
+      sText = sLang + " = \"" + sText + "\"\n";
+      writeSourceFile(sText);
+    }
+  }
 }