datapilotperf: compile without warnings

10 files changed, 46 insertions, 38 deletions

diff --git a/sc/inc/dpglobal.hxx b/sc/inc/dpglobal.hxx
index c4089be762c0..7de5947cc969 100644
--- a/sc/inc/dpglobal.hxx
+++ b/sc/inc/dpglobal.hxx
@@ -59,7 +59,8 @@
 #include <com/sun/star/sheet/XLevelsSupplier.hpp>
 
 
-#define MAX_LABELS  (MAXCOL+1)
+// moved from fieldwnd.hxx, see also SC_DAPI_MAXFIELDS
+#define MAX_LABELS  256
 
 #define MAX_PAGEFIELDS 10   // maximum count of fields for page area
 
@@ -126,7 +127,7 @@ private:
 
     friend class ScDPTableDataCache;
 public:
-    ScDPItemData() : fValue(0.0), nNumFormat( 0 ), mbFlag( 0 ){}
+    ScDPItemData() : nNumFormat( 0 ), fValue(0.0), mbFlag( 0 ){}
     ScDPItemData( ULONG nNF, const String & rS, double fV, BYTE bF ):nNumFormat(nNF), aString(rS), fValue(fV), mbFlag( bF ){}
     ScDPItemData( const String& rS, double fV = 0.0, BOOL bHV = FALSE, const ULONG nNumFormat = 0 , BOOL bData = TRUE) ;
     ScDPItemData( ScDocument* pDoc, SCROW nRow, USHORT nCol, USHORT nDocTab );
diff --git a/sc/source/core/data/dpglobal.cxx b/sc/source/core/data/dpglobal.cxx
index ae9a6c5c0534..6b84d37d8d0f 100644
--- a/sc/source/core/data/dpglobal.cxx
+++ b/sc/source/core/data/dpglobal.cxx
@@ -28,9 +28,15 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sc.hxx"
+
 #include "dpglobal.hxx"
 #include "document.hxx"
 
+#include <stdio.h>
+
 namespace ScDPGlobal
 {
     Rectangle operator *( const Rectangle &rLeft, const std::pair<double,double> & rRight )
@@ -97,8 +103,8 @@ ScDPItemDataPool::ScDPItemDataPool(void)
 }
 //
 ScDPItemDataPool::ScDPItemDataPool(const ScDPItemDataPool& r):
-    maItemIds( r.maItemIds),
-    maItems( r.maItems )
+    maItems(r.maItems),
+    maItemIds(r.maItemIds)
 {
 }
 
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index 4e02512cff63..9fff95b1fb73 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -67,9 +67,9 @@ using ::std::hash_set;
 ScSheetDPData::ScSheetDPData( ScDocument* pD, const ScSheetSourceDesc& rDesc , long nCacheId) :
     ScDPTableData(pD, rDesc.GetCacheId( pD, nCacheId) ), // DataPilot Migration - Cache&&Performance
     aQuery ( rDesc.aQueryParam  ),
+    pSpecial(NULL),
     bIgnoreEmptyRows( FALSE ),
     bRepeatIfEmpty(FALSE),
-    pSpecial(NULL),
     aCacheTable( pD, rDesc.GetCacheId( pD, nCacheId))
 {
     SCSIZE nEntryCount( aQuery.GetEntryCount());
@@ -192,10 +192,10 @@ BOOL ScSheetDPData::getIsDataLayoutDimension(long nColumn)
     return (nColumn ==(long)( aCacheTable.getColSize()));
 }
 
-void ScSheetDPData::SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty )
+void ScSheetDPData::SetEmptyFlags( BOOL bIgnoreEmptyRowsP, BOOL bRepeatIfEmptyP )
 {
-    bIgnoreEmptyRows = bIgnoreEmptyRows;
-    bRepeatIfEmpty   = bRepeatIfEmpty;
+    bIgnoreEmptyRows = bIgnoreEmptyRowsP;
+    bRepeatIfEmpty   = bRepeatIfEmptyP;
 }
 
 bool ScSheetDPData::IsRepeatIfEmpty()
diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx
index a518dec5f52c..d5b72ed9e8ba 100644
--- a/sc/source/core/data/dptabdat.cxx
+++ b/sc/source/core/data/dptabdat.cxx
@@ -65,8 +65,8 @@ ScDPTableData::CalcInfo::CalcInfo() :
 // ---------------------------------------------------------------------------
 
 ScDPTableData::ScDPTableData(ScDocument* pDoc, long nCacheId ) :
-    mpDoc ( pDoc ),
-    mnCacheId( nCacheId )
+    mnCacheId( nCacheId ),
+    mpDoc ( pDoc )
 {
     nLastDateVal = nLastHier = nLastLevel = nLastRet = -1;      // invalid
 
diff --git a/sc/source/core/data/dptablecache.cxx b/sc/source/core/data/dptablecache.cxx
index 843d5057a766..3f604235609b 100644
--- a/sc/source/core/data/dptablecache.cxx
+++ b/sc/source/core/data/dptablecache.cxx
@@ -108,7 +108,7 @@ namespace
                     fValue  = xRow->getBoolean(nCol) ? 1 : 0;
                     return new ScDPItemData( rStr, fValue,TRUE,nNumType);
                 }
-                break;
+                //break;
 
             case sdbc::DataType::TINYINT:
             case sdbc::DataType::SMALLINT:
@@ -124,7 +124,7 @@ namespace
                     fValue = xRow->getDouble(nCol);
                     return new ScDPItemData( rStr, fValue,TRUE);
                 }
-                break;
+                //break;
 
             case sdbc::DataType::DATE:
                 {
@@ -134,7 +134,7 @@ namespace
                     fValue = Date(aDate.Day, aDate.Month, aDate.Year) - rNullDate;
                     return new ScDPItemData( rStr, fValue, TRUE, nNumType );
                 }
-                break;
+                //break;
 
             case sdbc::DataType::TIME:
                 {
@@ -145,7 +145,7 @@ namespace
                         aTime.Seconds + aTime.HundredthSeconds / 100.0 ) / D_TIMEFACTOR;
                     return new ScDPItemData( rStr,fValue, TRUE, nNumType );
                 }
-                break;
+                //break;
 
             case sdbc::DataType::TIMESTAMP:
                 {
@@ -157,7 +157,7 @@ namespace
                         aStamp.Seconds + aStamp.HundredthSeconds / 100.0 ) / D_TIMEFACTOR;
                     return new ScDPItemData( rStr,fValue, TRUE, nNumType );
                 }
-                break;
+                //break;
             case sdbc::DataType::CHAR:
             case sdbc::DataType::VARCHAR:
             case sdbc::DataType::LONGVARCHAR:
@@ -167,7 +167,7 @@ namespace
             case sdbc::DataType::LONGVARBINARY:
             default:
                 return new ScDPItemData ( rStr );
-                break;
+                //break;
             }
         }
         catch (uno::Exception&)
@@ -183,13 +183,13 @@ namespace
 // Wang Xu Ming -- 12/23/2008
 //Refactor cache data
 ScDPItemData::ScDPItemData( const String& rS, double fV/* = 0.0*/, BOOL bHV/* = FALSE*/, const ULONG nNumFormatP /*= 0*/ , BOOL bData/* = TRUE*/) :
-aString(rS), fValue(fV), nNumFormat( nNumFormatP ),
+nNumFormat( nNumFormatP ), aString(rS), fValue(fV),
 mbFlag( (MK_VAL*!!bHV) | (MK_DATA*!!bData) | (MK_ERR*!!FALSE) | (MK_DATE*!!lcl_isDate( nNumFormat ) ) )
 {
 }
 
 ScDPItemData::ScDPItemData( ScDocument* pDoc, SCROW nRow, USHORT nCol, USHORT nDocTab  ):
