summaryrefslogtreecommitdiff
path: root/offapi/com/sun
diff options
context:
space:
mode:
authorChristian Lippka <cl@openoffice.org>2001-03-06 15:53:32 +0000
committerChristian Lippka <cl@openoffice.org>2001-03-06 15:53:32 +0000
commitc10f349de0d2f554b04ee9b592cf454db2200d39 (patch)
treeb83ccd4082c2170527f054a53cba35983e38f767 /offapi/com/sun
parentb4e2e54657b6c5d416274b3d9aeb66f441890256 (diff)
cleanup of shape services
Diffstat (limited to 'offapi/com/sun')
-rw-r--r--offapi/com/sun/star/drawing/ClosedBezierShape.idl54
-rw-r--r--offapi/com/sun/star/drawing/ConnectorProperties.idl115
-rw-r--r--offapi/com/sun/star/drawing/ConnectorShape.idl68
-rw-r--r--offapi/com/sun/star/drawing/ControlShape.idl32
-rw-r--r--offapi/com/sun/star/drawing/Defaults.idl109
-rw-r--r--offapi/com/sun/star/drawing/EllipseShape.idl68
-rw-r--r--offapi/com/sun/star/drawing/FillProperties.idl252
-rw-r--r--offapi/com/sun/star/drawing/GraphicObjectShape.idl108
-rw-r--r--offapi/com/sun/star/drawing/GroupShape.idl11
-rw-r--r--offapi/com/sun/star/drawing/LineProperties.idl177
-rw-r--r--offapi/com/sun/star/drawing/LineShape.idl39
-rw-r--r--offapi/com/sun/star/drawing/MeasureProperties.idl179
-rw-r--r--offapi/com/sun/star/drawing/MeasureShape.idl127
-rw-r--r--offapi/com/sun/star/drawing/OLE2Shape.idl41
-rw-r--r--offapi/com/sun/star/drawing/OpenBezierShape.idl43
-rw-r--r--offapi/com/sun/star/drawing/PolyLineShape.idl47
-rw-r--r--offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl58
-rw-r--r--offapi/com/sun/star/drawing/PolyPolygonShape.idl58
-rw-r--r--offapi/com/sun/star/drawing/RectangleShape.idl56
-rw-r--r--offapi/com/sun/star/drawing/ShadowProperties.idl115
-rw-r--r--offapi/com/sun/star/drawing/Shape.idl108
-rw-r--r--offapi/com/sun/star/drawing/Text.idl302
-rw-r--r--offapi/com/sun/star/drawing/TextProperties.idl306
-rw-r--r--offapi/com/sun/star/drawing/TextShape.idl53
-rw-r--r--offapi/com/sun/star/drawing/makefile.mk31
25 files changed, 1774 insertions, 783 deletions
diff --git a/offapi/com/sun/star/drawing/ClosedBezierShape.idl b/offapi/com/sun/star/drawing/ClosedBezierShape.idl
index 08c52268755a..9d9df7e476da 100644
--- a/offapi/com/sun/star/drawing/ClosedBezierShape.idl
+++ b/offapi/com/sun/star/drawing/ClosedBezierShape.idl
@@ -2,9 +2,9 @@
*
* $RCSfile: ClosedBezierShape.idl,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: mi $ $Date: 2000-11-08 12:42:41 $
+ * last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,20 +61,16 @@
#ifndef __com_sun_star_drawing_ClosedBezierShape_idl__
#define __com_sun_star_drawing_ClosedBezierShape_idl__
-#ifndef __com_sun_star_drawing_LineShapeDescriptor_idl__
-#include <com/sun/star/drawing/LineShapeDescriptor.idl>
-#endif
-
#ifndef __com_sun_star_drawing_LineShape_idl__
#include <com/sun/star/drawing/LineShape.idl>
#endif
-#ifndef __com_sun_star_drawing_AreaShapeDescriptor_idl__
-#include <com/sun/star/drawing/AreaShapeDescriptor.idl>
+#ifndef __com_sun_star_drawing_LineProperties_idl__
+#include <com/sun/star/drawing/LineProperties.idl>
#endif
-#ifndef __com_sun_star_drawing_AreaShape_idl__
-#include <com/sun/star/drawing/AreaShape.idl>
+#ifndef __com_sun_star_drawing_FillProperties_idl__
+#include <com/sun/star/drawing/FillProperties.idl>
#endif
#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__
@@ -85,8 +81,8 @@
#include <com/sun/star/drawing/Text.idl>
#endif
-#ifndef __com_sun_star_drawing_ShadowDescriptor_idl__
-#include <com/sun/star/drawing/ShadowDescriptor.idl>
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__
+#include <com/sun/star/drawing/ShadowProperties.idl>
#endif
#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
@@ -100,53 +96,27 @@
//=============================================================================
-// DocMerge from xml: service com::sun::star::drawing::ClosedBezierShape
/** This service is for a closed bezier shape.
*/
service ClosedBezierShape
{
- // DocMerge: empty anyway
- service com::sun::star::drawing::LineShapeDescriptor;
-
- // DocMerge: empty anyway
- service com::sun::star::drawing::LineShape;
+ service com::sun::star::drawing::Shape;
- // DocMerge: empty anyway
- service com::sun::star::drawing::AreaShapeDescriptor;
+ service com::sun::star::drawing::LineProperties;
- // DocMerge: empty anyway
- service com::sun::star::drawing::AreaShape;
+ service com::sun::star::drawing::FillProperties;
- // DocMerge: empty anyway
service com::sun::star::drawing::PolyPolygonBezierDescriptor;
- // DocMerge: empty anyway
service com::sun::star::drawing::Text;
- // DocMerge: empty anyway
- service com::sun::star::drawing::ShadowDescriptor;
+ service com::sun::star::drawing::ShadowProperties;
- // DocMerge: empty anyway
service com::sun::star::drawing::RotationDescriptor;
-
};
//=============================================================================
}; }; }; };
-/*=============================================================================
-
- $Log: not supported by cvs2svn $
- Revision 1.1.1.1 2000/09/18 23:35:12 hjs
- initial import
-
- Revision 1.3 2000/09/11 11:52:19 mi
- documentation merged from XML
-
- Revision 1.1.1.1 1999/11/11 09:48:42 jsc
- new
-
-
-=============================================================================*/
#endif
diff --git a/offapi/com/sun/star/drawing/ConnectorProperties.idl b/offapi/com/sun/star/drawing/ConnectorProperties.idl
new file mode 100644
index 000000000000..b7d31c6e3182
--- /dev/null
+++ b/offapi/com/sun/star/drawing/ConnectorProperties.idl
@@ -0,0 +1,115 @@
+/*************************************************************************
+ *
+ * $RCSfile: ConnectorProperties.idl,v $
+ *
+ * $Revision: 1.1 $
+ *
+ * last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
+ *
+ * The Contents of this file are made available subject to the terms of
+ * either of the following licenses
+ *
+ * - GNU Lesser General Public License Version 2.1
+ * - Sun Industry Standards Source License Version 1.1
+ *
+ * Sun Microsystems Inc., October, 2000
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2000 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ *
+ * Sun Industry Standards Source License Version 1.1
+ * =================================================
+ * The contents of this file are subject to the Sun Industry Standards
+ * Source License Version 1.1 (the "License"); You may not use this file
+ * except in compliance with the License. You may obtain a copy of the
+ * License at http://www.openoffice.org/license.html.
+ *
+ * Software provided under this License is provided on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ * See the License for the specific provisions governing your rights and
+ * obligations concerning the Software.
+ *
+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ * Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ * All Rights Reserved.
+ *
+ * Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_drawing_ConnectorProperties_idl__
+#define __com_sun_star_drawing_ConnectorProperties_idl__
+
+#ifndef __com_sun_star_drawing_ConnectorType_idl__
+#include <com/sun/star/drawing/ConnectorType.idl>
+#endif
+
+
+//=============================================================================
+
+ module com { module sun { module star { module drawing {
+
+//=============================================================================
+
+/** This is a set of properties to describe the style for rendering connector.
+ */
+service ConnectorProperties
+{
+ //-------------------------------------------------------------------------
+
+ /** This property contains the kind of the connector.
+ */
+ [property] com::sun::star::drawing::ConnectorType EdgeKind;
+
+ //-------------------------------------------------------------------------
+
+ /** This property contains the horizontal distance of node 1.
+ */
+ [property] long EdgeNode1HorzDist;
+
+ //-------------------------------------------------------------------------
+
+ /** This property contains the vertical distance of node 1.
+ */
+ [property] long EdgeNode1VertDist;
+
+ //-------------------------------------------------------------------------
+
+ /** This property contains the horizontal distance of node 2.
+ */
+ [property] long EdgeNode2HorzDist;
+
+ //-------------------------------------------------------------------------
+
+ /** This property contains the vertical distance of node 2.
+ */
+ [property] long EdgeNode2VertDist;
+
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/drawing/ConnectorShape.idl b/offapi/com/sun/star/drawing/ConnectorShape.idl
index d7a284ec8799..3ae0d4093468 100644
--- a/offapi/com/sun/star/drawing/ConnectorShape.idl
+++ b/offapi/com/sun/star/drawing/ConnectorShape.idl
@@ -2,9 +2,9 @@
*
* $RCSfile: ConnectorShape.idl,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: mi $ $Date: 2000-11-08 12:42:41 $
+ * last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -65,20 +65,24 @@
#include <com/sun/star/drawing/XConnectorShape.idl>
#endif
-#ifndef __com_sun_star_drawing_LineShape_idl__
-#include <com/sun/star/drawing/LineShape.idl>
+#ifndef __com_sun_star_drawing_ConnectorProperties_idl__
+#include <com/sun/star/drawing/ConnectorProperties.idl>
#endif
-#ifndef __com_sun_star_drawing_ConnectorShapeDescriptor_idl__
-#include <com/sun/star/drawing/ConnectorShapeDescriptor.idl>
+#ifndef __com_sun_star_drawing_Shape_idl__
+#include <com/sun/star/drawing/Shape.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_LineProperties_idl__
+#include <com/sun/star/drawing/LineProperties.idl>
#endif
#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
#endif
-#ifndef __com_sun_star_drawing_ShadowDescriptor_idl__
-#include <com/sun/star/drawing/ShadowDescriptor.idl>
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__
+#include <com/sun/star/drawing/ShadowProperties.idl>
#endif
#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
@@ -92,48 +96,48 @@
//=============================================================================
-// DocMerge from xml: service com::sun::star::drawing::ConnectorShape
/** This service is for a <type>ConnectorShape</type>, a specialized <type>Shape</type>
which can be connected to other <type>Shape</type>s or <type>GluePoint</type>s.
*/
service ConnectorShape
{
- // DocMerge: empty anyway
- interface com::sun::star::drawing::XConnectorShape;
+ service com::sun::star::drawing::Shape;
- // DocMerge: empty anyway
- service com::sun::star::drawing::LineShape;
+ service com::sun::star::drawing::LineProperties;
- // DocMerge: empty anyway
- service com::sun::star::drawing::ConnectorShapeDescriptor;
+ service com::sun::star::drawing::ConnectorProperties;
- // DocMerge: empty anyway
- service com::sun::star::drawing::Text;
+ service com::sun::star::drawing::ShadowProperties;
- // DocMerge: empty anyway
- service com::sun::star::drawing::ShadowDescriptor;
+ service com::sun::star::drawing::Text;
- // DocMerge: empty anyway
service com::sun::star::drawing::RotationDescriptor;
-};
+ //-------------------------------------------------------------------------
-//=============================================================================
+ interface com::sun::star::drawing::XConnectorShape;
-}; }; }; };
+ //-------------------------------------------------------------------------
-/*=============================================================================
+ /** This property contains the distance of line 1.
+ */
+ [property] long EdgeLine1Delta;
- $Log: not supported by cvs2svn $
- Revision 1.1.1.1 2000/09/18 23:35:12 hjs
- initial import
+ //-------------------------------------------------------------------------
- Revision 1.3 2000/09/11 11:52:19 mi
- documentation merged from XML
+ /** This property contains the distance of line 2.
+ */
+ [property] long EdgeLine2Delta;
- Revision 1.1.1.1 1999/11/11 09:48:42 jsc
- new
+ //-------------------------------------------------------------------------
+
+ /** This property contains the distance of line 3.
+ */
+ [property] long EdgeLine3Delta;
+};
+//=============================================================================
+
+}; }; }; };
-=============================================================================*/
#endif
diff --git a/offapi/com/sun/star/drawing/ControlShape.idl b/offapi/com/sun/star/drawing/ControlShape.idl
index 35a0e10fc834..1ab87ae6facb 100644
--- a/offapi/com/sun/star/drawing/ControlShape.idl
+++ b/offapi/com/sun/star/drawing/ControlShape.idl
@@ -2,9 +2,9 @@
*
* $RCSfile: ControlShape.idl,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: mi $ $Date: 2000-12-21 08:35:06 $
+ * last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -76,39 +76,19 @@
//=============================================================================
-// DocMerge from xml: service com::sun::star::drawing::ControlShape
-/** This service is for a <type>Shape</type> which contains a control.@see Shape
- @see XControlShape
+/** This service is for a <type>Shape</type> which contains a control.
+ <p>
+ @see Shape
+ @see XControlShape
*/
service ControlShape
{
- // DocMerge: empty anyway
service com::sun::star::drawing::Shape;
-
- // DocMerge: empty anyway
interface com::sun::star::drawing::XControlShape;
-
};
//=============================================================================
}; }; }; };
-/*=============================================================================
-
- $Log: not supported by cvs2svn $
- Revision 1.3 2000/11/08 12:42:41 mi
- moved from api
-
- Revision 1.1.1.1 2000/09/18 23:35:12 hjs
- initial import
-
- Revision 1.3 2000/09/11 11:52:19 mi
- documentation merged from XML
-
- Revision 1.1.1.1 1999/11/11 09:48:42 jsc
- new
-
-
-=============================================================================*/
#endif
diff --git a/offapi/com/sun/star/drawing/Defaults.idl b/offapi/com/sun/star/drawing/Defaults.idl
new file mode 100644
index 000000000000..3ec81fb68440
--- /dev/null
+++ b/offapi/com/sun/star/drawing/Defaults.idl
@@ -0,0 +1,109 @@
+/*************************************************************************
+ *
+ * $RCSfile: Defaults.idl,v $
+ *
+ * $Revision: 1.1 $
+ *
+ * last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
+ *
+ * The Contents of this file are made available subject to the terms of
+ * either of the following licenses
+ *
+ * - GNU Lesser General Public License Version 2.1
+ * - Sun Industry Standards Source License Version 1.1
+ *
+ * Sun Microsystems Inc., October, 2000
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2000 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ *
+ * Sun Industry Standards Source License Version 1.1
+ * =================================================
+ * The contents of this file are subject to the Sun Industry Standards
+ * Source License Version 1.1 (the "License"); You may not use this file
+ * except in compliance with the License. You may obtain a copy of the
+ * License at http://www.openoffice.org/license.html.
+ *
+ * Software provided under this License is provided on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ * See the License for the specific provisions governing your rights and
+ * obligations concerning the Software.
+ *
+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ * Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ * All Rights Reserved.
+ *
+ * Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_drawing_Defaults_idl__
+#define __com_sun_star_drawing_Defaults_idl__
+
+#ifndef __com_sun_star_drawing_LineProperties_idl__
+#include <com/sun/star/drawing/LineProperties.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_FillProperties_idl__
+#include <com/sun/star/drawing/FillProperties.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_TextProperties_idl__
+#include <com/sun/star/drawing/TextProperties.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__
+#include <com/sun/star/drawing/ShadowProperties.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_ConnectorProperties_idl__
+#include <com/sun/star/drawing/ConnectorProperties.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_MeasureProperties_idl__
+#include <com/sun/star/drawing/MeasureProperties.idl>
+#endif
+
+//=============================================================================
+
+module com { module sun { module star { module drawing {
+
+//=============================================================================
+/** describes a specialized shape with a 2D extent that can be filled.
+*/
+service Defaults
+{
+ service com::sun::star::drawing::LineProperties;
+ service com::sun::star::drawing::FillProperties;
+ service com::sun::star::drawing::TextProperties;
+ service com::sun::star::drawing::ShadowProperties;
+ service com::sun::star::drawing::ConnectorProperties;
+ service com::sun::star::drawing::MeasureProperties;
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/drawing/EllipseShape.idl b/offapi/com/sun/star/drawing/EllipseShape.idl
index 9ea80d9f0633..2056221c71bd 100644
--- a/offapi/com/sun/star/drawing/EllipseShape.idl
+++ b/offapi/com/sun/star/drawing/EllipseShape.idl
@@ -2,9 +2,9 @@
*
* $RCSfile: EllipseShape.idl,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: mi $ $Date: 2000-11-08 12:42:41 $
+ * last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,30 +61,33 @@
#ifndef __com_sun_star_drawing_EllipseShape_idl__
#define __com_sun_star_drawing_EllipseShape_idl__
-#ifndef __com_sun_star_drawing_LineShape_idl__
-#include <com/sun/star/drawing/LineShape.idl>
+#ifndef __com_sun_star_drawing_Shape_idl__
+#include <com/sun/star/drawing/Shape.idl>
#endif
-#ifndef __com_sun_star_drawing_AreaShape_idl__
-#include <com/sun/star/drawing/AreaShape.idl>
+#ifndef __com_sun_star_drawing_LineProperties_idl__
+#include <com/sun/star/drawing/LineProperties.idl>
#endif
-#ifndef __com_sun_star_drawing_EllipseShapeDescriptor_idl__
-#include <com/sun/star/drawing/EllipseShapeDescriptor.idl>
+#ifndef __com_sun_star_drawing_FillProperties_idl__
+#include <com/sun/star/drawing/FillProperties.idl>
#endif
#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
#endif
-#ifndef __com_sun_star_drawing_ShadowDescriptor_idl__
-#include <com/sun/star/drawing/ShadowDescriptor.idl>
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__
+#include <com/sun/star/drawing/ShadowProperties.idl>
#endif
#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
#endif
+#ifndef __com_sun_star_drawing_CircleKind_idl__
+#include <com/sun/star/drawing/CircleKind.idl>
+#endif
//=============================================================================
@@ -92,47 +95,44 @@
//=============================================================================
-// DocMerge from xml: service com::sun::star::drawing::EllipseShape
-/** This service is for a circle shape.
+/** This service is for a ellipse or circle shape.
*/
service EllipseShape
{
- // DocMerge: empty anyway
- service com::sun::star::drawing::LineShape;
+ service com::sun::star::drawing::Shape;
- // DocMerge: empty anyway
- service com::sun::star::drawing::AreaShape;
+ service com::sun::star::drawing::LineProperties;
- // DocMerge: empty anyway
- service com::sun::star::drawing::EllipseShapeDescriptor;
+ service com::sun::star::drawing::FillProperties;
- // DocMerge: empty anyway
service com::sun::star::drawing::Text;
- // DocMerge: empty anyway
- service com::sun::star::drawing::ShadowDescriptor;
+ service com::sun::star::drawing::ShadowProperties;
- // DocMerge: empty anyway
service com::sun::star::drawing::RotationDescriptor;
-};
+ //-------------------------------------------------------------------------
-//=============================================================================
+ /** This is the kind of circle.
+ */
+ [property] com::sun::star::drawing::CircleKind CircleKind;
-}; }; }; };
+ //-------------------------------------------------------------------------
-/*=============================================================================
+ /** If the kind specifies an open circle, this is the start angle.
+ */
+ [property] long CircleStartAngle;
- $Log: not supported by cvs2svn $
- Revision 1.1.1.1 2000/09/18 23:35:12 hjs
- initial import
+ //-------------------------------------------------------------------------
- Revision 1.3 2000/09/11 11:52:20 mi
- documentation merged from XML
+ /** If the kind specifies an open circle, this is the end angle.
+ */
+ [property] long CircleEndAngle;
- Revision 1.1.1.1 1999/11/11 09:48:42 jsc
- new
+};
+
+//=============================================================================
+}; }; }; };
-=============================================================================*/
#endif
diff --git a/offapi/com/sun/star/drawing/FillProperties.idl b/offapi/com/sun/star/drawing/FillProperties.idl
new file mode 100644
index 000000000000..ba278a9b9c10
--- /dev/null
+++ b/offapi/com/sun/star/drawing/FillProperties.idl
@@ -0,0 +1,252 @@
+/*************************************************************************
+ *
+ * $RCSfile: FillProperties.idl,v $
+ *
+ * $Revision: 1.1 $
+ *
+ * last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
+ *
+ * The Contents of this file are made available subject to the terms of
+ * either of the following licenses
+ *
+ * - GNU Lesser General Public License Version 2.1
+ * - Sun Industry Standards Source License Version 1.1
+ *
+ * Sun Microsystems Inc., October, 2000
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2000 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ *
+ * Sun Industry Standards Source License Version 1.1
+ * =================================================
+ * The contents of this file are subject to the Sun Industry Standards
+ * Source License Version 1.1 (the "License"); You may not use this file
+ * except in compliance with the License. You may obtain a copy of the
+ * License at http://www.openoffice.org/license.html.
+ *
+ * Software provided under this License is provided on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ * See the License for the specific provisions governing your rights and
+ * obligations concerning the Software.
+ *
+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ * Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ * All Rights Reserved.
+ *
+ * Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_drawing_FillProperties_idl__
+#define __com_sun_star_drawing_FillProperties_idl__
+
+#ifndef __com_sun_star_drawing_FillStyle_idl__
+#include <com/sun/star/drawing/FillStyle.idl>
+#endif
+
+#ifndef __com_sun_star_awt_Gradient_idl__
+#include <com/sun/star/awt/Gradient.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_Hatch_idl__
+#include <com/sun/star/drawing/Hatch.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_BitmapMode_idl__
+#include <com/sun/star/drawing/BitmapMode.idl>
+#endif
+
+#ifndef __com_sun_star_awt_XBitmap_idl__
+#include <com/sun/star/awt/XBitmap.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_RectanglePoint_idl__
+#include <com/sun/star/drawing/RectanglePoint.idl>
+#endif
+
+
+//=============================================================================
+
+module com { module sun { module star { module drawing {
+
+//=============================================================================
+
+/** This is a set of properties to describe the style for rendering an area.
+ */
+service FillProperties
+{
+ //-------------------------------------------------------------------------
+ /** This enumeration selects the style with which the area will be filled.
+ */
+ [property] com::sun::star::drawing::FillStyle FillStyle;
+
+ //-------------------------------------------------------------------------
+ /** If the <type>FillStyle</type> is set to <const>FillStyle::SOLID</const>,
+ this is the color used.
+ */
+ [property] long 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>.
+ */
+ [property] short FillTransparence;
+
+ //-------------------------------------------------------------------------
+ /** If a gradient is used for transparency, this is the name of the
+ used transparence gradient style or it is empty. If you set the name
+ of a transparence gradient style contained in the document, this
+ style used.
+ */
+ [property] string FillTransparenceGradientName;
+
+
+ //-------------------------------------------------------------------------
+ /** This describes the transparency of the fill area as a gradient.
+ */
+ [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.
+ */
+ [property] string FillGradientName;
+
+ //-------------------------------------------------------------------------
+ /** If the <type>FillStyle</type> 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.
+ */
+ [property] string FillHatchName;
+
+ //-------------------------------------------------------------------------
+ /** If the <type>FillStyle</type> is set to <const>FillStyle::HATCH</const>, this
+ describes the hatch used.
+ */
+ [optional, property] com::sun::star::drawing::Hatch FillHatch;
+
+ //-------------------------------------------------------------------------
+ /** If the <type>FillStyle</type> 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.
+ */
+ [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.
+ */
+ [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.
+ */
+ [property] short FillBitmapOffsetX;
+
+ //-------------------------------------------------------------------------
+ /** This is the vertical offset where the tile starts.
+
+ It is given in percent in relation to the width of the bitmap.
+ */
+ [property] short FillBitmapOffsetY;
+
+ //-------------------------------------------------------------------------
+ /** Every second line of tiles is moved the given percent of the
+ witdh of the bitmap.
+ */
+ [property] short FillBitmapPositionOffsetX;
+
+ //-------------------------------------------------------------------------
+ /** Every second row of tiles is moved the given percent of the
+ width of the bitmap.
+ */
+ [property] short FillBitmapPositionOffsetY;
+
+ //-------------------------------------------------------------------------
+ /** 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;
+
+ //-------------------------------------------------------------------------
+ /** 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.
+ */
+ [property] boolean FillBitmapLogicalSize;
+
+ //-------------------------------------------------------------------------
+ /** This is the width of the tile for filling.
+
+ <p>Depending on the property FillBitmapLogicalSize, 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.
+ */
+ [property] long FillBitmapSizeY;
+
+ //-------------------------------------------------------------------------
+ /** this enum selects how a area is filled with a single bitmap.
+ */
+ [property] com::sun::star::drawing::BitmapMode FillBitmapMode;
+
+ //-------------------------------------------------------------------------
+ /** if this is <TRUE/>, the transparent background of a
+ hatch filled area ist drawn in the current background color
+ */
+ [property] boolean FillBackground;
+
+ //-------------------------------------------------------------------------
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/drawing/GraphicObjectShape.idl b/offapi/com/sun/star/drawing/GraphicObjectShape.idl
index f259940e528e..a2811e74989a 100644
--- a/offapi/com/sun/star/drawing/GraphicObjectShape.idl
+++ b/offapi/com/sun/star/drawing/GraphicObjectShape.idl
@@ -2,9 +2,9 @@
*
* $RCSfile: GraphicObjectShape.idl,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: cl $ $Date: 2001-01-16 20:13:39 $
+ * last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -65,22 +65,25 @@
#include <com/sun/star/drawing/Shape.idl>
#endif
-#ifndef __com_sun_star_drawing_GraphicObjectShapeDescriptor_idl__
-#include <com/sun/star/drawing/GraphicObjectShapeDescriptor.idl>
-#endif
-
#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
#endif
-#ifndef __com_sun_star_drawing_ShadowDescriptor_idl__
-#include <com/sun/star/drawing/ShadowDescriptor.idl>
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__
+#include <com/sun/star/drawing/ShadowProperties.idl>
#endif
#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
#endif
+#ifndef __com_sun_star_awt_XBitmap_idl__
+#include <com/sun/star/awt/XBitmap.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_ColorMode_idl__
+#include <com/sun/star/drawing/ColorMode.idl>
+#endif
//=============================================================================
@@ -88,47 +91,84 @@
//=============================================================================
-// DocMerge from xml: service com::sun::star::drawing::GraphicObjectShape
/** This service is for a graphic shape.
*/
service GraphicObjectShape
{
- // DocMerge: empty anyway
service com::sun::star::drawing::Shape;
- // DocMerge: empty anyway
- service com::sun::star::drawing::GraphicObjectShapeDescriptor;
-
- // DocMerge: empty anyway
service com::sun::star::drawing::Text;
- // DocMerge: empty anyway
- service com::sun::star::drawing::ShadowDescriptor;
+ service com::sun::star::drawing::ShadowProperties;
- // DocMerge: empty anyway
service com::sun::star::drawing::RotationDescriptor;
+ //-------------------------------------------------------------------------
+ /** This is a url to the source bitmap for this graphic shape.
+ */
+ [property] string GraphicURL;
+
+ //-------------------------------------------------------------------------
+ /** This is a url to the stream ('in document' or linked graphic) for this graphic shape.
+ */
+ [property] string GraphicStreamURL;
+
+ //-------------------------------------------------------------------------
+ /** This is the bitmap that represents this graphic shape.
+ */
+ [optional, property] com::sun::star::awt::XBitmap GraphicObjectFillBitmap;
+
+ //-------------------------------------------------------------------------
+ /** If this property is set, the luminance of this graphic shape is adjusted
+ by the given signed percent value.
+ */
+ [property] short AdjustLuminance;
+
+ //-------------------------------------------------------------------------
+ /** If this property is set, the contrast of this graphic shape is adjusted
+ by the given signed percent value.
+ */
+ [property] short AdjustContrast;
+
+ //-------------------------------------------------------------------------
+ /** If this property is set, the red channel of this graphic shape is
+ adjusted by the given signed percent value.
+ */
+ [property] short AdjustRed;
+
+ //-------------------------------------------------------------------------
+ /** If this property is set, the green channel of this graphic shape is
+ adjusted by the given signed percent value.
+ */
+ [property] short AdjustGreen;
+
+ //-------------------------------------------------------------------------
+ /** If this property is set, the blue channel of this graphic shape is
+ adjusted by the given signed percent value.
+ */
+ [property] short AdjustBlue;
+
+ //-------------------------------------------------------------------------
+ /** If this property is set, the gama value of this graphic shape is
+ adjusted by the given value.
+ */
+ [property] double Gamma;
+
+ //-------------------------------------------------------------------------
+ /** If this property is set, the transparency value of this graphic shape is
+ adjusted by the given unsigned percent value.
+ 100% is fully transparent, 0 % is fully opaque.
+ */
+ [property] short Transparency;
+
+ //-------------------------------------------------------------------------
+ /** This property selects the color mode that is used for rendering.
+ */
+ [property] ColorMode GraphicColorMode;
};
//=============================================================================
}; }; }; };
-/*=============================================================================
-
- $Log: not supported by cvs2svn $
- Revision 1.3 2000/11/08 12:42:41 mi
- moved from api
-
- Revision 1.1.1.1 2000/09/18 23:35:13 hjs
- initial import
-
- Revision 1.3 2000/09/11 11:52:20 mi
- documentation merged from XML
-
- Revision 1.1.1.1 1999/11/11 09:48:42 jsc
- new
-
-
-=============================================================================*/
#endif
diff --git a/offapi/com/sun/star/drawing/GroupShape.idl b/offapi/com/sun/star/drawing/GroupShape.idl
index ac92d7d1ed65..6bf5520d0bcd 100644
--- a/offapi/com/sun/star/drawing/GroupShape.idl
+++ b/offapi/com/sun/star/drawing/GroupShape.idl
@@ -2,9 +2,9 @@
*
* $RCSfile: GroupShape.idl,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: cl $ $Date: 2001-01-16 20:21:55 $
+ * last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -80,9 +80,9 @@
//=============================================================================
-/** This service is for a group of <type>Shape</type>s.@see XShapeGroup
+/** This service is for a group of <type>Shape</type>s.
+ @see XShapeGroup
@see XShapes
- @see AreaShape
*/
service GroupShape
{
@@ -109,6 +109,9 @@ service GroupShape
/*=============================================================================
$Log: not supported by cvs2svn $
+ Revision 1.6 2001/01/16 20:21:55 cl
+ #80654# fixed some false service connections
+
Revision 1.5 2001/01/16 20:13:39 cl
#80654# fixed some false service connections
diff --git a/offapi/com/sun/star/drawing/LineProperties.idl b/offapi/com/sun/star/drawing/LineProperties.idl
new file mode 100644
index 000000000000..eee4ce6333fb
--- /dev/null
+++ b/offapi/com/sun/star/drawing/LineProperties.idl
@@ -0,0 +1,177 @@
+/*************************************************************************
+ *
+ * $RCSfile: LineProperties.idl,v $
+ *
+ * $Revision: 1.1 $
+ *
+ * last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
+ *
+ * The Contents of this file are made available subject to the terms of
+ * either of the following licenses
+ *
+ * - GNU Lesser General Public License Version 2.1
+ * - Sun Industry Standards Source License Version 1.1
+ *
+ * Sun Microsystems Inc., October, 2000
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2000 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ *
+ * Sun Industry Standards Source License Version 1.1
+ * =================================================
+ * The contents of this file are subject to the Sun Industry Standards
+ * Source License Version 1.1 (the "License"); You may not use this file
+ * except in compliance with the License. You may obtain a copy of the
+ * License at http://www.openoffice.org/license.html.
+ *
+ * Software provided under this License is provided on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ * See the License for the specific provisions governing your rights and
+ * obligations concerning the Software.
+ *
+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ * Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ * All Rights Reserved.
+ *
+ * Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_drawing_LineProperties_idl__
+#define __com_sun_star_drawing_LineProperties_idl__
+
+#ifndef __com_sun_star_drawing_LineStyle_idl__
+#include <com/sun/star/drawing/LineStyle.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_LineDash_idl__
+#include <com/sun/star/drawing/LineDash.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__
+#include <com/sun/star/drawing/PolyPolygonBezierCoords.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_LineJoint_idl__
+#include <com/sun/star/drawing/LineJoint.idl>
+#endif
+
+
+//=============================================================================
+
+ module com { module sun { module star { module drawing {
+
+//=============================================================================
+
+/** This is a set of properties to describe the style for rendering a Line.
+ <p>The properties for line ends and line starts are only supported by
+ shapes with open line ends.
+ */
+service LineProperties
+{
+ /** This property contains the type of the line.
+ */
+ [property] com::sun::star::drawing::LineStyle LineStyle;
+
+ //-------------------------------------------------------------------------
+
+ /** This property contains the dash of the line.
+ */
+ [property] com::sun::star::drawing::LineDash LineDash;
+
+ //-------------------------------------------------------------------------
+
+ /** This property contains the line color.
+ */
+ [property] long LineColor;
+
+ //-------------------------------------------------------------------------
+
+ /** This property contains the extent of transparency.
+ */
+ [property] short LineTransparence;
+
+ //-------------------------------------------------------------------------
+
+ /** This property contains the width of the line in 1/100th mm.
+ */
+ [property] long LineWidth;
+
+ //-------------------------------------------------------------------------
+
+ /** This property defines the rendering of joints between thick lines
+ */
+ [property] com::sun::star::drawing::LineJoint LineJoint;
+
+ //-------------------------------------------------------------------------
+
+ /** This property contains the name of the line starts poly polygon bezier.
+ <p>If this string is empty, no line end polygon is rendered.
+ */
+ [optional, property] string LineStartName;
+
+ //-------------------------------------------------------------------------
+
+ /** This property contains the line start in the form of a poly polygon bezier.
+ */
+ [optional, property] com::sun::star::drawing::PolyPolygonBezierCoords LineStart;
+
+ //-------------------------------------------------------------------------
+
+ /** This property contains the line end in the form of a poly polygon bezier.
+ */
+ [optional, property] com::sun::star::drawing::PolyPolygonBezierCoords LineEnd;
+
+ //-------------------------------------------------------------------------
+
+ /** If this property is <TRUE/>, the line will
+ start from the center of the polygon.
+ */
+ [optional, property] boolean LineStartCenter;
+
+ //-------------------------------------------------------------------------
+
+ /** This property contains the width of the line start polygon.
+ */
+ [optional, property] long LineStartWidth;
+
+ //-------------------------------------------------------------------------
+
+ /** If this property is <TRUE/>, the line will end
+ in the center of the polygon.
+ */
+ [optional, property] boolean LineEndCenter;
+
+ //-------------------------------------------------------------------------
+
+ /** This property contains the width of the line end polygon.
+ */
+ [optional, property] long LineEndWidth;
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/drawing/LineShape.idl b/offapi/com/sun/star/drawing/LineShape.idl
index 9b400835d78d..8ac3c19c25d6 100644
--- a/offapi/com/sun/star/drawing/LineShape.idl
+++ b/offapi/com/sun/star/drawing/LineShape.idl
@@ -2,9 +2,9 @@
*
* $RCSfile: LineShape.idl,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ * last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -65,8 +65,8 @@
#include <com/sun/star/drawing/Shape.idl>
#endif
-#ifndef __com_sun_star_drawing_LineShapeDescriptor_idl__
-#include <com/sun/star/drawing/LineShapeDescriptor.idl>
+#ifndef __com_sun_star_drawing_LineProperties_idl__
+#include <com/sun/star/drawing/LineProperties.idl>
#endif
#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__
@@ -77,62 +77,39 @@
#include <com/sun/star/drawing/Text.idl>
#endif
-#ifndef __com_sun_star_drawing_ShadowDescriptor_idl__
-#include <com/sun/star/drawing/ShadowDescriptor.idl>
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__
+#include <com/sun/star/drawing/ShadowProperties.idl>
#endif
#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
#endif
-
//=============================================================================
module com { module sun { module star { module drawing {
//=============================================================================
-// DocMerge from xml: service com::sun::star::drawing::LineShape
/** This service is for a simple <type>Shape</type> with lines.
*/
service LineShape
{
- // DocMerge: empty anyway
service com::sun::star::drawing::Shape;
- // DocMerge: empty anyway
- service com::sun::star::drawing::LineShapeDescriptor;
+ service com::sun::star::drawing::LineProperties;
- // DocMerge: empty anyway
service com::sun::star::drawing::PolyPolygonDescriptor;
- // DocMerge: empty anyway
service com::sun::star::drawing::Text;
- // DocMerge: empty anyway
- service com::sun::star::drawing::ShadowDescriptor;
+ service com::sun::star::drawing::ShadowProperties;
- // DocMerge: empty anyway
service com::sun::star::drawing::RotationDescriptor;
-
};
//=============================================================================
}; }; }; };
-/*=============================================================================
-
- $Log: not supported by cvs2svn $
- Revision 1.1.1.1 2000/09/18 23:35:13 hjs
- initial import
-
- Revision 1.3 2000/09/11 11:52:20 mi
- documentation merged from XML
-
- Revision 1.1.1.1 1999/11/11 09:48:42 jsc
- new
-
-
-=============================================================================*/
#endif
diff --git a/offapi/com/sun/star/drawing/MeasureProperties.idl b/offapi/com/sun/star/drawing/MeasureProperties.idl
new file mode 100644
index 000000000000..14e455269da7
--- /dev/null
+++ b/offapi/com/sun/star/drawing/MeasureProperties.idl
@@ -0,0 +1,179 @@
+/*************************************************************************
+ *
+ * $RCSfile: MeasureProperties.idl,v $
+ *
+ * $Revision: 1.1 $
+ *
+ * last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
+ *
+ * The Contents of this file are made available subject to the terms of
+ * either of the following licenses
+ *
+ * - GNU Lesser General Public License Version 2.1
+ * - Sun Industry Standards Source License Version 1.1
+ *
+ * Sun Microsystems Inc., October, 2000
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2000 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ *
+ * Sun Industry Standards Source License Version 1.1
+ * =================================================
+ * The contents of this file are subject to the Sun Industry Standards
+ * Source License Version 1.1 (the "License"); You may not use this file
+ * except in compliance with the License. You may obtain a copy of the
+ * License at http://www.openoffice.org/license.html.
+ *
+ * Software provided under this License is provided on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ * See the License for the specific provisions governing your rights and
+ * obligations concerning the Software.
+ *
+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ * Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ * All Rights Reserved.
+ *
+ * Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_drawing_MeasureProperties_idl__
+#define __com_sun_star_drawing_MeasureProperties_idl__
+
+#ifndef __com_sun_star_drawing_MeasureKind_idl__
+#include <com/sun/star/drawing/MeasureKind.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_MeasureTextHorzPos_idl__
+#include <com/sun/star/drawing/MeasureTextHorzPos.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_MeasureTextVertPos_idl__
+#include <com/sun/star/drawing/MeasureTextVertPos.idl>
+#endif
+
+
+//=============================================================================
+
+ module com { module sun { module star { module drawing {
+
+//=============================================================================
+
+/** This service describes a <type>MeasureShape</type>.
+ */
+service MeasureProperties
+{
+ //-------------------------------------------------------------------------
+ /** If this property is <TRUE/>, the measure is drawn below the
+ reference edge instead of above it.
+ */
+ [property] boolean MeasureBelowReferenceEdge;
+
+ //-------------------------------------------------------------------------
+ /** This is the length of the first help line.
+ */
+ [property] long MeasureHelpLine1Length;
+
+ //-------------------------------------------------------------------------
+ /** This is the length of the second help line.
+ */
+ [property] long MeasureHelpLine2Length;
+
+ //-------------------------------------------------------------------------
+ /** This is the distance from the measure line to the start of the
+ help lines.
+ */
+ [property] long MeasureHelpLineDistance;
+
+ //-------------------------------------------------------------------------
+ /** This is the overhang of the two help lines.
+ */
+ [property] long MeasureHelpLineOverhang;
+
+ //-------------------------------------------------------------------------
+ /** This enumeration specifies the <type>MeasureKind</type>.
+ */
+ [property] com::sun::star::drawing::MeasureKind MeasureKind;
+
+ //-------------------------------------------------------------------------
+ /** This is the distance from the reference edge to the measure line.
+ */
+ [property] long MeasureLineDistance;
+
+ //-------------------------------------------------------------------------
+ /** This is the overhang of the reference line over the help lines.
+ */
+ [property] long MeasureOverhang;
+
+ //-------------------------------------------------------------------------
+ /** If this is <TRUE/>, the unit of measure is shown in the measure text.
+ */
+ [property] boolean MeasureShowUnit;
+
+ //-------------------------------------------------------------------------
+ /** If this is <TRUE/>, the angle of the measure is set automatically.
+ */
+ [property] boolean MeasureTextAutoAngle;
+
+ //-------------------------------------------------------------------------
+ /** This is the automatic angle.
+ */
+ [property] long MeasureTextAutoAngleView;
+
+ //-------------------------------------------------------------------------
+ /** This is the fixed angle.
+ */
+ [property] long MeasureTextFixedAngle;
+
+ //-------------------------------------------------------------------------
+ /** This is the horizontal position of the measure text.
+ */
+ [property] com::sun::star::drawing::MeasureTextHorzPos MeasureTextHorizontalPosition;
+
+ //-------------------------------------------------------------------------
+ /** This is the vertical position of the text.
+ */
+ [property] com::sun::star::drawing::MeasureTextVertPos MeasureTextVerticalPosition;
+
+ //-------------------------------------------------------------------------
+ /** If this value is <TRUE/>, the measure has a fixed angle.
+ */
+ [property] boolean MeasureTextIsFixedAngle;
+
+ //-------------------------------------------------------------------------
+ /** If this value is <TRUE/>, the text is rotated 90 degrees.
+ */
+ [property] boolean MeasureTextRotate90;
+
+ //-------------------------------------------------------------------------
+ /** If this value is <TRUE/>, the text is printed upside down.
+ */
+ [property] boolean MeasureTextUpsideDown;
+ };
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/drawing/MeasureShape.idl b/offapi/com/sun/star/drawing/MeasureShape.idl
new file mode 100644
index 000000000000..c821b516cfea
--- /dev/null
+++ b/offapi/com/sun/star/drawing/MeasureShape.idl
@@ -0,0 +1,127 @@
+/*************************************************************************
+ *
+ * $RCSfile: MeasureShape.idl,v $
+ *
+ * $Revision: 1.1 $
+ *
+ * last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
+ *
+ * The Contents of this file are made available subject to the terms of
+ * either of the following licenses
+ *
+ * - GNU Lesser General Public License Version 2.1
+ * - Sun Industry Standards Source License Version 1.1
+ *
+ * Sun Microsystems Inc., October, 2000
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2000 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ *
+ * Sun Industry Standards Source License Version 1.1
+ * =================================================
+ * The contents of this file are subject to the Sun Industry Standards
+ * Source License Version 1.1 (the "License"); You may not use this file
+ * except in compliance with the License. You may obtain a copy of the
+ * License at http://www.openoffice.org/license.html.
+ *
+ * Software provided under this License is provided on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ * See the License for the specific provisions governing your rights and
+ * obligations concerning the Software.
+ *
+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ * Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ * All Rights Reserved.
+ *
+ * Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_drawing_MeasureShape_idl__
+#define __com_sun_star_drawing_MeasureShape_idl__
+
+#ifndef __com_sun_star_drawing_Shape_idl__
+#include <com/sun/star/drawing/Shape.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_MeasureProperties_idl__
+#include <com/sun/star/drawing/MeasureProperties.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_Text_idl__
+#include <com/sun/star/drawing/Text.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__
+#include <com/sun/star/drawing/ShadowProperties.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_LineProperties_idl__
+#include <com/sun/star/drawing/LineProperties.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
+#include <com/sun/star/drawing/RotationDescriptor.idl>
+#endif
+
+#ifndef __com_sun_star_awt_Point_idl__
+#include <com/sun/star/awt/Point.idl>
+#endif
+
+//=============================================================================
+
+ module com { module sun { module star { module drawing {
+
+//=============================================================================
+
+/** This service is for a dimensioning shape.
+ */
+service MeasureShape
+{
+ service com::sun::star::drawing::Shape;
+
+ service com::sun::star::drawing::MeasureProperties;
+
+ service com::sun::star::drawing::LineProperties;
+
+ service com::sun::star::drawing::Text;
+
+ service com::sun::star::drawing::ShadowProperties;
+
+ service com::sun::star::drawing::RotationDescriptor;
+
+ /** this point is the start of the measured distance */
+ [property] com::sun::star::awt::Point StartPosition;
+
+ //-------------------------------------------------------------------------
+
+ /** this point is the end of the measured distance */
+ [property] com::sun::star::awt::Point EndPosition;
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/drawing/OLE2Shape.idl b/offapi/com/sun/star/drawing/OLE2Shape.idl
index 4e21a45142c8..c33a719463ec 100644
--- a/offapi/com/sun/star/drawing/OLE2Shape.idl
+++ b/offapi/com/sun/star/drawing/OLE2Shape.idl
@@ -2,9 +2,9 @@
*
* $RCSfile: OLE2Shape.idl,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: mi $ $Date: 2000-12-19 14:58:59 $
+ * last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -65,15 +65,14 @@
#include <com/sun/star/drawing/XShapeDescriptor.idl>
#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
-#include <com/sun/star/drawing/XShape.idl>
+#ifndef __com_sun_star_drawing_Shape_idl__
+#include <com/sun/star/drawing/Shape.idl>
#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
+#ifndef __com_sun_star_frame_XModel_idl__
+#include <com/sun/star/frame/XModel.idl>
#endif
-
//=============================================================================
module com { module sun { module star { module drawing {
@@ -83,26 +82,28 @@ module com { module sun { module star { module drawing {
*/
service OLE2Shape
{
- /** The <type>XShapeDescriptor</type> tells you what kind of
- <type>Shape</type> this instance is.
- */
- interface com::sun::star::drawing::XShapeDescriptor;
+ service com::sun::star::drawing::Shape;
- /** This gives you the size and position of this <type>Shape</type> and
- lets you change it. You can use <member>getShapeType</member> to
- determine what kind of <type>Shape</type> this is.
- */
- interface com::sun::star::drawing::XShape;
-
- /** This lets a <type>Shape</type> act as a standard component.
- */
- interface com::sun::star::lang::XComponent;
+ //-------------------------------------------------------------------------
/** If you get this property you get the CLSID of the OLE2 document stream
contained in this OLE2 shape. If you set it, an empty OLE2 document stream
with this CLSID is created within this OLE2 shape.
*/
[property] string CLSID;
+
+ //-------------------------------------------------------------------------
+
+ /** This is the model for the ole2 inside this shape.
+ <p>This property returns an empty reference if the ole2 is not
+ Office component.
+ */
+ [readonly, property] com::sun::star::frame::XModel Model;
+
+ /** This property returns <TRUE/> for all ole2 that are internal
+ Office components.
+ */
+ [readonly, property] boolean IsInternal;
};
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/OpenBezierShape.idl b/offapi/com/sun/star/drawing/OpenBezierShape.idl
index c01807bc936e..2ebf4bc60cf3 100644
--- a/offapi/com/sun/star/drawing/OpenBezierShape.idl
+++ b/offapi/com/sun/star/drawing/OpenBezierShape.idl
@@ -2,9 +2,9 @@
*
* $RCSfile: OpenBezierShape.idl,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ * last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,12 +61,12 @@
#ifndef __com_sun_star_drawing_OpenBezierShape_idl__
#define __com_sun_star_drawing_OpenBezierShape_idl__
-#ifndef __com_sun_star_drawing_LineShapeDescriptor_idl__
-#include <com/sun/star/drawing/LineShapeDescriptor.idl>
+#ifndef __com_sun_star_drawing_Shape_idl__
+#include <com/sun/star/drawing/Shape.idl>
#endif
-#ifndef __com_sun_star_drawing_LineShape_idl__
-#include <com/sun/star/drawing/LineShape.idl>
+#ifndef __com_sun_star_drawing_LineProperties_idl__
+#include <com/sun/star/drawing/LineProperties.idl>
#endif
#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__
@@ -77,8 +77,8 @@
#include <com/sun/star/drawing/Text.idl>
#endif
-#ifndef __com_sun_star_drawing_ShadowDescriptor_idl__
-#include <com/sun/star/drawing/ShadowDescriptor.idl>
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__
+#include <com/sun/star/drawing/ShadowProperties.idl>
#endif
#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
@@ -92,27 +92,20 @@
//=============================================================================
-// DocMerge from xml: service com::sun::star::drawing::OpenBezierShape
/** This service is for an open bezier shape.
*/
service OpenBezierShape
{
- // DocMerge: empty anyway
- service com::sun::star::drawing::LineShapeDescriptor;
+ service com::sun::star::drawing::Shape;
- // DocMerge: empty anyway
- service com::sun::star::drawing::LineShape;
+ service com::sun::star::drawing::LineProperties;
- // DocMerge: empty anyway
service com::sun::star::drawing::PolyPolygonBezierDescriptor;
- // DocMerge: empty anyway
service com::sun::star::drawing::Text;
- // DocMerge: empty anyway
- service com::sun::star::drawing::ShadowDescriptor;
+ service com::sun::star::drawing::ShadowProperties;
- // DocMerge: empty anyway
service com::sun::star::drawing::RotationDescriptor;
};
@@ -121,18 +114,4 @@ service OpenBezierShape
}; }; }; };
-/*=============================================================================
-
- $Log: not supported by cvs2svn $
- Revision 1.1.1.1 2000/09/18 23:35:13 hjs
- initial import
-
- Revision 1.3 2000/09/11 11:52:21 mi
- documentation merged from XML
-
- Revision 1.1.1.1 1999/11/11 09:48:42 jsc
- new
-
-
-=============================================================================*/
#endif
diff --git a/offapi/com/sun/star/drawing/PolyLineShape.idl b/offapi/com/sun/star/drawing/PolyLineShape.idl
index 696c25e1dcfb..298ecd6eb8e4 100644
--- a/offapi/com/sun/star/drawing/PolyLineShape.idl
+++ b/offapi/com/sun/star/drawing/PolyLineShape.idl
@@ -2,9 +2,9 @@
*
* $RCSfile: PolyLineShape.idl,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ * last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,12 +61,12 @@
#ifndef __com_sun_star_drawing_PolyLineShape_idl__
#define __com_sun_star_drawing_PolyLineShape_idl__
-#ifndef __com_sun_star_drawing_LineShapeDescriptor_idl__
-#include <com/sun/star/drawing/LineShapeDescriptor.idl>
+#ifndef __com_sun_star_drawing_Shape_idl__
+#include <com/sun/star/drawing/Shape.idl>
#endif
-#ifndef __com_sun_star_drawing_LineShape_idl__
-#include <com/sun/star/drawing/LineShape.idl>
+#ifndef __com_sun_star_drawing_LineProperties_idl__
+#include <com/sun/star/drawing/LineProperties.idl>
#endif
#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__
@@ -77,8 +77,8 @@
#include <com/sun/star/drawing/Text.idl>
#endif
-#ifndef __com_sun_star_drawing_ShadowDescriptor_idl__
-#include <com/sun/star/drawing/ShadowDescriptor.idl>
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__
+#include <com/sun/star/drawing/ShadowProperties.idl>
#endif
#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
@@ -92,51 +92,26 @@
//=============================================================================
-// DocMerge from xml: service com::sun::star::drawing::PolyLineShape
/** This service is for a polyline shape.
-
-
-
<p>A polyline has one or more straight lines.</p>
*/
service PolyLineShape
{
- // DocMerge: empty anyway
- service com::sun::star::drawing::LineShapeDescriptor;
+ service com::sun::star::drawing::Shape;
- // DocMerge: empty anyway
- service com::sun::star::drawing::LineShape;
+ service com::sun::star::drawing::LineProperties;
- // DocMerge: empty anyway
service com::sun::star::drawing::PolyPolygonDescriptor;
- // DocMerge: empty anyway
service com::sun::star::drawing::Text;
- // DocMerge: empty anyway
- service com::sun::star::drawing::ShadowDescriptor;
+ service com::sun::star::drawing::ShadowProperties;
- // DocMerge: empty anyway
service com::sun::star::drawing::RotationDescriptor;
-
};
//=============================================================================
}; }; }; };
-/*=============================================================================
-
- $Log: not supported by cvs2svn $
- Revision 1.1.1.1 2000/09/18 23:35:14 hjs
- initial import
-
- Revision 1.3 2000/09/11 11:52:21 mi
- documentation merged from XML
-
- Revision 1.1.1.1 1999/11/11 09:48:42 jsc
- new
-
-
-=============================================================================*/
#endif
diff --git a/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl b/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl
index 91796c09727f..a39c691fdbfc 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl
@@ -2,9 +2,9 @@
*
* $RCSfile: PolyPolygonBezierShape.idl,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: cl $ $Date: 2000-11-22 18:39:00 $
+ * last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,24 +61,28 @@
#ifndef __com_sun_star_drawing_PolyPolygonBezierShape_idl__
#define __com_sun_star_drawing_PolyPolygonBezierShape_idl__
-#ifndef __com_sun_star_drawing_AreaShape_idl__
-#include <com/sun/star/drawing/AreaShape.idl>
+#ifndef __com_sun_star_drawing_Shape_idl__
+#include <com/sun/star/drawing/Shape.idl>
#endif
-#ifndef __com_sun_star_drawing_LineShape_idl__
-#include <com/sun/star/drawing/LineShape.idl>
+#ifndef __com_sun_star_drawing_LineProperties_idl__
+#include <com/sun/star/drawing/LineProperties.idl>
#endif
-#ifndef __com_sun_star_drawing_PolyPolygonBezierShapeDescriptor_idl__
-#include <com/sun/star/drawing/PolyPolygonBezierShapeDescriptor.idl>
+#ifndef __com_sun_star_drawing_FillProperties_idl__
+#include <com/sun/star/drawing/FillProperties.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__
+#include <com/sun/star/drawing/PolyPolygonBezierDescriptor.idl>
#endif
#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
#endif
-#ifndef __com_sun_star_drawing_ShadowDescriptor_idl__
-#include <com/sun/star/drawing/ShadowDescriptor.idl>
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__
+#include <com/sun/star/drawing/ShadowProperties.idl>
#endif
#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
@@ -97,45 +101,23 @@
*/
service PolyPolygonBezierShape
{
- // DocMerge: empty anyway
- service com::sun::star::drawing::AreaShape;
+ service com::sun::star::drawing::Shape;
+
+ service com::sun::star::drawing::LineProperties;
- // DocMerge: empty anyway
- service com::sun::star::drawing::LineShape;
+ service com::sun::star::drawing::FillProperties;
- // DocMerge: empty anyway
- service com::sun::star::drawing::PolyPolygonBezierShapeDescriptor;
+ service com::sun::star::drawing::PolyPolygonBezierDescriptor;
- // DocMerge: empty anyway
service com::sun::star::drawing::Text;
- // DocMerge: empty anyway
- service com::sun::star::drawing::ShadowDescriptor;
+ service com::sun::star::drawing::ShadowProperties;
- // DocMerge: empty anyway
service com::sun::star::drawing::RotationDescriptor;
-
};
//=============================================================================
}; }; }; };
-/*=============================================================================
-
- $Log: not supported by cvs2svn $
- Revision 1.3 2000/11/08 12:42:42 mi
- moved from api
-
- Revision 1.1.1.1 2000/09/18 23:35:14 hjs
- initial import
-
- Revision 1.3 2000/09/11 11:52:21 mi
- documentation merged from XML
-
- Revision 1.1.1.1 1999/11/11 09:48:42 jsc
- new
-
-
-=============================================================================*/
#endif
diff --git a/offapi/com/sun/star/drawing/PolyPolygonShape.idl b/offapi/com/sun/star/drawing/PolyPolygonShape.idl
index e3de10ee6a31..6418a997af5d 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonShape.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonShape.idl
@@ -2,9 +2,9 @@
*
* $RCSfile: PolyPolygonShape.idl,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ * last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,24 +61,28 @@
#ifndef __com_sun_star_drawing_PolyPolygonShape_idl__
#define __com_sun_star_drawing_PolyPolygonShape_idl__
-#ifndef __com_sun_star_drawing_LineShape_idl__
-#include <com/sun/star/drawing/LineShape.idl>
+#ifndef __com_sun_star_drawing_Shape_idl__
+#include <com/sun/star/drawing/Shape.idl>
#endif
-#ifndef __com_sun_star_drawing_AreaShape_idl__
-#include <com/sun/star/drawing/AreaShape.idl>
+#ifndef __com_sun_star_drawing_LineProperties_idl__
+#include <com/sun/star/drawing/LineProperties.idl>
#endif
-#ifndef __com_sun_star_drawing_PolyPolygonShapeDescriptor_idl__
-#include <com/sun/star/drawing/PolyPolygonShapeDescriptor.idl>
+#ifndef __com_sun_star_drawing_FillProperties_idl__
+#include <com/sun/star/drawing/FillProperties.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__
+#include <com/sun/star/drawing/PolyPolygonDescriptor.idl>
#endif
#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
#endif
-#ifndef __com_sun_star_drawing_ShadowDescriptor_idl__
-#include <com/sun/star/drawing/ShadowDescriptor.idl>
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__
+#include <com/sun/star/drawing/ShadowProperties.idl>
#endif
#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
@@ -92,32 +96,24 @@
//=============================================================================
-// DocMerge from xml: service com::sun::star::drawing::PolyPolygonShape
/** This service is for a polygon shape.
-
-
-
<p>A polypolygon has 2 or more straight lines, with the first and
last point connected by a straight line.</p>
*/
service PolyPolygonShape
{
- // DocMerge: empty anyway
- service com::sun::star::drawing::LineShape;
+ service com::sun::star::drawing::Shape;
+
+ service com::sun::star::drawing::LineProperties;
- // DocMerge: empty anyway
- service com::sun::star::drawing::AreaShape;
+ service com::sun::star::drawing::FillProperties;
- // DocMerge: empty anyway
- service com::sun::star::drawing::PolyPolygonShapeDescriptor;
+ service com::sun::star::drawing::PolyPolygonDescriptor;
- // DocMerge: empty anyway
service com::sun::star::drawing::Text;
- // DocMerge: empty anyway
- service com::sun::star::drawing::ShadowDescriptor;
+ service com::sun::star::drawing::ShadowProperties;
- // DocMerge: empty anyway
service com::sun::star::drawing::RotationDescriptor;
};
@@ -126,18 +122,4 @@ service PolyPolygonShape
}; }; }; };
-/*=============================================================================
-
- $Log: not supported by cvs2svn $
- Revision 1.1.1.1 2000/09/18 23:35:14 hjs
- initial import
-
- Revision 1.3 2000/09/11 11:52:22 mi
- documentation merged from XML
-
- Revision 1.1.1.1 1999/11/11 09:48:42 jsc
- new
-
-
-=============================================================================*/
#endif
diff --git a/offapi/com/sun/star/drawing/RectangleShape.idl b/offapi/com/sun/star/drawing/RectangleShape.idl
index 7a519dae16e9..5bb7dc60d05d 100644
--- a/offapi/com/sun/star/drawing/RectangleShape.idl
+++ b/offapi/com/sun/star/drawing/RectangleShape.idl
@@ -2,9 +2,9 @@
*
* $RCSfile: RectangleShape.idl,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ * last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,20 +61,24 @@
#ifndef __com_sun_star_drawing_RectangleShape_idl__
#define __com_sun_star_drawing_RectangleShape_idl__
-#ifndef __com_sun_star_drawing_RectangleShapeDescriptor_idl__
-#include <com/sun/star/drawing/RectangleShapeDescriptor.idl>
+#ifndef __com_sun_star_drawing_Shape_idl__
+#include <com/sun/star/drawing/Shape.idl>
#endif
-#ifndef __com_sun_star_drawing_AreaShape_idl__
-#include <com/sun/star/drawing/AreaShape.idl>
+#ifndef __com_sun_star_drawing_FillProperties_idl__
+#include <com/sun/star/drawing/FillProperties.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_LineProperties_idl__
+#include <com/sun/star/drawing/LineProperties.idl>
#endif
#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
#endif
-#ifndef __com_sun_star_drawing_ShadowDescriptor_idl__
-#include <com/sun/star/drawing/ShadowDescriptor.idl>
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__
+#include <com/sun/star/drawing/ShadowProperties.idl>
#endif
#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
@@ -88,44 +92,32 @@
//=============================================================================
-// DocMerge from xml: service com::sun::star::drawing::RectangleShape
/** This service is for a rectangle <type>Shape</type>.
*/
service RectangleShape
{
- // DocMerge: empty anyway
- service com::sun::star::drawing::RectangleShapeDescriptor;
+ service com::sun::star::drawing::Shape;
+
+ service com::sun::star::drawing::FillProperties;
- // DocMerge: empty anyway
- service com::sun::star::drawing::AreaShape;
+ service com::sun::star::drawing::LineProperties;
- // DocMerge: empty anyway
service com::sun::star::drawing::Text;
- // DocMerge: empty anyway
- service com::sun::star::drawing::ShadowDescriptor;
+ service com::sun::star::drawing::ShadowProperties;
- // DocMerge: empty anyway
service com::sun::star::drawing::RotationDescriptor;
-};
+ //-------------------------------------------------------------------------
+
+ /** For <type>Shape</type>s with rounded corners, this is the radius
+ of the corners.
+ */
+ [property] long CornerRadius;
+ };
//=============================================================================
}; }; }; };
-/*=============================================================================
-
- $Log: not supported by cvs2svn $
- Revision 1.1.1.1 2000/09/18 23:35:14 hjs
- initial import
-
- Revision 1.3 2000/09/11 11:52:22 mi
- documentation merged from XML
-
- Revision 1.1.1.1 1999/11/11 09:48:42 jsc
- new
-
-
-=============================================================================*/
#endif
diff --git a/offapi/com/sun/star/drawing/ShadowProperties.idl b/offapi/com/sun/star/drawing/ShadowProperties.idl
new file mode 100644
index 000000000000..efbf9d930dc3
--- /dev/null
+++ b/offapi/com/sun/star/drawing/ShadowProperties.idl
@@ -0,0 +1,115 @@
+/*************************************************************************
+ *
+ * $RCSfile: ShadowProperties.idl,v $
+ *
+ * $Revision: 1.1 $
+ *
+ * last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
+ *
+ * The Contents of this file are made available subject to the terms of
+ * either of the following licenses
+ *
+ * - GNU Lesser General Public License Version 2.1
+ * - Sun Industry Standards Source License Version 1.1
+ *
+ * Sun Microsystems Inc., October, 2000
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2000 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ *
+ * Sun Industry Standards Source License Version 1.1
+ * =================================================
+ * The contents of this file are subject to the Sun Industry Standards
+ * Source License Version 1.1 (the "License"); You may not use this file
+ * except in compliance with the License. You may obtain a copy of the
+ * License at http://www.openoffice.org/license.html.
+ *
+ * Software provided under this License is provided on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ * See the License for the specific provisions governing your rights and
+ * obligations concerning the Software.
+ *
+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ * Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ * All Rights Reserved.
+ *
+ * Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__
+#define __com_sun_star_drawing_ShadowProperties_idl__
+
+
+//=============================================================================
+
+ module com { module sun { module star { module drawing {
+
+//=============================================================================
+
+/** This is a set of properties to describe the style for rendering a shadow.
+ */
+service ShadowProperties
+{
+ //-------------------------------------------------------------------------
+
+ /** enables/disables the shadow of a <type>Shape</type>.
+ <p>The other shadow properties are only applied if this is
+ set to <TRUE/>.</p>
+ */
+ [property] boolean Shadow;
+
+ //-------------------------------------------------------------------------
+
+ /** This is the color of the shadow of this <type>Shape</type>.
+ */
+ [property] long ShadowColor;
+
+ //-------------------------------------------------------------------------
+
+ /** This defines the degree of transparence of the shadow in percent.
+ */
+ [property] short ShadowTransparence;
+
+ //-------------------------------------------------------------------------
+
+ /** This is the horizontal distance of the left edge of the
+ <type>Shape</type> to the shadow.
+ */
+ [property] long ShadowXDistance;
+
+ //-------------------------------------------------------------------------
+
+ /** This is the vertical distance of the top edge of the
+ <type>Shape</type> to the shadow.
+ */
+ [property] long ShadowYDistance;
+
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/drawing/Shape.idl b/offapi/com/sun/star/drawing/Shape.idl
index 5b0e5c11dc49..39f9c6da33d6 100644
--- a/offapi/com/sun/star/drawing/Shape.idl
+++ b/offapi/com/sun/star/drawing/Shape.idl
@@ -2,9 +2,9 @@
*
* $RCSfile: Shape.idl,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: mi $ $Date: 2000-12-21 08:35:06 $
+ * last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -65,10 +65,6 @@
#include <com/sun/star/document/LinkTarget.idl>
#endif
-#ifndef __com_sun_star_drawing_ShapeDescriptor_idl__
-#include <com/sun/star/drawing/ShapeDescriptor.idl>
-#endif
-
#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
#endif
@@ -77,6 +73,13 @@
#include <com/sun/star/lang/XComponent.idl>
#endif
+#ifndef __com_sun_star_style_XStyle_idl__
+#include <com/sun/star/style/XStyle.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_HomogenMatrix3_idl__
+#include <com/sun/star/drawing/HomogenMatrix3.idl>
+#endif
//=============================================================================
@@ -84,7 +87,6 @@
//=============================================================================
-// DocMerge from xml: service com::sun::star::drawing::Shape
/** This abstract service specifies the general characteristics of all
<type>Shape</type>s.@see XShape
@see com::sun::star::lang::XComponent
@@ -93,67 +95,95 @@
*/
service Shape
{
+ //-------------------------------------------------------------------------
- // DocMerge from xml: service com::sun::star::drawing::Shape: service com::sun::star::drawing::ShapeDescriptor
- /** contains the basic properties and interfaces that describe a
- <type>Shape</type>.
+ /** handles all the properties of this instance.
*/
- service com::sun::star::drawing::ShapeDescriptor;
+ interface com::sun::star::beans::XPropertySet;
+ //-------------------------------------------------------------------------
- // DocMerge from xml: service com::sun::star::drawing::Shape: interface com::sun::star::drawing::XShape
/** This gives you the size and position of this <type>Shape</type>
and lets you change it. You can use <member>getShapeType</member>
to determine what kind of shape this is.
*/
interface com::sun::star::drawing::XShape;
+ //-------------------------------------------------------------------------
- // DocMerge from xml: service com::sun::star::drawing::Shape: interface com::sun::star::lang::XComponent
- /** is used for lifetime control of this
- <type>Shape</type>.
+ /** is used for lifetime control of this <type>Shape</type>.
*/
interface com::sun::star::lang::XComponent;
+ //-------------------------------------------------------------------------
+
+ /** The <type>XShapeDescriptor</type> tells you what kind of
+ <type>Shape</type> this instance is.
+ */
+ interface com::sun::star::drawing::XShapeDescriptor;
+
+ //-------------------------------------------------------------------------
+
/** is used to query or change the ZOrder of this <type>Shape</type>. */
[property] long ZOrder;
-};
+ //-------------------------------------------------------------------------
-//=============================================================================
+ /** This is the ID of the <type>Layer</type> to which this
+ <type>Shape</type> is attached.
+ */
+ [optional, readonly, property] short LayerID;
-}; }; }; };
+ //-------------------------------------------------------------------------
-/*=============================================================================
+ /** This is the name of the <type>Layer</type> to which this
+ <type>Shape</type> is attached.
+ */
+ [optional, readonly, property] string LayerName;
- $Log: not supported by cvs2svn $
- Revision 1.5 2000/12/19 16:03:29 mi
- documentations syntax errors fixed
+ //-------------------------------------------------------------------------
- Revision 1.4 2000/11/23 19:11:28 cl
- #80679# added ZOrder property for shapes
+ /** If this is <FALSE/>, the <type>Shape</type> is not visible
+ on printer outputs.
+ */
+ [optional, property] boolean Printable;
- Revision 1.3 2000/11/08 12:42:42 mi
- moved from api
+ //-------------------------------------------------------------------------
- Revision 1.2 2000/10/09 14:24:55 mi
- #78715# exchanged stardiv::... by com::sun::star::... (especially in @see tags)
+ /** With this set to <TRUE/>, this <type>Shape</type>
+ can not be moved interactively in the user interface.
+ */
+ [optional, property] boolean MoveProtect;
- Revision 1.1.1.1 2000/09/18 23:35:14 hjs
- initial import
+ //-------------------------------------------------------------------------
- Revision 1.5 2000/09/11 11:52:22 mi
- documentation merged from XML
+ /** This is the name of this <type>Shape</type>.
+ */
+ [optional, property] string Name;
- Revision 1.3 2000/08/17 12:22:07 cl
- #76816# removed LinkTarget
+ //-------------------------------------------------------------------------
- Revision 1.2 1999/11/18 11:49:56 mi
- XComponent now in module lang
+ /** With this set to <TRUE/>, this <type>Shape</type> may not be
+ sized interactively in the user interface.
+ */
+ [optional, property] boolean SizeProtect;
+
+ //-------------------------------------------------------------------------
+
+ /** this property lets you get and set a style for this shape.
+ */
+ [optional, property] com::sun::star::style::XStyle Style;
- Revision 1.1.1.1 1999/11/11 09:48:42 jsc
- new
+ //-------------------------------------------------------------------------
+ /** this property lets you get and set the transformation matrix
+ for this shape.
+ */
+ [optional, property] com::sun::star::drawing::HomogenMatrix3 Transformation;
+};
+
+//=============================================================================
+
+}; }; }; };
-=============================================================================*/
#endif
diff --git a/offapi/com/sun/star/drawing/Text.idl b/offapi/com/sun/star/drawing/Text.idl
index f0bc6433ac42..0adb3601c733 100644
--- a/offapi/com/sun/star/drawing/Text.idl
+++ b/offapi/com/sun/star/drawing/Text.idl
@@ -2,9 +2,9 @@
*
* $RCSfile: Text.idl,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: mi $ $Date: 2000-12-14 12:53:36 $
+ * last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,48 +61,12 @@
#ifndef __com_sun_star_drawing_Text_idl__
#define __com_sun_star_drawing_Text_idl__
-#ifndef __com_sun_star_text_XSimpleText_idl__
-#include <com/sun/star/text/XSimpleText.idl>
+#ifndef __com_sun_star_text_XText_idl__
+#include <com/sun/star/text/XText.idl>
#endif
-#ifndef __com_sun_star_style_CharacterProperties_idl__
-#include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
-#include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexReplace_idl__
-#include <com/sun/star/container/XIndexReplace.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_TextFitToSizeType_idl__
-#include <com/sun/star/drawing/TextFitToSizeType.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_TextAdjust_idl__
-#include <com/sun/star/drawing/TextAdjust.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_TextAnimationDirection_idl__
-#include <com/sun/star/drawing/TextAnimationDirection.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_TextAnimationKind_idl__
-#include <com/sun/star/drawing/TextAnimationKind.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_TextVerticalAdjust_idl__
-#include <com/sun/star/drawing/TextVerticalAdjust.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_TextHorizontalAdjust_idl__
-#include <com/sun/star/drawing/TextHorizontalAdjust.idl>
-#endif
-
-#ifndef __com_sun_star_text_WritingMode_idl__
-#include <com/sun/star/text/WritingMode.idl>
+#ifndef __com_sun_star_drawing_TextProperties_idl__
+#include <com/sun/star/drawing/TextProperties.idl>
#endif
//=============================================================================
@@ -111,270 +75,24 @@
//=============================================================================
-// DocMerge from xml: service com::sun::star::drawing::Text
/** This abstract service specifies the general characteristics of an optional
text inside a <type>Shape</type>.
*/
service Text
{
-
-
- // DocMerge from xml: service com::sun::star::drawing::Text: interface com::sun::star::text::XSimpleText
/** With this interface you can modify the text of this
<type>Shape<type>.
*/
- interface com::sun::star::text::XSimpleText;
-
-
- // DocMerge from xml: service com::sun::star::drawing::Text: service com::sun::star::style::CharacterProperties
- /** The properties in this service set default formats for text
- inside the <type>Shape</type>.
- */
- service com::sun::star::style::CharacterProperties;
-
-
- // DocMerge from xml: service com::sun::star::drawing::Text: service com::sun::star::style::ParagraphProperties
- /** The properties in this service set default formats for text
- inside the <type>Shape</type>.
- */
- service com::sun::star::style::ParagraphProperties;
-
- //-------------------------------------------------------------------------
-
- // DocMerge from xml: property com::sun::star::drawing::Text::IsNumbering
- /** If this is <TRUE/>, numbering is ON for the text of
- this <type>Shape</type>.
- */
- [property] boolean IsNumbering;
-
- //-------------------------------------------------------------------------
-
- // DocMerge from xml: property com::sun::star::drawing::Text::NumberingRules
- /** describes the numbering levels.
-
-
-
- <p>The different rules accessible with this
- <type scope="com::sun::star::container">XIndexReplace</type> interface
- are sequences of property values as described in the service
- <type scope="com::sun::star::style">NumberingRule</type>.</p>
- */
- [property] com::sun::star::container::XIndexReplace NumberingRules;
-
- //-------------------------------------------------------------------------
-
- // DocMerge from xml: property com::sun::star::drawing::Text::TextAutoGrowHeight
- /** If this value is <TRUE/>, the height of the <type>Shape</type> is
- automatically expanded/shrunk when text is added to or removed from
- the <type>Shape</type>.
- */
- [property] boolean TextAutoGrowHeight;
-
- //-------------------------------------------------------------------------
-
- // DocMerge from xml: property com::sun::star::drawing::Text::TextAutoGrowWidth
- /** If this value is <TRUE/>, the width of the <type>Shape</type> is
- automatically expanded/shrunk when text is added to or removed from
- the <type>Shape</type>.
- */
- [property] boolean TextAutoGrowWidth;
-
- //-------------------------------------------------------------------------
-
- // DocMerge from xml: property com::sun::star::drawing::Text::TextContourFrame
- /** If this value is <TRUE/>, the left edge of every line of text is
- aligned with the left edge of this <type>Shape</type>.
- */
- [property] boolean TextContourFrame;
-
- //-------------------------------------------------------------------------
-
- // DocMerge from xml: property com::sun::star::drawing::Text::TextFitToSize
- /** With this set to <TRUE/>, the text inside of the <type>Shape</type>
- is stretched to fit into the <type>Shape</type>.
- */
- [property] com::sun::star::drawing::TextFitToSizeType TextFitToSize;
-
- //-------------------------------------------------------------------------
-
- /** adjusts the horizontal position of the text inside of
- the <type>Shape</type>.
- */
- [property] com::sun::star::drawing::TextHorizontalAdjust HorizontalAdjust;
-
- //-------------------------------------------------------------------------
-
- /** adjusts the vertical position of the text inside of
- the <type>Shape</type>.
- */
- [property] com::sun::star::drawing::TextVerticalAdjust VerticalAdjust;
-
- //-------------------------------------------------------------------------
-
- /** This is the distance from the left edge of the <type>Shape</type>
- to the left edge of the text.
- <p>This is only useful if <member>Text::TextHorizontalAdjust</member> is
- <const>BLOCK</const> or <const>STRETCH</const> or if
- <member>Text::TextFitSize</member> is <TRUE/>.</p>
- */
- [property] long TextLeftDistance;
-
- //-------------------------------------------------------------------------
-
- /** This is the distance from the right edge of the <type>Shape</type>
- to the right edge of the text.
-
- <p>This is only useful if <member>Text::TextHorizontalAdjust</member> is
- <const>BLOCK</const> or <const>STRETCH</const>
- or if <member>Text::TextFitSize</member> is <TRUE/>.</p>
- */
- [property] long TextRightDistance;
-
- //-------------------------------------------------------------------------
+ interface com::sun::star::text::XText;
- /** This is the distance from the upper edge of the <type>Shape</type> to
- the upper edge of the text.
-
- <p>This is only useful if <member>Text::TextVerticalAdjust</member> is
- <const>BLOCK</const> or if <member>Text::TextFitSize</member> is
- <TRUE/>.</p>
+ /** The properties in this service describe the style for rendering
+ a shapes text area.
*/
- [property] long TextUpperDistance;
-
- //-------------------------------------------------------------------------
-
- // DocMerge from xml: property com::sun::star::drawing::Text::TextLowerDistance
- /** This is the distance from the lower edge of the <type>Shape</type> to the
- lower edge of the text.
-
-
-
- <p>This is only useful if <type>Text::TextVerticalAdjust</type> is
- <const>BLOCK</const> or if <member>Text::TextFitSize</member> is
- <TRUE/>.</p>
- */
- [property] long TextLowerDistance;
-
- //-------------------------------------------------------------------------
- // DOCUMENTATION OMITTED FOR Text::TextMaximumFrameHeight
-
- // DocMerge: empty anyway
- [property] long TextMaximumFrameHeight;
-
- //-------------------------------------------------------------------------
- // DOCUMENTATION OMITTED FOR Text::TextMaximumFrameWidth
-
- // DocMerge: empty anyway
- [property] long TextMaximumFrameWidth;
-
- //-------------------------------------------------------------------------
- // DOCUMENTATION OMITTED FOR Text::TextMinimalFrameHeight
-
- // DocMerge: empty anyway
- [property] long TextMinimumFrameHeight;
-
- //-------------------------------------------------------------------------
- // DOCUMENTATION OMITTED FOR Text::TextMinimumFrameWidth
-
- // DocMerge: empty anyway
- [property] long TextMinimumFrameWidth;
-
- //-------------------------------------------------------------------------
-
- // DocMerge from xml: property com::sun::star::drawing::Text::TextAnimationAmount
- /** This is the number of pixels the text is moved in each animation step.
- */
- [property] short TextAnimationAmount;
-
- //-------------------------------------------------------------------------
-
- // DocMerge from xml: property com::sun::star::drawing::Text::TextAnimationCount
- /** This number defines how many times the text animation is repeated.
-
-
-
- <p>If this is set to zero, the repeat is endless.</p>
- */
- [property] short TextAnimationCount;
-
- //-------------------------------------------------------------------------
-
- // DocMerge from xml: property com::sun::star::drawing::Text::TextAnimationDelay
- /** This is the delay in thousandths of a second between each
- of the animation steps.
- */
- [property] short TextAnimationDelay;
-
- //-------------------------------------------------------------------------
-
- // DocMerge from xml: property com::sun::star::drawing::Text::TextAnimationDirection
- /** This enumeration defines the direction in which the text moves.
- */
- [property] com::sun::star::drawing::TextAnimationDirection TextAnimationDirection;
-
- //-------------------------------------------------------------------------
-
- // DocMerge from xml: property com::sun::star::drawing::Text::TextAnimationKind
- /** This value defines the type of animation.
- */
- [property] com::sun::star::drawing::TextAnimationKind TextAnimationKind;
-
- //-------------------------------------------------------------------------
-
- // DocMerge from xml: property com::sun::star::drawing::Text::TextAnimationStartInside
- /** If this value is <TRUE/>, the text is visible at the start of the
- animation.
- */
- [property] boolean TextAnimationStartInside;
-
- //-------------------------------------------------------------------------
-
- // DocMerge from xml: property com::sun::star::drawing::Text::TextAnimationStopInside
- /** If this value is <TRUE/>, the text is visible at the end of the
- animation.
- */
- [property] boolean TextAnimationStopInside;
-
- /** If this value selects the writing mode for the text.
- */
- [property] ::com::sun::star::text::WritingMode TextWritingMode;
-
+ service com::sun::star::drawing::TextProperties;
};
//=============================================================================
}; }; }; };
-/*=============================================================================
-
- $Log: not supported by cvs2svn $
- Revision 1.5 2000/12/07 19:44:06 cl
- #80304# vertical writing added
-
- Revision 1.4 2000/11/15 16:57:04 cl
- #79743# replaced TextAdjust with TextHorizontalAdjust and TextVerticalAdjust
-
- Revision 1.3 2000/11/08 12:42:42 mi
- moved from api
-
- Revision 1.1.1.1 2000/09/18 23:35:15 hjs
- initial import
-
- Revision 1.6 2000/09/11 11:52:22 mi
- documentation merged from XML
-
- Revision 1.4 2000/07/17 10:24:46 cl
- chg: XSimpleText is now used instead of XText
-
- Revision 1.3 2000/03/27 10:55:43 cl
- #70728# fixed doku
-
- Revision 1.2 2000/02/07 11:24:30 mi
- zu #70728# missing documentation marked
-
- Revision 1.1.1.1 1999/11/11 09:48:42 jsc
- new
-
-
-=============================================================================*/
#endif
diff --git a/offapi/com/sun/star/drawing/TextProperties.idl b/offapi/com/sun/star/drawing/TextProperties.idl
new file mode 100644
index 000000000000..946d12178a69
--- /dev/null
+++ b/offapi/com/sun/star/drawing/TextProperties.idl
@@ -0,0 +1,306 @@
+/*************************************************************************
+ *
+ * $RCSfile: TextProperties.idl,v $
+ *
+ * $Revision: 1.1 $
+ *
+ * last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
+ *
+ * The Contents of this file are made available subject to the terms of
+ * either of the following licenses
+ *
+ * - GNU Lesser General Public License Version 2.1
+ * - Sun Industry Standards Source License Version 1.1
+ *
+ * Sun Microsystems Inc., October, 2000
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2000 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ *
+ * Sun Industry Standards Source License Version 1.1
+ * =================================================
+ * The contents of this file are subject to the Sun Industry Standards
+ * Source License Version 1.1 (the "License"); You may not use this file
+ * except in compliance with the License. You may obtain a copy of the
+ * License at http://www.openoffice.org/license.html.
+ *
+ * Software provided under this License is provided on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ * See the License for the specific provisions governing your rights and
+ * obligations concerning the Software.
+ *
+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ * Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ * All Rights Reserved.
+ *
+ * Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_drawing_TextProperties_idl__
+#define __com_sun_star_drawing_TextProperties_idl__
+
+#ifndef __com_sun_star_container_XIndexReplace_idl__
+#include <com/sun/star/container/XIndexReplace.idl>
+#endif
+
+#ifndef __com_sun_star_style_CharacterProperties_idl__
+#include <com/sun/star/style/CharacterProperties.idl>
+#endif
+
+#ifndef __com_sun_star_style_ParagraphProperties_idl__
+#include <com/sun/star/style/ParagraphProperties.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_TextFitToSizeType_idl__
+#include <com/sun/star/drawing/TextFitToSizeType.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_TextAdjust_idl__
+#include <com/sun/star/drawing/TextAdjust.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_TextAnimationDirection_idl__
+#include <com/sun/star/drawing/TextAnimationDirection.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_TextAnimationKind_idl__
+#include <com/sun/star/drawing/TextAnimationKind.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_TextVerticalAdjust_idl__
+#include <com/sun/star/drawing/TextVerticalAdjust.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_TextHorizontalAdjust_idl__
+#include <com/sun/star/drawing/TextHorizontalAdjust.idl>
+#endif
+
+#ifndef __com_sun_star_text_WritingMode_idl__
+#include <com/sun/star/text/WritingMode.idl>
+#endif
+
+//=============================================================================
+
+ module com { module sun { module star { module drawing {
+
+//=============================================================================
+
+
+/** This is a set of properties to describe the style for rendering a the
+ text area inside a shape.
+ */
+service TextProperties
+{
+ /** The properties in this service set default formats for text
+ inside the <type>Shape</type>.
+ */
+ service com::sun::star::style::CharacterProperties;
+
+ /** The properties in this service set default formats for text
+ inside the <type>Shape</type>.
+ */
+ service com::sun::star::style::ParagraphProperties;
+
+ //-------------------------------------------------------------------------
+
+ /** If this is <TRUE/>, numbering is ON for the text of
+ this <type>Shape</type>.
+ */
+ [optional, property] boolean IsNumbering;
+
+ //-------------------------------------------------------------------------
+
+ /** describes the numbering levels.
+ <p>The different rules accessible with this
+ <type scope="com::sun::star::container">XIndexReplace</type> interface
+ are sequences of property values as described in the service
+ <type scope="com::sun::star::style">NumberingRule</type>.</p>
+ */
+ [optional, property] com::sun::star::container::XIndexReplace NumberingRules;
+
+ //-------------------------------------------------------------------------
+
+ /** If this value is <TRUE/>, the height of the <type>Shape</type> is
+ automatically expanded/shrunk when text is added to or removed from
+ the <type>Shape</type>.
+ */
+ [property] boolean TextAutoGrowHeight;
+
+ //-------------------------------------------------------------------------
+
+ /** If this value is <TRUE/>, the width of the <type>Shape</type> is
+ automatically expanded/shrunk when text is added to or removed from
+ the <type>Shape</type>.
+ */
+ [property] boolean TextAutoGrowWidth;
+
+ //-------------------------------------------------------------------------
+
+ // DocMerge from xml: property com::sun::star::drawing::Text::TextContourFrame
+ /** If this value is <TRUE/>, the left edge of every line of text is
+ aligned with the left edge of this <type>Shape</type>.
+ */
+ [property] boolean TextContourFrame;
+
+ //-------------------------------------------------------------------------
+
+ /** With this set to <TRUE/>, the text inside of the <type>Shape</type>
+ is stretched to fit into the <type>Shape</type>.
+ */
+ [property] com::sun::star::drawing::TextFitToSizeType TextFitToSize;
+
+ //-------------------------------------------------------------------------
+
+ /** adjusts the horizontal position of the text inside of
+ the <type>Shape</type>.
+ */
+ [property] com::sun::star::drawing::TextHorizontalAdjust HorizontalAdjust;
+
+ //-------------------------------------------------------------------------
+
+ /** adjusts the vertical position of the text inside of
+ the <type>Shape</type>.
+ */
+ [property] com::sun::star::drawing::TextVerticalAdjust VerticalAdjust;
+
+ //-------------------------------------------------------------------------
+
+ /** This is the distance from the left edge of the <type>Shape</type>
+ to the left edge of the text.
+ <p>This is only useful if <member>Text::TextHorizontalAdjust</member> is
+ <const>BLOCK</const> or <const>STRETCH</const> or if
+ <member>Text::TextFitSize</member> is <TRUE/>.</p>
+ */
+ [property] long TextLeftDistance;
+
+ //-------------------------------------------------------------------------
+
+ /** This is the distance from the right edge of the <type>Shape</type>
+ to the right edge of the text.
+
+ <p>This is only useful if <member>Text::TextHorizontalAdjust</member> is
+ <const>BLOCK</const> or <const>STRETCH</const>
+ or if <member>Text::TextFitSize</member> is <TRUE/>.</p>
+ */
+ [property] long TextRightDistance;
+
+ //-------------------------------------------------------------------------
+
+ /** This is the distance from the upper edge of the <type>Shape</type> to
+ the upper edge of the text.
+
+ <p>This is only useful if <member>Text::TextVerticalAdjust</member> is
+ <const>BLOCK</const> or if <member>Text::TextFitSize</member> is
+ <TRUE/>.</p>
+ */
+ [property] long TextUpperDistance;
+
+ //-------------------------------------------------------------------------
+
+ /** This is the distance from the lower edge of the <type>Shape</type> to the
+ lower edge of the text.
+
+
+
+ <p>This is only useful if <type>Text::TextVerticalAdjust</type> is
+ <const>BLOCK</const> or if <member>Text::TextFitSize</member> is
+ <TRUE/>.</p>
+ */
+ [property] long TextLowerDistance;
+
+ //-------------------------------------------------------------------------
+ // DOCUMENTATION OMITTED FOR Text::TextMaximumFrameHeight
+ [property] long TextMaximumFrameHeight;
+
+ //-------------------------------------------------------------------------
+ // DOCUMENTATION OMITTED FOR Text::TextMaximumFrameWidth
+ [property] long TextMaximumFrameWidth;
+
+ //-------------------------------------------------------------------------
+ // DOCUMENTATION OMITTED FOR Text::TextMinimalFrameHeight
+ [property] long TextMinimumFrameHeight;
+
+ //-------------------------------------------------------------------------
+ // DOCUMENTATION OMITTED FOR Text::TextMinimumFrameWidth
+ [property] long TextMinimumFrameWidth;
+
+ //-------------------------------------------------------------------------
+
+ /** This is the number of pixels the text is moved in each animation step.
+ */
+ [property] short TextAnimationAmount;
+
+ //-------------------------------------------------------------------------
+
+ /** This number defines how many times the text animation is repeated.
+ <p>If this is set to zero, the repeat is endless.</p>
+ */
+ [property] short TextAnimationCount;
+
+ //-------------------------------------------------------------------------
+
+ /** This is the delay in thousandths of a second between each
+ of the animation steps.
+ */
+ [property] short TextAnimationDelay;
+
+ //-------------------------------------------------------------------------
+
+ /** This enumeration defines the direction in which the text moves.
+ */
+ [property] com::sun::star::drawing::TextAnimationDirection TextAnimationDirection;
+
+ //-------------------------------------------------------------------------
+
+ /** This value defines the type of animation.
+ */
+ [property] com::sun::star::drawing::TextAnimationKind TextAnimationKind;
+
+ //-------------------------------------------------------------------------
+
+ /** If this value is <TRUE/>, the text is visible at the start of the
+ animation.
+ */
+ [property] boolean TextAnimationStartInside;
+
+ //-------------------------------------------------------------------------
+
+ /** If this value is <TRUE/>, the text is visible at the end of the
+ animation.
+ */
+ [property] boolean TextAnimationStopInside;
+
+ //-------------------------------------------------------------------------
+
+ /** If this value selects the writing mode for the text.
+ */
+ [property] ::com::sun::star::text::WritingMode TextWritingMode;
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/drawing/TextShape.idl b/offapi/com/sun/star/drawing/TextShape.idl
index c55fea53da5f..c34fe5863b09 100644
--- a/offapi/com/sun/star/drawing/TextShape.idl
+++ b/offapi/com/sun/star/drawing/TextShape.idl
@@ -2,9 +2,9 @@
*
* $RCSfile: TextShape.idl,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ * last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,10 +61,6 @@
#ifndef __com_sun_star_drawing_TextShape_idl__
#define __com_sun_star_drawing_TextShape_idl__
-#ifndef __com_sun_star_drawing_TextShapeDescriptor_idl__
-#include <com/sun/star/drawing/TextShapeDescriptor.idl>
-#endif
-
#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
#endif
@@ -73,8 +69,16 @@
#include <com/sun/star/drawing/Text.idl>
#endif
-#ifndef __com_sun_star_drawing_ShadowDescriptor_idl__
-#include <com/sun/star/drawing/ShadowDescriptor.idl>
+#ifndef __com_sun_star_drawing_FillProperties_idl__
+#include <com/sun/star/drawing/FillProperties.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_LineProperties_idl__
+#include <com/sun/star/drawing/LineProperties.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__
+#include <com/sun/star/drawing/ShadowProperties.idl>
#endif
#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
@@ -88,44 +92,29 @@
//=============================================================================
-// DocMerge from xml: service com::sun::star::drawing::TextShape
/** This service is for a text shape.
*/
service TextShape
{
- // DocMerge: empty anyway
- service com::sun::star::drawing::TextShapeDescriptor;
-
- // DocMerge: empty anyway
service com::sun::star::drawing::Shape;
- // DocMerge: empty anyway
- service com::sun::star::drawing::Text;
+ service com::sun::star::drawing::FillProperties;
- // DocMerge: empty anyway
- service com::sun::star::drawing::ShadowDescriptor;
+ service com::sun::star::drawing::LineProperties;
+
+ service com::sun::star::drawing::ShadowProperties;
+
+ service com::sun::star::drawing::Text;
- // DocMerge: empty anyway
service com::sun::star::drawing::RotationDescriptor;
+ /** This is the radius of the corners.
+ */
+ [property] long CornerRadius;
};
//=============================================================================
}; }; }; };
-/*=============================================================================
-
- $Log: not supported by cvs2svn $
- Revision 1.1.1.1 2000/09/18 23:35:15 hjs
- initial import
-
- Revision 1.3 2000/09/11 11:52:23 mi
- documentation merged from XML
-
- Revision 1.1.1.1 1999/11/11 09:48:42 jsc
- new
-
-
-=============================================================================*/
#endif
diff --git a/offapi/com/sun/star/drawing/makefile.mk b/offapi/com/sun/star/drawing/makefile.mk
index f450ce57bd7f..acbffc6b15a4 100644
--- a/offapi/com/sun/star/drawing/makefile.mk
+++ b/offapi/com/sun/star/drawing/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.10 $
+# $Revision: 1.11 $
#
-# last change: $Author: cl $ $Date: 2001-01-12 16:13:38 $
+# last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -73,29 +73,31 @@ PACKAGE=com$/sun$/star$/drawing
# ------------------------------------------------------------------------
IDLFILES=\
+ ConnectorProperties.idl\
+ MeasureProperties.idl\
+ FillProperties.idl\
+ LineProperties.idl\
+ ShadowProperties.idl\
+ TextProperties.idl\
+ Defaults.idl\
BitmapMode.idl\
CameraGeometry.idl\
BoundVolume.idl\
Alignment.idl\
- AreaShape.idl\
- AreaShapeDescriptor.idl\
Arrangement.idl\
BezierPoint.idl\
CircleKind.idl\
ClosedBezierShape.idl\
- ClosedFreeHandShape.idl\
color.idl\
ColorMode.idl\
ConnectionType.idl\
ConnectorShape.idl\
- ConnectorShapeDescriptor.idl\
ConnectorType.idl\
ControlShape.idl\
CoordinateSequence.idl\
CoordinateSequenceSequence.idl\
DashStyle.idl\
- DimensioningShape.idl\
- DimensioningShapeDescriptor.idl\
+ MeasureShape.idl\
Direction3D.idl\
DoubleSequence.idl\
DoubleSequenceSequence.idl\
@@ -105,14 +107,12 @@ IDLFILES=\
DrawPages.idl\
DrawViewMode.idl\
EllipseShape.idl\
- EllipseShapeDescriptor.idl\
FillStyle.idl\
FlagSequence.idl\
FlagSequenceSequence.idl\
GenericDrawPage.idl\
GluePoint.idl\
GraphicObjectShape.idl\
- GraphicObjectShapeDescriptor.idl\
GroupShape.idl\
Hatch.idl\
HatchStyle.idl\
@@ -129,7 +129,6 @@ IDLFILES=\
LineDash.idl\
LineEndType.idl\
LineShape.idl\
- LineShapeDescriptor.idl\
LineStyle.idl\
LineJoint.idl\
MasterPage.idl\
@@ -141,34 +140,25 @@ IDLFILES=\
NormalsKind.idl\
OLE2Shape.idl\
OpenBezierShape.idl\
- OpenFreeHandShape.idl\
PageShape.idl\
PointSequence.idl\
PointSequenceSequence.idl\
PolygonFlags.idl\
PolygonKind.idl\
- PolyLinePathShape.idl\
PolyLineShape.idl\
PolyPolygonBezierCoords.idl\
PolyPolygonBezierDescriptor.idl\
PolyPolygonBezierShape.idl\
- PolyPolygonBezierShapeDescriptor.idl\
PolyPolygonDescriptor.idl\
- PolyPolygonPathShape.idl\
PolyPolygonShape.idl\
PolyPolygonShape3D.idl\
- PolyPolygonShapeDescriptor.idl\
Position3D.idl\
ProjectionMode.idl\
RectanglePoint.idl\
RectangleShape.idl\
- RectangleShapeDescriptor.idl\
RotationDescriptor.idl\
ShadeMode.idl\
- ShadowDescriptor.idl\
Shape.idl\
- ShapeDescriptor.idl\
- ShapeGroup.idl\
Shapes.idl\
SnapObjectType.idl\
Text.idl\
@@ -177,7 +167,6 @@ IDLFILES=\
TextAnimationKind.idl\
TextFitToSizeType.idl\
TextShape.idl\
- TextShapeDescriptor.idl\
TextureKind.idl\
TextureKind2.idl\
TextureMode.idl\