ooo-build r11530 - in trunk: . patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Thu Feb  7 21:23:19 2008
New Revision: 11530
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11530&view=rev

Log:
2008-02-07  Rene Engelhard  <rene debian org>

        * patches/src680/layout-dialogs-transex3.diff: fix build with
          system-expat (XML_ERROR_RESERVED_* not defined in it)


Modified:
   trunk/ChangeLog
   trunk/patches/src680/layout-dialogs-transex3.diff

Modified: trunk/patches/src680/layout-dialogs-transex3.diff
==============================================================================
--- trunk/patches/src680/layout-dialogs-transex3.diff	(original)
+++ trunk/patches/src680/layout-dialogs-transex3.diff	Thu Feb  7 21:23:19 2008
@@ -848,7 +848,7 @@
  
  	return Execute( &aMemStream );
  }
-@@ -1295,6 +1304,27 @@ XMLFile *SimpleXMLParser::Execute( SvMemoryStream *pStream )
+@@ -1295,6 +1304,29 @@ 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;
@@ -868,9 +868,11 @@
 +            case XML_ERROR_ABORTED:
 +            case XML_ERROR_FINISHED:
 +            case XML_ERROR_SUSPEND_PE:
++#ifndef SYSTEM_EXPAT
 +            case XML_ERROR_RESERVED_PREFIX_XML:
 +            case XML_ERROR_RESERVED_PREFIX_XMLNS:
 +            case XML_ERROR_RESERVED_NAMESPACE_URI:
++endif
 +                break;
 +
  		}