summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--offapi/com/sun/star/awt/ImageScaleMode.idl65
-rw-r--r--offapi/com/sun/star/awt/UnoControlImageControlModel.idl10
-rw-r--r--offapi/com/sun/star/awt/XUnitConversion.idl22
-rw-r--r--offapi/com/sun/star/awt/makefile.mk3
-rw-r--r--offapi/com/sun/star/graphic/GraphicObject.idl66
-rwxr-xr-xoffapi/com/sun/star/graphic/MediaProperties.idl6
-rw-r--r--offapi/com/sun/star/graphic/XGraphicObject.idl68
-rwxr-xr-xoffapi/com/sun/star/graphic/makefile.mk4
-rw-r--r--offapi/com/sun/star/sdb/application/NamedDatabaseObject.idl9
-rw-r--r--offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl8
10 files changed, 238 insertions, 23 deletions
diff --git a/offapi/com/sun/star/awt/ImageScaleMode.idl b/offapi/com/sun/star/awt/ImageScaleMode.idl
new file mode 100644
index 000000000000..ca61481d5a39
--- /dev/null
+++ b/offapi/com/sun/star/awt/ImageScaleMode.idl
@@ -0,0 +1,65 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: ImageScaleMode.idl,v $
+*
+* $Revision: 1.1.2.1 $
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#ifndef __com_sun_star_awt_ImageScaleMode_idl__
+#define __com_sun_star_awt_ImageScaleMode_idl__
+
+//=============================================================================
+
+module com { module sun { module star { module awt {
+
+//=============================================================================
+
+/** defines modes how an image displayed in a given area should be scaled to fit this area
+ */
+constants ImageScaleMode
+{
+ /** specifies that no scaling should happen at all
+ */
+ const short None = 0;
+
+ /** specifies that the image should be scaled up or down to the size of the surrounding area isotropicly,
+ i.e. by keeping its aspect ratio.
+ */
+ const short Isotropic = 1;
+
+ /** specifies that the image should be scaled up or down to the size of the surrounding area anisotropicly.
+
+ <p>The image will finally cover all of the surrounding area, but its dimensions might be distorted.</p>
+ */
+ const short Anisotropic = 2;
+};
+
+//=============================================================================
+
+}; }; }; };
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/awt/UnoControlImageControlModel.idl b/offapi/com/sun/star/awt/UnoControlImageControlModel.idl
index 35f76fad5d9d..8c09f94bad3a 100644
--- a/offapi/com/sun/star/awt/UnoControlImageControlModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlImageControlModel.idl
@@ -137,6 +137,16 @@ published service UnoControlImageControlModel
*/
[property] boolean ScaleImage;
+ /** defines how to scale the image
+
+ <p>If this property is present, it supersedes the <member>ScaleImage</member> property.</p>
+
+ <p>The value of this property is one of the <type>ImageScaleMode</type> constants.</p>
+
+ @since OOo 3.1
+ */
+ [property, optional] short ScaleMode;
+
//-------------------------------------------------------------------------
/** specifies that the control can be reached with the TAB key.
diff --git a/offapi/com/sun/star/awt/XUnitConversion.idl b/offapi/com/sun/star/awt/XUnitConversion.idl
index 8a8b4420df3d..6e8d185f2fdc 100644
--- a/offapi/com/sun/star/awt/XUnitConversion.idl
+++ b/offapi/com/sun/star/awt/XUnitConversion.idl
@@ -8,7 +8,7 @@
*
* $RCSfile: XUnitConversion.idl,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.2.54.1 $
*
* This file is part of OpenOffice.org.
*
@@ -35,10 +35,6 @@
#include <com/sun/star/uno/XInterface.idl>
#endif
-// #ifndef __com_sun_star_util_MeasureUnit_idl__
-// #include <com/sun/star/util/MeasureUnit.idl>
-// #endif
-
#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
#endif
@@ -57,28 +53,30 @@
//=============================================================================
-/** gives access to the value and formatting of a metric field.
+/** allows converting between different measurement units
+
+ @since OOo 3.0
*/
interface XUnitConversion: com::sun::star::uno::XInterface
{
- //-------------------------------------------------------------------------
-
- /**
+ /** converts the given <type>Point</type>, which is specified in pixels, into the given logical unit
*/
com::sun::star::awt::Point convertPointToLogic( [in] com::sun::star::awt::Point aPoint, [in] short TargetUnit )
raises ( com::sun::star::lang::IllegalArgumentException );
+ /** converts the given <type>Point</type>, which is specified in the given logical unit, into pixels
+ */
com::sun::star::awt::Point convertPointToPixel( [in] com::sun::star::awt::Point aPoint, [in] short SourceUnit )
raises ( com::sun::star::lang::IllegalArgumentException );
- //-------------------------------------------------------------------------
-
- /**
+ /** converts the given <type>Size</type>, which is specified in pixels, into the given logical unit
*/
com::sun::star::awt::Size convertSizeToLogic( [in] com::sun::star::awt::Size aSize, [in] short TargetUnit )
raises ( com::sun::star::lang::IllegalArgumentException );
+ /** converts the given <type>Size</type>, which is specified in the given logical unit, into pixels
+ */
com::sun::star::awt::Size convertSizeToPixel( [in] com::sun::star::awt::Size aSize, [in] short SourceUnit )
raises ( com::sun::star::lang::IllegalArgumentException );
diff --git a/offapi/com/sun/star/awt/makefile.mk b/offapi/com/sun/star/awt/makefile.mk
index 8a9e5831f6ae..48db14da133d 100644
--- a/offapi/com/sun/star/awt/makefile.mk
+++ b/offapi/com/sun/star/awt/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.50 $
+# $Revision: 1.50.20.1 $
#
# This file is part of OpenOffice.org.
#
@@ -109,6 +109,7 @@ IDLFILES=\
GradientStyle.idl\
ImageAlign.idl\
ImagePosition.idl\
+ ImageScaleMode.idl\
ImageStatus.idl\
InputEvent.idl\
InvalidateStyle.idl\
diff --git a/offapi/com/sun/star/graphic/GraphicObject.idl b/offapi/com/sun/star/graphic/GraphicObject.idl
new file mode 100644
index 000000000000..b8d6f7565fae
--- /dev/null
+++ b/offapi/com/sun/star/graphic/GraphicObject.idl
@@ -0,0 +1,66 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: GraphicObject.idl,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef com_sun_star_graphic_GraphicObject_idl
+#define com_sun_star_graphic_GraphicObject_idl
+
+#include <com/sun/star/graphic/XGraphicObject.idl>
+
+module com { module sun { module star { module graphic
+{
+/** The <code>GraphicObject</code> service can be used to create <type>XGraphicObject</type> instances.
+
+ <p><type>XGraphicObject</type> objects are accessable using GraphicObject scheme urls like
+ <code>vnd.sun.star.GraphicObject:10000000000001940000012FB99807BD</code>.
+ As long as at least one instance of <type>XGraphicObject</type> with a particular UniqueID exists,
+ the associated image/graphic is available.</p>
+
+ @see GraphicObject
+ @see GraphicProvider
+ @see MediaProperties
+*/
+
+service GraphicObject : XGraphicObject
+{
+ /** Creates an <type>GraphicObject</type>
+ */
+ create();
+
+ /** Creates an <type>GraphicObject</type> with <code>uniqueId</code>
+ @param uniqueId
+ If another <type>XGraphicObject</type> with <code>uniqueId</code> exists, this GraphicObject
+ is populated with the other <type>GraphicObject</type>'s data.
+ */
+ createWithId( [in] string uniqueId );
+};
+
+} ; } ; } ; } ;
+
+#endif
diff --git a/offapi/com/sun/star/graphic/MediaProperties.idl b/offapi/com/sun/star/graphic/MediaProperties.idl
index fb04e22cf728..f7b6e98ecaf7 100755
--- a/offapi/com/sun/star/graphic/MediaProperties.idl
+++ b/offapi/com/sun/star/graphic/MediaProperties.idl
@@ -61,11 +61,15 @@ published service MediaProperties
<li>private:resource/projectshortname/imagelist/12345</li>
<li>private:resource/projectshortname/imagelist/12345/12</li>
</ul>
+And additionally, GraphicObject scheme url's like
+ <ul> <li>vnd.sun.star.GraphicObject:10000000000001940000012FB99807BD</li> </ul>
+ can be used to access graphics held by the GraphicCache implementation.
</p>
<p>Yet more, you can access graphics in the application-wide image
repository by specifying URLs of the form
- <code>private:graphicrepository/<em>&lt;path_in_repository&gt;</em></code>.</p>
+ <code>private:graphicrepository/<em>&lt;path_in_repository&gt;</em></code>.
+</p>
*/
[optional, property ] string URL;
diff --git a/offapi/com/sun/star/graphic/XGraphicObject.idl b/offapi/com/sun/star/graphic/XGraphicObject.idl
new file mode 100644
index 000000000000..89d0c775a0bc
--- /dev/null
+++ b/offapi/com/sun/star/graphic/XGraphicObject.idl
@@ -0,0 +1,68 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: XGraphicObject.idl,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef com_sun_star_graphic_XGraphicObject_idl
+#define com_sun_star_graphic_XGraphicObject_idl
+
+#include <com/sun/star/uno/XInterface.idl>
+
+module com { module sun { module star { module graphic
+{
+interface XGraphic;
+/** <code>XGraphicObject</code> objects represent in-memory image and graphic
+ objects.
+
+ <p>Such objects are accessable using GraphicObject scheme urls like
+ <ul>
+ <li>vnd.sun.star.GraphicObject:10000000000001940000012FB99807BD</li>
+ </ul>
+ The numeric portion of the url is formed from <member>UniqueID</member>.
+ As long as at least one instance of <code>XGraphicObject</code> with a particular UniqueID exists,
+ the associated image/graphic is available.</p>
+
+ @see XGraphicObject
+ @see GraphicProvider
+ @see MediaProperties
+*/
+
+interface XGraphicObject : ::com::sun::star::uno::XInterface
+{
+ /** is the associated image/graphic for this object.
+ */
+ [attribute ] XGraphic Graphic;
+
+ /** is the id that can be used to form the <code>vnd.sun.star.GraphicObject</code> url to address this object.
+ */
+ [attribute, readonly ] string UniqueID;
+};
+
+} ; } ; } ; } ;
+
+#endif
diff --git a/offapi/com/sun/star/graphic/makefile.mk b/offapi/com/sun/star/graphic/makefile.mk
index 71d68ba40102..6f0e9afd7ddd 100755
--- a/offapi/com/sun/star/graphic/makefile.mk
+++ b/offapi/com/sun/star/graphic/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.10.1 $
#
# This file is part of OpenOffice.org.
#
@@ -56,6 +56,8 @@ IDLFILES= \
XGraphic.idl \
XGraphicProvider.idl \
XGraphicRenderer.idl \
+ XGraphicObject.idl \
+ GraphicObject.idl \
XGraphicTransformer.idl
# --- Targets ------------------------------------------------------
diff --git a/offapi/com/sun/star/sdb/application/NamedDatabaseObject.idl b/offapi/com/sun/star/sdb/application/NamedDatabaseObject.idl
index 2cf76eb2aacd..155c76a87aa5 100644
--- a/offapi/com/sun/star/sdb/application/NamedDatabaseObject.idl
+++ b/offapi/com/sun/star/sdb/application/NamedDatabaseObject.idl
@@ -69,10 +69,11 @@ struct NamedDatabaseObject
</ul>
</p>
- <p>In case of the virtual folders denoted by <member>DatabaseObjectContainer::ALL_TABLES</member>,
- <member>DatabaseObjectContainer::ALL_QUERIES</member>, <member>DatabaseObjectContainer::DATA_SOURCE</member>,
- <member>DatabaseObjectContainer::ALL_FORMS</member> or <member>DatabaseObjectContainer::ALL_REPORTS</member>,
- this denotes the name of the data source.</p>
+ <p>In case of the virtual folders denoted by <member>DatabaseObjectContainer::TABLES</member>,
+ <member>DatabaseObjectContainer::QUERIES</member>, <member>DatabaseObjectContainer::DATA_SOURCE</member>,
+ <member>DatabaseObjectContainer::FORMS</member> or <member>DatabaseObjectContainer::REPORTS</member>,
+ this denotes the name of the data source (as denoted by
+ <member scope="com::sun::star::sdb">DataSource::Name</member>)</p>
@see XDatabaseMetaData::isCatalogAtStart
@see DatabaseObjectContainer
diff --git a/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl b/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
index 26a559e0a47e..91e84aafc1b3 100644
--- a/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
+++ b/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
@@ -115,11 +115,11 @@ interface XDatabaseDocumentUI
<p>If the connection cannot be established, the respective error message is shown
in the application window.</p>
- @return
- whether or not the connection attempt was successful, i.e. whether or not
- a subsequent call to <member>isConnected</member> would return <TRUE/>.
+ @throws ::com::sun::star::sdbc::SQLException
+ if the connection cannot be established
*/
- boolean connect();
+ void connect()
+ raises ( ::com::sun::star::sdbc::SQLException );
/** contains all sub components of the database document
generated by cgit (git 2.34.1) at 2025-01-14 08:11:15 +0000