diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-18 14:01:53 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-18 14:01:53 +0000 |
| commit | fe71ccf1b865d47fce99d9517fbd605cfb8c4474 (patch) | |
| tree | 43a31a0ce1d0dc37e973fbd85b58bb8293ed56bb /svx/source | |
| parent | 43b4c2a400561a0788a97f39ebb52ce7e3a043f5 (diff) | |
INTEGRATION: CWS mav14 (1.21.32); FILE MERGED
2005/01/06 13:00:54 mav 1.21.32.1: #i35475# support embedded links
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/svxlink/linkmgr.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/svx/source/svxlink/linkmgr.cxx b/svx/source/svxlink/linkmgr.cxx index 6f4935e89218..d785976444e3 100644 --- a/svx/source/svxlink/linkmgr.cxx +++ b/svx/source/svxlink/linkmgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: linkmgr.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: rt $ $Date: 2005-01-11 13:04:57 $ + * last change: $Author: kz $ $Date: 2005-01-18 15:01:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -143,6 +143,7 @@ sfx2::SvLinkSourceRef SvxLinkManager::CreateObj( sfx2::SvBaseLink * pLink ) { case OBJECT_CLIENT_FILE: case OBJECT_CLIENT_GRF: + case OBJECT_CLIENT_OLE: return new SvFileObject; case OBJECT_INTERN: @@ -194,6 +195,7 @@ BOOL SvxLinkManager::GetDisplayNames( const sfx2::SvBaseLink* pBaseLink, { case OBJECT_CLIENT_FILE: case OBJECT_CLIENT_GRF: + case OBJECT_CLIENT_OLE: { USHORT nPos = 0; String sFile( sLNm.GetToken( 0, ::sfx2::cTokenSeperator, nPos ) ); @@ -207,12 +209,14 @@ BOOL SvxLinkManager::GetDisplayNames( const sfx2::SvBaseLink* pBaseLink, *pFilter = sLNm.Copy( nPos ); if( pType ) + { + sal_uInt16 nObjType = pBaseLink->GetObjType(); *pType = String( ResId( - OBJECT_CLIENT_FILE == pBaseLink->GetObjType() + ( OBJECT_CLIENT_FILE == nObjType || OBJECT_CLIENT_OLE == nObjType ) ? RID_SVXSTR_FILELINK : RID_SVXSTR_GRAFIKLINK , DIALOG_MGR() )); - + } bRet = TRUE; } break; |