mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#i10000# masterfix build break

Browse Source
This commit is contained in:
Ivo Hinkelmann
2008-07-31 09:46:48 +00:00
parent b11c99ffca
commit 1eddd90c39
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
transex3/layout/tralay.cxx
View File

@@ -8,7 +8,7 @@
* *
* $RCSfile: tralay.cxx,v $ * $RCSfile: tralay.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -37,6 +37,7 @@
#include "export.hxx" #include "export.hxx"
#include "layoutparse.hxx" #include "layoutparse.hxx"
#include "helpmerge.hxx" #include "helpmerge.hxx"
#include "xmlparse.hxx"
// Convert a rtl::OUString to a byte string. // Convert a rtl::OUString to a byte string.
#define OUSTRING_CSTR( str ) \ #define OUSTRING_CSTR( str ) \
@@ -265,9 +266,10 @@ void TranslateLayout::MergeLanguage( ByteString const& language )
MergeDataFile mergeData( mLocalize, xmlFile, MergeDataFile mergeData( mLocalize, xmlFile,
FALSE, RTL_TEXTENCODING_MS_1252 ); FALSE, RTL_TEXTENCODING_MS_1252 );
DirEntry aFile( xmlFile );
SimpleXMLParser aParser; SimpleXMLParser aParser;
LayoutXMLFile* layoutXml = new LayoutXMLFile( mMergeMode ); LayoutXMLFile* layoutXml = new LayoutXMLFile( mMergeMode );
if ( !aParser.Execute( STRING( xmlFile ), layoutXml ) ) if ( !aParser.Execute( aFile.GetFull() , STRING( xmlFile ), layoutXml ) )
{ {
fprintf(stderr, "error: parsing: %s\n", xmlFile.GetBuffer() ); fprintf(stderr, "error: parsing: %s\n", xmlFile.GetBuffer() );
return; return;