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

[strba svn gnome org]

Author: strba
Date: Fri Feb  8 08:24:19 2008
New Revision: 11534
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11534&view=rev

Log:
unbreak the build with the internal expat

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	Fri Feb  8 08:24:19 2008
@@ -848,31 +848,11 @@
  
  	return Execute( &aMemStream );
  }
-@@ -1295,6 +1304,29 @@ XMLFile *SimpleXMLParser::Execute( SvMemoryStream *pStream )
+@@ -1295,6 +1304,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;
-+
-+            case XML_ERROR_UNEXPECTED_STATE:
-+            case XML_ERROR_ENTITY_DECLARED_IN_PE:
-+            case XML_ERROR_FEATURE_REQUIRES_XML_DTD:
-+            case XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING:
-+            case XML_ERROR_UNBOUND_PREFIX:
-+            case XML_ERROR_UNDECLARING_PREFIX:
-+            case XML_ERROR_INCOMPLETE_PE:
-+            case XML_ERROR_XML_DECL:
-+            case XML_ERROR_TEXT_DECL:
-+            case XML_ERROR_PUBLICID:
-+            case XML_ERROR_SUSPENDED:
-+            case XML_ERROR_NOT_SUSPENDED:
-+            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
++            default:
 +                break;
 +
  		}