summaryrefslogtreecommitdiff
path: root/offapi
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-11-22 16:57:31 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-11-22 18:58:19 +0100
commit75144495ee77a41e5a94d9e21b7f6aaf16a80b4f (patch)
treeb7fb8157daacf2ab54c1099ca1fef91c16f852fd /offapi
parent71af2d5885eba0b82e6e0f3938bf08a9346776ff (diff)
Published FormController cannot reference unpublished XFormOperations
...and the hack to locally introduce a bogus pupblished forward declaration of XFormOperations with which this has been worked around in cf5c36912390b2f6018f57f79085ab1fa88a08d6 "INTEGRATION: CWS dba23b: work around idlc limitation, which does not allow to refer unpublished interfaces as optional entities in published services" no longer works in offapi/type_reference/offapi.idl. So given FormController is a (deprecated, even) old-style service (i.e., little more than glorified commentary), the best fix probably is to demote the problematic optional property to a comment. Change-Id: Ia38483c817dc1762ba73315abcd4f9f063db3093
Diffstat (limited to 'offapi')
-rw-r--r--offapi/com/sun/star/form/FormController.idl7
-rw-r--r--offapi/type_reference/offapi.idl4
2 files changed, 1 insertions, 10 deletions
diff --git a/offapi/com/sun/star/form/FormController.idl b/offapi/com/sun/star/form/FormController.idl
index 137bd6eafb6c..c49dc71f340e 100644
--- a/offapi/com/sun/star/form/FormController.idl
+++ b/offapi/com/sun/star/form/FormController.idl
@@ -40,18 +40,13 @@
module com { module sun { module star { module form {
-module runtime {
- published interface XFormOperations;
-};
-
-
/** is superseded by com::sun::star::form::runtime::FormController.
@deprecated
*/
published service FormController
{
[optional] service FormControllerDispatcher;
- [optional, property] ::com::sun::star::form::runtime::XFormOperations FormOperations;
+ // [optional, property] ::com::sun::star::form::runtime::XFormOperations FormOperations; is not published
/** is used for notifying the (de)activation of the controller.
*/
diff --git a/offapi/type_reference/offapi.idl b/offapi/type_reference/offapi.idl
index 509fe6b0fa6f..a474f590ec15 100644
--- a/offapi/type_reference/offapi.idl
+++ b/offapi/type_reference/offapi.idl
@@ -6493,9 +6493,6 @@ module com {
};
};
module form {
- module runtime {
- interface XFormOperations;
- };
/** @deprecated */ published service FormController {
[optional] service ::com::sun::star::form::FormControllerDispatcher;
interface ::com::sun::star::form::XFormController;
@@ -6508,7 +6505,6 @@ module com {
interface ::com::sun::star::sdb::XSQLErrorBroadcaster;
interface ::com::sun::star::sdb::XRowSetApproveBroadcaster;
interface ::com::sun::star::form::XDatabaseParameterBroadcaster;
- [property, optional] ::com::sun::star::form::runtime::XFormOperations FormOperations;
};
published enum FormSubmitEncoding {
URL = 0,