[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 3 commits - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/dptablecache.hxx              |    3 +--
 sc/source/core/data/dpcachetable.cxx |   10 +++++-----
 sc/source/core/data/dptablecache.cxx |    2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 4b9bdcae93c07262bf3b65297f01aaf30ed3f413
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Apr 29 21:26:04 2011 -0400

    Typo.

diff --git a/sc/source/core/data/dptablecache.cxx b/sc/source/core/data/dptablecache.cxx
index 85ae11e..2072e8d 100644
--- a/sc/source/core/data/dptablecache.cxx
+++ b/sc/source/core/data/dptablecache.cxx
@@ -499,7 +499,7 @@ bool ScDPCache::InitFromDoc(ScDocument* pDoc, const ScRange& rRange)
 bool ScDPCache::InitFromDataBase (const Reference<sdbc::XRowSet>& xRowSet, const Date& rNullDate)
 {
     if (!xRowSet.is())
-        // Dont' even waste time to go any further.
+        // Don't even waste time to go any further.
         return false;
     try
     {
commit d7f205fcc0cb2b5fa3be4d3a4ee10df6cf8bf206
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Apr 29 21:11:21 2011 -0400

    Let's not friend a class just because of one private method.

diff --git a/sc/inc/dptablecache.hxx b/sc/inc/dptablecache.hxx
index 5956623..0f65c2a 100644
--- a/sc/inc/dptablecache.hxx
+++ b/sc/inc/dptablecache.hxx
@@ -48,7 +48,6 @@ struct ScQueryParam;
  */
 class SC_DLLPUBLIC ScDPCache
 {
-    friend class ScDPCacheTable;
 public:
     typedef ::boost::ptr_vector<ScDPItemData>           DataListType;
 private:
@@ -102,6 +101,7 @@ public:
     bool  IsDateDimension( long nDim ) const ;
     sal_uLong GetDimNumType( SCCOL nDim) const;
     SCROW GetDimMemberCount( SCCOL nDim ) const;
+    SCROW GetOrder( long nDim, SCROW nIndex ) const;
 
     SCROW GetSortedItemDataId( SCCOL nDim, SCROW nOrder ) const;
     const DataListType& GetDimMemberValues( SCCOL nDim ) const;
@@ -127,7 +127,6 @@ public:
     ~ScDPCache();
 
 private:
-    SCROW GetOrder( long nDim, SCROW nIndex ) const;
     void AddLabel( ScDPItemData* pData);
     bool AddData(long nDim, ScDPItemData* pData);
 };
commit 21e5faa0756a136ed8431273ccc24b51cb561685
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Apr 29 21:08:55 2011 -0400

    Fixed indentation and naming inconsistencies.

diff --git a/sc/source/core/data/dpcachetable.cxx b/sc/source/core/data/dpcachetable.cxx
index e7f0633..f764272 100644
--- a/sc/source/core/data/dpcachetable.cxx
+++ b/sc/source/core/data/dpcachetable.cxx
@@ -198,7 +198,7 @@ void ScDPCacheTable::fillTable(
         SCROW nMemCount = getCache()->GetDimMemberCount( nCol );
         if ( nMemCount )
         {
-            std::vector< SCROW > pAdded( nMemCount, -1 );
+            std::vector<SCROW> aAdded( nMemCount, -1 );
 
             for (SCROW nRow = 0; nRow < nRowCount; ++nRow )
             {
@@ -206,7 +206,7 @@ void ScDPCacheTable::fillTable(
                 SCROW nOrder = getOrder( nCol, nIndex );
                 
                 if ( nCol == 0 )
-                         maRowsVisible.push_back(false);
+                    maRowsVisible.push_back(false);
 
                 if ( lcl_HasQueryEntry(rQuery) &&  
                     !getCache()->ValidQuery( nRow , rQuery, pSpecial ) )
@@ -217,13 +217,13 @@ void ScDPCacheTable::fillTable(
                 if ( nCol == 0 )
                      maRowsVisible.back() = true;
 
-                pAdded[nOrder] = nIndex;
+                aAdded[nOrder] = nIndex;
             }
             maFieldEntries.push_back( vector<SCROW>() );
             for ( SCROW nRow = 0; nRow < nMemCount; nRow++ )
             {
-                if ( pAdded[nRow] != -1 )
-                    maFieldEntries.back().push_back( pAdded[nRow] );
+                if ( aAdded[nRow] != -1 )
+                    maFieldEntries.back().push_back( aAdded[nRow] );
             }
         }
     }