[Libreoffice-commits] core.git: 4 commits - sc/source vcl/source

[Caolán McNamara]

 sc/source/core/data/dociter.cxx  |   34 ++++++++++++++++------------------
 sc/source/core/data/fillinfo.cxx |   11 ++++-------
 vcl/source/window/builder.cxx    |    5 +++++
 3 files changed, 25 insertions(+), 25 deletions(-)

New commits:
commit dd7babac7096d7f7a4288109f8263293046445aa
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Mar 9 18:57:13 2014 +0000

    map GtkSpinner to Throbber
    
    Change-Id: I52eab374fbce2dd51a3ab12c4cff605f4cd7610d

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 705af35..535222c 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -29,6 +29,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabpage.hxx>
+#include <vcl/throbber.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/vclmedit.hxx>
 #include <vcl/settings.hxx>
@@ -1484,6 +1485,10 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri
         if (pRealParent != pParent)
             cleanupWidgetOwnScrolling(pParent, pWindow, rMap);
     }
+    else if (name == "GtkSpinner")
+    {
+        pWindow = new Throbber(pParent, WB_3DLOOK);
+    }
     else if (name == "GtkToolbar")
     {
         pWindow = new ToolBox(pParent, WB_3DLOOK | WB_TABSTOP);
commit f88e69b52c3a153515ad67748e74579c65b8bee1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Mar 9 17:30:43 2014 +0000

    coverity#707995 Uninitialized scalar field
    
    Change-Id: Idef908843df92bad5283d36c3412090dd3b7c709

diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index a9b3200..481796c 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -528,10 +528,10 @@ void ScDBQueryDataIterator::DataAccessInternal::incPos()
         incBlock();
 }
 
-
-ScDBQueryDataIterator::DataAccessMatrix::DataAccessMatrix(const ScDBQueryDataIterator* pParent, ScDBQueryParamMatrix* pParam) :
-    DataAccess(pParent),
-    mpParam(pParam)
+ScDBQueryDataIterator::DataAccessMatrix::DataAccessMatrix(const ScDBQueryDataIterator* pParent, ScDBQueryParamMatrix* pParam)
+    : DataAccess(pParent)
+    , mpParam(pParam)
+    , mnCurRow(0)
 {
     SCSIZE nC, nR;
     mpParam->mpMatrix->GetDimensions(nC, nR);
commit 0e3dfb658651f5900c241d7f52f05bcde7c03047
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Mar 9 17:28:58 2014 +0000

    coverity#707996 Uninitialized scalar field
    
    Change-Id: I793e8753b941af768544d8082e8946f56122b54c

diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 9b2178b..a9b3200 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -350,18 +350,19 @@ bool ScDBQueryDataIterator::IsQueryValid(
     return rDoc.maTabs[nTab]->ValidQuery(nRow, rParam, pCell);
 }
 
-
-
-ScDBQueryDataIterator::DataAccessInternal::DataAccessInternal(const ScDBQueryDataIterator* pParent, ScDBQueryParamInternal* pParam, ScDocument* pDoc) :
-    DataAccess(pParent),
-    mpCells(NULL),
-    mpParam(pParam),
-    mpDoc(pDoc),
-    bCalcAsShown( pDoc->GetDocOptions().IsCalcAsShown() )
+ScDBQueryDataIterator::DataAccessInternal::DataAccessInternal(const ScDBQueryDataIterator* pParent, ScDBQueryParamInternal* pParam, ScDocument* pDoc)
+    : DataAccess(pParent)
+    , mpCells(NULL)
+    , mpParam(pParam)
+    , mpDoc(pDoc)
+    , pAttrArray(0)
+    , nNumFormat(0) // Initialized in GetNumberFormat
+    , nCol(mpParam->mnField)
+    , nRow(mpParam->nRow1)
+    , nAttrEndRow(0)
+    , nTab(mpParam->nTab)
+    , bCalcAsShown(pDoc->GetDocOptions().IsCalcAsShown())
 {
-    nCol = mpParam->mnField;
-    nRow = mpParam->nRow1;
-    nTab = mpParam->nTab;
     SCSIZE i;
     SCSIZE nCount = mpParam->GetEntryCount();
     for (i=0; (i<nCount) && (mpParam->GetEntry(i).bDoQuery); i++)
@@ -375,9 +376,6 @@ ScDBQueryDataIterator::DataAccessInternal::DataAccessInternal(const ScDBQueryDat
             rItem.maString.getString(), nIndex, rItem.mfVal);
         rItem.meType = bNumber ? ScQueryEntry::ByValue : ScQueryEntry::ByString;
     }
-    nNumFormat = 0; // Initialized in GetNumberFormat
-    pAttrArray = 0;
-    nAttrEndRow = 0;
 }
 
 ScDBQueryDataIterator::DataAccessInternal::~DataAccessInternal()
commit 5d837b249415bb363cc339f664c6f52080390d91
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Mar 9 17:21:51 2014 +0000

    coverity#708001 Uninitialized scalar field
    
    Change-Id: Ib8985a3966af4baf3ceb9b46fa250677556afdca

diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index f5012f7..71c2e61 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -1123,11 +1123,10 @@ void ScDocument::FillInfo(
         rArray.MirrorSelfX( true, false );
 }
 
-
-
-ScTableInfo::ScTableInfo() :
-    mpRowInfo( new RowInfo[ ROWINFO_MAX ] ),
-    mbPageMode( false )
+ScTableInfo::ScTableInfo()
+    : mpRowInfo(new RowInfo[ROWINFO_MAX])
+    , mnArrCount(0)
+    , mbPageMode(false)
 {
     for( sal_uInt16 nIdx = 0; nIdx < ROWINFO_MAX; ++nIdx )
         mpRowInfo[ nIdx ].pCellInfo = 0;
@@ -1140,6 +1139,4 @@ ScTableInfo::~ScTableInfo()
     delete [] mpRowInfo;
 }
 
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */