[ooo-build-commit] .: sw/source

[Caolán McNamara]

 sw/source/filter/ww8/ww8graf.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d1454a6400d8485028e59fad583cdedfeaf6bd43
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 30 16:39:50 2010 +0100

    avoid possible null pointer dereference on .doc import

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 6a70ac1..317bcb5 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2834,7 +2834,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
         MapWrapIntoFlyFmt(pRecord, pRetFrmFmt);
 
     // Set frame name with object name
-    if( aObjName.Len() )
+    if( pRetFrmFmt /*#i52825# */ && aObjName.Len() )
         pRetFrmFmt->SetName( aObjName );
     return AddAutoAnchor(pRetFrmFmt);
 }