diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-06 13:10:34 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-06 13:10:34 +0000 |
commit | 4656e074fe5ac9b47a80193324df6de68e0464cf (patch) | |
tree | e9a45648795693060e980a6cf5812b70f72e218c /vcl | |
parent | e8f84bc743950d6ef0e9c01a44c49a48874cb513 (diff) |
INTEGRATION: CWS ka009 (1.2.22); FILE MERGED
2007/04/26 09:17:19 ka 1.2.22.1: reapplied patches due to new header structure / removed warnings
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/vcl/bitmapex.hxx | 5 | ||||
-rw-r--r-- | vcl/inc/vcl/image.hxx | 45 |
2 files changed, 17 insertions, 33 deletions
diff --git a/vcl/inc/vcl/bitmapex.hxx b/vcl/inc/vcl/bitmapex.hxx index 166f71aaf1b1..444f8a264c25 100644 --- a/vcl/inc/vcl/bitmapex.hxx +++ b/vcl/inc/vcl/bitmapex.hxx @@ -4,9 +4,9 @@ * * $RCSfile: bitmapex.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: vg $ $Date: 2007-04-11 17:47:59 $ + * last change: $Author: ihi $ $Date: 2007-06-06 14:10:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -92,6 +92,7 @@ public: BitmapEx(); BitmapEx( const ResId& rResId ); BitmapEx( const BitmapEx& rBitmapEx ); + BitmapEx( const BitmapEx& rBitmapEx, Point aSrc, Size aSize ); BitmapEx( const Bitmap& rBmp ); BitmapEx( const Bitmap& rBmp, const Bitmap& rMask ); BitmapEx( const Bitmap& rBmp, const AlphaMask& rAlphaMask ); diff --git a/vcl/inc/vcl/image.hxx b/vcl/inc/vcl/image.hxx index b1fc0960920c..8e93603db9c3 100644 --- a/vcl/inc/vcl/image.hxx +++ b/vcl/inc/vcl/image.hxx @@ -4,9 +4,9 @@ * * $RCSfile: image.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: vg $ $Date: 2007-04-11 17:56:38 $ + * last change: $Author: ihi $ $Date: 2007-06-06 14:10:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -137,39 +137,24 @@ public: const ::rtl::OUString& rPrefix, const Color* pMaskColor = NULL ); ImageList( const ImageList& rImageList ); - ImageList( const BitmapEx& rBitmapEx, - USHORT nInitSize, - USHORT* pIdAry = NULL, - USHORT nGrow = 4 ); - ImageList( const BitmapEx& rBitmapEx, - const ::std::vector< ::rtl::OUString >& rNameVector, - USHORT nGrow = 4 ); - - ImageList( const Bitmap& rBitmap, - USHORT nInitSize, USHORT* pIdAry = NULL, - USHORT nGrow = 4 ); - ImageList( const Bitmap& rBitmap, const Bitmap& rMaskBmp, - USHORT nInitSize, USHORT* pIdAry = NULL, - USHORT nGrow = 4 ); - ImageList( const Bitmap& rBitmap, const Color& rColor, - USHORT nInitSize, USHORT* pIdAry = NULL, - USHORT nGrow = 4 ); ~ImageList(); - void Clear(); - + void Clear(); + void InsertFromHorizontalStrip( const BitmapEx &rBitmapEx, + const std::vector< rtl::OUString > &rNameVector ); + void InsertFromHorizontalBitmap( const ResId& rResId, + USHORT nCount, + const Color *pNonAlphaMaskColor, + const Color *pSearchColors = NULL, + const Color *pReplaceColors = NULL, + ULONG nColorCount = 0); + BitmapEx GetAsHorizontalStrip() const; USHORT GetImageCount() const; Size GetImageSize() const; - BitmapEx GetBitmapEx() const; - ImageList GetColorTransformedImageList( ImageColorTransform eColorTransform ) const; - void Invert(); void AddImage( USHORT nNewId, const Image& rImage ); void AddImage( const ::rtl::OUString& rImageName, const Image& rImage ); - void CopyImage( USHORT nNewId, USHORT nCopyId ); - void CopyImage( const ::rtl::OUString& rImageName, const ::rtl::OUString& rCopyName ); - void ReplaceImage( USHORT nId, const Image& rImage ); void ReplaceImage( const ::rtl::OUString& rImageName, const Image& rImage ); @@ -183,6 +168,7 @@ public: Image GetImage( const ::rtl::OUString& rImageName ) const; USHORT GetImagePos( USHORT nId ) const; + bool HasImageAtPos( USHORT nId ) const; USHORT GetImagePos( const ::rtl::OUString& rImageName ) const; USHORT GetImageId( USHORT nPos ) const; @@ -195,9 +181,6 @@ public: BOOL operator==( const ImageList& rImageList ) const; BOOL operator!=( const ImageList& rImageList ) const { return !(ImageList::operator==( rImageList )); } - friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, ImageList& rImageList ); - friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStream, const ImageList& rImageList ); - private: ImplImageList* mpImplData; @@ -209,7 +192,7 @@ private: const ::rtl::OUString& rSymbolsStyle, BitmapEx& rBmpEx, const Color* pMaskColor ) const; - SAL_DLLPRIVATE void ImplInit( const BitmapEx& rBitmapEx, USHORT nInit, const USHORT* pIdAry, const ::std::vector< ::rtl::OUString >* pNames, USHORT nGrow ); + SAL_DLLPRIVATE void ImplInit( USHORT nItems, const Size &rSize ); SAL_DLLPRIVATE USHORT ImplGetImageId( const ::rtl::OUString& rImageName ) const; SAL_DLLPRIVATE void ImplMakeUnique(); }; |