diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-03-15 10:19:39 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-03-15 10:19:39 +0000 |
| commit | 5d912098afd6fa4e7aa35feabf454f0e5058de3b (patch) | |
| tree | e558750ab2245dfde9e68128c442dedb17d6c093 /xmloff/source/text/XMLTextFrameContext.cxx | |
| parent | 7db7e040d6cfbdc4ebc5f9828e53d614cb0077c3 (diff) | |
INTEGRATION: CWS mav17 (1.64.36); FILE MERGED
2005/02/18 16:54:17 mav 1.64.36.1: #i39893# relative URLs for embedded links
Diffstat (limited to 'xmloff/source/text/XMLTextFrameContext.cxx')
| -rw-r--r-- | xmloff/source/text/XMLTextFrameContext.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index d5c34bf70424..abe154b9b7ce 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLTextFrameContext.cxx,v $ * - * $Revision: 1.64 $ + * $Revision: 1.65 $ * - * last change: $Author: rt $ $Date: 2005-01-27 11:09:50 $ + * last change: $Author: obo $ $Date: 2005-03-15 11:19:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -596,18 +596,20 @@ void XMLTextFrameContext_Impl::Create( sal_Bool bHRefOrBase64 ) OUString sURL( GetImport().ResolveEmbeddedObjectURL( sHRef, OUString() ) ); - if( sURL.getLength() ) + if( GetImport().IsPackageURL( sHRef ) ) + { xPropSet = GetImport().GetTextImport() ->createAndInsertOLEObject( GetImport(), sURL, sStyleName, sTblName, nWidth, nHeight ); + } else { // it should be an own OOo link that has no storage persistance xPropSet = GetImport().GetTextImport() ->createAndInsertOOoLink( GetImport(), - sHRef, + sURL, sStyleName, sTblName, nWidth, nHeight ); |