diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-05-20 18:23:23 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-05-20 18:23:23 +0000 |
| commit | d8673482480d2de5c281650a68f4f0064a803e73 (patch) | |
| tree | 8181996605935ab78f2e903e12b9b398383060a4 /sfx2/inc/imgmgr.hxx | |
| parent | b52f2ca1be04ea0d1dcf7b14628dc748aedeaa19 (diff) | |
INTEGRATION: CWS bmpres01 (1.11.264); FILE MERGED
2004/04/27 20:03:45 ka 1.11.264.2: RESYNC: (1.11-1.12); FILE MERGED
2004/02/12 11:48:17 ka 1.11.264.1: #i22149# support for alpha masks
Diffstat (limited to 'sfx2/inc/imgmgr.hxx')
| -rw-r--r-- | sfx2/inc/imgmgr.hxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sfx2/inc/imgmgr.hxx b/sfx2/inc/imgmgr.hxx index 62155bb262ef..9f2ec0700be6 100644 --- a/sfx2/inc/imgmgr.hxx +++ b/sfx2/inc/imgmgr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: imgmgr.hxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: hr $ $Date: 2004-04-13 10:46:36 $ + * last change: $Author: kz $ $Date: 2004-05-20 19:23:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,7 +113,6 @@ public: USHORT GetType() const; Size GetImageSize() const; - Color GetMaskColor() const; // get images from resources Image GetImage(USHORT nId, SfxModule* pMod = 0 ) const; @@ -129,7 +128,7 @@ public: Image GetDefaultImage(USHORT nId, SfxModule* pMod, BOOL bBig, BOOL bHiContrast ) const; // add images to configurable user list - void ReplaceImage(USHORT nId, Bitmap* pBmp=0); + void ReplaceImage(USHORT nId, BitmapEx* pBmp=0); void AddImage(USHORT nId, const Image& rImage); // reconfigure user list @@ -147,7 +146,7 @@ public: #if _SOLAR__PRIVATE BOOL IsUserDef_Impl(USHORT nId) const; - const Bitmap& GetUserDefBitmap_Impl(USHORT nId) const; + const BitmapEx& GetUserDefBitmapEx_Impl(USHORT nId) const; Image GetAndLockImage_Impl(USHORT nId, SfxModule* pMod = 0 ); Image GetAndLockImage_Impl(USHORT nId, BOOL bHiContrast, SfxModule* pMod = 0 ); Image GetImageFromModule_Impl( USHORT nId, SfxModule *pMod ); |