CWS-TOOLING: integrate CWS dr68

2009-06-19 17:43:48 +0200 oc  r273175 : #i102946# some lines for new dialog added
2009-06-19 14:17:45 +0200 oc  r273158 : #i102946# three lines added
2009-05-19 11:56:14 +0200 dr  r272065 : #i99677# wrong attribute name
2009-05-18 18:37:05 +0200 dr  r272045 : #i10000# suncc warning
2009-05-05 16:46:13 +0200 dr  r271536 : #i10000# adoptions after rebase to master containing dr67
2009-05-05 16:01:19 +0200 dr  r271530 : #i10000# adoptions after rebase to master containing dr67
2009-05-04 14:20:39 +0200 dr  r271453 : CWS-TOOLING: rebase CWS dr68 to trunk@271427 (milestone: DEV300:m47)
2009-04-28 17:01:14 +0200 dr  r271332 : CWS-TOOLING: rebase CWS dr68 to trunk@270723 (milestone: DEV300:m46)
2009-04-23 12:21:40 +0200 dr  r271149 : #i100688# missing checkins
2009-04-23 12:18:16 +0200 dr  r271147 : #i100978# relations path handling
2009-04-22 19:25:45 +0200 nn  r271136 : #i49491# show navigator for double click on document position status bar control
2009-04-22 11:28:36 +0200 nn  r271085 : #i60401# small text change
2009-04-21 16:53:23 +0200 dr  r271044 : #i10000# missing dtor
2009-04-20 13:39:25 +0200 nn  r270977 : #i60401# add dialog to extend sort range (patch from maoyg)
2009-04-08 12:11:08 +0200 dr  r270630 : #i100943# prevent assertion when loading chart with empty category ranges
2009-04-07 19:03:00 +0200 dr  r270609 : #i100688# missing bits for OLE
2009-04-07 17:14:06 +0200 dr  r270605 : ported fix for #i100710#
2009-04-07 17:12:50 +0200 dr  r270604 : #i10000# wae
2009-04-07 15:31:55 +0200 dr  r270598 : import system colors moved to FilterBase class, more rework on fill and color contexts
2009-04-06 15:00:03 +0200 dr  r270552 : #i99677# prevent recursive loading of the current document
2009-04-03 18:28:42 +0200 dr  r270515 : added import of brightness/contrast and mono/grayscale color effects for image shapes
2009-04-03 17:36:03 +0200 dr  r270509 : cache already imported embedded graphics
2009-04-03 16:46:34 +0200 dr  r270500 : more rework on bitmap fill and graphic object handling
2009-03-31 12:28:10 +0200 dr  r270271 : #i10000# unxlngi6 wae
2009-03-31 09:04:10 +0200 dr  r270261 : CWS-TOOLING: rebase CWS dr68 to trunk@270033 (milestone: DEV300:m45)
2009-03-30 17:42:05 +0200 dr  r270249 : #i91122# add missing doc
2009-03-30 17:37:08 +0200 dr  r270248 : #i91122# add missing doc
2009-03-30 16:59:15 +0200 dr  r270241 : #i99677# add import of ActiveX scrollbar controls
2009-03-30 14:30:36 +0200 dr  r270230 : #i91122# missing/wrong documentation
2009-03-30 13:03:38 +0200 dr  r270220 : #i99677# add import of ActiveX combobox and spinbutton controls
2009-03-27 11:46:59 +0100 dr  r270144 : #i99677# import ActiveX listbox controls (Forms.ListBox.1)
2009-03-26 19:58:00 +0100 dr  r270104 : #i99677# move more OLE import code into ole submodule
2009-03-26 15:15:02 +0100 dr  r270082 : #i100546# add import of chart bitmap fills, add import of X/Y offset in tiled bitmap fills of all shapes
2009-03-25 12:54:59 +0100 dr  r270018 : #i99677# import ActiveX edit text control (Forms.TextBox.1)
2009-03-24 10:59:29 +0100 dr  r269921 : #i99677# moved import of OLE StdHlink to 'ole' submodule, added string import helpers to BinaryStreamBase class, removed implementation of ST_XString import from docprop in favour of the implementation in class AttributeList
2009-03-24 10:40:18 +0100 dr  r269919 : #i100502# implicit precedence of '&&' was intended
2009-03-24 10:18:29 +0100 dr  r269917 : #i100502# missing parentheses
2009-03-23 15:17:48 +0100 dr  r269876 : #i99677# more code reorg, added graphic helper and OLE helper object per filter, added OLE/control import to PPTX/XLSX filter, moved helpers from XmlFilterBase to FilterBase
2009-03-19 12:45:20 +0100 dr  r269740 : #i99677# interface changes in oox
2009-03-18 15:51:50 +0100 dr  r269683 : #i99677# improved relation handling (internal/external), added preprocessor for VML streams to eat MS specific instructions, added OCX ToggleButton/OptionButton import, added DIB import for BIFF (page background picture, lots of other minor improvements
2009-03-16 15:25:30 +0100 dr  r269551 : #i99677# import excel form control client data (printable, cell link)
2009-03-13 18:37:17 +0100 dr  r269494 : #i99677# import image controls and check boxes
2009-03-12 15:08:18 +0100 dr  r269420 : #i10000# rebase problems
2009-03-12 14:43:09 +0100 dr  r269418 : #i10000# rebase problems
2009-03-12 14:42:41 +0100 dr  r269417 : #i10000# missing delivered header
2009-03-12 13:57:06 +0100 dr  r269405 : #i10000# typos
2009-03-12 12:58:52 +0100 dr  r269391 : CWS-TOOLING: rebase CWS dr68 to trunk@269297 (milestone: DEV300:m43)
2009-03-12 11:11:46 +0100 dr  r269374 : #i99677# first step to import BIFF8 page background
2009-03-12 10:21:53 +0100 dr  r269364 : #i99677# rework of graphic import in entire filter, added import of AX Label controls
2009-03-09 16:44:50 +0100 dr  r269202 : #i99677# import some formatting attributes of command buttons
2009-03-05 15:31:46 +0100 dr  r268911 : #i99677# use VML shape client data to import excel VML shape positions
2009-03-05 11:39:48 +0100 dr  r268888 : #i99677# create UNO control shapes from VML control shapes
2009-03-05 11:38:59 +0100 dr  r268886 : #i99677# change attribute Shapes to DrawPage for import of embedded form controls
2009-03-05 11:30:40 +0100 dr  r268885 : #i99677# change attribute Shapes to DrawPage for import of embedded form controls
2009-03-04 18:46:05 +0100 dr  r268860 : adapt namespace ids according to oox
2009-03-04 18:43:49 +0100 dr  r268859 : #i99677# more VML import rework
2009-03-03 13:38:36 +0100 dr  r268721 : #i99677# more cleanup for VML filter
2009-03-03 13:13:15 +0100 dr  r268719 : #i99807# do not iterate beyond end of std::list
2009-03-02 11:55:49 +0100 dr  r268644 : add ST_XString support (encoded characters in attribute values)
2009-02-26 17:07:18 +0100 dr  r268542 : #i99677# first steps of ax control import: dummy AX base classes, reimplement VML import (hopefully without breaking anything), register embedded AX controls at VML drawing
2009-02-23 17:43:50 +0100 dr  r268365 : #i99426# remaining work on scenario import
2009-02-19 16:56:25 +0100 dr  r268295 : #i99426# base implementations for scenarios import

