diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 12:01:39 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 12:01:39 +0000 |
| commit | b737d54dd5a074b71091cd68fc0013d338a0e4c8 (patch) | |
| tree | 9889d3f8b3e4d090cc6874247c93d9c6ebbb1369 /svx/source/items | |
| parent | 8271249c0700ea43b1cd165a8bc8c985271ce103 (diff) | |
INTEGRATION: CWS sb19 (1.35.154); FILE MERGED
2004/10/27 07:30:38 mba 1.35.154.1: #110407#: remove static BaseURL
Diffstat (limited to 'svx/source/items')
| -rw-r--r-- | svx/source/items/frmitems.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/svx/source/items/frmitems.cxx b/svx/source/items/frmitems.cxx index b2ef7f8ded61..e17e284cbe2d 100644 --- a/svx/source/items/frmitems.cxx +++ b/svx/source/items/frmitems.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmitems.cxx,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: hr $ $Date: 2004-08-02 17:47:47 $ + * last change: $Author: rt $ $Date: 2005-01-11 13:01:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -3752,7 +3752,10 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion, // UNICODE: rStream >> aRel; rStream.ReadByteString(aRel); - String aAbs = INetURLObject::RelToAbs( aRel ); + // TODO/MBA: how can we get a BaseURL here?! + DBG_ERROR("No BaseURL!"); + String aAbs = INetURLObject::GetAbsURL( String(), aRel ); + DBG_ASSERT( aAbs.Len(), "Invalid URL!" ); pStrLink = new String( aAbs ); } @@ -4139,7 +4142,9 @@ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 nItemVersion ) con rStream << pImpl->pGraphicObject->GetGraphic(); if ( pStrLink ) { - String aRel = INetURLObject::AbsToRel( *pStrLink ); + DBG_ERROR("No BaseURL!"); + // TODO/MBA: how to get a BaseURL?! + String aRel = INetURLObject::GetRelURL( String(), *pStrLink ); // UNICODE: rStream << aRel; rStream.WriteByteString(aRel); } |