Removed unnecessary comments

8 files changed, 0 insertions, 144 deletions

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 852a28567f29..ac783d84471c 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -246,10 +246,7 @@ private:
     ScRangeName*        pRangeName;
     ScDBCollection*     pDBCollection;
     ScDPCollection*     pDPCollection;
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     std::list<ScDPTableDataCache*>   m_listDPObjectsCaches;
-    // End Comments
     ScChartCollection*  pChartCollection;
     std::auto_ptr< ScTemporaryChartLock > apTemporaryChartLock;
     ScPatternAttr*      pSelectionAttr;                 // Attributes of a block
@@ -491,15 +488,12 @@ public:
     SC_DLLPUBLIC ScDPCollection*        GetDPCollection();
     ScDPObject*         GetDPAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab) const;
     ScDPObject*         GetDPAtBlock( const ScRange& rBlock ) const;
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     SC_DLLPUBLIC ScDPTableDataCache*    GetDPObjectCache( long nID );
     SC_DLLPUBLIC ScDPTableDataCache*    GetUsedDPObjectCache ( ScRange rRange );
     SC_DLLPUBLIC long                                 AddDPObjectCache( ScDPTableDataCache* pData );
     SC_DLLPUBLIC void                                 RemoveDPObjectCache( long nID );
     SC_DLLPUBLIC void                                 RemoveUnusedDPObjectCaches();
     SC_DLLPUBLIC long                                 GetNewDPObjectCacheId ();
-    // End Comments
 
     SC_DLLPUBLIC ScChartCollection* GetChartCollection() const;
 
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index a47b78719531..2f710339a8ef 100644
--- a/sc/inc/dpgroup.hxx
+++ b/sc/inc/dpgroup.hxx
@@ -35,10 +35,7 @@
 
 #include "dptabdat.hxx"
 #include "scdllapi.h"
-// Wang Xu Ming -- 2009-8-17
-// DataPilot Migration - Cache&&Performance
 #include "dpglobal.hxx"
-// End Comments
 class ScDocument;
 class SvNumberFormatter;
 
@@ -77,11 +74,8 @@ public:
     sal_Int32   GetDatePart() const { return nDatePart; }
     const ScDPNumGroupInfo& GetNumInfo() const { return aNumInfo; }
 
-    // Wang Xu Ming -- 2009-9-8
-    // DataPilot Migration - Cache&&Performance
     void        FillColumnEntries( SCCOL nSourceDim, ScDPTableDataCache* pCahe , std::vector< SCROW >& rEntries,
         const std::vector< SCROW >& rOriginal  ) const;
-    // End Comments
 };
 
 // --------------------------------------------------------------------
@@ -115,10 +109,7 @@ class ScDPGroupDimension
     String                      aGroupName;
     ScDPDateGroupHelper*        pDateHelper;
     ScDPGroupItemVec            aItems;
-    // Wang Xu Ming -- 2009-9-4
-    // DataPilot Migration - Cache&&Performance
    mutable  ::std::vector< SCROW >            maMemberEntries;
-    // End Comments
 public:
                 ScDPGroupDimension( long nSource, const String& rNewName );
                 ScDPGroupDimension( const ScDPGroupDimension& rOther );
@@ -133,10 +124,7 @@ public:
     long        GetGroupDim() const     { return nGroupDim; }
     const      String& GetName() const       { return aGroupName; }
 
-// Wang Xu Ming -- 2009-9-2
-// DataPilot Migration - Cache&&Performance
     const std::vector< SCROW >&  GetColumnEntries( const ScDPCacheTable&  rCacheTable, const std::vector< SCROW >& rOriginal ) const;
-// End Comments
     const ScDPGroupItem* GetGroupForData( const ScDPItemData& rData ) const;  // rData = entry in original dim.
     const ScDPGroupItem* GetGroupForName( const ScDPItemData& rName ) const;  // rName = entry in group dim.
     const ScDPGroupItem* GetGroupByIndex( size_t nIndex ) const;