2 files changed, 98 insertions, 47 deletions

diff --git a/offapi/com/sun/star/drawing/FillProperties.idl b/offapi/com/sun/star/drawing/FillProperties.idl
index 47749376a7d5..9aaedfed601f 100644
--- a/offapi/com/sun/star/drawing/FillProperties.idl
+++ b/offapi/com/sun/star/drawing/FillProperties.idl
@@ -70,21 +70,21 @@ module com { module sun { module star { module drawing {
 published service FillProperties
 {
     //-------------------------------------------------------------------------
-    /** This enumeration selects the style with which the area will be filled.
+    /** This enumeration selects the style the area will be filled with.
     */
-    [property] com::sun::star::drawing::FillStyle FillStyle;
+    [property] FillStyle FillStyle;
 
     //-------------------------------------------------------------------------
-    /** If the <type>FillStyle</type> is set to <const>FillStyle::SOLID</const>,
-        this is the color used.
+    /** If the property <member>FillStyle</member> is set to <const>
+        FillStyle::SOLID</const>, this is the color used.
     */
     [property] com::sun::star::util::Color FillColor;
 
     //-------------------------------------------------------------------------
     /** This is the transparence of the filled area.
 
-        <p>This property is only valid if <type>FillStyle</type> is set to
-        <const>FillStyle::SOLID</const>.
+        <p>This property is only valid if the property <member>FillStyle
+        </member> is set to <const>FillStyle::SOLID</const>.
     */
     [property] short FillTransparence;
 
@@ -103,117 +103,168 @@ published service FillProperties
     [optional, property] com::sun::star::awt::Gradient FillTransparenceGradient;
 
     //-------------------------------------------------------------------------
-    /** If the <type>FillStyle</type> is set to <const>FillStyle::GRADIENT</const>, this
-        is the name of the used fill gradient style.
+    /** If the property <member>FillStyle</member> is set to <const>
+        FillStyle::GRADIENT</const>, this is the name of the used fill
+        gradient style.
     */
     [property] string FillGradientName;
 
     //-------------------------------------------------------------------------
-    /** If the <type>FillStyle</type> is set to <const>FillStyle::GRADIENT</const>, this
-        describes the gradient used.
+    /** If the property <member>FillStyle</member> is set to <const>
+        FillStyle::GRADIENT</const>, this describes the gradient used.
     */
     [optional, property] com::sun::star::awt::Gradient FillGradient;
 
     //-------------------------------------------------------------------------
-    /** If the <type>FillStyle</type> is set to <const>FillStyle::GRADIENT</const>, this
-        is the name of the used fill hatch style.
+    /** If the property <member>FillStyle</member> is set to <const>
+        FillStyle::HATCH</const>, this is the name of the used fill hatch
+        style.
     */
     [property] string FillHatchName;
 
     //-------------------------------------------------------------------------
-    /** If the <type>FillStyle</type> is set to <const>FillStyle::HATCH</const>, this
-        describes the hatch used.
+    /** If the property <member>FillStyle</member> is set to <const>
+        FillStyle::HATCH</const>, this describes the hatch used.
     */
-    [optional, property] com::sun::star::drawing::Hatch FillHatch;
+    [optional, property] Hatch FillHatch;
 
     //-------------------------------------------------------------------------
-    /** If the <type>FillStyle</type> is set to <const>FillStyle::BITMAP</const>, this is
-        the name of the used fill bitmap style.
+    /** if this is <TRUE/>, the transparent background of a
+        hatch filled area is drawn in the current background color.
+    */
+    [property] boolean FillBackground;
+
+    //-------------------------------------------------------------------------
+    /** If the property <memebr>FillStyle</member> is set to <const>
+        FillStyle::BITMAP</const>, this is the name of the used fill bitmap
+        style.
     */
     [property] string FillBitmapName;
 
     //-------------------------------------------------------------------------
-    /** If the <type>FillStyle</type> is set to <const>FillStyle::BITMAP</const>, this is
-        the bitmap used.
+    /** If the property <member>FillStyle</member> is set to <const>
+        FillStyle::BITMAP</const>, this is the bitmap used.
     */
     [optional, property] com::sun::star::awt::XBitmap FillBitmap;
 
     //-------------------------------------------------------------------------
-    /** If the <type>FillStyle</type> is set to <const>FillStyle::BITMAP</const>, this is
-        a URL to the bitmap used.
+    /** If the property <member>FillStyle</member> is set to <const>
+        FillStyle::BITMAP</const>, this is a URL to the bitmap used.
     */
     [optional, property] string FillBitmapURL;
 
     //-------------------------------------------------------------------------
     /** This is the horizontal offset where the tile starts.
 
-        <p>It is given in percent in relation to the width of the bitmap.
+        <p>It is given in percent in relation to the width of the bitmap.</p>
     */
-    [property] short FillBitmapOffsetX;
+    [property] short FillBitmapPositionOffsetX;
 
     //-------------------------------------------------------------------------
     /** This is the vertical offset where the tile starts.
 
-        It is given in percent in relation to the width of the bitmap.
+        <p>It is given in percent in relation to the height of the bitmap.</p>
     */
-    [property] short FillBitmapOffsetY;
+    [property] short FillBitmapPositionOffsetY;
 
     //-------------------------------------------------------------------------
     /** Every second line of tiles is moved the given percent of the
         witdh of the bitmap.
     */
-    [property] short FillBitmapPositionOffsetX;
+    [property] short FillBitmapOffsetX;
 
     //-------------------------------------------------------------------------
     /** Every second row of tiles is moved the given percent of the
-        width of the bitmap.
+        height of the bitmap.
     */
-    [property] short FillBitmapPositionOffsetY;
+    [property] short FillBitmapOffsetY;
 
     //-------------------------------------------------------------------------
     /** The RectanglePoint specifies the position inside of the bitmap to
         use as the top left position for rendering.
     */
-    [property] com::sun::star::drawing::RectanglePoint FillBitmapRectanglePoint;
+    [property] RectanglePoint FillBitmapRectanglePoint;
 
     //-------------------------------------------------------------------------
-    /** specifies if the size is given in percentage or
-        as an absolute value.
+    /** specifies if the size is given in percentage or as an absolute value.
 
-        <p>If this is <TRUE/>, the properties FillBitmapSizeX
-        and  FillBitmapSizeY contain the size of the tile in percent
-        of the size of the original bitmap. If this
-        is <FALSE/>, the size of the tile is specified
-        with 1/100th mm.
+        <p>If this is <TRUE/>, the properties <member>FillBitmapSizeX</member>
+        and <member>FillBitmapSizeY</member> contain the size of the tile in
+        percent of the size of the original bitmap. If this is <FALSE/>, the
+        size of the tile is specified with 1/100th mm.
     */
     [property] boolean FillBitmapLogicalSize;
 
     //-------------------------------------------------------------------------
     /** This is the width of the tile for filling.
 
-        <p>Depending on the property FillBitmapLogicalSize, this is
-        either relative or absolute.
+        <p>Depending on the property <member>FillBitmapLogicalSize</member>,
+        this is either relative or absolute.
     */
     [property] long FillBitmapSizeX;
 
     //-------------------------------------------------------------------------
     /** This is the height of the tile for filling.
 
-        <p>Depending on the property FillBitmapLogicalSize, this
-        is either relative or absolute.
+        <p>Depending on the property <member>FillBitmapLogicalSize</member>,
+        this is either relative or absolute.
     */
     [property] long FillBitmapSizeY;
 
     //-------------------------------------------------------------------------
     /** this enum selects how a area is filled with a single bitmap.
+
+        <p>This property corresponds to the properties <member>
+        FillBitmapStretch</member> and <member>FillBitmapTile</member>.</p>
+
+        <p>If set to <const>BitmapMode::REPEAT</const>, the property
+        FillBitmapStretch is set to <FALSE/>, and the property FillBitmapTile
+        is set to <TRUE/>.</p>
+
+        <p>If set to <const>BitmapMode::STRETCH</const>, the property
+        FillBitmapStretch is set to <TRUE/>, and the property FillBitmapTile
+        is set to <FALSE/>.</p>
+
+        <p>If set to <const>BitmapMode::NO_REPEAT</const>, both properties
+        FillBitmapStretch and FillBitmapTile are set to <FALSE/>.</p>
     */
-    [property] com::sun::star::drawing::BitmapMode FillBitmapMode;
+    [property] BitmapMode FillBitmapMode;
 
     //-------------------------------------------------------------------------
-    /** if this is <TRUE/>, the transparent background of a
-        hatch filled area is drawn in the current background color
-    */
-    [property] boolean FillBackground;
+    /** if set, the fill bitmap is stretched to fill the area of the shape.
+
+        <p>This property should not be used anymore and is included here for
+        completeness. The <member>FillBitmapMode</member> property can be used
+        instead to set all supported bitmap modes.</p>
+
+        <p>If set to <TRUE/>, the value of the FillBitmapMode property changes
+        to <const>BitmapMode::STRETCH</const>. BUT: behaviour is undefined, if
+        the property <member>FillBitmapTile</member> is <TRUE/> too.</p>
+
+        <p>If set to <FALSE/>, the value of the FillBitmapMode property
+        changes to <const>BitmapMode::REPEAT</const> or <const>
+        BitmapMode::NO_REPEAT</const>, depending on the current value of the
+        <member>FillBitmapTile</member> property.</p>
+     */
+    [optional, property] boolean FillBitmapStretch;
+
+    //-------------------------------------------------------------------------
+    /** if set, the fill bitmap is repeated to fill the area of the shape.
+
+        <p>This property should not be used anymore and is included here for
+        completeness. The <member>FillBitmapMode</member> property can be used
+        instead to set all supported bitmap modes.</p>
+
+        <p>If set to <TRUE/>, the value of the FillBitmapMode property changes
+        to <const>BitmapMode::REPEAT</const>. BUT: behaviour is undefined, if
+        the property <member>FillBitmapStretch</member> is <TRUE/> too.</p>
+
+        <p>If set to <FALSE/>, the value of the FillBitmapMode property
+        changes to <const>BitmapMode::STRETCH</const> or <const>
+        BitmapMode::NO_REPEAT</const>, depending on the current value of the
+        <member>FillBitmapStretch</member> property.</p>
+     */
+    [optional, property] boolean FillBitmapTile;
 
     //-------------------------------------------------------------------------
 };
diff --git a/offapi/com/sun/star/xml/sax/XFastShapeContextHandler.idl b/offapi/com/sun/star/xml/sax/XFastShapeContextHandler.idl
index 3def460ed435..c125e55ddd2e 100644
--- a/offapi/com/sun/star/xml/sax/XFastShapeContextHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XFastShapeContextHandler.idl
@@ -32,7 +32,7 @@
 
 #include <com/sun/star/xml/sax/XFastContextHandler.idl>
 #include <com/sun/star/drawing/XShape.idl>
-#include <com/sun/star/drawing/XShapes.idl>
+#include <com/sun/star/drawing/XDrawPage.idl>
 #include <com/sun/star/frame/XModel.idl>
 #include <com/sun/star/io/XInputStream.idl>
 
@@ -50,7 +50,7 @@ module com {  module sun {  module star {  module xml {  module sax {
 interface XFastShapeContextHandler: com::sun::star::xml::sax::XFastContextHandler
 {
     [attribute, readonly] com::sun::star::drawing::XShape Shape;
-    [attribute] com::sun::star::drawing::XShapes Shapes;
+    [attribute] com::sun::star::drawing::XDrawPage DrawPage;
     [attribute] com::sun::star::frame::XModel Model;
     [attribute] com::sun::star::io::XInputStream InputStream;
     [attribute] string RelationFragmentPath;