diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-02-13 21:46:50 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-02-13 21:47:25 +0100 |
commit | 2fce337212044d3d3a552c675fffe9bdc137eef9 (patch) | |
tree | 06c268708024cf77346776f00d89cb02326260cc /l10ntools/source/xmlparse.cxx | |
parent | 7c3fab1be983241c61df2c871556ba3e7e35dec6 (diff) |
l10ntools now only depends on sal and externals
Still room for further improvement.
Includes some fixes for regressions introduced with previous commits.
Diffstat (limited to 'l10ntools/source/xmlparse.cxx')
-rw-r--r-- | l10ntools/source/xmlparse.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx index 51e38e6f029b..24dedf095832 100644 --- a/l10ntools/source/xmlparse.cxx +++ b/l10ntools/source/xmlparse.cxx @@ -466,7 +466,7 @@ void XMLFile::InsertL10NElement( XMLElement* pElement ){ elem=pos->second; if ( (*elem)[ language ] ) { - fprintf(stdout,"Error: Duplicated entry. ID = %s LANG = %s in File %s\n", id.getStr(), language.getStr(), rtl::OUStringToOString(sFullName, RTL_TEXTENCODING_ASCII_US).getStr() ); + fprintf(stdout,"Error: Duplicated entry. ID = %s LANG = %s in File %s\n", id.getStr(), language.getStr(), rtl::OUStringToOString(sFileName, RTL_TEXTENCODING_ASCII_US).getStr() ); exit( -1 ); } (*elem)[ language ]=pElement; @@ -1113,7 +1113,7 @@ void SimpleXMLParser::Default( } /*****************************************************************************/ -XMLFile *SimpleXMLParser::Execute( const rtl::OUString &rFullFileName , const rtl::OUString &rFileName, XMLFile* pXMLFileIn ) +XMLFile *SimpleXMLParser::Execute( const rtl::OUString &rFileName, XMLFile* pXMLFileIn ) /*****************************************************************************/ { aErrorInformation.eCode = XML_ERROR_NONE; @@ -1150,7 +1150,6 @@ XMLFile *SimpleXMLParser::Execute( const rtl::OUString &rFullFileName , const rt pXMLFile = pXMLFileIn; pXMLFile->SetName( rFileName ); - pXMLFile->SetFullName( rFullFileName ); pCurNode = pXMLFile; pCurData = NULL; |