incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From l...@apache.org
Subject svn commit: r1382698 - in /incubator/ooo/trunk/main/sc: inc/dptablecache.hxx source/core/data/column3.cxx source/core/data/dptablecache.cxx
Date Mon, 10 Sep 2012 08:55:28 GMT
Author: leiw
Date: Mon Sep 10 08:55:28 2012
New Revision: 1382698

URL: http://svn.apache.org/viewvc?rev=1382698&view=rev
Log:
#i120854 Module sc fails to build 

          Patch by: Li Tan
          Review by: Wang Lei

Modified:
    incubator/ooo/trunk/main/sc/inc/dptablecache.hxx
    incubator/ooo/trunk/main/sc/source/core/data/column3.cxx
    incubator/ooo/trunk/main/sc/source/core/data/dptablecache.cxx

Modified: incubator/ooo/trunk/main/sc/inc/dptablecache.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/inc/dptablecache.hxx?rev=1382698&r1=1382697&r2=1382698&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/inc/dptablecache.hxx (original)
+++ incubator/ooo/trunk/main/sc/inc/dptablecache.hxx Mon Sep 10 08:55:28 2012
@@ -109,7 +109,6 @@ protected:
 private:
 public:
 	void		AddLabel( ScDPItemData* pData);
-    template< bool bCheckDate >
     sal_Bool	AddData( long nDim, ScDPItemData* itemData );
 };
 

Modified: incubator/ooo/trunk/main/sc/source/core/data/column3.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/core/data/column3.cxx?rev=1382698&r1=1382697&r2=1382698&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/core/data/column3.cxx (original)
+++ incubator/ooo/trunk/main/sc/source/core/data/column3.cxx Mon Sep 10 08:55:28 2012
@@ -1793,8 +1793,7 @@ void  ScColumn::FillDPCacheT( long nDim,
 }
 void  ScColumn::FillDPCache( ScDPTableDataCache * pCache, long nDim, SCROW nStartRow, SCROW
nEndRow )
 {
-    typedef sal_Bool(ScDPTableDataCache::*PFNAddData)( long, ScDPItemData* );
-    FillDPCacheT<boost::function<void(ScDPItemData*)>, boost::function<sal_Bool(long,ScDPItemData*)>
>( nDim, nStartRow, nEndRow, boost::bind( &ScDPTableDataCache::AddLabel, pCache, _1
), boost::bind( (PFNAddData)&ScDPTableDataCache::AddData<false>, pCache, _1, _2
) );
+    FillDPCacheT<boost::function<void(ScDPItemData*)>, boost::function<sal_Bool(long,ScDPItemData*)>
>( nDim, nStartRow, nEndRow, boost::bind( &ScDPTableDataCache::AddLabel, pCache, _1
), boost::bind( &ScDPTableDataCache::AddData, pCache, _1, _2 ) );
 }
 
 void ScColumn::GetInputString( SCROW nRow, String& rString ) const

Modified: incubator/ooo/trunk/main/sc/source/core/data/dptablecache.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/core/data/dptablecache.cxx?rev=1382698&r1=1382697&r2=1382698&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/core/data/dptablecache.cxx (original)
+++ incubator/ooo/trunk/main/sc/source/core/data/dptablecache.cxx Mon Sep 10 08:55:28 2012
@@ -475,7 +475,7 @@ void ScDPTableDataCache::AddRow( ScDPIte
 	else
 	{
 		for ( sal_uInt16 i = 0; i < nCount && i < mnColumnCount; i ++ )
-			AddData<true>( i, new ScDPItemData( pRow[i] ) );
+			AddData( i, new ScDPItemData( pRow[i] ) );
 	}
 }
 
@@ -607,7 +607,7 @@ bool ScDPTableDataCache::InitFromDataBas
             {
                ScDPItemData * pNew =  lcl_GetItemValue( xRow, aColTypes[nCol], nCol+1, rNullDate
);
                 if ( pNew )
-                    AddData<true>(  nCol , pNew );
+                    AddData(  nCol , pNew );
             }
         }
         while (xRowSet->next());
@@ -863,7 +863,6 @@ bool ScDPTableDataCache::IsEmptyMember( 
 	return !GetItemDataById( nColumn, GetItemDataId( nColumn, nRow, sal_False ) )->IsHasData();
 }
 
-template< bool bCheckDate >
 sal_Bool ScDPTableDataCache::AddData(long nDim, ScDPItemData* pitemData)
 {
 	DBG_ASSERT( IsValid(), "  IsValid() == false " );
@@ -872,7 +871,6 @@ sal_Bool ScDPTableDataCache::AddData(lon
 
 	sal_Bool	bInserted = sal_False;
 	
-    if( bCheckDate )
 	pitemData->SetDate( lcl_isDate( GetNumType( pitemData->nNumFormat ) ) );
 	
 	if ( !lcl_Search( mpTableDataValues[nDim], mpGlobalOrder[nDim], *pitemData, nIndex ) )
@@ -900,15 +898,6 @@ sal_Bool ScDPTableDataCache::AddData(lon
 	return sal_True;
 }
 
-
-void func_dummy()
-{
-    sal_Bool (ScDPTableDataCache::*pfnAddData)(long , ScDPItemData* )
-        = &ScDPTableDataCache::AddData<false>;
-
-    pfnAddData = (sal_Bool (ScDPTableDataCache::*)(long , ScDPItemData* ))&ScDPTableDataCache::AddData<true>;
-}
-
 String ScDPTableDataCache::GetDimensionName( sal_uInt16 nColumn ) const
 {
     DBG_ASSERT( /* nColumn>=0 && */ nColumn < mrLabelNames.size()-1 , "ScDPTableDataCache::GetDimensionName");



Mime
View raw message