diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-10-19 11:09:41 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-10-19 11:09:41 +0000 |
| commit | 78e01b89aa24c4c06d2c928f0499ad57ebd2ceff (patch) | |
| tree | 8dc65047609145583fea66b0e3cbafeb09b78f2c /svx/source/gallery2 | |
| parent | 1524af4f823f565d06b9b78457e4d582c5752a6d (diff) | |
INTEGRATION: CWS cov2src (1.19.82); FILE MERGED
2005/10/18 14:14:18 rt 1.19.82.1: #126234# Join MWS COV680 m4 into SRC680
Diffstat (limited to 'svx/source/gallery2')
| -rw-r--r-- | svx/source/gallery2/galobj.cxx | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index bc45b7dfd785..80ba79bed827 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -4,9 +4,9 @@ * * $RCSfile: galobj.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: rt $ $Date: 2005-09-08 23:07:54 $ + * last change: $Author: rt $ $Date: 2005-10-19 12:09:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -137,7 +137,7 @@ BOOL SgaObject::CreateThumb( const Graphic& rGraphic ) // ------------------------------------------------------------------------ -void SgaObject::WriteData( SvStream& rOut ) const +void SgaObject::WriteData( SvStream& rOut, const String& rDestDir ) const { static const UINT32 nInventor = COMPAT_FORMAT( 'S', 'G', 'A', '3' ); @@ -160,7 +160,9 @@ void SgaObject::WriteData( SvStream& rOut ) const else rOut << aThumbMtf; - rOut << ByteString( String(aURL.GetMainURL( INetURLObject::NO_DECODE )), RTL_TEXTENCODING_UTF8 ); + String aURLWithoutDestDir = String(aURL.GetMainURL( INetURLObject::NO_DECODE )); + aURLWithoutDestDir.SearchAndReplace(rDestDir, String()); + rOut << ByteString( aURLWithoutDestDir, RTL_TEXTENCODING_UTF8 ); } // ------------------------------------------------------------------------ @@ -227,7 +229,7 @@ void SgaObject::SetTitle( const String& rTitle ) SvStream& operator<<( SvStream& rOut, const SgaObject& rObj ) { - rObj.WriteData( rOut ); + rObj.WriteData( rOut, String() ); return rOut; } @@ -280,13 +282,13 @@ void SgaObjectBmp::Init( const Graphic& rGraphic, const INetURLObject& rURL ) // ------------------------------------------------------------------------ -void SgaObjectBmp::WriteData( SvStream& rOut ) const +void SgaObjectBmp::WriteData( SvStream& rOut, const String& rDestDir ) const { String aDummyStr; char aDummy[ 10 ]; // Version setzen - SgaObject::WriteData( rOut ); + SgaObject::WriteData( rOut, rDestDir ); rOut.Write( aDummy, 10 ); rOut << ByteString( aDummyStr, RTL_TEXTENCODING_UTF8 ) << ByteString( aTitle, RTL_TEXTENCODING_UTF8 ); } @@ -367,9 +369,9 @@ Bitmap SgaObjectSound::GetThumbBmp() const // ------------------------------------------------------------------------ -void SgaObjectSound::WriteData( SvStream& rOut ) const +void SgaObjectSound::WriteData( SvStream& rOut, const String& rDestDir ) const { - SgaObject::WriteData( rOut ); + SgaObject::WriteData( rOut, rDestDir ); rOut << (UINT16) eSoundType << ByteString( aTitle, RTL_TEXTENCODING_UTF8 ); } @@ -541,9 +543,9 @@ BOOL SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& rMode // ------------------------------------------------------------------------ -void SgaObjectSvDraw::WriteData( SvStream& rOut ) const +void SgaObjectSvDraw::WriteData( SvStream& rOut, const String& rDestDir ) const { - SgaObject::WriteData( rOut ); + SgaObject::WriteData( rOut, rDestDir ); rOut << ByteString( aTitle, RTL_TEXTENCODING_UTF8 ); } |