[Libreoffice-commits] .: sc/source

[Kohei Yoshida]

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

New commits:
commit b499711d80eebdc113130c4b763d4782d734ab3a
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Mar 1 20:49:29 2011 -0500

    More on ScfRefMap to std::map conversion.

diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index d9afb09..8ae0923 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -3396,6 +3396,12 @@ void XclImpChAxesSet::Finalize()
     }
 }
 
+XclImpChTypeGroupRef XclImpChAxesSet::GetTypeGroup( sal_uInt16 nGroupIdx ) const
+{
+    XclImpChTypeGroupMap::const_iterator itr = maTypeGroups.find(nGroupIdx);
+    return itr == maTypeGroups.end() ? XclImpChTypeGroupRef() : itr->second;
+}
+
 XclImpChTypeGroupRef XclImpChAxesSet::GetFirstTypeGroup() const
 {
     XclImpChTypeGroupRef xTypeGroup;
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index cb6d410..2eeedab 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -1301,7 +1301,7 @@ public:
     /** Returns the outer plot area position, if existing. */
     inline XclImpChFramePosRef GetPlotAreaFramePos() const { return mxFramePos; }
     /** Returns the specified chart type group. */
-    inline XclImpChTypeGroupRef GetTypeGroup( sal_uInt16 nGroupIdx ) const { return maTypeGroups.get( nGroupIdx ); }
+    XclImpChTypeGroupRef GetTypeGroup( sal_uInt16 nGroupIdx ) const;
     /** Returns the first chart type group. */
     XclImpChTypeGroupRef GetFirstTypeGroup() const;
     /** Looks for a legend in all chart type groups and returns it. */
@@ -1338,7 +1338,7 @@ private:
     void                ConvertBackground( XDiagramRef xDiagram ) const;
 
 private:
-    typedef ScfRefMap< sal_uInt16, XclImpChTypeGroup > XclImpChTypeGroupMap;
+    typedef ::std::map<sal_uInt16, XclImpChTypeGroupRef> XclImpChTypeGroupMap;
 
     XclChAxesSet        maData;             /// Contents of the CHAXESSET record.
     XclImpChFramePosRef mxFramePos;         /// Outer plot area position (CHFRAMEPOS record).