[Libreoffice-commits] core.git: 2 commits - vcl/osx vcl/source

[Caolán McNamara]

 vcl/osx/salinst.cxx          |    2 +-
 vcl/source/window/window.cxx |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4fcaa8ee1f94799321596eab2f6fd2c768bbec9d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 7 20:38:29 2014 +0000

    coverity#441048 silence Dereference after null check
    
    Change-Id: I3869657bbf20ac3152090a96428456c2a9eb9d14

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 5163cc2..7ee6c70 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -9040,6 +9040,7 @@ void Window::RecordLayoutData( vcl::ControlLayoutData* pLayout, const Rectangle&
         OutputDevice *pOutDev = GetOutDev();
         pOutDev->ImplInitOutDevData();
     }
+    assert(mpOutDevData);
     mpOutDevData->mpRecordLayout = pLayout;
     mpOutDevData->maRecordRect = rRect;
     Paint( rRect );
commit b1e45c93e8e6339df6d7b7158029cbd9550c08cc
Author: Herbert Dürr <hdu at apache.org>
Date:   Fri Feb 7 14:29:20 2014 +0000

    Related: #i124201# fix frame-list handling with AppleRemote events
    
    (cherry picked from commit 2d6f7c351fd53de62af5262778173538942aa4b1)
    
    Conflicts:
    	vcl/osx/salinst.cxx
    
    Change-Id: I3f80bacd673f06be92406d397260d5b7bb0d1a19

diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 58b0f0f..723ad00 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -586,7 +586,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent )
                 break;
         }
         AquaSalFrame* pFrame = pSalData->maFrames.front();
-        Window * pWindow = pFrame->GetWindow() ? pSalData->maFrames.front()->GetWindow() : NULL;
+        Window* pWindow = pFrame ? pFrame->GetWindow() : NULL;
 
         if( pWindow )
         {