CWS-TOOLING: integrate CWS dba34b

12 files changed, 432 insertions, 69 deletions

diff --git a/offapi/com/sun/star/awt/AnimatedImagesControl.idl b/offapi/com/sun/star/awt/AnimatedImagesControl.idl
new file mode 100755
index 000000000000..90f8b3a356e8
--- /dev/null
+++ b/offapi/com/sun/star/awt/AnimatedImagesControl.idl
@@ -0,0 +1,58 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_awt_AnimatedImagesControl_idl__
+#define __com_sun_star_awt_AnimatedImagesControl_idl__
+
+#include <com/sun/star/awt/UnoControl.idl>
+
+//======================================================================================================================
+
+module com { module sun { module star { module awt {
+
+interface XAnimation;
+
+//======================================================================================================================
+
+/** is the default control used for an <type>AnimatedImagesControlModel</type>, displayed a series of
+    images.
+
+    @since OOo 3.4
+ */
+service AnimatedImagesControl
+{
+    service com::sun::star::awt::UnoControl;
+
+    interface XAnimation;
+};
+
+//======================================================================================================================
+
+}; }; }; };
+
+//======================================================================================================================
+
+#endif
diff --git a/offapi/com/sun/star/awt/AnimatedImagesControlModel.idl b/offapi/com/sun/star/awt/AnimatedImagesControlModel.idl
new file mode 100755
index 000000000000..2bc1260775c9
--- /dev/null
+++ b/offapi/com/sun/star/awt/AnimatedImagesControlModel.idl
@@ -0,0 +1,57 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_awt_AnimatedImagesControlModel_idl__
+#define __com_sun_star_awt_AnimatedImagesControlModel_idl__
+
+#include <com/sun/star/awt/UnoControlModel.idl>
+
+//======================================================================================================================
+
+module com { module sun { module star { module awt {
+
+interface XAnimatedImages;
+
+//======================================================================================================================
+
+/** describes the model for a control displaying a series of images
+
+    @since OOo 3.4
+ */
+service AnimatedImagesControlModel
+{
+    service com::sun::star::awt::UnoControlModel;
+
+    interface XAnimatedImages;
+};
+
+//======================================================================================================================
+
+}; }; }; };
+
+//======================================================================================================================
+
+#endif
diff --git a/offapi/com/sun/star/awt/SpinningProgressControlModel.idl b/offapi/com/sun/star/awt/SpinningProgressControlModel.idl
new file mode 100755
index 000000000000..a75417d41cc3
--- /dev/null
+++ b/offapi/com/sun/star/awt/SpinningProgressControlModel.idl
@@ -0,0 +1,54 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_awt_SpinningProgressControlModel_idl__
+#define __com_sun_star_awt_SpinningProgressControlModel_idl__
+
+#include <com/sun/star/awt/AnimatedImagesControlModel.idl>
+
+//======================================================================================================================
+
+module com { module sun { module star { module awt {
+
+//======================================================================================================================
+
+/** is a specialization of the <type>AnimatedImagesControlModel</type> which provides standard image sets
+    for displaying a non-procentual progress.
+
+    <p>Three image sets are provided, of size 16x16, 32x32, and 64x64 pixels.</p>
+ */
+service SpinningProgressControlModel
+{
+    service AnimatedImagesControlModel;
+};
+
+//======================================================================================================================
+
+}; }; }; };
+
+//======================================================================================================================
+
+#endif
diff --git a/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl b/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
index cf45f0aea0f0..b00ec8740521 100644..100755
--- a/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
+++ b/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
@@ -42,17 +42,14 @@
 
 //=============================================================================
 
-/** specifies a simple animation control.
-
-    <p>The model of an <type>UnoControlSimpleAnimation</type> control must support
-    the <type>UnoControlSimpleAnimationModel</type> service.</p>
-
+/**
     @since OOo 2.2
+    @deprecated
+        You should use <type>AnimatedImagesControl</type>.
  */
 published service UnoControlSimpleAnimation
 {
     service com::sun::star::awt::UnoControl;
-
     interface com::sun::star::awt::XSimpleAnimation;
 
 };
