INTEGRATION: CWS chart2mst3 (1.1.4); FILE MERGED

2006/10/20 20:30:55 iha 1.1.4.8: implement gradient step count
2005/10/07 11:41:06 bm 1.1.4.7: RESYNC: (1.1-1.2); FILE MERGED
2005/07/14 14:42:44 iha 1.1.4.6: cleanup Fillproperties
2005/07/14 12:32:49 iha 1.1.4.5: remove unused parameter 'bIncludeStyleProperties'
2005/07/12 12:57:06 bm 1.1.4.4: use named properties for gradients etc. in chart model
2005/06/16 07:56:48 iha 1.1.4.3: added missing Property FillBackground
2005/06/15 18:17:25 iha 1.1.4.2: correct name for Property FillTransparenceGradient + added comments
2004/02/13 16:51:23 bm 1.1.4.1: join from changes on branch bm_post_chart01

1 files changed, 32 insertions, 12 deletions

diff --git a/chart2/source/inc/FillProperties.hxx b/chart2/source/inc/FillProperties.hxx
index cd2123fbf..746354596 100644
--- a/chart2/source/inc/FillProperties.hxx
+++ b/chart2/source/inc/FillProperties.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: FillProperties.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 00:40:38 $
+ *  last change: $Author: vg $ $Date: 2007-05-22 18:16:44 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -55,20 +55,40 @@ public:
     enum
     {
         // com.sun.star.drawing.FillProperties
-        PROP_FILL_STYLE = FAST_PROPERTY_ID_START_FILL_PROP,
-        PROP_FILL_COLOR,
-        PROP_FILL_TRANSPARENCE,
-        PROP_FILL_GRADIENT,
-        PROP_FILL_HATCH,
-        PROP_FILL_TRANSPARENCY_STYLE,
-        PROP_FILL_TRANSPARENCY_GRADIENT
+        // com.sun.star.drawing.FillProperties
+        PROP_FILL_STYLE = FAST_PROPERTY_ID_START_FILL_PROP
+        , PROP_FILL_COLOR
+        , PROP_FILL_TRANSPARENCE
+        , PROP_FILL_TRANSPARENCE_GRADIENT_NAME
+//        , PROP_FILL_TRANSPARENCE_GRADIENT //optional
+        , PROP_FILL_GRADIENT_NAME
+        , PROP_FILL_GRADIENT_STEPCOUNT
+//        , PROP_FILL_GRADIENT   //optional
+        , PROP_FILL_HATCH_NAME
+//        , PROP_FILL_HATCH  //optional
+        //------------------------
+        // bitmap properties start
+        , PROP_FILL_BITMAP_NAME
+//        , PROP_FILL_BITMAP //optional
+//        , PROP_FILL_BITMAP_URL //optional
+        , PROP_FILL_BITMAP_OFFSETX
+        , PROP_FILL_BITMAP_OFFSETY
+        , PROP_FILL_BITMAP_POSITION_OFFSETX
+        , PROP_FILL_BITMAP_POSITION_OFFSETY
+        , PROP_FILL_BITMAP_RECTANGLEPOINT
+        , PROP_FILL_BITMAP_LOGICALSIZE
+        , PROP_FILL_BITMAP_SIZEX
+        , PROP_FILL_BITMAP_SIZEY
+        , PROP_FILL_BITMAP_MODE
+        // bitmap properties end
+        //------------------------
+        , PROP_FILL_BACKGROUND
     };
 
     static void AddPropertiesToVector(
-        ::std::vector< ::com::sun::star::beans::Property > & rOutProperties,
-        bool bIncludeStyleProperties = false );
+        ::std::vector< ::com::sun::star::beans::Property > & rOutProperties );
 
-    static void AddDefaultsToMap( ::chart::helper::tPropertyValueMap & rOutMap, bool bIncludeStyleProperties = false );
+    static void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap );
 
 private:
     // not implemented