diff options
| author | Oliver Specht <os@openoffice.org> | 2001-01-30 13:17:19 +0000 |
|---|---|---|
| committer | Oliver Specht <os@openoffice.org> | 2001-01-30 13:17:19 +0000 |
| commit | 90b99a26874dd5c2e90e58ea8ca0a901d4b1a6e1 (patch) | |
| tree | 305674488e5833374d38f48995d8dac74191be70 /sw/source/ui/fldui/fldtdlg.cxx | |
| parent | d8b3b1192dfa9812e847febc6a61c8da85790713 (diff) | |
::Activate(): check active view prior to access
Diffstat (limited to 'sw/source/ui/fldui/fldtdlg.cxx')
| -rw-r--r-- | sw/source/ui/fldui/fldtdlg.cxx | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 9264f8a3b10f..70e53837851f 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fldtdlg.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: jp $ $Date: 2001-01-18 14:01:38 $ + * last change: $Author: os $ $Date: 2001-01-30 14:17:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -442,18 +442,21 @@ void SwFldDlg::ReInitTabPage(USHORT nPageId) void SwFldDlg::Activate() { - BOOL bHtmlMode = (::GetHtmlMode((SwDocShell*)SfxObjectShell::Current()) & HTMLMODE_ON) != 0; - - const SwWrtShell& rSh = ::GetActiveView()->GetWrtShell(); - GetOKButton().Enable( !rSh.IsReadOnlyAvailable() || - !rSh.HasReadonlySel() ); - - ReInitTabPage(TP_FLD_VAR); - - if (!bHtmlMode) + SwView* pView = ::GetActiveView(); + if(pView) { - ReInitTabPage(TP_FLD_REF); - ReInitTabPage(TP_FLD_FUNC); + BOOL bHtmlMode = (::GetHtmlMode((SwDocShell*)SfxObjectShell::Current()) & HTMLMODE_ON) != 0; + const SwWrtShell& rSh = pView->GetWrtShell(); + GetOKButton().Enable( !rSh.IsReadOnlyAvailable() || + !rSh.HasReadonlySel() ); + + ReInitTabPage(TP_FLD_VAR); + + if (!bHtmlMode) + { + ReInitTabPage(TP_FLD_REF); + ReInitTabPage(TP_FLD_FUNC); + } } } @@ -484,6 +487,9 @@ void SwFldDlg::InsertHdl() /*------------------------------------------------------------------------ $Log: not supported by cvs2svn $ + Revision 1.2 2001/01/18 14:01:38 jp + new Field/-Type: combined character + Revision 1.1.1.1 2000/09/18 17:14:36 hr initial import |