[Libreoffice-commits] core.git: 2 commits - sc/source

[Markus Mohrhard]

 sc/source/filter/excel/xecontent.cxx         |    2 +-
 sc/source/filter/xcl97/XclExpChangeTrack.cxx |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 0179d35fb3bcae57777d628087fd7adde357187a
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sun Jun 8 07:05:20 2014 +0200

    workaround for DBG_UTIL XML correctness checks
    
    The current check will always be hit as the StartXmlElement does not use
    a call that puts the element on the stack. So copy the pattern for the
    EndXmlElement class.
    
    However we should work on getting rid of these ugly hacks.
    
    Change-Id: Id1141f4afc78a0cae1e4b7accae76e6ae08b77a7

diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index ae8fb1d..8eef7b7 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -1338,7 +1338,8 @@ public:
 
 void EndXmlElement::SaveXml( XclExpXmlStream& rStrm )
 {
-    rStrm.GetCurrentStream()->endElement( mnElement );
+    sax_fastparser::FSHelperPtr pStream = rStrm.GetCurrentStream();
+    pStream->write("</")->writeId(mnElement)->write(">");
 }
 
 class EndHeaderElement : public EndXmlElement
commit 0620ca9d81d844452cfe5a65f1416417ac01154d
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sun Jun 8 06:13:40 2014 +0200

    check for empty string before accessing first element
    
    E.g. fdo#64530-1.xlsx
    
    Change-Id: Iff2d026f6e876ab76c9b89b8200413d6c3a7a0e3

diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index af726b2..ab47be4d 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -404,7 +404,7 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot& rRoot, const SvxURLField& rU
 
         msTarget = XclXmlUtils::ToOUString( aUrl );
     }
-    else if( rUrl[0] == '#' )     // hack for #89066#
+    else if( !rUrl.isEmpty() && rUrl[0] == '#' )     // hack for #89066#
     {
         OUString aTextMark( rUrl.copy( 1 ) );