diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 15:03:44 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 15:03:44 +0000 |
commit | da982e92bbed1b8c86364e4fb74448c533732a9c (patch) | |
tree | b2b39ecbf39656c486af17cedb3a1f650629390e /sc/source/ui/miscdlgs/redcom.cxx | |
parent | 0e8f7351587fd57f454cd0660caededa41499271 (diff) |
INTEGRATION: CWS dialogdiet01 (1.5.32); FILE MERGED
2004/02/27 06:01:02 mwu 1.5.32.1: dialogdiet01 2004_02_27
Diffstat (limited to 'sc/source/ui/miscdlgs/redcom.cxx')
-rw-r--r-- | sc/source/ui/miscdlgs/redcom.cxx | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx index 8395f18fc4a9..47b8c9dbfe7b 100644 --- a/sc/source/ui/miscdlgs/redcom.cxx +++ b/sc/source/ui/miscdlgs/redcom.cxx @@ -2,9 +2,9 @@ * * $RCSfile: redcom.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hr $ $Date: 2004-02-03 20:34:35 $ + * last change: $Author: hr $ $Date: 2004-05-10 16:03:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,21 +76,28 @@ #include "redcom.hxx" #include "docsh.hxx" #include "tabvwsh.hxx" - +#include <svx/svxdlg.hxx> //CHINA001 +#include <svx/dialogs.hrc> //CHINA001 //------------------------------------------------------------------------ ScRedComDialog::ScRedComDialog( Window* pParent, const SfxItemSet& rCoreSet, ScDocShell *pShell,ScChangeAction *pAction,BOOL bPrevNext) { - pDlg = new SvxPostItDialog(pParent,rCoreSet,bPrevNext,TRUE); - pDocShell=pShell; - pDlg->DontChangeAuthor(); - pDlg->HideAuthor(); + //CHINA001 pDlg = new SvxPostItDialog(pParent,rCoreSet,bPrevNext,TRUE); + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); + if(pFact) + { + pDlg = pFact->CreateSvxPostItDialog( pParent, rCoreSet, ResId(RID_SVXDLG_POSTIT), bPrevNext, TRUE ); + DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + pDocShell=pShell; + pDlg->DontChangeAuthor(); + pDlg->HideAuthor(); - pDlg->SetPrevHdl(LINK( this, ScRedComDialog, PrevHdl)); - pDlg->SetNextHdl(LINK( this, ScRedComDialog, NextHdl)); + pDlg->SetPrevHdl(LINK( this, ScRedComDialog, PrevHdl)); + pDlg->SetNextHdl(LINK( this, ScRedComDialog, NextHdl)); - ReInit(pAction); + ReInit(pAction); + } } ScRedComDialog::~ScRedComDialog() @@ -196,7 +203,7 @@ void ScRedComDialog::SelectCell() } } -IMPL_LINK(ScRedComDialog, PrevHdl, SvxPostItDialog*, pDlg ) +IMPL_LINK(ScRedComDialog, PrevHdl, AbstractSvxPostItDialog*, pDlg ) { if (pDocShell!=NULL && pDlg->GetNote() != aComment ) pDocShell->SetChangeComment( pChangeAction, pDlg->GetNote()); @@ -207,7 +214,7 @@ IMPL_LINK(ScRedComDialog, PrevHdl, SvxPostItDialog*, pDlg ) return 0; } -IMPL_LINK(ScRedComDialog, NextHdl, SvxPostItDialog*, pDlg ) +IMPL_LINK(ScRedComDialog, NextHdl, AbstractSvxPostItDialog*, pDlg ) { if ( pDocShell!=NULL && pDlg->GetNote() != aComment ) pDocShell->SetChangeComment( pChangeAction, pDlg->GetNote()); |