[Libreoffice-commits] .: sc/source

[Kohei Yoshida]

 sc/source/filter/excel/xichart.cxx |    6 +++++-
 sc/source/filter/inc/xichart.hxx   |    6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit b02def384ffebc3e795a032cf97023273abf16c2
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Mar 1 20:44:18 2011 -0500

    These ones are best converted to std::map.

diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index 52e0bad..d9afb09 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -1805,7 +1805,11 @@ void XclImpChSeries::FinalizeDataFormats()
         if( mxSeriesFmt )
         {
             // #i83100# set text label format, e.g. for trend line equations
-            mxSeriesFmt->SetDataLabel( maLabels.get( EXC_CHDATAFORMAT_ALLPOINTS ) );
+            XclImpChTextRef xLabel;
+            XclImpChTextMap::iterator itr = maLabels.find(EXC_CHDATAFORMAT_ALLPOINTS);
+            if (itr != maLabels.end())
+                xLabel = itr->second;
+            mxSeriesFmt->SetDataLabel(xLabel);
             // create missing automatic formats
             mxSeriesFmt->UpdateTrendLineFormat();
         }
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index f8a9fac..cb6d410 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -870,9 +870,9 @@ private:
     XPropertySetRef     CreateErrorBar( sal_uInt8 nPosBarId, sal_uInt8 nNegBarId ) const;
 
 private:
-    typedef ScfRefMap< sal_uInt16, XclImpChDataFormat > XclImpChDataFormatMap;
-    typedef ScfRefMap< sal_uInt16, XclImpChText >       XclImpChTextMap;
-    typedef ::std::list< XclImpChSerTrendLineRef >      XclImpChSerTrendLineList;
+    typedef ::std::map<sal_uInt16, XclImpChDataFormatRef> XclImpChDataFormatMap;
+    typedef ::std::map<sal_uInt16, XclImpChTextRef>       XclImpChTextMap;
+    typedef ::std::list< XclImpChSerTrendLineRef >        XclImpChSerTrendLineList;
     typedef ::boost::ptr_map<sal_uInt8, XclImpChSerErrorBar> XclImpChSerErrorBarMap;
 
     XclChSeries         maData;             /// Contents of the CHSERIES record.