[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/sdi sc/source

[Julien Nabet]

 sc/sdi/scalc.sdi              |    6 +++---
 sc/source/ui/view/cellsh1.cxx |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ed09c7638e3ea40fc40b51af5cf0b2018c5c78c9
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Aug 9 12:30:40 2015 +0200

    tdf#79741: Macro with Find @ Replace crash Calc
    
    0x00002aaaaf4bd163 in SfxItemSet::GetItemState (this=0x0, nWhich=26182, bSrchInParent=true, ppItem=0x7fffffff1730)
        at /home/julien/compile-libreoffice/libreoffice/svl/source/items/itemset.cxx:422
    422	        SfxItemArray ppFnd = pAktSet->m_pItems;
    (gdb) bt
    0  0x00002aaaaf4bd163 in SfxItemSet::GetItemState(unsigned short, bool, SfxPoolItem const**) const (this=0x0, nWhich=26182, bSrchInParent=true, ppItem=0x7fffffff1730)
        at /home/julien/compile-libreoffice/libreoffice/svl/source/items/itemset.cxx:422
    1  0x00002aaaaf4bd306 in SfxItemSet::HasItem(unsigned short, SfxPoolItem const**) const (this=0x0, nWhich=26182, ppItem=0x7fffffff1730)
        at /home/julien/compile-libreoffice/libreoffice/svl/source/items/itemset.cxx:463
    2  0x00002aaacd9902c9 in ScCellShell::ExecuteEdit(SfxRequest&) (this=0x312fe10, rReq=...) at /home/julien/compile-libreoffice/libreoffice/sc/source/ui/view/cellsh1.cxx:1032
    
    See https://gerrit.libreoffice.org/#/c/17603/ for details
    Thank you Maxim!
    
    Change-Id: Ie4cf31e3764c02f335830c59674a94acd6c209df
    Reviewed-on: https://gerrit.libreoffice.org/17603
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
    Tested-by: Maxim Monastirsky <momonasmon at gmail.com>
    (cherry picked from commit 958ec9ccfe3bbe54369f9e9105c10beae80d9548)
    Reviewed-on: https://gerrit.libreoffice.org/17615
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 2fbf373..7bc2db6 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -3280,7 +3280,7 @@ SfxVoidItem SolverDialog SID_OPENDLG_OPTSOLVER
 ]
 
 SfxVoidItem SearchResultsDialog SID_SEARCH_RESULTS_DIALOG
-()
+(SfxBoolItem Visible SID_SEARCH_RESULTS_DIALOG)
 [
     /* flags: */
     AutoUpdate = FALSE,
@@ -3297,9 +3297,9 @@ SfxVoidItem SearchResultsDialog SID_SEARCH_RESULTS_DIALOG
 
     /* config: */
     AccelConfig = TRUE,
-    MenuConfig = TRUE,
+    MenuConfig = FALSE,
     StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
+    ToolBoxConfig = FALSE,
     GroupId = GID_OPTIONS;
 ]
 
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 6fd0e50..6c2a7ef 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1017,7 +1017,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
         case SID_SEARCH_RESULTS_DIALOG:
         {
             const SfxPoolItem* pItem = NULL;
-            if (pReqArgs->HasItem(SID_SEARCH_RESULTS_DIALOG, &pItem))
+            if (pReqArgs && pReqArgs->HasItem(SID_SEARCH_RESULTS_DIALOG, &pItem))
             {
                 bool bVisible = static_cast<const SfxBoolItem*>(pItem)->GetValue();
                 SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();