mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#46808, Adapt UNO services to the new style, Part 1-2

Browse Source 
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
This commit is contained in:
Gergő Mocsi
2013-02-14 12:16:58 +01:00
committed by Stephan Bergmann
parent 27f93b3b85
commit f6c8220f5c
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
offapi/UnoApi_offapi.mk
View File

@@ -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,\ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/animations,\
SequenceTimeContainer \ SequenceTimeContainer \
TargetPropertiesCreator \ TargetPropertiesCreator \
@@ -404,7 +407,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star,\
modules \ modules \
)) ))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/accessibility,\ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/accessibility,\
AccessBridge \
Accessible \ Accessible \
AccessibleContext \ AccessibleContext \
)) ))

11
offapi/com/sun/star/accessibility/AccessBridge.idl
View File

@@ -19,9 +19,9 @@
#ifndef __com_sun_star_accessibility_AccessBridge_idl__ #ifndef __com_sun_star_accessibility_AccessBridge_idl__
#define __com_sun_star_accessibility_AccessBridge_idl__ #define __com_sun_star_accessibility_AccessBridge_idl__
module com { module sun { module star { module lang { #include <com/sun/star/lang/XComponent.idl>
published interface XInitialization; #include <com/sun/star/awt/XExtendedToolkit.idl>
}; }; }; };
module com { module sun { module star { module accessibility { 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 @since OOo 1.1.2
*/ */
service AccessBridge service AccessBridge : com::sun::star::lang::XComponent
{ {
/** Expects and instance of XExtendedToolkit as first parameter */ createWithToolkit([in] com::sun::star::awt::XExtendedToolkit toolkit);
interface ::com::sun::star::lang::XInitialization;
}; };
}; }; }; }; }; }; }; };