Kaydet (Commit) 75144495 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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
cf5c3691 "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
üst 71af2d58
...@@ -40,18 +40,13 @@ ...@@ -40,18 +40,13 @@
module com { module sun { module star { module form { module com { module sun { module star { module form {
module runtime {
published interface XFormOperations;
};
/** is superseded by com::sun::star::form::runtime::FormController. /** is superseded by com::sun::star::form::runtime::FormController.
@deprecated @deprecated
*/ */
published service FormController published service FormController
{ {
[optional] service FormControllerDispatcher; [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. /** is used for notifying the (de)activation of the controller.
*/ */
......
...@@ -6493,9 +6493,6 @@ module com { ...@@ -6493,9 +6493,6 @@ module com {
}; };
}; };
module form { module form {
module runtime {
interface XFormOperations;
};
/** @deprecated */ published service FormController { /** @deprecated */ published service FormController {
[optional] service ::com::sun::star::form::FormControllerDispatcher; [optional] service ::com::sun::star::form::FormControllerDispatcher;
interface ::com::sun::star::form::XFormController; interface ::com::sun::star::form::XFormController;
...@@ -6508,7 +6505,6 @@ module com { ...@@ -6508,7 +6505,6 @@ module com {
interface ::com::sun::star::sdb::XSQLErrorBroadcaster; interface ::com::sun::star::sdb::XSQLErrorBroadcaster;
interface ::com::sun::star::sdb::XRowSetApproveBroadcaster; interface ::com::sun::star::sdb::XRowSetApproveBroadcaster;
interface ::com::sun::star::form::XDatabaseParameterBroadcaster; interface ::com::sun::star::form::XDatabaseParameterBroadcaster;
[property, optional] ::com::sun::star::form::runtime::XFormOperations FormOperations;
}; };
published enum FormSubmitEncoding { published enum FormSubmitEncoding {
URL = 0, URL = 0,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment