svn commit: r1527449 - /openoffice/branches/l10n40/main/l10ntools/source/gConXrmWrap.cxx

[jani]

Author: jani
Date: Mon Sep 30 05:52:33 2013
New Revision: 1527449

URL: http://svn.apache.org/r1527449
Log:
merge of xrm tested

Modified:
    openoffice/branches/l10n40/main/l10ntools/source/gConXrmWrap.cxx

Modified: openoffice/branches/l10n40/main/l10ntools/source/gConXrmWrap.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gConXrmWrap.cxx?rev=1527449&r1=1527448&r2=1527449&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gConXrmWrap.cxx (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gConXrmWrap.cxx Mon Sep 30 
05:52:33 2013
@@ -59,9 +59,6 @@ namespace XrmWrap
 /**********************   I M P L E M E N T A T I O N   **********************/
 void convert_xrm::execute()
 {
-  if (mbMergeMode)
-    throw l10nMem::showError("Merge not implemented");
-
   XrmWrap::yylex();
 
   // write last part of file.
@@ -149,10 +146,7 @@ void convert_xrm::stopCollectData(char *
   copySource(yytext);
   if (!mbNoCollectingData)
   {
-    mcMemory.setSourceKey(miLineNo, msSourceFile, msKey, sText);
     mbNoCollectingData = true;
-  
-
     if (mbMergeMode)
     {
       sTagEnd  = "</" + msTag.substr(1,msTag.size()-2) + ">\n";
@@ -171,6 +165,8 @@ void convert_xrm::stopCollectData(char *
         writeSourceFile(sTagText);
       }
     }
+    else
+      mcMemory.setSourceKey(miLineNo, msSourceFile, msKey, sText);
     msKey.clear();
   }
   mbIsTag = false;