rebase

2 files changed, 14 insertions, 3 deletions

diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index 662d58d3f28a..e1f5161b7e3a 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -136,6 +136,11 @@ OUString XmlChar2OUString( const XML_Char *p )
                                             pThis->rDocumentLocator->getColumnNumber()\
                                      ) );\
         }\
+        catch( com::sun::star::uno::RuntimeException &e ) {\
+            pThis->bExceptionWasThrown = sal_True; \
+            pThis->bRTExceptionWasThrown = sal_True; \
+            pImpl->rtexception = e; \
+        }\
     }\
     ((void)0)
 
@@ -256,7 +261,9 @@ public: // module scope
     // Exception cannot be thrown through the C-XmlParser (possible resource leaks),
     // therefor the exception must be saved somewhere.
     SAXParseException   exception;
-    sal_Bool                bExceptionWasThrown;
+    RuntimeException    rtexception;
+    sal_Bool            bExceptionWasThrown;
+    sal_Bool            bRTExceptionWasThrown;
 
     Locale              locale;
 
@@ -437,6 +444,7 @@ SaxExpatParser::SaxExpatParser(  )
     m_pImpl->rAttrList = Reference< XAttributeList > ( m_pImpl->pAttrList );
 
     m_pImpl->bExceptionWasThrown = sal_False;
+    m_pImpl->bRTExceptionWasThrown = sal_False;
 }
 
 SaxExpatParser::~SaxExpatParser()
@@ -737,6 +745,9 @@ void SaxExpatParser_Impl::parse( )
 
         if( ! bContinue || this->bExceptionWasThrown ) {
 
+            if ( this->bRTExceptionWasThrown )
+                throw rtexception;
+
             // Error during parsing !
             XML_Error xmlE = XML_GetErrorCode( getEntity().pParser );
             OUString sSystemId = rDocumentLocator->getSystemId();
diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx
index b3fba10cc911..717767d86e11 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.cxx
@@ -436,7 +436,7 @@ inline sal_Bool SaxWriterHelper::convertToXML( const sal_Unicode * pStr,
             OSL_ENSURE( nSurrogate != 0, "lone 2nd Unicode surrogate" );
 
             nSurrogate = ( nSurrogate << 10 ) | ( c & 0x03ff );
-            if( nSurrogate > 0x00010000  &&  nSurrogate <= 0x001FFFFF )
+            if( nSurrogate >= 0x00010000  &&  nSurrogate <= 0x0010FFFF )
             {
                 sal_Int8 aBytes[] = { sal_Int8(0xF0 | ((nSurrogate >> 18) & 0x0F)),
                                       sal_Int8(0x80 | ((nSurrogate >> 12) & 0x3F)),
@@ -864,7 +864,7 @@ inline sal_Int32 calcXMLByteLength( const sal_Unicode *pStr, sal_Int32 nStrLen,
         {
             // 2. surrogate: write as UTF-8 (if range is OK
             nSurrogate = ( nSurrogate << 10 ) | ( c & 0x03ff );
-            if( nSurrogate > 0x00010000  &&  nSurrogate <= 0x001FFFFF )
+            if( nSurrogate >= 0x00010000  &&  nSurrogate <= 0x0010FFFF )
                 nOutputLength += 4;
             nSurrogate = 0;
         }