diff options
| author | Gergő Mocsi <gmocsi91@gmail.com> | 2013-02-14 12:16:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-08 15:43:57 +0100 |
| commit | f6c8220f5c14be8ebacd146d2775b4594efea043 (patch) | |
| tree | 3265f626e28d9ca2957873a6efbb0842ec33b287 | |
| parent | 27f93b3b851e59d254bf5cd3825c8691d0ff3b51 (diff) | |
fdo#46808, Adapt UNO services to the new style, Part 1-2
Written constructor for opffapi/com/sun/star/accessibility/AccessBridge.idl and rewritten to new style in offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl
Signed-off-by Stephan Bergmann <sbergman@redhat.com>:
* Moved offapi/com/sun/star/accessibility/AccessBridge.idl from _noheader to
_nohdl, as necessary for a new-style service.
* Left out changes to offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl, as
that appears to never be instantiated at the global component context/service
manager, but rather via some local ControlModelContainerBase::createInstance
in toolkit/source/controls/controlmodelcontainerbase.cxx, so does not look
like it qualifies for a new-style service.
Conflicts:
offapi/com/sun/star/accessibility/AccessBridge.idl
Change-Id: I88dc745cddf9956c930c1216c697dd142e33c846
| -rw-r--r-- | offapi/UnoApi_offapi.mk | 4 | ||||
| -rw-r--r-- | offapi/com/sun/star/accessibility/AccessBridge.idl | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 1c631a31189e..e5513f63f4ec 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -30,6 +30,9 @@ $(eval $(call gb_UnoApi_set_include,offapi,\ )) +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/accessibility,\ + AccessBridge \ +)) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/animations,\ SequenceTimeContainer \ TargetPropertiesCreator \ @@ -404,7 +407,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star,\ modules \ )) $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/accessibility,\ - AccessBridge \ Accessible \ AccessibleContext \ )) diff --git a/offapi/com/sun/star/accessibility/AccessBridge.idl b/offapi/com/sun/star/accessibility/AccessBridge.idl index 44703ed8192f..f9205c03f55a 100644 --- a/offapi/com/sun/star/accessibility/AccessBridge.idl +++ b/offapi/com/sun/star/accessibility/AccessBridge.idl @@ -19,9 +19,9 @@ #ifndef __com_sun_star_accessibility_AccessBridge_idl__ #define __com_sun_star_accessibility_AccessBridge_idl__ -module com { module sun { module star { module lang { - published interface XInitialization; -}; }; }; }; +#include <com/sun/star/lang/XComponent.idl> +#include <com/sun/star/awt/XExtendedToolkit.idl> + module com { module sun { module star { module accessibility { @@ -35,10 +35,9 @@ module com { module sun { module star { module accessibility { @since OOo 1.1.2 */ -service AccessBridge +service AccessBridge : com::sun::star::lang::XComponent { - /** Expects and instance of XExtendedToolkit as first parameter */ - interface ::com::sun::star::lang::XInitialization; + createWithToolkit([in] com::sun::star::awt::XExtendedToolkit toolkit); }; }; }; }; }; |