summaryrefslogtreecommitdiff
path: root/offapi
diff options
context:
space:
mode:
Diffstat (limited to 'offapi')
-rw-r--r--offapi/com/sun/star/accessibility/AccessibleRelation.idl2
-rw-r--r--[-rwxr-xr-x]offapi/com/sun/star/chart/XComplexDescriptionAccess.idl0
-rw-r--r--[-rwxr-xr-x]offapi/com/sun/star/document/XCodeNameQuery.idl0
-rw-r--r--offapi/com/sun/star/drawing/framework/XResourceFactory.idl11
-rw-r--r--offapi/com/sun/star/drawing/framework/XView.idl2
-rw-r--r--offapi/com/sun/star/ui/UIElement.idl32
-rw-r--r--offapi/com/sun/star/ui/UIElementType.idl7
-rw-r--r--offapi/com/sun/star/ui/XToolPanel.idl64
-rw-r--r--offapi/com/sun/star/ui/XUIElement.idl25
-rw-r--r--offapi/com/sun/star/ui/XUIElementFactory.idl5
-rw-r--r--offapi/com/sun/star/ui/makefile.mk3
11 files changed, 114 insertions, 37 deletions
diff --git a/offapi/com/sun/star/accessibility/AccessibleRelation.idl b/offapi/com/sun/star/accessibility/AccessibleRelation.idl
index 2c4aadd314d4..8df475e9fa0e 100644
--- a/offapi/com/sun/star/accessibility/AccessibleRelation.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleRelation.idl
@@ -50,7 +50,7 @@ published struct AccessibleRelation
the whole relation is regarded as invalid. The content of the
targetSet is then undefined.</p>
- @see AccessibleRelationType.
+ @see AccessibleRelationType
*/
short RelationType;
diff --git a/offapi/com/sun/star/chart/XComplexDescriptionAccess.idl b/offapi/com/sun/star/chart/XComplexDescriptionAccess.idl
index 4e5af5f3ba83..4e5af5f3ba83 100755..100644
--- a/offapi/com/sun/star/chart/XComplexDescriptionAccess.idl
+++ b/offapi/com/sun/star/chart/XComplexDescriptionAccess.idl
diff --git a/offapi/com/sun/star/document/XCodeNameQuery.idl b/offapi/com/sun/star/document/XCodeNameQuery.idl
index 948c86debf3a..948c86debf3a 100755..100644
--- a/offapi/com/sun/star/document/XCodeNameQuery.idl
+++ b/offapi/com/sun/star/document/XCodeNameQuery.idl
diff --git a/offapi/com/sun/star/drawing/framework/XResourceFactory.idl b/offapi/com/sun/star/drawing/framework/XResourceFactory.idl
index 5e0286128999..4bb8b09bc8ad 100644
--- a/offapi/com/sun/star/drawing/framework/XResourceFactory.idl
+++ b/offapi/com/sun/star/drawing/framework/XResourceFactory.idl
@@ -31,6 +31,12 @@
#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
#endif
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/lang/IllegalArgumentException.idl>
+#endif
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__
+#include <com/sun/star/lang/WrappedTargetException.idl>
+#endif
module com { module sun { module star { module drawing { module framework {
@@ -65,7 +71,10 @@ interface XResourceFactory
when the given URL is not supported by the factory.
*/
XResource createResource (
- [in] XResourceId xResourceId);
+ [in] XResourceId xResourceId)
+ raises ( ::com::sun::star::lang::IllegalArgumentException,
+ ::com::sun::star::lang::WrappedTargetException
+ );
/** Call this method to tell a factory that the given resource is no
longer in use. The factory can decide whether to destroy the
diff --git a/offapi/com/sun/star/drawing/framework/XView.idl b/offapi/com/sun/star/drawing/framework/XView.idl
index 8e07eb27f0f6..c773cd903a00 100644
--- a/offapi/com/sun/star/drawing/framework/XView.idl
+++ b/offapi/com/sun/star/drawing/framework/XView.idl
@@ -45,8 +45,6 @@ module com { module sun { module star { module drawing { module framework {
view is. It just needs to identify view objects and a typesafe way to
reference them.</p>
<p>The URL prefix of views is <code>private:resource/view</code></p>
- @see XViewController
- @see XViewFactory
*/
interface XView
{
diff --git a/offapi/com/sun/star/ui/UIElement.idl b/offapi/com/sun/star/ui/UIElement.idl
index 890074fe24b5..580a660f734e 100644
--- a/offapi/com/sun/star/ui/UIElement.idl
+++ b/offapi/com/sun/star/ui/UIElement.idl
@@ -28,10 +28,6 @@
#ifndef __com_sun_star_ui_UIElement_idl__
#define __com_sun_star_ui_UIElement_idl__
-#ifndef __com_sun_star_frame_XFrame_idl__
-#include <com/sun/star/frame/XFrame.idl>
-#endif
-
#ifndef __com_sun_star_ui_XUIElement_idl__
#include <com/sun/star/ui/XUIElement.idl>
#endif
@@ -40,10 +36,6 @@
#include <com/sun/star/beans/XPropertySet.idl>
#endif
-#ifndef __com_sun_star_ui_UIElementType_idl__
-#include <com/sun/star/ui/UIElementType.idl>
-#endif
-
#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
#endif
@@ -97,7 +89,7 @@ service UIElement
@see com::sun::star::ui::UIElementFactoryManager;
@see com::sun::star::ui::UIElementFactory
*/
- interface ::com::sun::star::lang::XInitialization;
+ [optional] interface ::com::sun::star::lang::XInitialization;
/** used to notify an implementation that it needs to update its visual representation.
@@ -106,31 +98,11 @@ service UIElement
representation. It is up to the implementation if it ignores notifications.
</p>
*/
- interface com::sun::star::util::XUpdatable;
+ [optional] interface com::sun::star::util::XUpdatable;
/** controls the life-time of the object.
*/
interface ::com::sun::star::lang::XComponent;
-
- /** determines the frame to which this element is bound to.
-
- <p>
- The life time of a user interface element does not explicitly depend on the
- frame itself but on the visible component attached to the frame. It is possible
- to exchange the visible component of a frame and that will lead to the end of
- life of all user interface elements.
- */
- [readonly, property] com::sun::star::frame::XFrame Frame;
-
- /** a resource URL which is a unique identifier of a user interface element.
- */
- [readonly, property] string ResourceURL;
-
- /** determines the real type of the user interface element.
-
- @see UIElementType
- */
- [readonly, property] short Type;
};
}; }; }; };
diff --git a/offapi/com/sun/star/ui/UIElementType.idl b/offapi/com/sun/star/ui/UIElementType.idl
index d9cca7ed8fc5..f87d91ca6243 100644
--- a/offapi/com/sun/star/ui/UIElementType.idl
+++ b/offapi/com/sun/star/ui/UIElementType.idl
@@ -73,9 +73,14 @@ constants UIElementType
const short PROGRESSBAR = 6;
//-------------------------------------------------------------------------
+ /** specifies a tool panel
+ */
+ const short TOOLPANEL = 7;
+
+ //-------------------------------------------------------------------------
/** specifies the number of constants.
*/
- const short COUNT = 7;
+ const short COUNT = 8;
};
}; }; }; };
diff --git a/offapi/com/sun/star/ui/XToolPanel.idl b/offapi/com/sun/star/ui/XToolPanel.idl
new file mode 100644
index 000000000000..261f4c20413d
--- /dev/null
+++ b/offapi/com/sun/star/ui/XToolPanel.idl
@@ -0,0 +1,64 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef __com_sun_star_ui_XToolPanel_idl__
+#define __com_sun_star_ui_XToolPanel_idl__
+
+#include <com/sun/star/awt/XWindow.idl>
+#include <com/sun/star/accessibility/XAccessible.idl>
+
+//=============================================================================
+
+module com { module sun { module star { module ui {
+
+//=============================================================================
+
+/** describes the basic interface to be implemented by a tool panel
+ */
+interface XToolPanel
+{
+ /** provides access to the tool panel's main window.
+
+ <p>It is allowed for an implementation to return <NULL/> here, but in this case some functionality, for instance
+ automatic positioning of the tool panel, might not be available, and must be implemented by the tool panel itself.</p>
+ */
+ [attribute, readonly] ::com::sun::star::awt::XWindow Window;
+
+ /** creates the root of the Accessibility object tree for the tool panel
+ @param ParentAccessible
+ the parent object in the Accessibility object tree
+ */
+ ::com::sun::star::accessibility::XAccessible
+ createAccessible( [in] ::com::sun::star::accessibility::XAccessible ParentAccessible );
+};
+
+//=============================================================================
+
+}; }; }; };
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/ui/XUIElement.idl b/offapi/com/sun/star/ui/XUIElement.idl
index 1ec3dc579cab..26536a85f29f 100644
--- a/offapi/com/sun/star/ui/XUIElement.idl
+++ b/offapi/com/sun/star/ui/XUIElement.idl
@@ -36,6 +36,10 @@
#include <com/sun/star/beans/XPropertySet.idl>
#endif
+#ifndef __com_sun_star_frame_XFrame_idl__
+#include <com/sun/star/frame/XFrame.idl>
+#endif
+
//=============================================================================
module com { module sun { module star { module ui {
@@ -64,7 +68,26 @@ interface XUIElement : com::sun::star::uno::XInterface
a special purpose interface which depends on the type of the user
interface element.
*/
- com::sun::star::uno::XInterface getRealInterface();
+ ::com::sun::star::uno::XInterface getRealInterface();
+
+ /** determines the document frame to which this element is bound to.
+
+ <p>The life time of a user interface element does not explicitly depend on the
+ frame itself but on the visible component attached to the frame. It is possible
+ to exchange the visible component of a frame and that will lead to the end of
+ life of all user interface elements.</p>
+ */
+ [readonly, attribute] ::com::sun::star::frame::XFrame Frame;
+
+ /** a resource URL which is a unique identifier of a user interface element.
+ */
+ [readonly, attribute] string ResourceURL;
+
+ /** determines the type of the user interface element.
+
+ @see UIElementType
+ */
+ [readonly, attribute] short Type;
};
}; }; }; };
diff --git a/offapi/com/sun/star/ui/XUIElementFactory.idl b/offapi/com/sun/star/ui/XUIElementFactory.idl
index b1522c298752..7a86842508ac 100644
--- a/offapi/com/sun/star/ui/XUIElementFactory.idl
+++ b/offapi/com/sun/star/ui/XUIElementFactory.idl
@@ -97,6 +97,11 @@ interface XUIElementFactory : ::com::sun::star::uno::XInterface
configuration manager. This argument is <b>mandatory</b> to
have a working configurable user interface element instance.
</li>
+ <li><b>ParentWindow</b><br/>
+ specifies a parent window to use for the window(s) representing
+ the UI element. Depending on the concrete UI element type, this parameter
+ might be required or ignored by an implementation.
+ </li>
<li><b>Persistent</b><br>specifies if changes to a configurable
user interface element should be persistent. This is an
optional argument. The default value is <TRUE/>.</li>
diff --git a/offapi/com/sun/star/ui/makefile.mk b/offapi/com/sun/star/ui/makefile.mk
index 944c8ee689c8..313d74dcd9e8 100644
--- a/offapi/com/sun/star/ui/makefile.mk
+++ b/offapi/com/sun/star/ui/makefile.mk
@@ -84,7 +84,8 @@ IDLFILES=\
XUIElementFactory.idl \
XUIElementFactoryRegistration.idl \
XUIElementSettings.idl \
- XUIFunctionListener.idl
+ XUIFunctionListener.idl \
+ XToolPanel.idl
# ------------------------------------------------------------------