@@ -158,10 +146,7 @@ class SC_DLLPUBLIC ScDPNumGroupDimension
 {
     ScDPNumGroupInfo            aGroupInfo;         // settings
     ScDPDateGroupHelper*        pDateHelper;
-// Wang Xu Ming -- 2009-9-4
-// DataPilot Migration - Cache&&Performance
     mutable  ::std::vector< SCROW >            maMemberEntries;
-// End Comments
     mutable bool                bHasNonInteger;     // initialized in GetNumEntries
     mutable sal_Unicode         cDecSeparator;      // initialized in GetNumEntries
 
@@ -203,11 +188,8 @@ class ScDPGroupTableData : public ScDPTableData
     ScDocument*             pDoc;
     StringHashSet           aGroupNames;
 
-// Wang Xu Ming -- 2009-8-17
-// DataPilot Migration - Cache&&Performance
     void                         FillGroupValues( SCROW* pItemDataIndex, long nCount, const long* pDims );
     virtual long                GetSourceDim( long nDim );
-// End Comments
 
     bool        IsNumGroupDimension( long nDimension ) const;
     void        GetNumGroupInfo( long nDimension, ScDPNumGroupInfo& rInfo,
@@ -227,14 +209,11 @@ public:
     ScDocument* GetDocument()   { return pDoc; }
 
     virtual long                    GetColumnCount();
-// Wang Xu Ming -- 2009-8-17
-// DataPilot Migration - Cache&&Performance
     virtual   long                                          GetMembersCount( long nDim );
     virtual    const std::vector< SCROW >& GetColumnEntries( long nColumn ) ;
     virtual const ScDPItemData* GetMemberById( long nDim, long nId);
     virtual long Compare( long nDim, long nDataId1, long nDataId2);
 
-// End Comments
     virtual String                  getDimensionName(long nColumn);
     virtual BOOL                    getIsDataLayoutDimension(long nColumn);
     virtual BOOL                    IsDateDimension(long nDim);
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index ac6959ebf335..94fdae7535d0 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -120,13 +120,10 @@ private:
     long                        mnCacheId;
 
 public:
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     inline void SetRefresh() { bRefresh = TRUE; }
     long          GetCacheId() const;
     void          SetCacheId( long nCacheId );
     ULONG RefreshCache();
-    // End Comments
                 ScDPObject( ScDocument* pD );
                 ScDPObject(const ScDPObject& r);
     virtual     ~ScDPObject();
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index 9ecb1c598bba..f56d552d34ff 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -201,10 +201,7 @@ private:
     USHORT      nRepeatEmptyMode;
     BOOL        bFilterButton;      // not passed to DataPilotSource
     BOOL        bDrillDown;         // not passed to DataPilotSource
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     long      mnCacheId;
-    // End Comments
 
     /** if true, all dimensions already have all of their member instances
      *  created. */
@@ -261,14 +258,11 @@ public:
 
     void                    WriteToSource( const com::sun::star::uno::Reference<
         com::sun::star::sheet::XDimensionsSupplier>& xSource );
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     void                    Refresh( const com::sun::star::uno::Reference<
                                             com::sun::star::sheet::XDimensionsSupplier>& xSource );
     BOOL                    IsEmpty() const;
     inline long GetCacheId() const{ return mnCacheId; }
     inline void SetCacheId( long nCacheId ){ mnCacheId = nCacheId; }
-    // End Comments
     const ScDPDimensionSaveData* GetExistingDimensionData() const   { return pDimensionData; }
     SC_DLLPUBLIC ScDPDimensionSaveData*  GetDimensionData();     // create if not there
     void                    SetDimensionData( const ScDPDimensionSaveData* pNew );      // copied
diff --git a/sc/inc/dpsdbtab.hxx b/sc/inc/dpsdbtab.hxx
index 9863e332058e..799700762e5b 100644
--- a/sc/inc/dpsdbtab.hxx
+++ b/sc/inc/dpsdbtab.hxx
@@ -59,13 +59,10 @@ struct ScImportSourceDesc
                  nType   == rOther.nType &&
                  bNative == rOther.bNative; }
 
-        // Wang Xu Ming -- 2009-9-15
-        // DataPilot Migration - Cache&&Performance
     ScDPTableDataCache* GetExistDPObjectCache( ScDocument* pDoc ) const;
     ScDPTableDataCache* CreateCache(  ScDocument* pDoc , long nID  ) const;
     ScDPTableDataCache* GetCache( ScDocument* pDoc, long nID ) const;
     long    GetCacheId( ScDocument* pDoc, long nID ) const;
-        // End Comments
 };
 
 class ScDatabaseDPData : public ScDPTableData
diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx
index 11217f631cf0..d4ba8562e539 100644
--- a/sc/inc/dptabdat.hxx
+++ b/sc/inc/dptabdat.hxx
@@ -32,10 +32,7 @@
 #include "address.hxx"
 #include "dpoutput.hxx"
 #include "dpcachetable.hxx"
-// Wang Xu Ming -- 2009-8-17
-// DataPilot Migration - Cache&&Performance
 #include "dptablecache.hxx"
-// End Comments
 #include <tools/string.hxx>
 
 #include <vector>
@@ -100,11 +97,8 @@ class SC_DLLPUBLIC ScDPTableData
     long    nLastHier;
     long    nLastLevel;
     long    nLastRet;
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     long                          mnCacheId;
     const ScDocument*   mpDoc;
-    // End Comments
 public:
 
     /** This structure stores dimension information used when calculating
@@ -130,10 +124,7 @@ public:
         CalcInfo();
     };
 
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     ScDPTableData(ScDocument* pDoc, long nCacheId );
-    // End Comments
     virtual     ~ScDPTableData();
 
     long        GetDatePart( long nDateVal, long nHierarchy, long nLevel );
@@ -142,11 +133,8 @@ public:
                 //! or separate Str and ValueCollection
 
     virtual long                    GetColumnCount() = 0;
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     virtual   const std::vector< SCROW >& GetColumnEntries( long nColumn ) ;
     long                                                     GetCacheId() const;
-    // End Comments
     virtual String                  getDimensionName(long nColumn) = 0;
     virtual BOOL                    getIsDataLayoutDimension(long nColumn) = 0;
     virtual BOOL                    IsDateDimension(long nDim) = 0;
@@ -174,26 +162,20 @@ public:
     virtual BOOL                    HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
                                                       const ScDPItemData& rSecondData, long nSecondIndex ) const;
 
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     virtual long                            GetMembersCount( long nDim );
     virtual const ScDPItemData*   GetMemberByIndex( long nDim, long nIndex );
     virtual const ScDPItemData*   GetMemberById( long nDim, long nId);
     virtual SCROW                        GetIdOfItemData( long  nDim, const ScDPItemData& rData );
     virtual long                GetSourceDim( long nDim );
     virtual long                Compare( long nDim, long nDataId1, long nDataId2);
-    // End Comments
 protected:
     /** This structure stores vector arrays that hold intermediate data for
         each row during cache table iteration. */
     struct CalcRowData
     {
-        // Wang Xu Ming -- 2009-8-17
-        // DataPilot Migration - Cache&&Performance
         ::std::vector< SCROW >  aColData;
         ::std::vector< SCROW >  aRowData;
         ::std::vector< SCROW >  aPageData;
-        // End Comments
         ::std::vector<ScDPValueData> aValues;
     };
 
@@ -202,11 +184,8 @@ protected:
     void            CalcResultsFromCacheTable(const ScDPCacheTable& rCacheTable, CalcInfo& rInfo, bool bAutoShow);
 
 private:
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     void            GetItemData(const ScDPCacheTable& rCacheTable, sal_Int32 nRow,
                                           const ::std::vector<long>& rDims, ::std::vector< SCROW >& rItemData);
-    // End Comments
 };
 #endif
 
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index 2fafbc610227..a96b0ec58be1 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -58,10 +58,7 @@ class ScDPResultMember;
 class ScDPResultVisibilityData;
 
 struct ScDPValueData;
-// Wang Xu Ming -- 2009-8-17
-// DataPilot Migration - Cache&&Performance
 class ScDPItemData;
-// End Comments
 //
 //  Member names that are being processed for InitFrom/LateInitFrom
 //  (needed for initialization of grouped items)
