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

[Maxim Monastirsky]

 sw/source/uibase/shells/annotsh.cxx  |    2 +-
 sw/source/uibase/shells/drwtxtex.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6045c38f86fc6e96610dcd9a055892af21ea2629
Author: Maxim Monastirsky <momonas...@gmail.com>
Date:   Fri Aug 29 02:31:42 2014 +0300

    Avoid crash when no args specified
    
    Change-Id: Id3d10566af674f02f3734f981e6b4b45b528ed92

diff --git a/sw/source/uibase/shells/annotsh.cxx 
b/sw/source/uibase/shells/annotsh.cxx
index 5c74c35..7ead827 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -467,7 +467,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
         {
             const SfxItemSet* pArgs = rReq.GetArgs();
             const SfxStringItem* pItem = 0;
-            if (nSlot == SID_CHAR_DLG)
+            if (pArgs && nSlot == SID_CHAR_DLG)
                 pItem = static_cast< const SfxStringItem* 
>(pArgs->GetItem(FN_PARAM_1, false, TYPE(SfxStringItem) ) );
 
             if( !pArgs || pItem )
diff --git a/sw/source/uibase/shells/drwtxtex.cxx 
b/sw/source/uibase/shells/drwtxtex.cxx
index 84b1fa5..fef670e 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -299,7 +299,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
         {
             const SfxItemSet* pArgs = rReq.GetArgs();
             const SfxStringItem* pItem = 0;
-            if (nSlot == SID_CHAR_DLG)
+            if (pArgs && nSlot == SID_CHAR_DLG)
                 pItem = static_cast< const SfxStringItem* 
>(pArgs->GetItem(FN_PARAM_1, false, TYPE(SfxStringItem) ) );
 
             if( !pArgs || pItem )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits