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/18 21:38:14 UTC
svn commit: r1457979 - in /openoffice/branches/l10n/main/l10ntools/source:
gConXcsWrap.cxx gConXcuWrap.cxx
Author: jani
Date: Mon Mar 18 20:38:14 2013
New Revision: 1457979
URL: http://svn.apache.org/r1457979
Log:
base part of merge works.
Modified:
openoffice/branches/l10n/main/l10ntools/source/gConXcsWrap.cxx
openoffice/branches/l10n/main/l10ntools/source/gConXcuWrap.cxx
Modified: openoffice/branches/l10n/main/l10ntools/source/gConXcsWrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConXcsWrap.cxx?rev=1457979&r1=1457978&r2=1457979&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConXcsWrap.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConXcsWrap.cxx Mon Mar 18 20:38:14 2013
@@ -153,8 +153,7 @@ void convert_xcs::stopCollectData(char *
}
#endif
}
- else
- mcMemory.setSourceKey(miLineNo, msSourceFile, sKey, sText);
+ mcMemory.setSourceKey(miLineNo, msSourceFile, sKey, sText);
mbCollectingData = false;
}
Modified: openoffice/branches/l10n/main/l10ntools/source/gConXcuWrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConXcuWrap.cxx?rev=1457979&r1=1457978&r2=1457979&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConXcuWrap.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConXcuWrap.cxx Mon Mar 18 20:38:14 2013
@@ -167,9 +167,9 @@ void convert_xcu::stopCollectData(char *
}
#endif
}
- else
- if (useText.size())
- mcMemory.setSourceKey(miLineNo, msSourceFile, useKey, useText);
+
+ if (useText.size())
+ mcMemory.setSourceKey(miLineNo, msSourceFile, useKey, useText);
}