--- oox/inc/oox/core/containerhelper.hxx	21 Sep 2007 13:23:54 -0000	1.1.2.10
+++ oox/inc/oox/core/containerhelper.hxx	19 Oct 2007 09:43:33 -0000	1.1.2.11
@@ -143,7 +143,7 @@
 public:
     typedef ::std::map< KeyType, ::boost::shared_ptr< ObjType > >   container_type;
     typedef typename container_type::key_type                       key_type;
-    typedef typename container_type::data_type                      data_type;
+    typedef typename container_type::mapped_type                    mapped_type;
     typedef typename container_type::value_type                     value_type;
 
 public:
@@ -151,15 +151,15 @@
         Returns false, if the key exists but points to an empty reference. */
     inline bool         has( key_type nKey ) const
                         {
-                            const data_type* pxRef = getRef( nKey );
+                            const mapped_type* pxRef = getRef( nKey );
                             return pxRef && pxRef->get();
                         }
 
     /** Returns a reference to the object accossiated to the passed key, or 0 on error. */
-    inline data_type    get( key_type nKey ) const
+    inline mapped_type    get( key_type nKey ) const
                         {
-                            if( const data_type* pxRef = getRef( nKey ) ) return *pxRef;
-                            return data_type();
+                            if( const mapped_type* pxRef = getRef( nKey ) ) return *pxRef;
+                            return mapped_type();
                         }
 
     /** Calls the passed functor for every contained object. */
@@ -192,7 +192,7 @@
         inline void         operator()( const value_type& rValue ) const { mrFunctor( *rValue.second ); }
     };
 
-    inline const data_type* getRef( key_type nKey ) const
+    inline const mapped_type* getRef( key_type nKey ) const
                         {
                             typename container_type::const_iterator aIt = find( nKey );
                             return (aIt == this->end()) ? 0 : &aIt->second;
--- oox/source/xls/viewsettings.cxx-old	2007-10-19 14:20:11.000000000 +0200
+++ oox/source/xls/viewsettings.cxx	2007-10-19 14:20:35.000000000 +0200
@@ -169,7 +169,7 @@
 
 OoxSheetSelectionData& OoxSheetViewData::createSelectionData( sal_Int32 nPaneId )
 {
-    OoxSelectionDataMap::data_type& rxSelData = maSelMap[ nPaneId ];
+    OoxSelectionDataMap::mapped_type& rxSelData = maSelMap[ nPaneId ];
     if( !rxSelData )
         rxSelData.reset( new OoxSheetSelectionData );
     return *rxSelData;
@@ -249,7 +249,7 @@
 
 OoxSheetViewData& ViewSettings::createSheetViewData( sal_Int32 nSheet )
 {
-    SheetViewDataMap::data_type& rxData = maSheetDatas[ nSheet ];
+    SheetViewDataMap::mapped_type& rxData = maSheetDatas[ nSheet ];
     if( !rxData )
         rxData.reset( new SheetViewDataVec );
     rxData->push_back( SheetViewDataVec::value_type( new OoxSheetViewData ) );
