Author: jani
Date: Mon Sep 30 17:24:18 2013
New Revision: 1527668
URL: http://svn.apache.org/r1527668
Log:
.xhp and .tree merge tested
Modified:
openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx
Modified: openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx?rev=1527668&r1=1527667&r2=1527668&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx Mon Sep 30
17:24:18 2013
@@ -74,9 +74,6 @@ void convert_xhp::execute()
std::string sLang;
std::string sFile, sFile2;
- if (mbMergeMode)
- throw l10nMem::showError("Merge not implemented");
-
// prepare list with languages
miCntLanguages = mcMemory.prepareMerge();
if (mbMergeMode)
