diff options
| author | gt <gt@openoffice.org> | 2002-07-23 06:24:38 +0000 |
|---|---|---|
| committer | gt <gt@openoffice.org> | 2002-07-23 06:24:38 +0000 |
| commit | 565617caa48ca99097aaa567742bc5c29d465a31 (patch) | |
| tree | 549a3fee04bbfa7767ebdea083835e54ca4963b3 /svx/source/dialog/hldocntp.cxx | |
| parent | 4544aef45c5601c02e0c674e6bd91c5a51ce4cc6 (diff) | |
#101614#, #101547# ...::DeactivatePage(): handling of pSet == NULL
Diffstat (limited to 'svx/source/dialog/hldocntp.cxx')
| -rw-r--r-- | svx/source/dialog/hldocntp.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/svx/source/dialog/hldocntp.cxx b/svx/source/dialog/hldocntp.cxx index 84ff12bc38d3..8408a68f0b72 100644 --- a/svx/source/dialog/hldocntp.cxx +++ b/svx/source/dialog/hldocntp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: hldocntp.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: af $ $Date: 2002-07-16 12:41:59 $ + * last change: $Author: gt $ $Date: 2002-07-23 07:24:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -406,17 +406,20 @@ void SvxHyperlinkNewDocTp::ActivatePage( const SfxItemSet& rItemSet ) int SvxHyperlinkNewDocTp::DeactivatePage( SfxItemSet* pSet ) { + // #101547: not sure, if GetCurentItemData(), GetMacroEvents() and GetMacroTable() don't change this String aStrURL, aStrName, aStrIntName, aStrFrame; SvxLinkInsertMode eMode; - GetCurentItemData ( aStrURL, aStrName, aStrIntName, aStrFrame, eMode); + GetCurentItemData( aStrURL, aStrName, aStrIntName, aStrFrame, eMode ); USHORT nEvents = GetMacroEvents(); SvxMacroTableDtor* pTable = GetMacroTable(); - SvxHyperlinkItem aItem( SID_HYPERLINK_GETLINK, aStrName, aStrURL, aStrFrame, - aStrIntName, eMode, nEvents, pTable ); - pSet->Put (aItem); + if( pSet ) + { + SvxHyperlinkItem aItem( SID_HYPERLINK_GETLINK, aStrName, aStrURL, aStrFrame, aStrIntName, eMode, nEvents, pTable ); + pSet->Put( aItem ); + } return( LEAVE_PAGE ); } |