diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 14:06:05 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 14:06:05 +0000 |
| commit | 80204d8fcf35c14168a75765360eb61977653162 (patch) | |
| tree | bef084bbf17b8e0d28743b03ea7213aafeae831e /svx/source/dialog/hldocntp.cxx | |
| parent | 45804b0395ec0f8369224229e41f1b099c4754d3 (diff) | |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'svx/source/dialog/hldocntp.cxx')
| -rw-r--r-- | svx/source/dialog/hldocntp.cxx | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/svx/source/dialog/hldocntp.cxx b/svx/source/dialog/hldocntp.cxx index 03e5c5a4c494..0c7eb8e778ca 100644 --- a/svx/source/dialog/hldocntp.cxx +++ b/svx/source/dialog/hldocntp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: hldocntp.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: iha $ $Date: 2002-10-15 11:54:23 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:00:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -315,6 +315,9 @@ void SvxHyperlinkNewDocTp::FillDocumentList () // Insert into listbox if ( aDocumentUrl.getLength() ) { + if ( aDocumentUrl.equalsAscii( "private:factory/simpress?slot=10425" ) ) // SJ: #106216# do not start + aDocumentUrl = String( RTL_CONSTASCII_USTRINGPARAM( "private:factory/simpress" ) ); // the AutoPilot for impress + const SfxObjectFactory* pFactory = SfxObjectFactory::GetFactory ( aDocumentUrl ); if ( pFactory ) { @@ -483,17 +486,19 @@ void SvxHyperlinkNewDocTp::DoApply () &aFrame, &aReferer, 0L ); // save new doc - const SfxViewFrameItem *pItem = PTR_CAST( SfxViewFrameItem, pReturn ); - pViewFrame = pItem->GetFrame(); - if (pViewFrame) + const SfxViewFrameItem *pItem = PTR_CAST( SfxViewFrameItem, pReturn ); // SJ: pReturn is NULL if the Hyperlink + if ( pItem ) // creation is cancelled #106216# { - //SfxViewFrame *pViewFrame = pFrame->GetCurrentViewFrame(); - SfxStringItem aNewName( SID_FILE_NAME, aURL.GetMainURL( INetURLObject::NO_DECODE ) ); - - pViewFrame->GetDispatcher()->Execute( SID_SAVEASDOC, - SFX_CALLMODE_SYNCHRON, - &aNewName, 0L ); - + pViewFrame = pItem->GetFrame(); + if (pViewFrame) + { + //SfxViewFrame *pViewFrame = pFrame->GetCurrentViewFrame(); + SfxStringItem aNewName( SID_FILE_NAME, aURL.GetMainURL( INetURLObject::NO_DECODE ) ); + + pViewFrame->GetDispatcher()->Execute( SID_SAVEASDOC, + SFX_CALLMODE_SYNCHRON, + &aNewName, 0L ); + } } } |