-         fValue(0.0), nNumFormat( 0 ), mbFlag( 0 )
+        nNumFormat( 0 ), fValue(0.0), mbFlag( 0 )
 {
     String aDocStr;
     pDoc->GetString( nCol, nRow, nDocTab, aDocStr );
@@ -422,11 +422,11 @@ BOOL ScDPTableDataCache::operator== ( const ScDPTableDataCache& r ) const
 
 ScDPTableDataCache::ScDPTableDataCache(  ScDocument* pDoc  ) :
 mpDoc( pDoc ),
+mnColumnCount ( 0 ),
 mpTableDataValues ( NULL ),
 mpSourceData ( NULL ),
 mpGlobalOrder( NULL ),
-mpIndexOrder( NULL),
-mnColumnCount ( 0 )
+mpIndexOrder( NULL)
 {
     mnID = -1;
 }
@@ -874,7 +874,7 @@ BOOL ScDPTableDataCache::AddData(long nDim, ScDPItemData* pitemData)
 
 String ScDPTableDataCache::GetDimensionName( USHORT nColumn ) const
 {
-    DBG_ASSERT( nColumn>=0 && nColumn < mrLabelNames.size()-1 , "ScDPTableDataCache::GetDimensionName");
+    DBG_ASSERT( /* nColumn>=0 && */ nColumn < mrLabelNames.size()-1 , "ScDPTableDataCache::GetDimensionName");
     DBG_ASSERT( mrLabelNames.size() == static_cast <USHORT> (mnColumnCount+1), "ScDPTableDataCache::GetDimensionName");
     if ( static_cast<size_t>(nColumn+1) < mrLabelNames.size() )
     {
@@ -919,7 +919,7 @@ void ScDPTableDataCache::AddLabel(ScDPItemData *pData)
 SCROW ScDPTableDataCache::GetItemDataId(USHORT nDim, SCROW nRow, BOOL bRepeatIfEmpty) const
 { //
     DBG_ASSERT( IsValid(), "  IsValid() == false " );
-    DBG_ASSERT( nDim >= 0 && nDim < mnColumnCount, "ScDPTableDataCache::GetItemDataId " );
+    DBG_ASSERT( /* nDim >= 0 && */ nDim < mnColumnCount, "ScDPTableDataCache::GetItemDataId " );
 
     if ( bRepeatIfEmpty )
     {
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 1477fec48c8b..8267bbe0f878 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -976,7 +976,7 @@ ResultMembers* ScDPResultData::GetDimResultMembers( long nDim ,  ScDPDimension*
       if ( mpDimMembers[ nDim ] == NULL )
         {
 
-                long nDimSource = pDim->GetDimension();
+                //long nDimSource = pDim->GetDimension();
 
                 ResultMembers* pResultMembers = new ResultMembers();
                 // global order is used to initialize aMembers, so it doesn't have to be looked at later
@@ -1014,8 +1014,8 @@ ScDPResultMember::ScDPResultMember(  const ScDPResultData* pData, const ScDPPare
     bForceSubTotal( bForceSub ),
     bHasHiddenDetails( FALSE ),
     bInitialized( FALSE ),
-    nMemberStep( 1 ),
-    bAutoHidden( FALSE )
+    bAutoHidden( FALSE ),
+    nMemberStep( 1 )
 {
     // pParentLevel/pMemberDesc is 0 for root members
 }
@@ -1029,8 +1029,8 @@ ScDPResultMember::ScDPResultMember(  const ScDPResultData* pData,
     bForceSubTotal( bForceSub ),
     bHasHiddenDetails( FALSE ),
     bInitialized( FALSE ),
-    nMemberStep( 1 ),
-    bAutoHidden( FALSE )
+    bAutoHidden( FALSE ),
+    nMemberStep( 1 )
 {
 }
 ScDPResultMember::~ScDPResultMember()
@@ -3022,7 +3022,7 @@ void ScDPResultDimension::ProcessData( const vector< SCROW >& aMembers,
         if (aMembers.size() > 1)
         {
             vector</*ScDPItemData*/SCROW >::const_iterator itr = aMembers.begin();
-            aChildMembers.assign(++itr, aMembers.end());
+            aChildMembers.insert(aChildMembers.begin(), ++itr, aMembers.end());
         }
         pMember->ProcessData( aChildMembers, pDataDim, aDataMembers, aValues );
         return;
@@ -3572,7 +3572,7 @@ void ScDPDataDimension::ProcessData( const vector< SCROW >& aDataMembers, const
             if (aDataMembers.size() > 1)
             {
                 vector</*ScDPItemData*/SCROW >::const_iterator itr = aDataMembers.begin();
-                aChildDataMembers.assign(++itr, aDataMembers.end());
+                aChildDataMembers.insert(aChildDataMembers.begin(), ++itr, aDataMembers.end());
             }
             pMember->ProcessData( aChildDataMembers, aValues, rSubState );
             return;
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 784c39389ae3..9d2135795f97 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -2891,14 +2891,14 @@ const ScDPItemData& ScDPMember::GetItemData() const
 const ScDPItemData* ScDPSource::GetItemDataById(long nDim, long nId)
 {
     long nSrcDim = GetSourceDim( nDim );
-    const ScDPItemData* pData = GetData()->GetMemberById(  nSrcDim,  nId );
-    if ( !pData )
+    const ScDPItemData* pItemData = GetData()->GetMemberById(  nSrcDim,  nId );
+    if ( !pItemData )
    { //todo:
            ScDPItemData item;
            nId = GetCache()->GetAdditionalItemID( item );
-        pData = GetData()->GetMemberById(  nSrcDim,  nId );
+        pItemData = GetData()->GetMemberById(  nSrcDim,  nId );
     }
-   return pData;
+   return pItemData;
 }
 
 SCROW  ScDPSource::GetMemberId(  long  nDim, const ScDPItemData& rData )
diff --git a/sc/source/core/data/makefile.mk b/sc/source/core/data/makefile.mk
index 07e311f1b565..abb8ea863862 100644
--- a/sc/source/core/data/makefile.mk
+++ b/sc/source/core/data/makefile.mk
@@ -76,8 +76,8 @@ SLOFILES =  \
     $(SLO)$/document.obj \
         $(SLO)$/dpcachetable.obj \
         $(SLO)$/dpdimsave.obj \
-        $(SLO)$/dpgroup.obj \
     $(SLO)$/dpglobal.obj \
+        $(SLO)$/dpgroup.obj \
     $(SLO)$/dpobject.obj \
     $(SLO)$/dpoutput.obj \
     $(SLO)$/dpoutputgeometry.obj \
@@ -128,6 +128,7 @@ EXCEPTIONSFILES= \
     $(SLO)$/documen2.obj \
     $(SLO)$/document.obj \
     $(SLO)$/dpdimsave.obj \
+    $(SLO)$/dpglobal.obj \
     $(SLO)$/dpgroup.obj \
     $(SLO)$/dpshttab.obj \
     $(SLO)$/dptabres.obj \
@@ -142,8 +143,9 @@ EXCEPTIONSFILES= \
     $(SLO)$/documen5.obj \
     $(SLO)$/documen6.obj \
     $(SLO)$/documen9.obj \
-  $(SLO)$/dpcachetable.obj \
-  $(SLO)$/dptablecache.obj\
+    $(SLO)$/dpcachetable.obj \
+    $(SLO)$/dptablecache.obj \
+    $(SLO)$/scdpoutputimpl.obj \
     $(SLO)$/dpsdbtab.obj \
     $(SLO)$/dpobject.obj \
     $(SLO)$/dpoutput.obj \
diff --git a/sc/source/core/data/scdpoutputimpl.hxx b/sc/source/core/data/scdpoutputimpl.hxx
index 357807533836..9148fe91ba02 100644
--- a/sc/source/core/data/scdpoutputimpl.hxx
+++ b/sc/source/core/data/scdpoutputimpl.hxx
@@ -54,8 +54,8 @@ class OutputImpl
     SCROW   mnMemberStartRow;
 
     SCCOL   mnDataStartCol;
-    SCCOL   mnTabEndCol;
     SCROW   mnDataStartRow;
+    SCCOL   mnTabEndCol;
     SCROW   mnTabEndRow;
 
 public:
diff --git a/sc/source/ui/inc/fieldwnd.hxx b/sc/source/ui/inc/fieldwnd.hxx
index ae2dbf1ffb52..40dfc100a52d 100644
--- a/sc/source/ui/inc/fieldwnd.hxx
+++ b/sc/source/ui/inc/fieldwnd.hxx
@@ -37,7 +37,6 @@
 #include <vcl/fixed.hxx>
 #include <cppuhelper/weakref.hxx>
 
-#define MAX_LABELS  256
 #define PAGE_SIZE   16      // count of visible fields for scrollbar
 #define LINE_SIZE   8       // count of fields per column for scrollbar
 #define MAX_FIELDS  8       // maximum count of fields for row/col/data area