diff --git a/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl b/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
index ca301483263f..1f96099fee63 100644..100755
--- a/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
@@ -38,36 +38,16 @@
 
 //=============================================================================
 
-/** specifies the standard model of an <type>UnoControlSimpleAnimation</type>.
-
-    <p>The simple animation control displays a sequence of images.</p>
-
-    <p> </p>
-
-    @see UnoControlScrollBarModel
+/**
     @since OOo 2.2
+    @deprecated
+        You should use <type>AnimatedImagesControlModel</type>.
  */
 
 published service UnoControlSimpleAnimationModel
 {
     service com::sun::star::awt::UnoControlModel;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the time in milliseconds between two animation steps.
-
-        <pre>This is the minimum time, the actual value might be longer due to
-        system load. The default value will be 100 ms.</pre>
-     */
     [property] long StepTime;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies whether the animation will restart again after displaying the last
-        image.
-
-        <p>The default is FALSE.</p>
-     */
     [property] boolean AutoRepeat;
 };
 
diff --git a/offapi/com/sun/star/awt/UnoControlThrobber.idl b/offapi/com/sun/star/awt/UnoControlThrobber.idl
index f5194075019a..85b5d8b850f7 100644
--- a/offapi/com/sun/star/awt/UnoControlThrobber.idl
+++ b/offapi/com/sun/star/awt/UnoControlThrobber.idl
@@ -42,17 +42,14 @@
 
 //=============================================================================
 
-/** specifies a simple animation control.
-
-    <p>The model of an <type>UnoControlThrobber</type> control must support
-    the <type>UnoControlThrobberModel</type> service.</p>
-
+/**
     @since OOo 2.2
+    @deprecatd
+        You should use <type>AnimatedImagesControl</type>.
  */
 published service UnoControlThrobber
 {
     service com::sun::star::awt::UnoControl;
-
     interface com::sun::star::awt::XThrobber;
 
 };
diff --git a/offapi/com/sun/star/awt/UnoControlThrobberModel.idl b/offapi/com/sun/star/awt/UnoControlThrobberModel.idl
index f2eacad5b76b..060ff105c119 100644
--- a/offapi/com/sun/star/awt/UnoControlThrobberModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlThrobberModel.idl
@@ -38,14 +38,10 @@
 
 //=============================================================================
 
-/** specifies the standard model of an <type>UnoControlThrobber</type>.
-
-    <p>The simple animation control displays a sequence of images.</p>
-
-    <p> </p>
-
-    @see UnoControlScrollBarModel
+/**
     @since OOo 2.2
+    @deprecatd
+        You should use <type>SpinningAnimationControlModel</type>.
  */
 
 published service UnoControlThrobberModel
