More cleanup, tab removal, bogus comments etc.

2 files changed, 14 insertions, 21 deletions

diff --git a/sc/inc/dptablecache.hxx b/sc/inc/dptablecache.hxx
index 8ff667822f09..9a32729fa71b 100644
--- a/sc/inc/dptablecache.hxx
+++ b/sc/inc/dptablecache.hxx
@@ -41,30 +41,24 @@
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
 
-class ScDPTableDataCache;
-class TypedStrData;
 struct ScQueryParam;
 
-// --------------------------------------------------------------------
-//
-//  base class ScDPTableData to allow implementation with tabular data
-//  by deriving only of this
-//
-
 class SC_DLLPUBLIC ScDPTableDataCache
 {
-    long    mnID;
     ScDocument* mpDoc;
 
-    long                         mnColumnCount;     // Column count
+    long    mnID;
+    long    mnColumnCount;
+
+    std::vector<ScDPItemData*>* mpTableDataValues; //Data Pilot Table's index - value map
+    std::vector<SCROW>*         mpSourceData;      //Data Pilot Table's Source data
+    std::vector<SCROW>*         mpGlobalOrder;     //Sorted members index
+    std::vector<SCROW>*         mpIndexOrder;      //Index the sorted number
+    std::vector<ScDPItemData*>  mrLabelNames;      //Source Label data
+    std::vector<bool>           mbEmptyRow;        //If empty row?
+
+    mutable ScDPItemDataPool    maAdditionalDatas;
 
-    std::vector<ScDPItemData*>*      mpTableDataValues; //Data Pilot Table's index - value map
-    std::vector<SCROW>*          mpSourceData;      //Data Pilot Table's Source data
-    std::vector<SCROW>*          mpGlobalOrder;     //Sorted members index
-    std::vector<SCROW>*          mpIndexOrder;      //Index the sorted number
-    std::vector<ScDPItemData*>   mrLabelNames;      //Source Label data
-    std::vector<bool>            mbEmptyRow;        //If empty row?
-    mutable ScDPItemDataPool                 maAdditionalDatas;
 public:
     SCROW GetOrder( long nDim, SCROW nIndex ) const;
     SCROW GetIdByItemData( long nDim,  String sItemData  ) const;
@@ -107,12 +101,11 @@ public:
     ScDPTableDataCache( ScDocument* pDoc );
     virtual ~ScDPTableDataCache();
 
-protected:
 private:
-    void        AddLabel( ScDPItemData* pData);
+    void    AddLabel( ScDPItemData* pData);
     bool    AddData( long nDim, ScDPItemData* itemData );
 };
 
-#endif //DPTABLECACHE_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/dptablecache.cxx b/sc/source/core/data/dptablecache.cxx
index 68924b6a9ff7..27bd9039bc6f 100644
--- a/sc/source/core/data/dptablecache.cxx
+++ b/sc/source/core/data/dptablecache.cxx
@@ -399,13 +399,13 @@ bool ScDPTableDataCache::operator== ( const ScDPTableDataCache& r ) const
 
 ScDPTableDataCache::ScDPTableDataCache(  ScDocument* pDoc  ) :
     mpDoc( pDoc ),
+    mnID(-1),
     mnColumnCount ( 0 ),
     mpTableDataValues ( NULL ),
     mpSourceData ( NULL ),
     mpGlobalOrder( NULL ),
     mpIndexOrder( NULL)
 {
-    mnID = -1;
 }
 
 ScDPTableDataCache::~ScDPTableDataCache()