A little clean up.

2 files changed, 14 insertions, 14 deletions

diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index 36ed4aceec5f..3a64f6d50012 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -506,15 +506,15 @@ private:
     const ScDPResultData*   pResultData;
     MemberArray             maMemberArray;
     MemberHash              maMemberHash;
-    sal_Bool                    bInitialized;
-    String                  aDimensionName;     //! or ptr to IntDimension?
-    sal_Bool                    bIsDataLayout;      //! or ptr to IntDimension?
-    sal_Bool                    bSortByData;
-    sal_Bool                    bSortAscending;
+    rtl::OUString           aDimensionName;     //! or ptr to IntDimension?
     long                    nSortMeasure;
     ScMemberSortOrder       aMemberOrder;       // used when sorted by measure
-    sal_Bool                    bAutoShow;
-    sal_Bool                    bAutoTopItems;
+    bool                    bIsDataLayout:1;      //! or ptr to IntDimension?
+    bool                    bSortByData:1;
+    bool                    bSortAscending:1;
+    bool                    bAutoShow:1;
+    bool                    bAutoTopItems:1;
+    bool                    bInitialized:1;
     long                    nAutoMeasure;
     long                    nAutoCount;
 
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 314fc7e7d0c4..41fb72284de5 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -2719,13 +2719,13 @@ sal_Bool ScDPGroupCompare::TestIncluded( const ScDPMember& rMember )
 
 ScDPResultDimension::ScDPResultDimension( const ScDPResultData* pData ) :
     pResultData( pData ),
-    bInitialized( false ),
+    nSortMeasure( 0 ),
     bIsDataLayout( false ),
     bSortByData( false ),
     bSortAscending( false ),
-    nSortMeasure( 0 ),
     bAutoShow( false ),
     bAutoTopItems( false ),
+    bInitialized( false ),
     nAutoMeasure( 0 ),
     nAutoCount( 0 )
 {
@@ -2786,7 +2786,7 @@ void ScDPResultDimension::InitFrom( const vector<ScDPDimension*>& ppDim, const v
     const sheet::DataPilotFieldAutoShowInfo& rAutoInfo = pThisLevel->GetAutoShow();
     if ( rAutoInfo.IsEnabled )
     {
-        bAutoShow     = sal_True;
+        bAutoShow     = true;
         bAutoTopItems = ( rAutoInfo.ShowItemsMode == sheet::DataPilotFieldShowItemsMode::FROM_TOP );
         nAutoMeasure  = pThisLevel->GetAutoMeasure();
         nAutoCount    = rAutoInfo.ItemCount;
@@ -2796,7 +2796,7 @@ void ScDPResultDimension::InitFrom( const vector<ScDPDimension*>& ppDim, const v
     const sheet::DataPilotFieldSortInfo& rSortInfo = pThisLevel->GetSortInfo();
     if ( rSortInfo.Mode == sheet::DataPilotFieldSortMode::DATA )
     {
-        bSortByData = sal_True;
+        bSortByData = true;
         bSortAscending = rSortInfo.IsAscending;
         nSortMeasure = pThisLevel->GetSortMeasure();
     }
@@ -2820,12 +2820,12 @@ void ScDPResultDimension::InitFrom( const vector<ScDPDimension*>& ppDim, const v
             ScDPParentDimData aData( i, pThisDim, pThisLevel, pMember);
             ScDPResultMember* pNew = AddMember( aData );
 
-            rInitState.AddMember( nDimSource, /*aMemberData*/pNew->GetDataId() );
+            rInitState.AddMember(nDimSource, pNew->GetDataId());
             pNew->InitFrom( ppDim, ppLev, nPos+1, rInitState, bInitChild  );
             rInitState.RemoveMember();
         }
     }
-    bInitialized = sal_True;
+    bInitialized = true;
 }
 
 void ScDPResultDimension::LateInitFrom(
@@ -3976,7 +3976,7 @@ void ScDPResultDimension::InitWithMembers(
         if ( pResultMember )
         {
             rInitState.AddMember( nDimSource, pResultMember->GetDataId()  );
-            pResultMember->LateInitFrom( rParams /*ppDim, ppLev*/, pItemData, nPos+1 , rInitState );
+            pResultMember->LateInitFrom(rParams, pItemData, nPos+1, rInitState);
             rInitState.RemoveMember();
         }
     }