diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 12:12:09 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 12:12:09 +0000 |
| commit | ae6b894ab1ba9eb8737905e0d3861f8bf4b9da51 (patch) | |
| tree | 4538baef5869e4b433631907d8ce50ddb8cf59bf /svtools/source/misc | |
| parent | fe6811b8ec89c4756124bb0a898286a11845347d (diff) | |
INTEGRATION: CWS sb19 (1.67.20); FILE MERGED
2004/10/22 12:41:47 mba 1.67.20.2: #110407#: ImageMaps in clipboard shouldn't contain relative URLs
2004/10/20 15:11:32 mba 1.67.20.1: #110407#: remove static BaseURL
Diffstat (limited to 'svtools/source/misc')
| -rw-r--r-- | svtools/source/misc/transfer.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index b0c595a3fef7..3e61cce8363e 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: transfer.cxx,v $ * - * $Revision: 1.67 $ + * $Revision: 1.68 $ * - * last change: $Author: kz $ $Date: 2004-10-04 19:47:57 $ + * last change: $Author: rt $ $Date: 2005-01-11 13:12:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -736,7 +736,7 @@ sal_Bool TransferableHelper::SetImageMap( const ImageMap& rIMap, const ::com::su SvMemoryStream aMemStm( 8192, 8192 ); aMemStm.SetVersion( SOFFICE_FILEFORMAT_50 ); - aMemStm << rIMap; + rIMap.Write( aMemStm, String() ); maAny <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aMemStm.GetData() ), aMemStm.Seek( STREAM_SEEK_TO_END ) ); return( maAny.hasValue() ); @@ -1686,7 +1686,7 @@ sal_Bool TransferableDataHelper::GetImageMap( const ::com::sun::star::datatransf if( bRet ) { - *xStm >> rIMap; + rIMap.Read( *xStm, String() ); bRet = ( xStm->GetError() == ERRCODE_NONE ); } |