[Libreoffice-commits] core.git: 3 commits - sfx2/source sw/source vcl/source

[Caolán McNamara]

 sfx2/source/appl/appopen.cxx                 |    5 ++---
 sw/source/uibase/sidebar/PageMarginPanel.cxx |    4 ++++
 vcl/source/opengl/OpenGLContext.cxx          |    1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 2ad5055145201efe5a244656a0715b391149e825
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun May 29 21:18:26 2016 +0100

    coverity#1362173 Dereference after null check
    
    Change-Id: I75c6f6fba947ac56c198afdef9b5ad078a76cdc5

diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index e5ff943..4f1d71c 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -450,14 +450,13 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
 
         SfxObjectShell* pCurrentShell = SfxObjectShell::Current();
         Reference<XModel> xModel;
-
         if(pCurrentShell)
             xModel = pCurrentShell->GetModel();
 
         ScopedVclPtrInstance< SfxTemplateManagerDlg > aTemplDlg;
 
-        if(xModel.is())
-            aTemplDlg->setDocumentModel(pCurrentShell->GetModel());
+        if (xModel.is())
+            aTemplDlg->setDocumentModel(xModel);
 
         int nRet = aTemplDlg->Execute();
         if ( nRet == RET_OK )
commit b5ff87efd8b1ecf7d06b64a76ae70c7942aba91c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun May 29 21:16:26 2016 +0100

    coverity#1362175 Uninitialized scalar field
    
    Change-Id: Ia2da9cc6a2e2f6c5f3f85c2ad3d95fb1adad6225

diff --git a/sw/source/uibase/sidebar/PageMarginPanel.cxx b/sw/source/uibase/sidebar/PageMarginPanel.cxx
index b6e5a9e..0575408 100644
--- a/sw/source/uibase/sidebar/PageMarginPanel.cxx
+++ b/sw/source/uibase/sidebar/PageMarginPanel.cxx
@@ -61,6 +61,10 @@ PageMarginPanel::PageMarginPanel(
     mpBindings(pBindings),
     meFUnit(),
     meUnit(),
+    mnPageLeftMargin(0),
+    mnPageRightMargin(0),
+    mnPageTopMargin(0),
+    mnPageBottomMargin(0),
     mpPageLRMarginItem( new SvxLongLRSpaceItem( 0, 0, SID_ATTR_PAGE_LRSPACE ) ),
     mpPageULMarginItem( new SvxLongULSpaceItem( 0, 0, SID_ATTR_PAGE_ULSPACE ) ),
     maSwPageLRControl(SID_ATTR_PAGE_LRSPACE, *pBindings, *this),
commit 6f5a6d1668e0a0a9db9099a17bde769f128ef0ed
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun May 29 21:15:05 2016 +0100

    coverity#1362019 Uninitialized scalar variable
    
    Change-Id: I18d913fc6e0131f0c31c9d0cfe0f39e1161035eb

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index ea90537..3503017 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -412,6 +412,7 @@ void OpenGLContext::reset()
 SystemWindowData OpenGLContext::generateWinData(vcl::Window* /*pParent*/, bool /*bRequestLegacyContext*/)
 {
     SystemWindowData aWinData;
+    memset(&aWinData, 0, sizeof(aWinData));
     aWinData.nSize = sizeof(aWinData);
     return aWinData;
 }