[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sc/source

[Markus Mohrhard]

 sc/source/filter/excel/xichart.cxx |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 0c78ff5de2ac1e10e68876ef586c0f2d9d5d626a
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date:   Fri Feb 24 20:42:09 2012 +0000

    fdo#40320: Insert only a placeholder since the caller relies on this behavior.
    
    Signed-off-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index 7d5f7d9..e83b8d8 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -2135,8 +2135,9 @@ XclImpChTextRef* XclImpChSeries::GetDataLabelRef( sal_uInt16 nPointIdx )
         XclImpChTextMap::iterator itr = maLabels.lower_bound(nPointIdx);
         if (itr == maLabels.end() || maLabels.key_comp()(nPointIdx, itr->first))
         {
-            // No object exists at this point index position.  Insert a new one.
-            XclImpChTextRef p(new XclImpChText(GetChRoot()));
+            // No object exists at this point index position.  Insert a new
+            // placeholder.
+            XclImpChTextRef p;
             itr = maLabels.insert(itr, XclImpChTextMap::value_type(nPointIdx, p));
         }
         return &itr->second;
commit 1f2cf45c6f423c3ad1e12307e8f02a5014a3b913
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date:   Fri Feb 24 19:44:43 2012 +0000

    fdo#40320: Correctly import data point formats in data series.
    
    Signed-off-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index 8cf884d..7d5f7d9 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -2118,8 +2118,9 @@ XclImpChDataFormatRef* XclImpChSeries::GetDataFormatRef( sal_uInt16 nPointIdx )
         XclImpChDataFormatMap::iterator itr = maPointFmts.lower_bound(nPointIdx);
         if (itr == maPointFmts.end() || maPointFmts.key_comp()(nPointIdx, itr->first))
         {
-            // No object exists at this point index position.  Insert a new one.
-            XclImpChDataFormatRef p(new XclImpChDataFormat(GetChRoot()));
+            // No object exists at this point index position.  Insert a new
+            // placeholder.
+            XclImpChDataFormatRef p;
             itr = maPointFmts.insert(itr, XclImpChDataFormatMap::value_type(nPointIdx, p));
         }
         return &itr->second;