summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-06-04 08:48:58 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-06-04 08:48:58 +0000
commitfe3b984d42bd4240bc458f041de05d68f756b71d (patch)
treea73ebfc90d6ec438c6e826a693ab6852e72f9d90
parent260a3275f1df63e74ef6309384b06b86100576ed (diff)
INTEGRATION: CWS l10nfix26 (1.23.8); FILE MERGED
2008/05/26 16:13:44 ihi 1.23.8.1: #158069# Write full file path in error message
-rw-r--r--transex3/source/xmlparse.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/transex3/source/xmlparse.cxx b/transex3/source/xmlparse.cxx
index a300aef85403..61fada5b0d3e 100644
--- a/transex3/source/xmlparse.cxx
+++ b/transex3/source/xmlparse.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: xmlparse.cxx,v $
- * $Revision: 1.23 $
+ * $Revision: 1.24 $
*
* This file is part of OpenOffice.org.
*
@@ -544,7 +544,7 @@ void XMLFile::InsertL10NElement( XMLElement* pElement ){
elem=pos->second;
if ( (*elem)[ language ] )
{
- fprintf(stdout,"Error: Entry for language double. ID = %s LANG = %s in File %s\n", id.GetBuffer(), language.GetBuffer(), ByteString( sFileName,RTL_TEXTENCODING_ASCII_US ).GetBuffer() );
+ fprintf(stdout,"Error: Duplicated entry. ID = %s LANG = %s in File %s\n", id.GetBuffer(), language.GetBuffer(), ByteString( sFullName,RTL_TEXTENCODING_ASCII_US ).GetBuffer() );
exit( -1 );
}
(*elem)[ language ]=pElement;
@@ -1203,7 +1203,7 @@ void SimpleXMLParser::Default(
}
/*****************************************************************************/
-XMLFile *SimpleXMLParser::Execute( const String &rFileName, XMLFile* pXMLFileIn )
+XMLFile *SimpleXMLParser::Execute( const String &rFullFileName , const String &rFileName, XMLFile* pXMLFileIn )
/*****************************************************************************/
{
// printf("DBG: SimpleXMLParser::Execute( %s )", ByteString( rFileName , RTL_TEXTENCODING_ASCII_US ).GetBuffer() );
@@ -1226,6 +1226,7 @@ XMLFile *SimpleXMLParser::Execute( const String &rFileName, XMLFile* pXMLFileIn
pXMLFile = pXMLFileIn;
pXMLFile->SetName( rFileName );
+ pXMLFile->SetFullName( rFullFileName );
return Execute( &aMemStream );
}