diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-10-06 01:15:10 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-10-06 21:25:11 +0200 |
| commit | ea89abb435a0175a7c12a6ccb430752393ce4b64 (patch) | |
| tree | 934b2be53769765a1b64f9448a24650a62620141 /sc | |
| parent | 32d8c9b96cef77fd563ca1ab0c3943f783f1b16a (diff) | |
onyl show the exisiting cond format if the range is equal
Change-Id: I6a183b41261f1813b1cce277f3fe4a276ab07bb0
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/view/cellsh1.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index b4685302060b..3d292f690697 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2061,9 +2061,12 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) const ScConditionalFormat* pCondFormat = pDoc->GetCondFormat(aPos.Col(), aPos.Row(), aPos.Tab()); if(pCondFormat) { - pDlg.reset(pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, pCondFormat, pCondFormat->GetRange(), aPos, RID_SCDLG_CONDFORMAT )); + const ScRangeList& rCondFormatRange = pCondFormat->GetRange(); + if(rCondFormatRange == aRangeList) + pDlg.reset(pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, pCondFormat, pCondFormat->GetRange(), aPos, RID_SCDLG_CONDFORMAT )); } - else + + if(!pDlg) { pDlg.reset(pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, NULL, aRangeList, aRangeList.GetTopLeftCorner(), RID_SCDLG_CONDFORMAT )); } |