[Libreoffice-commits] .: toolkit/source

[Libreoffice Gerrit user]

 toolkit/source/awt/vclxcontainer.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit a9b9ffacac74310c38f152cb9bcc56fe06b0e1d6
Author: Noel Power <noel.power at suse.com>
Date:   Tue Sep 11 17:48:21 2012 +0100

    blind fix for toolkit_unoapi
    
    Change-Id: I545b712c5fb72d8de415752b7fb4ec20ab3fcee0

diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx
index a15fef2..1afcfab 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.cxx
@@ -260,6 +260,10 @@ throw(::com::sun::star::uno::RuntimeException)
                 OutputDevice* pDev = VCLUnoHelper::GetOutputDevice( getGraphics() );
                 if ( !pDev )
                     pDev = pWindow->GetParent();
+                // shouldn't happen but it appears pDev can be NULL
+                // #FIXME ( find out how/why )
+                if ( !pDev )
+                    break;
 
                 aSize = pDev->LogicToPixel( aSize, aMode );
                 switch ( nPropType )