[Libreoffice-commits] core.git: include/oox oox/source

[Caolán McNamara]

 include/oox/core/fastparser.hxx |    6 +++---
 oox/source/core/fastparser.cxx  |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e21ef810e178e37f202e5ab8d0b582b24d5ce001
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 9 09:34:17 2016 +0000

    crashtesting: unexpected exception on novell403458-1.pptx
    
    since
    
    commit 4bcf1872bbe9db1388769485a7e4c0cbcce3d53c
    Date:   Thu Oct 13 23:43:41 2016 +0200
    
        chartx: fix sparse chart import
    
    because
    
    - Matrix< Any > aMatrix( rDataSeq.maData.size(), 1 );
    + Matrix< Any > aMatrix( rDataSeq.mnPointCount, 1 );
    
    where rDataSeq.mnPointCount is -1
    
    Change-Id: I4bb4805dd81a342d4c0ce24e3240154daf53b452

diff --git a/include/oox/core/fastparser.hxx b/include/oox/core/fastparser.hxx
index 0b48a74..4497d8b 100644
--- a/include/oox/core/fastparser.hxx
+++ b/include/oox/core/fastparser.hxx
@@ -74,19 +74,19 @@ public:
     /** Parses the passed SAX input source.
         @param bCloseStream  True = closes the stream in the input source after parsing. */
     void                parseStream( const css::xml::sax::InputSource& rInputSource, bool bCloseStream = false )
-                            throw( css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException );
+                            throw( css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException, std::exception );
 
     /** Parses the passed input stream.
         @param bCloseStream  True = closes the passed stream after parsing. */
     void                parseStream(
                             const css::uno::Reference< css::io::XInputStream >& rxInStream,
                             const OUString& rStreamName )
-                            throw( css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException );
+                            throw( css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException, std::exception );
 
     /** Parses a stream from the passed storage with the specified name.
         @param bCloseStream  True = closes the stream after parsing. */
     void                parseStream( StorageBase& rStorage, const OUString& rStreamName )
-                            throw( css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException );
+                            throw( css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException, std::exception );
 
     const css::uno::Reference< css::xml::sax::XFastTokenHandler >&
                getTokenHandler() const { return mxTokenHandler; }
diff --git a/oox/source/core/fastparser.cxx b/oox/source/core/fastparser.cxx
index 5a9121d..54b07b1 100644
--- a/oox/source/core/fastparser.cxx
+++ b/oox/source/core/fastparser.cxx
@@ -109,7 +109,7 @@ void FastParser::setDocumentHandler( const Reference< XFastDocumentHandler >& rx
     mxParser->setFastDocumentHandler( rxDocHandler );
 }
 
-void FastParser::parseStream( const InputSource& rInputSource, bool bCloseStream ) throw( SAXException, IOException, RuntimeException )
+void FastParser::parseStream( const InputSource& rInputSource, bool bCloseStream ) throw( SAXException, IOException, RuntimeException, std::exception )
 {
     // guard closing the input stream also when exceptions are thrown
     InputStreamCloseGuard aGuard( rInputSource.aInputStream, bCloseStream );
@@ -118,7 +118,7 @@ void FastParser::parseStream( const InputSource& rInputSource, bool bCloseStream
     mxParser->parseStream( rInputSource );
 }
 
-void FastParser::parseStream( const Reference< XInputStream >& rxInStream, const OUString& rStreamName ) throw( SAXException, IOException, RuntimeException )
+void FastParser::parseStream( const Reference< XInputStream >& rxInStream, const OUString& rStreamName ) throw( SAXException, IOException, RuntimeException, std::exception )
 {
     InputSource aInputSource;
     aInputSource.sSystemId = rStreamName;
@@ -126,7 +126,7 @@ void FastParser::parseStream( const Reference< XInputStream >& rxInStream, const
     parseStream( aInputSource );
 }
 
-void FastParser::parseStream( StorageBase& rStorage, const OUString& rStreamName ) throw( SAXException, IOException, RuntimeException )
+void FastParser::parseStream( StorageBase& rStorage, const OUString& rStreamName ) throw( SAXException, IOException, RuntimeException, std::exception )
 {
     parseStream( rStorage.openInputStream( rStreamName ), rStreamName );
 }