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

[Markus Mohrhard]

 oox/source/export/chartexport.cxx   |    2 +-
 sc/source/filter/excel/xestream.cxx |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 1efe2782de94f55faac510d8fd4596fc54ea1d37
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Tue Feb 25 10:47:47 2014 +0100

    fix OOXML validation error
    
    Change-Id: Ia27f9615b063393a0733e061df7dd1666283badb

diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index e565035..4250cb7 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2553,6 +2553,7 @@ void ChartExport::exportDataLabels(
         {
             if (GetProperty( xPropSet, "Label"))
                mAny >>= aTempLabel;
+        }
 
 
 
@@ -2661,7 +2662,6 @@ void ChartExport::exportDataLabels(
 
         pFS->endElement( FSNS( XML_c, XML_dLbls ) );
     }
-    }
 }
 
 void ChartExport::exportDataPoints(
commit b428fda3d353eb64d4af55277277c969d383db16
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Tue Feb 25 10:34:54 2014 +0100

    don't access empty container, related fdo#33698
    
    Change-Id: I6deb23c9f5cd1c60e2b478afd67a5196f45d3c43

diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 30d774f..3dc697d 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -757,6 +757,9 @@ OString XclXmlUtils::ToOString( const ScAddress& rAddress )
 
 OString XclXmlUtils::ToOString( const ScfUInt16Vec& rBuffer )
 {
+    if(rBuffer.empty())
+        return OString();
+
     const sal_uInt16* pBuffer = &rBuffer [0];
     return OString( pBuffer, rBuffer.size(), RTL_TEXTENCODING_UTF8 );
 }