#92987#: some changes for imagemanager format

2 files changed, 18 insertions, 5 deletions

diff --git a/framework/inc/classes/imagesconfiguration.hxx b/framework/inc/classes/imagesconfiguration.hxx
index 5d2a52832ada..c491688a6e83 100644
--- a/framework/inc/classes/imagesconfiguration.hxx
+++ b/framework/inc/classes/imagesconfiguration.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: imagesconfiguration.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: cd $ $Date: 2001-11-09 08:01:21 $
+ *  last change: $Author: mba $ $Date: 2001-11-27 09:48:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,6 +78,12 @@
 namespace framework
 {
 
+enum ImageMaskMode
+{
+    ImageMaskMode_Color,
+    ImageMaskMode_Bitmap
+};
+
 struct ImageItemDescriptor
 {
     ImageItemDescriptor() : nIndex( -1 ) {}
@@ -100,11 +106,14 @@ SV_DECL_PTRARR_DEL( ExternalImageItemListDescriptor, ExternalImageItemDescriptor
 
 struct ImageListItemDescriptor
 {
-    ImageListItemDescriptor() : pImageItemList( 0 ) {}
+    ImageListItemDescriptor() : pImageItemList( 0 )
+                                , nMaskMode( ImageMaskMode_Color ) {}
     ~ImageListItemDescriptor() { delete pImageItemList; }
 
     String                      aURL;           // a URL to a bitmap with several images inside
     Color                       aMaskColor;     // a color used as transparent
+    String                      aMaskURL;       // a URL to an optional bitmap used as a mask
+    ImageMaskMode               nMaskMode;      // a enum to describe the current mask mode
     ImageItemListDescriptor*    pImageItemList; // an array of ImageItemDescriptors that describes every image
 };
 
diff --git a/framework/inc/classes/imagesdocumenthandler.hxx b/framework/inc/classes/imagesdocumenthandler.hxx
index 1c53f1751d58..a47430e71ec6 100644
--- a/framework/inc/classes/imagesdocumenthandler.hxx
+++ b/framework/inc/classes/imagesdocumenthandler.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: imagesdocumenthandler.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: cd $ $Date: 2001-11-09 07:49:26 $
+ *  last change: $Author: mba $ $Date: 2001-11-27 09:48:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -123,6 +123,8 @@ class OReadImagesDocumentHandler : public ::com::sun::star::xml::sax::XDocumentH
             IMG_ATTRIBUTE_MASKCOLOR,
             IMG_ATTRIBUTE_COMMAND,
             IMG_ATTRIBUTE_BITMAPINDEX,
+            IMG_ATTRIBUTE_MASKURL,
+            IMG_ATTRIBUTE_MASKMODE,
             IMG_XML_ENTRY_COUNT
         };
 
@@ -204,6 +206,8 @@ class OReadImagesDocumentHandler : public ::com::sun::star::xml::sax::XDocumentH
         sal_Bool                                                                    m_bExternalImagesStartFound;
         sal_Bool                                                                    m_bExternalImagesEndFound;
         sal_Bool                                                                    m_bExternalImageStartFound;
+        sal_Int32                                                                   m_nHashMaskModeBitmap;
+        sal_Int32                                                                   m_nHashMaskModeColor;
         ImageHashMap                                                                m_aImageMap;
         ImageListsDescriptor&                                                       m_aImageList;
         ImageListItemDescriptor*                                                    m_pImages;