diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-10-06 05:19:19 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-10-06 21:25:11 +0200 |
| commit | c2d8d60748769d32133f33efb43be3e9ea28f8c8 (patch) | |
| tree | 05c017d05e6a8539191dfea826addb5d072d3bd7 /sc/source/ui/view/cellsh1.cxx | |
| parent | b65e98a6a8be0ad7864eb607087d9b85003e5a1e (diff) | |
selecting the correct entry will also show it in the dialog
Change-Id: I6bbeb2d1cb5af724ac0743d13f3e36cb8b613a88
Diffstat (limited to 'sc/source/ui/view/cellsh1.cxx')
| -rw-r--r-- | sc/source/ui/view/cellsh1.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index c4b21f30a4a3..1f970b6d0130 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2065,15 +2065,15 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { const ScRangeList& rCondFormatRange = pCondFormat->GetRange(); if(rCondFormatRange == aRangeList) - pDlg.reset(pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, pCondFormat, pCondFormat->GetRange(), aPos, RID_SCDLG_CONDFORMAT )); + pDlg.reset(pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, pCondFormat, pCondFormat->GetRange(), aPos, 0 )); } if(!pDlg) { - pDlg.reset(pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, NULL, aRangeList, aRangeList.GetTopLeftCorner(), RID_SCDLG_CONDFORMAT )); + pDlg.reset(pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, NULL, aRangeList, aRangeList.GetTopLeftCorner(), nSlot )); } - if(pDlg->Execute() == RET_OK) + if(pDlg && pDlg->Execute() == RET_OK) { ScConditionalFormat* pFormat = pDlg->GetConditionalFormat(); sal_uLong nOldIndex = 0; |