[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sfx2/source

[Michael Stahl]

 sfx2/source/dialog/dockwin.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit a3eb2cfdb136ab2d20e21421f0400e2eeca4ff8f
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Dec 15 12:35:47 2015 +0100

    sfx2: fix valgrind warning
    
    ==7727== Conditional jump or move depends on uninitialised value(s)
    ==7727==    at 0x9121E24: SfxDockingWindow::Resize() (dockwin.cxx:451)
    ==7727==    by 0x3CADFAC3: SmElementsDockingWindow::Resize()
    (ElementsDockingWindow.cxx:753)
    
    Change-Id: Ie6e8a61f6c295373e5ccad409e2557e7c2dd6c1a
    (cherry picked from commit 8831281942b0ffe3dbdcea6febcda97a2ab665b3)
    (cherry picked from commit 5d9a20b3ab3167242a41a6f5ea951d426677ec29)
    Reviewed-on: https://gerrit.libreoffice.org/20756
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index f376e52..811baf6 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -858,6 +858,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
     pImp->nLine = pImp->nDockLine = 0;
     pImp->nPos  = pImp->nDockPos = 0;
     pImp->bNewLine = false;
+    pImp->SetDockAlignment(SfxChildAlignment::NOALIGNMENT);
     pImp->SetLastAlignment(SfxChildAlignment::NOALIGNMENT);
     pImp->aMoveIdle.SetPriority(SchedulerPriority::RESIZE);
     pImp->aMoveIdle.SetIdleHdl(LINK(this,SfxDockingWindow,TimerHdl));
@@ -903,6 +904,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
     pImp->nLine = pImp->nDockLine = 0;
     pImp->nPos  = pImp->nDockPos = 0;
     pImp->bNewLine = false;
+    pImp->SetDockAlignment(SfxChildAlignment::NOALIGNMENT);
     pImp->SetLastAlignment(SfxChildAlignment::NOALIGNMENT);
     pImp->aMoveIdle.SetPriority(SchedulerPriority::RESIZE);
     pImp->aMoveIdle.SetIdleHdl(LINK(this,SfxDockingWindow,TimerHdl));
@@ -948,6 +950,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
     pImp->nLine = pImp->nDockLine = 0;
     pImp->nPos  = pImp->nDockPos = 0;
     pImp->bNewLine = false;
+    pImp->SetDockAlignment(SfxChildAlignment::NOALIGNMENT);
     pImp->SetLastAlignment(SfxChildAlignment::NOALIGNMENT);
     pImp->aMoveIdle.SetPriority(SchedulerPriority::RESIZE);
     pImp->aMoveIdle.SetIdleHdl(LINK(this,SfxDockingWindow,TimerHdl));