commit 9edb6ba992ad2ef092996903d775df5313613bee
author Markus Mohrhard <markus.mohrhard@googlemail.com> Fri Sep 28 18:09:43 2012 +0200
committer Markus Mohrhard <markus.mohrhard@googlemail.com> Fri Sep 28 18:12:22 2012 +0200
tree 8b09075181feb978ec7bcc1628b13d064cb53944
parent 985e7e4f5017b67f2734b8885d81e32e2011e470

add the remaining parts to previous commit

Change-Id: Ia0b9ed9eed30991f38234bf56c49b26392491f30

sc/source/ui/view/cellsh1.cxx

diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index a1cdc8c..e9211c1 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2061,11 +2061,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                const ScConditionalFormat* pCondFormat = pDoc->GetCondFormat(aPos.Col(), aPos.Row(), aPos.Tab());
                if(pCondFormat)
                {
                    pDlg = pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, pCondFormat, pCondFormat->GetRange(), aPos, RID_SCDLG_CONDFORMAT );
                    pDlg = pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, pCondFormat, pCondFormat->GetRange(), pCondFormat->GetRange().GetTopLeftCorner(), RID_SCDLG_CONDFORMAT );
                }
                else
                {
                    pDlg = pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, NULL, aRangeList, aPos, RID_SCDLG_CONDFORMAT );
                    pDlg = pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, NULL, aRangeList, aRangeList.GetTopLeftCorner(), RID_SCDLG_CONDFORMAT );
                }

                if(pDlg->Execute() == RET_OK)