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

2014-05-07 Thread Markus Mohrhard 
 sc/source/ui/drawfunc/fuins2.cxx|   19 ---
 sc/source/ui/inc/gridwin.hxx|1 +
 sc/source/ui/view/gridwin5.cxx  |   13 +
 vcl/source/opengl/OpenGLContext.cxx |3 ++-
 4 files changed, 24 insertions(+), 12 deletions(-)

New commits:
commit 7ee5bd5b98c00e346a4954b03ebf5bd2fbaaec90
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Thu May 8 03:05:49 2014 +0200

we only want a fb that allows window rendering

Change-Id: I13d58c941e6a2411c3840b9efd341a4b827afc93

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 89484c7..916d208 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -712,6 +712,7 @@ SystemWindowData OpenGLContext::generateWinData(Window* 
pParent)
 static int visual_attribs[] =
 {
 GLX_DOUBLEBUFFER,   True,
+GLX_X_RENDERABLE,   True,
 GLX_RED_SIZE,   8,
 GLX_GREEN_SIZE, 8,
 GLX_BLUE_SIZE,  8,
commit cdcdeb933448e3519f1b3245f9f8428c941380b7
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Thu May 8 03:03:19 2014 +0200

fix another crash on exit

Change-Id: I580d17b16760516b73ac9f882fd8f9707ce6337b

diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 4a4a0ac..1505b28 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -730,7 +730,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, 
Window* pWin, ScDrawView*
 sal_Int16 nDialogRet = xDialog-execute();
 if( nDialogRet == 
ui::dialogs::ExecutableDialogResults::CANCEL )
 {
-delete pChildWindow;
+pGridWindow-DeleteChildWindow(pChildWindow);
 // leave OLE inplace mode and unmark
 OSL_ASSERT( pViewShell );
 OSL_ASSERT( pView );
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 5170e25..0a01935 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -415,6 +415,7 @@ public:
  * Takes ownership of the window
  */
 voidAddChildWindow(Window* pChildWindow);
+voidDeleteChildWindow(Window* pChildWindow);
 
 protected:
 // #114409#
diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx
index 798d34a..a85a549 100644
--- a/sc/source/ui/view/gridwin5.cxx
+++ b/sc/source/ui/view/gridwin5.cxx
@@ -479,4 +479,17 @@ void ScGridWindow::AddChildWindow(Window* pWindow)
 maChildWindows.push_back(pWindow);
 }
 
+void ScGridWindow::DeleteChildWindow(Window* pWindow)
+{
+for(boost::ptr_vectorWindow::iterator itr = maChildWindows.begin(),
+itrEnd = maChildWindows.end(); itr != itrEnd; ++itr)
+{
+if((*itr) == pWindow)
+{
+maChildWindows.erase(itr);
+return;
+}
+}
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 702953442ad26802ec47c0f6e1f446c0f1082de8
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Thu May 8 03:02:12 2014 +0200

don't put the parent window as child into itself

Change-Id: I961b92d47c35d63fa852bab2b478b93314e9add7

diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 2043ff9..4a4a0ac 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -546,23 +546,20 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, 
Window* pWin, ScDrawView*
 bool bUndo (pScDoc-IsUndoEnabled());
 
 Window* pParentWindow = pData-GetActiveWin();
-ScGridWindow* pGridWindow = dynamic_castScGridWindow*(pParentWindow);
-if(pGridWindow)
-{
-pGridWindow-AddChildWindow(pGridWindow);
-}
-else
-SAL_WARN(sc, not a grid window. Youare in serious trouble);
 OpenGLWindow* pChildWindow = new OpenGLWindow(pParentWindow);
 Size aWindowSize = pChildWindow-LogicToPixel( aSize, MapMode( 
MAP_100TH_MM ) );
 pChildWindow-SetSizePixel(aWindowSize);
-Wallpaper aBackground = pChildWindow-GetBackground();
-aBackground.SetColor(COL_BLUE);
-pChildWindow-SetBackground(aBackground);
 pChildWindow-Show();
 uno::Reference chart2::X3DChartWindowProvider  x3DWindowProvider( 
xChartModel, uno::UNO_QUERY_THROW );
 sal_uInt64 nWindowPtr = reinterpret_castsal_uInt64(pChildWindow);
 x3DWindowProvider-setWindow(nWindowPtr);
+ScGridWindow* pGridWindow = dynamic_castScGridWindow*(pParentWindow);
+if(pGridWindow)
+{
+pGridWindow-AddChildWindow(pChildWindow);
+}
+else
+SAL_WARN(sc, not a grid window. You are in serious trouble);
 
 if( pReqArgs )

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

2014-03-09 Thread 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 caol...@redhat.com
Date:   Sun Mar 9 18:57:13 2014 +

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 caol...@redhat.com
Date:   Sun Mar 9 17:30:43 2014 +

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 caol...@redhat.com
Date:   Sun Mar 9 17:28:58 2014 +

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; (inCount)  (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 caol...@redhat.com
Date:   Sun Mar 9 17:21:51 2014 +

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 =