diff options
Diffstat (limited to 'svx/source/gallery2/galobj.cxx')
| -rw-r--r-- | svx/source/gallery2/galobj.cxx | 76 |
1 files changed, 1 insertions, 75 deletions
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index ed84ca2ec1e3..cb4f07a0e228 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -41,10 +41,6 @@ using namespace ::com::sun::star; -// ------------- -// - SgaObject - -// ------------- - SgaObject::SgaObject() : bIsValid ( sal_False ), bIsThumbBmp ( sal_True ) @@ -93,8 +89,6 @@ BitmapEx SgaObject::createPreviewBitmapEx(const Size& rSizePixel) const return aRetval; } -// ------------------------------------------------------------------------ - sal_Bool SgaObject::CreateThumb( const Graphic& rGraphic ) { sal_Bool bRet = sal_False; @@ -173,8 +167,6 @@ sal_Bool SgaObject::CreateThumb( const Graphic& rGraphic ) return bRet; } -// ------------------------------------------------------------------------ - void SgaObject::WriteData( SvStream& rOut, const OUString& rDestDir ) const { static const sal_uInt32 nInventor = COMPAT_FORMAT( 'S', 'G', 'A', '3' ); @@ -203,8 +195,6 @@ void SgaObject::WriteData( SvStream& rOut, const OUString& rDestDir ) const write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, aURLWithoutDestDir, RTL_TEXTENCODING_UTF8); } -// ------------------------------------------------------------------------ - void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion ) { sal_uInt32 nTmp32; @@ -225,8 +215,6 @@ void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion ) aURL = INetURLObject(aTmpStr); } -// ------------------------------------------------------------------------ - const OUString SgaObject::GetTitle() const { OUString aReturnValue( aTitle ); @@ -259,23 +247,17 @@ const OUString SgaObject::GetTitle() const return aReturnValue; } -// ------------------------------------------------------------------------ - void SgaObject::SetTitle( const OUString& rTitle ) { aTitle = rTitle; } -// ------------------------------------------------------------------------ - SvStream& operator<<( SvStream& rOut, const SgaObject& rObj ) { rObj.WriteData( rOut, "" ); return rOut; } -// ------------------------------------------------------------------------ - SvStream& operator>>( SvStream& rIn, SgaObject& rObj ) { sal_uInt16 nReadVersion; @@ -286,16 +268,10 @@ SvStream& operator>>( SvStream& rIn, SgaObject& rObj ) return rIn; } -// ---------------- -// - SgaObjectBmp - -// ---------------- - SgaObjectBmp::SgaObjectBmp() { } -// ------------------------------------------------------------------------ - SgaObjectBmp::SgaObjectBmp( const INetURLObject& rURL ) { Graphic aGraphic; @@ -305,27 +281,21 @@ SgaObjectBmp::SgaObjectBmp( const INetURLObject& rURL ) Init( aGraphic, rURL ); } -// ------------------------------------------------------------------------ - SgaObjectBmp::SgaObjectBmp( const Graphic& rGraphic, const INetURLObject& rURL, const OUString& ) { if( FileExists( rURL ) ) Init( rGraphic, rURL ); } -// ------------------------------------------------------------------------ - void SgaObjectBmp::Init( const Graphic& rGraphic, const INetURLObject& rURL ) { aURL = rURL; bIsValid = CreateThumb( rGraphic ); } -// ------------------------------------------------------------------------ - void SgaObjectBmp::WriteData( SvStream& rOut, const OUString& rDestDir ) const { - // Version setzen + // Set version SgaObject::WriteData( rOut, rDestDir ); char aDummy[ 10 ]; rOut.Write( aDummy, 10 ); @@ -333,8 +303,6 @@ void SgaObjectBmp::WriteData( SvStream& rOut, const OUString& rDestDir ) const write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, aTitle, RTL_TEXTENCODING_UTF8); } -// ------------------------------------------------------------------------ - void SgaObjectBmp::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) { @@ -346,9 +314,6 @@ void SgaObjectBmp::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) aTitle = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); } -// ------------------ -// - SgaObjectSound - -// ------------------ DBG_NAME(SgaObjectSound) SgaObjectSound::SgaObjectSound() : @@ -357,8 +322,6 @@ SgaObjectSound::SgaObjectSound() : DBG_CTOR(SgaObjectSound,NULL); } -// ------------------------------------------------------------------------ - SgaObjectSound::SgaObjectSound( const INetURLObject& rURL ) : eSoundType( SOUND_STANDARD ) { @@ -374,15 +337,11 @@ SgaObjectSound::SgaObjectSound( const INetURLObject& rURL ) : bIsValid = sal_False; } -// ------------------------------------------------------------------------ - SgaObjectSound::~SgaObjectSound() { DBG_DTOR(SgaObjectSound,NULL); } -// ------------------------------------------------------------------------ - BitmapEx SgaObjectSound::GetThumbBmp() const { sal_uInt16 nId; @@ -408,8 +367,6 @@ BitmapEx SgaObjectSound::GetThumbBmp() const return aBmpEx; } -// ------------------------------------------------------------------------ - void SgaObjectSound::WriteData( SvStream& rOut, const OUString& rDestDir ) const { SgaObject::WriteData( rOut, rDestDir ); @@ -417,8 +374,6 @@ void SgaObjectSound::WriteData( SvStream& rOut, const OUString& rDestDir ) const write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, aTitle, RTL_TEXTENCODING_UTF8); } -// ------------------------------------------------------------------------ - void SgaObjectSound::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) { SgaObject::ReadData( rIn, rReadVersion ); @@ -434,16 +389,10 @@ void SgaObjectSound::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) } } -// ----------------- -// - SgaObjectAnim - -// ----------------- - SgaObjectAnim::SgaObjectAnim() { } -// ------------------------------------------------------------------------ - SgaObjectAnim::SgaObjectAnim( const Graphic& rGraphic, const INetURLObject& rURL, const OUString& ) @@ -452,38 +401,25 @@ SgaObjectAnim::SgaObjectAnim( const Graphic& rGraphic, bIsValid = CreateThumb( rGraphic ); } -// ----------------- -// - SgaObjectINet - -// ----------------- - SgaObjectINet::SgaObjectINet() { } -// ------------------------------------------------------------------------ - SgaObjectINet::SgaObjectINet( const Graphic& rGraphic, const INetURLObject& rURL, const OUString& rFormatName ) : SgaObjectAnim ( rGraphic, rURL, rFormatName ) { } -// ------------------- -// - SgaObjectSvDraw - -// ------------------- - SgaObjectSvDraw::SgaObjectSvDraw() { } -// ------------------------------------------------------------------------ - SgaObjectSvDraw::SgaObjectSvDraw( const FmFormModel& rModel, const INetURLObject& rURL ) { aURL = rURL; bIsValid = CreateThumb( rModel ); } -// ------------------------------------------------------------------------ DBG_NAME(SvxGalleryDrawModel) SvxGalleryDrawModel::SvxGalleryDrawModel() @@ -512,8 +448,6 @@ SvxGalleryDrawModel::SvxGalleryDrawModel() } } -// ------------------------------------------------------------------------ - SvxGalleryDrawModel::~SvxGalleryDrawModel() { if( mxDoc.Is() ) @@ -522,8 +456,6 @@ SvxGalleryDrawModel::~SvxGalleryDrawModel() DBG_DTOR(SvxGalleryDrawModel,NULL); } -// ------------------------------------------------------------------------ - SgaObjectSvDraw::SgaObjectSvDraw( SvStream& rIStm, const INetURLObject& rURL ) { SvxGalleryDrawModel aModel; @@ -538,8 +470,6 @@ SgaObjectSvDraw::SgaObjectSvDraw( SvStream& rIStm, const INetURLObject& rURL ) } } -// ------------------------------------------------------------------------ - sal_Bool SgaObjectSvDraw::CreateThumb( const FmFormModel& rModel ) { Graphic aGraphic; @@ -597,16 +527,12 @@ sal_Bool SgaObjectSvDraw::CreateThumb( const FmFormModel& rModel ) return bRet; } -// ------------------------------------------------------------------------ - void SgaObjectSvDraw::WriteData( SvStream& rOut, const OUString& rDestDir ) const { SgaObject::WriteData( rOut, rDestDir ); write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, aTitle, RTL_TEXTENCODING_UTF8); } -// ------------------------------------------------------------------------ - void SgaObjectSvDraw::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) { SgaObject::ReadData( rIn, rReadVersion ); |