diff --git a/offapi/com/sun/star/awt/XAnimatedImages.idl b/offapi/com/sun/star/awt/XAnimatedImages.idl
new file mode 100755
index 000000000000..a03d08c965f1
--- /dev/null
+++ b/offapi/com/sun/star/awt/XAnimatedImages.idl
@@ -0,0 +1,176 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_awt_XAnimatedImages_idl__
+#define __com_sun_star_awt_XAnimatedImages_idl__
+
+#include <com/sun/star/container/XContainerListener.idl>
+#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
+#include <com/sun/star/container/XContainer.idl>
+#include <com/sun/star/lang/IllegalArgumentException.idl>
+
+//======================================================================================================================
+
+module com { module sun { module star { module awt {
+
+//======================================================================================================================
+
+/** allows administrating a set of images, to be displayed as animated seres.
+
+    <p>Components implementing this interface maintain a variable number of image sets. Components displaying
+    those images will choose the best-fitting image set depending on the available space, and possibly other
+    restrictions.</p>
+
+    @since OOo 3.4
+ */
+interface XAnimatedImages
+{
+    /** specifies the time in milliseconds between two animation steps.
+
+        <p>This is the minimum time, the actual value might be longer due to
+        system load. The default value will be 100 ms.</p>
+    */
+    [attribute] long    StepTime;
+
+    /** specifies whether the animation should start over with the first image of the image series when the last image
+        has been played.
+
+        <p>The default value for this attribute is <TRUE/>.</p>
+    */
+    [attribute] boolean AutoRepeat;
+
+    /** controls the way the images are scaled up or down, when the available space is larger or smaller
+        than what is needed for them.
+
+        <p>Allowed values are those from the <type>ImageScaleMode</type> constants group.</p>
+    */
+    [attribute] short ScaleMode
+    {
+        set raises (::com::sun::star::lang::IllegalArgumentException);
+    };
+
+    /** returns the number of images sets maintained by the component.
+    */
+    long
+        getImageSetCount();
+
+    /** returns the URLs of the image set with the given index
+
+        @param i_index
+            the index of the set those image URLs are to be retrieved. Must be greater than or equal to <code>0</code>,
+            and smaller than the value returned by <member>getImageSetCount</member>.
+
+        @throws ::com::sun::star::lang::IndexOutOfBoundsException
+            if the <code>i_index</code> is not a valid index.
+    */
+    sequence< string >
+        getImageSet
+        (
+            [in] long i_index
+        )
+        raises
+        (
+            ::com::sun::star::lang::IndexOutOfBoundsException
+        );
+
+    /** sets the URLs of the image set with the given index
+
+        @param i_index
+            the index at which a new image set should be inserted. Must be greater than or equal to <code>0</code>,
+            and smaller than or equal to the value returned by <member>getImageSetCount</member>.
+        @param i_imageURLs
+            the URLs for the images for the given set. Will be resolved using a <type scope="com::sun::star::graphic">GraphicProvider</type>.
+
+        @throws ::com::sun::star::lang::IndexOutOfBoundsException
+            if the <code>i_index</code> is not a valid index.
+    */
+    void
+        insertImageSet
+        (
+            [in] long i_index,
+            [in] sequence< string > i_imageURLs
+        )
+        raises
+        (
+            ::com::sun::star::lang::IndexOutOfBoundsException
+        );
+
+    /** replaces the image set given by index with a new one
+
+        @param i_index
+            the index of the set those image URLs are to be replaced. Must be greater than or equal to <code>0</code>,
+            and smaller than the value returned by <member>getImageSetCount</member>.
+
+        @param i_imageURLs
+            the URLs for the images for the given set. Will be resolved using a <type scope="com::sun::star::graphic">GraphicProvider</type>.
+
+        @throws ::com::sun::star::lang::IndexOutOfBoundsException
+            if the <code>i_index</code> is not a valid index.
+    */
+    void
+        replaceImageSet
+        (
+            [in] long i_index,
+            [in] sequence< string > i_imageURLs
+        )
+        raises
+        (
+            ::com::sun::star::lang::IndexOutOfBoundsException
+        );
+
+
+    /** removes the image set with the given index
+
+        @param i_index
+            the index of the set to remove. Must be greater than or equal to <code>0</code>,
+            and smaller than the value returned by <member>getImageSetCount</member>.
+
+        @throws ::com::sun::star::lang::IndexOutOfBoundsException
+            if the <code>i_index</code> is not a valid index.
+    */
+    void
+        removeImageSet
+        (
+            [in] long i_index
+        )
+        raises
+        (
+            ::com::sun::star::lang::IndexOutOfBoundsException
+        );
+
+
+    /** allows other components to observer the insertion, removal, and replacement of image sets
+    */
+    interface ::com::sun::star::container::XContainer;
+};
+
+//======================================================================================================================
+
+}; }; }; };
+
+//======================================================================================================================
+
+#endif
diff --git a/offapi/com/sun/star/awt/XAnimation.idl b/offapi/com/sun/star/awt/XAnimation.idl
new file mode 100755
index 000000000000..e1e8f6023a7d
--- /dev/null
+++ b/offapi/com/sun/star/awt/XAnimation.idl
@@ -0,0 +1,63 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_awt_XAnimation_idl__
+#define __com_sun_star_awt_XAnimation_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+
+//======================================================================================================================
+
+module com { module sun { module star { module awt {
+
+//======================================================================================================================
+
+/** allows controlling an animation.
+
+    @since OOo 3.4
+ */
+interface XAnimation
+{
+    /** starts the animation
+    */
+    void    startAnimation();
+
+    /** stops the animation
+    */
+    void    stopAnimation();
+
+    /** determines whether the animation is currently running
+    */
+    boolean isAnimationRunning();
+};
+
+//======================================================================================================================
+
+}; }; }; };
+
+//======================================================================================================================
+
+#endif
diff --git a/offapi/com/sun/star/awt/XSimpleAnimation.idl b/offapi/com/sun/star/awt/XSimpleAnimation.idl
index 1cfd758590b9..bff9eeeb5a90 100644..100755
--- a/offapi/com/sun/star/awt/XSimpleAnimation.idl
+++ b/offapi/com/sun/star/awt/XSimpleAnimation.idl
@@ -41,28 +41,15 @@
 
 //=============================================================================
 