@@ -70,10 +67,7 @@ class ScDPItemData;
 class ScDPInitState
 {
     long*           pIndex;     // array
-// Wang Xu Ming -- 2009-8-17
-// DataPilot Migration - Cache&&Performance
     SCROW*     pData; // array
- // End Comments
     long            nCount;
 
 public:
@@ -85,11 +79,8 @@ public:
 
     long                GetCount() const    { return nCount; }
     const long*         GetSource() const   { return pIndex; }
-// Wang Xu Ming -- 2009-8-17
-// DataPilot Migration - Cache&&Performance
     const SCROW* GetNameIds() const    { return pData; }
     SCROW   GetNameIdForIndex( long nIndexValue ) const;
-// End Comments
 };
 
 typedef ::std::vector<sal_Int32> ScMemberSortOrder;
@@ -238,8 +229,6 @@ class ScDPDataMember;
 
 #define SC_DPMEASURE_ALL    -1
 #define SC_DPMEASURE_ANY    -2
-// Wang Xu Ming -- 2009-8-17
-// DataPilot Migration - Cache&&Performance
 
 struct MemberHashIndexFunc : public std::unary_function< const SCROW &, size_t >
 {
@@ -299,7 +288,6 @@ public:
     inline BOOL  IsRow() const { return mbRow; }
     BOOL  IsEnd( size_t nPos ) const ;
 };
-// End Comments
 
 class ScDPResultData
 {
@@ -348,8 +336,6 @@ public:
     BOOL                IsBaseForGroup( long nDim ) const;              // any group
     long                GetGroupBase( long nGroupDim ) const;
     BOOL                IsNumOrDateGroup( long nDim ) const;
- // Wang Xu Ming -- 2009-8-17
-// DataPilot Migration - Cache&&Performance
     BOOL                IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
                                                long nBaseDataId, long nBaseIndex ) const;
     BOOL                IsInGroup( SCROW nGroupDataId, long nGroupIndex,
@@ -359,7 +345,6 @@ public:
 
     ResultMembers* GetDimResultMembers( long nDim , ScDPDimension* pDim , ScDPLevel*   pLevel) const ;
 
-// End Comments
     const ScDPSource*   GetSource() const;
 };
 
