diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2015-08-09 12:30:40 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-08-11 13:27:18 +0000 |
| commit | 04f704066e60f10c68c76d757033746e9fa2aaa7 (patch) | |
| tree | 5d3cef56c3710d168b2601f2213b8c0ea40ba3ad | |
| parent | 0ecc9fe7ac1358d9bbcfcebcc348906cca73872b (diff) | |
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@gmail.com>
Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
(cherry picked from commit 958ec9ccfe3bbe54369f9e9105c10beae80d9548)
Reviewed-on: https://gerrit.libreoffice.org/17615
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit ed09c7638e3ea40fc40b51af5cf0b2018c5c78c9)
Reviewed-on: https://gerrit.libreoffice.org/17649
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sc/sdi/scalc.sdi | 6 | ||||
| -rw-r--r-- | sc/source/ui/view/cellsh1.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi index e196e852e69b..311172dc9f98 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 331a76556ebe..f54f963c507d 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -1016,7 +1016,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(); |