-/** Controls the animation control.
+/**
+    @deprecated
+        You should use <type>XAnimation</type>, <type>AnimatedImagesControl</type>, and <type>AnimatedImagesControlModel</type>.
  */
 published interface XSimpleAnimation: com::sun::star::uno::XInterface
 {
-    //-------------------------------------------------------------------------
-
-    /** starts the animation of the control.
-     */
     void start();
-
-    //-------------------------------------------------------------------------
-
-    /** stops the animation of the control.
-     */
     void stop();
-
-    //-------------------------------------------------------------------------
-
-    /** The list of images to be displayed.
-     */
     void setImageList( [in] sequence < com::sun::star::graphic::XGraphic > ImageList );
-
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XThrobber.idl b/offapi/com/sun/star/awt/XThrobber.idl
index 0a4ac133524a..04dc6887cbe9 100644
--- a/offapi/com/sun/star/awt/XThrobber.idl
+++ b/offapi/com/sun/star/awt/XThrobber.idl
@@ -41,20 +41,13 @@
 
 //=============================================================================
 
-/** Controls the animation control.
+/**
+    @deprecatd
+        You should use <type>XAnimation</type>, <type>AnimatedImagesControl</type>, and <type>AnimatedImagesControlModel</type>.
  */
 published interface XThrobber: com::sun::star::uno::XInterface
 {
-    //-------------------------------------------------------------------------
-
-    /** starts the animation of the control.
-     */
     void start();
-
-    //-------------------------------------------------------------------------
-
-    /** stops the animation of the control.
-     */
     void stop();
 };
 
diff --git a/offapi/com/sun/star/awt/makefile.mk b/offapi/com/sun/star/awt/makefile.mk
index 259b482516bc..c2397d81bf44 100644
--- a/offapi/com/sun/star/awt/makefile.mk
+++ b/offapi/com/sun/star/awt/makefile.mk
@@ -335,7 +335,12 @@ IDLFILES=\
     XPopupMenuExtended.idl \
     XItemList.idl \
     XItemListListener.idl \
-    ItemListEvent.idl
+    ItemListEvent.idl \
+    AnimatedImagesControl.idl \
+    AnimatedImagesControlModel.idl \
+    XAnimatedImages.idl \
+    XAnimation.idl \
+    SpinningProgressControlModel.idl
 
 # ------------------------------------------------------------------