Author: jani
Date: Mon Sep 30 19:36:08 2013
New Revision: 1527739
URL: http://svn.apache.org/r1527739
Log:
.src is ready to be tested for merge (integrate in build system and look for
errors).
Modified:
openoffice/branches/l10n40/main/l10ntools/source/gConSrcWrap.cxx
Modified: openoffice/branches/l10n40/main/l10ntools/source/gConSrcWrap.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gConSrcWrap.cxx?rev=1527739&r1=1527738&r2=1527739&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gConSrcWrap.cxx (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gConSrcWrap.cxx Mon Sep 30
19:36:08 2013
@@ -64,9 +64,6 @@ namespace SrcWrap
/********************** I M P L E M E N T A T I O N **********************/
void convert_src::execute()
{
- if (mbMergeMode)
- throw l10nMem::showError("Merge not implemented");
-
SrcWrap::yylex();
}
@@ -350,7 +347,8 @@ void convert_src::insertLanguagePart(std
for (; mcMemory.getMergeLang(sLang, sText);)
{
// Prepare tag start and end
- sTagText = sTextType + "[ " + sLang + " ] = \"" + sText + "\"\n";
+ sTagText = sTextType + "[ " + sLang + " ] = \"" + sText + "\" ;" +
+ (mbExpectMacro ? "\\" : "") + "\n";
writeSourceFile(sTagText);
}
}
\ No newline at end of file
