[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source

[Libreoffice Gerrit user]

 sw/source/ui/shells/drwtxtex.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit e68fe11ffa5b4cbcc194fae59350b64200256d01
Author: Arnaud Versini <arnaud.versini at gmail.com>
Date:   Sun Nov 4 17:27:13 2012 +0100

    Fix fdo#56603 by NULL pointer checking in SwDrawTextShell::Execute
    
    Pushed in master as c954e6e1317f82e06fac66556674bc066b429469
    
    Change-Id: I98f246b2bafcf2669a8f6c3ec4c86ccee56519bf
    Reviewed-on: https://gerrit.libreoffice.org/984
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/985
    Tested-by: Miklos Vajna <vmiklos at suse.cz>
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index be020a9..33bfacc 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -165,8 +165,11 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
             if (nSlot == SID_ATTR_CHAR_FONT)
                 nScriptTypes = pOLV->GetSelectedScriptType();
 
-            aSetItem.PutItemForScriptType( nScriptTypes, pNewAttrs->Get( nWhich ) );
-            aNewAttr.Put( aSetItem.GetItemSet() );
+            if (pNewAttrs)
+            {
+                aSetItem.PutItemForScriptType( nScriptTypes, pNewAttrs->Get( nWhich ) );
+                aNewAttr.Put( aSetItem.GetItemSet() );
+            }
         }
         break;