[Libreoffice-commits] .: l10ntools/source
Andras Timar
timar at kemper.freedesktop.org
Tue Feb 28 06:13:22 PST 2012
l10ntools/source/helpmerge.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 249dea425a1b8660197af53ab8a56268fddf8ce6
Author: Andras Timar <atimar at suse.com>
Date: Tue Feb 28 15:11:22 2012 +0100
Prevent crash of helpex.exe
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 4cbf8d5..a682bfb 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -244,7 +244,6 @@ bool HelpParser::Merge(
//TODO: explicit BOM handling?
XMLFile* xmlfile = aParser.Execute( sXmlFile, new XMLFile( rtl::OUString('0') ) );
- xmlfile->Extract();
if( xmlfile == NULL)
{
@@ -252,6 +251,7 @@ bool HelpParser::Merge(
exit(-1);
}
+ xmlfile->Extract();
rtl::OString sCur;
for( unsigned int n = 0; n < aLanguages.size(); n++ ){
More information about the Libreoffice-commits
mailing list