@@ -368,10 +353,7 @@ class ScDPResultMember
 {
 private:
     const ScDPResultData*   pResultData;
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     ScDPParentDimData        aParentDimData;
-    // End Comments
     ScDPResultDimension*    pChildDimension;
     ScDPDataMember*         pDataRoot;
     BOOL                    bHasElements;
@@ -383,16 +365,11 @@ private:
 
     USHORT                  nMemberStep;            // step to show details
 public:
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     ScDPResultMember(  const ScDPResultData* pData,  const ScDPParentDimData& rParentDimData,
         BOOL bForceSub );  //! Ref
     ScDPResultMember(  const ScDPResultData* pData, BOOL bForceSub );
-    // End Comments
     ~ScDPResultMember();
 
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     void                InitFrom( const ::std::vector<ScDPDimension*>& ppDim,
                                         const ::std::vector<ScDPLevel*>& ppLev,
                                         size_t nPos,
@@ -404,7 +381,6 @@ public:
                                         size_t nPos,
                                         ScDPInitState& rInitState);
     void              CheckShowEmpty( BOOL bShow = FALSE );
-    // End Comments
     String              GetName() const;
     void                FillItemData( ScDPItemData& rData ) const;
     BOOL                IsValid() const;
@@ -416,22 +392,16 @@ public:
 //  BOOL                SubTotalEnabled() const;
     long                GetSubTotalCount( long* pUserSubStart = NULL ) const;
 
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     BOOL              IsNamedItem( SCROW nIndex ) const;
     bool IsValidEntry( const ::std::vector< SCROW >& aMembers ) const;
-    // End Comments
 
     void                SetHasElements()    { bHasElements = TRUE; }
     void                SetAutoHidden()     { bAutoHidden = TRUE; }
 
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     void                ProcessData( const ::std::vector<SCROW>& aChildMembers,
                                         const ScDPResultDimension* pDataDim,
                                         const ::std::vector<SCROW>& aDataMembers,
                                         const ::std::vector<ScDPValueData>& aValues );
-    // End Comments
     void                FillMemberResults( com::sun::star::uno::Sequence<
                                                 com::sun::star::sheet::MemberResult>* pSequences,
                                             long& rPos, long nMeasure, BOOL bRoot,
@@ -461,15 +431,12 @@ public:
 
     ScDPDataMember*         GetDataRoot() const             { return pDataRoot; }
 
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     const ScDPDimension*  GetParentDim() const               { return aParentDimData.mpParentDim; }     //! Ref
     const ScDPLevel*         GetParentLevel() const         { return aParentDimData.mpParentLevel; }   //! Ref
     const ScDPMember*     GetDPMember()const              { return aParentDimData.mpMemberDesc; }    //! Ref
     inline SCROW               GetOrder() const                           { return aParentDimData.mnOrder; }         //! Ref
     inline BOOL                  IsRoot() const                       { return GetParentLevel() == NULL; }
     SCROW                       GetDataId( ) const ;
-    // End Comments
     ScDPAggData*        GetColTotal( long nMeasure ) const;
 
     void                FillVisibilityData(ScDPResultVisibilityData& rData) const;
@@ -495,17 +462,11 @@ public:
     BOOL                IsVisible() const;
     BOOL                HasData( long nMeasure, const ScDPSubTotalState& rSubState ) const;
 
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     BOOL              IsNamedItem(   SCROW r ) const;
-    // End Comments
     BOOL                HasHiddenDetails() const;
 
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     void                ProcessData( const ::std::vector< SCROW >& aChildMembers, const ::std::vector<ScDPValueData>& aValues,
                                        const ScDPSubTotalState& rSubState );
-    // End Comments
     BOOL                HasError( long nMeasure, const ScDPSubTotalState& rSubState ) const;
     double              GetAggregate( long nMeasure, const ScDPSubTotalState& rSubState ) const;
     const ScDPAggData*  GetConstAggData( long nMeasure, const ScDPSubTotalState& rSubState ) const;
@@ -545,11 +506,8 @@ SV_DECL_PTRARR_DEL(ScDPDataMembers, ScDPDataMemberPtr, SC_DP_RES_GROW, SC_DP_RES
 class ScDPResultDimension
 {
 public :
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     typedef std::vector <ScDPResultMember *>                           MemberArray;
     typedef std::map < SCROW , ScDPResultMember *> MemberHash;
-    // End Comments
 private:
         const ScDPResultData*   pResultData;
     MemberArray             maMemberArray;
@@ -566,8 +524,6 @@ private:
     long                    nAutoMeasure;
     long                    nAutoCount;
 
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     ScDPResultMember*        FindMember(   SCROW  iData ) const;
     ScDPResultMember*        AddMember( const ScDPParentDimData& aData );
     ScDPResultMember*        InsertMember( ScDPParentDimData* pMemberData );
@@ -575,14 +531,11 @@ private:
                                                             const ::std::vector< SCROW >& pItemData,
                                                             size_t  nPos,
                                                             ScDPInitState& rInitState  );
-    // End Comments
 public:
        ScDPResultDimension( const ScDPResultData* pData );
     ~ScDPResultDimension();
 
                         //  allocates new members
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     void                InitFrom( const ::std::vector<ScDPDimension*>& ppDim,
                                         const ::std::vector<ScDPLevel*>& ppLev,
                                         size_t nPos,
@@ -593,11 +546,8 @@ public:
                                         ScDPInitState& rInitState );
     void               CheckShowEmpty( BOOL bShow = FALSE );
 
-    // End Comments
     long                GetSize(long nMeasure) const;
 
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     bool                IsValidEntry( const ::std::vector<SCROW>& aMembers ) const;
 
     //  modifies existing members, allocates data dimensions
@@ -605,7 +555,6 @@ public:
                                      const ScDPResultDimension* pDataDim,
                                      const ::std::vector<SCROW>& aDataMembers,
                                      const ::std::vector<ScDPValueData>& aValues ) const;   //! Test
- // End Comments
     void                FillMemberResults( com::sun::star::uno::Sequence<
                                                 com::sun::star::sheet::MemberResult>* pSequences,
                                             long nStart, long nMeasure );
@@ -675,11 +624,8 @@ public:
                         ~ScDPDataDimension();
 
     void                InitFrom( const ScDPResultDimension* pDim );        // recursive
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     void                ProcessData( const ::std::vector< SCROW >& aDataMembers, const ::std::vector<ScDPValueData>& aValues,
                                        const ScDPSubTotalState& rSubState );
-    // End Comments
     void                FillDataRow( const ScDPResultDimension* pRefDim,
                                     com::sun::star::uno::Sequence<com::sun::star::sheet::DataResult>& rSequence,
                                     long nCol, long nMeasure, BOOL bIsSubTotalRow,
@@ -713,10 +659,7 @@ public:
 class ScDPResultVisibilityData
 {
 public:
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     ScDPResultVisibilityData( ScDPSource* pSource);
-    // End Comments
     ~ScDPResultVisibilityData();
 
     void addVisibleMember(const String& rDimName, const ScDPItemData& rMemberItem);
diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index a787f3e7f67a..8fc7961dbb26 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -31,10 +31,7 @@
 
 #include <vector>
 #include <hash_map>
-// Wang Xu Ming -- 2009-8-17
-// DataPilot Migration - Cache&&Performance
 #include <list>
-// End Comments
 #include <memory>
 #include <tools/string.hxx>
 #include <tools/list.hxx>
@@ -62,10 +59,7 @@
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/implbase6.hxx>
-// Wang Xu Ming -- 2009-8-17
-// DataPilot Migration - Cache&&Performance
 #include "dpglobal.hxx"
-// End Comments
 #include "dptabdat.hxx"
 
 namespace com { namespace sun { namespace star {
@@ -79,10 +73,7 @@ namespace com { namespace sun { namespace star {
 
 class ScDPResultMember;
 class ScDPResultData;
-// Wang Xu Ming -- 2009-8-17
-// DataPilot Migration - Cache&&Performance
 class ScDPItemData;
-// End Comments
 class ScDPTableData;
 
 // ------------------------------------------------------------------------
@@ -183,13 +174,10 @@ public:
     long                    GetDataDimensionCount();
     ScDPDimension*          GetDataDimension(long nIndex);
     String                  GetDataDimName(long nIndex);
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     ScDPTableDataCache*         GetCache();
     const ScDPItemData*            GetItemDataById( long nDim, long nId );
     long                                       GetDataLayoutDim(){ return pData->GetColumnCount(); }
     SCROW                                GetMemberId(  long  nDim, const ScDPItemData& rData );
-    // End Comments
     BOOL                    IsDataLayoutDimension(long nDim);
     USHORT                  GetDataLayoutOrientation();
 
@@ -455,10 +443,7 @@ public:
 
     const ::com::sun::star::sheet::DataPilotFieldReference& GetReferenceValue() const;
 
-// Wang Xu Ming -- 2009-8-17
-// DataPilot Migration - Cache&&Performance
     BOOL                      IsVisible( const ScDPItemData& rData );
-// End Comments
 };
 
 class ScDPHierarchies : public cppu::WeakImplHelper2<
@@ -752,12 +737,9 @@ public:
     long                    getMinMembers() const;
 
     sal_Int32               GetIndexFromName( const ::rtl::OUString& rName ) const;     // <0 if not found
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     const std::vector<sal_Int32>&    GetGlobalOrder();
     const ScDPItemData*               GetSrcItemDataByIndex(  SCROW nIndex);
     SCROW                                   GetSrcItemsCount();
-    // End Comments
 };
 
 class ScDPMember : public cppu::WeakImplHelper3<
@@ -771,10 +753,7 @@ private:
     long            nHier;
     long            nLev;
 
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     SCROW       mnDataId;
-    // End Comments
 //  String          aCaption;           // visible name (changeable by user)
     ::std::auto_ptr<rtl::OUString> mpLayoutName;
 
@@ -783,22 +762,16 @@ private:
     BOOL            bShowDet;
 
 public:
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     ScDPMember( ScDPSource* pSrc, long nD, long nH, long nL,
         SCROW nIndex /*const String& rN, double fV, BOOL bHV */);
-    // End Comments
     virtual                 ~ScDPMember();
 
     String                  GetNameStr() const;
     void                    FillItemData( ScDPItemData& rData ) const;
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     //  const ScDPItemData&  GetItemData() const{ return maData; }
     const ScDPItemData&  GetItemData() const;
     inline SCROW               GetItemDataId() const { return mnDataId; }
     BOOL                           IsNamedItem( SCROW    nIndex  ) const;
-    // End Comments
 
     SC_DLLPUBLIC const ::rtl::OUString*  GetLayoutName() const;