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

INTEGRATION: CWS layout_DEV300 (1.19.28); FILE MERGED

Browse Source 
2008/02/15 13:51:55 jcn 1.19.28.2: Cleanup tralay, fixing shortcomings: any and all _-prefixed attributes are translated.
2008/02/11 15:33:50 jcn 1.19.28.1: Initial import into layout cws.
This commit is contained in:
Kurt Zenker
2008-03-06 11:38:44 +00:00
parent ac57921945
commit ffadf10e41
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
transex3/source/xmlparse.cxx
View File

@@ -4,9 +4,9 @@
*
* $RCSfile: xmlparse.cxx,v $
*
* $Revision: 1.21 $
* $Revision: 1.22 $
*
* last change: $Author: ihi $ $Date: 2008-02-06 17:17:37 $
* last change: $Author: kz $ $Date: 2008-03-06 12:38:44 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -1208,7 +1208,7 @@ void SimpleXMLParser::Default(
}
/*****************************************************************************/
XMLFile *SimpleXMLParser::Execute( const String &rFileName )
XMLFile *SimpleXMLParser::Execute( const String &rFileName, XMLFile* pXMLFileIn )
/*****************************************************************************/
{
// printf("DBG: SimpleXMLParser::Execute( %s )", ByteString( rFileName , RTL_TEXTENCODING_ASCII_US ).GetBuffer() );
@@ -1229,7 +1229,8 @@ XMLFile *SimpleXMLParser::Execute( const String &rFileName )
aStream.Close();
pXMLFile = new XMLFile( rFileName );
pXMLFile = pXMLFileIn;
pXMLFile->SetName( rFileName );
return Execute( &aMemStream );
}
@@ -1300,6 +1301,9 @@ XMLFile *SimpleXMLParser::Execute( SvMemoryStream *pStream )
case XML_ERROR_EXTERNAL_ENTITY_HANDLING: aErrorInformation.sMessage += String::CreateFromAscii( "External entity handling" ); break;
case XML_ERROR_NOT_STANDALONE: aErrorInformation.sMessage += String::CreateFromAscii( "Not standalone" ); break;
case XML_ERROR_NONE: break;
default:
break;
}
delete pXMLFile;
pXMLFile = NULL;