strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unnecessary XTypeProvider from IDL

Browse source 
XTypeProvider does not need to be explicitly declared in interface or service
definitions, it is handling automagically by the cppuhelpers.
Along the way, convert service definitions that now only have one interface into
new-style UNO service definitions.

Change-Id: Id1706b5afdc2c49f89c583eef8cf0a8a0721713f
This commit is contained in:
Noel Grandin 2012-08-28 16:17:16 +02:00 committed by Stephan Bergmann
parent d110a01252
commit 7a2ef79376
19 changed files with 24 additions and 144 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
offapi/UnoApi_offapi.mk
View file

@ -77,6 +77,10 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/configurat
Update \
theDefaultProvider \
))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/datatransfer,\
DataFormatTranslator \
MimeContentTypeFactory \
))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment,\
ExtensionManager \
PackageInformationProvider \
@ -252,6 +256,12 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/smarttags,
SmartTagAction \
SmartTagRecognizer \
))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/system,\
ProxySettings \
SimpleCommandMail \
SimpleSystemMail \
SystemShellExecute \
))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/task,\
InteractionRequestStringResolver \
JobExecutor \
@ -559,10 +569,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configu
$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/bootstrap,\
BootstrapContext \
))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer,\
DataFormatTranslator \
MimeContentTypeFactory \
))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer/clipboard,\
ClipboardManager \
GenericClipboard \
@ -1182,12 +1188,8 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sync,\
Synchronizer \
))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/system,\
ProxySettings \
SOffice52ProxySettings \
SimpleCommandMail \
SimpleSystemMail \
SystemProxySettings \
SystemShellExecute \
))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/table,\
AccessibleCellView \

15
offapi/com/sun/star/datatransfer/DataFormatTranslator.idl
View file

@ -20,8 +20,6 @@
#ifndef __com_sun_star_datatransfer_DataFormatTranslator_idl__
#define __com_sun_star_datatransfer_DataFormatTranslator_idl__
#include <com/sun/star/lang/XTypeProvider.idl>
module com { module sun { module star { module datatransfer {
@ -35,17 +33,10 @@ module com { module sun { module star { module datatransfer {
@see com::sun::star::datatransfer::XDataFormatTranslator
@see com::sun::star::datatransfer::DataFlavor
*/
published service DataFormatTranslator
{
/** Converts a <type>DataFlavor</type> to system data types and vice versa.
*/
interface XDataFormatTranslator;
/** Service should always support this interface.
*/
interface com::sun::star::lang::XTypeProvider;
};
Converts a <type>DataFlavor</type> to system data types and vice versa.
*/
published service DataFormatTranslator : XDataFormatTranslator;
}; }; }; };

18
offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl
View file

@ -20,9 +20,6 @@
#ifndef __com_sun_star_datatransfer_MimeContentType_idl__
#define __com_sun_star_datatransfer_MimeContentType_idl__
#include <com/sun/star/lang/XComponent.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
module com { module sun { module star { module datatransfer {
@ -37,20 +34,7 @@ module com { module sun { module star { module datatransfer {
@see com::sun::star::datatransfer::XMimeContentTypeFactory
*/
published service MimeContentTypeFactory
{
/** Creates an instance that implement the interface
<type>XMimeContentType</type> from the string
representation of such a MIME content-types that is conform to
<a href="ftp://ftp.isi.edu/in-notes/rfc2045.txt">Rfc2045</a>,
<a href="ftp://ftp.isi.edu/in-notes/rfc2046.txt">Rfc2046</a>.
*/
interface XMimeContentTypeFactory;
/** Service should always support this interface.
*/
interface com::sun::star::lang::XTypeProvider;
};
published service MimeContentTypeFactory : XMimeContentTypeFactory;
}; }; }; };

5
offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl
View file

@ -21,7 +21,6 @@
#define __com_sun_star_datatransfer_clipboard_ClipboardManager_idl__
#include <com/sun/star/lang/XComponent.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
module com { module sun { module star { module datatransfer { module clipboard {
@ -43,10 +42,6 @@ published service ClipboardManager
/** For shutdown and listener support.
*/
interface com::sun::star::lang::XComponent;
/** Service should always support this interface.
*/
interface com::sun::star::lang::XTypeProvider;
};

5
offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl
View file

@ -22,7 +22,6 @@
#include <com/sun/star/lang/XComponent.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
module com { module sun { module star { module datatransfer { module clipboard {
@ -50,10 +49,6 @@ published service GenericClipboard
/** For shutdown and listener support.
*/
interface com::sun::star::lang::XComponent;
/** Service should always support this interface.
*/
interface com::sun::star::lang::XTypeProvider;
};

5
offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl
View file

@ -21,7 +21,6 @@
#define __com_sun_star_datatransfer_clipboard_SystemClipboard_idl__
#include <com/sun/star/lang/XComponent.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
#include <com/sun/star/lang/XInitialization.idl>
@ -67,10 +66,6 @@ published service SystemClipboard
/** For shutdown and listener support.
*/
interface com::sun::star::lang::XComponent;
/** Service should always support this interface.
*/
interface com::sun::star::lang::XTypeProvider;
};

5
offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl
View file

@ -31,7 +31,6 @@
#include <com/sun/star/lang/XComponent.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
module com { module sun { module star { module datatransfer { module dnd {
@ -66,10 +65,6 @@ published service OleDragSource
/** For shutdown and listener support.
*/
interface com::sun::star::lang::XComponent;
/** Service should always support this interface.
*/
interface com::sun::star::lang::XTypeProvider;
};

7
offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl
View file

@ -31,13 +31,12 @@
#include <com/sun/star/lang/XComponent.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
module com { module sun { module star { module datatransfer { module dnd {
published interface XDropTarget;
published interface XDropTarget;
/** This service connects the Java-like UNO Drag & Drop protocol to the protocol
used on window platforms. It realizes the drop target.
@ -58,10 +57,6 @@ published service OleDropTarget
/** For shutdown and listener support.
*/
interface com::sun::star::lang::XComponent;
/** Service should always support this interface.
*/
interface com::sun::star::lang::XTypeProvider;
};

5
offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl
View file

@ -22,7 +22,6 @@
#include <com/sun/star/lang/XComponent.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
module com { module sun { module star { module datatransfer { module dnd {
@ -52,10 +51,6 @@ published service X11DragSource
/** For shutdown and listener support.
*/
interface com::sun::star::lang::XComponent;
/** Service should always support this interface.
*/
interface com::sun::star::lang::XTypeProvider;
};

5
offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl
View file

@ -22,7 +22,6 @@
#include <com/sun/star/lang/XComponent.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
module com { module sun { module star { module datatransfer { module dnd {
@ -55,10 +54,6 @@ published service X11DropTarget
/** For shutdown and listener support.
*/
interface com::sun::star::lang::XComponent;
/** Service should always support this interface.
*/
interface com::sun::star::lang::XTypeProvider;
};

16
offapi/com/sun/star/system/ProxySettings.idl
View file

@ -20,14 +20,11 @@
#ifndef __com_sun_star_system_ProxySettings_idl__
#define __com_sun_star_system_ProxySettings_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
module com { module sun { module star { module system {
published interface XProxySettings;
published interface XProxySettings;
/** Specifies a service for reading the proxy settings from an old office
installation or a central system database.
@ -37,16 +34,7 @@ module com { module sun { module star { module system {
@deprecated
*/
published service ProxySettings
{
/** Provides access to a <type>XProxySettings</type> interface.
*/
interface XProxySettings;
/** Service should always support this interface.
*/
interface com::sun::star::lang::XTypeProvider;
};
published service ProxySettings : XProxySettings;
}; }; }; };

2
offapi/com/sun/star/system/SOffice52ProxySettings.idl
View file

@ -20,8 +20,6 @@
#ifndef __com_sun_star_system_SOffice52ProxySettings_idl__
#define __com_sun_star_system_SOffice52ProxySettings_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
#include <com/sun/star/system/ProxySettings.idl>

16
offapi/com/sun/star/system/SimpleCommandMail.idl
View file

@ -21,14 +21,12 @@
#define __com_sun_star_system_SimpleCommandMail_idl__
#include <com/sun/star/configuration/ConfigurationProvider.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
module com { module sun { module star { module system {
published interface XSimpleMailClientSupplier;
published interface XSimpleMailClientSupplier;
/** Specifies a SimpleCommandMail service. Implementations of such a service, do
implement an interface to send mail messages via the current configured
@ -37,17 +35,7 @@ module com { module sun { module star { module system {
@see com::sun::star::system::XSimpleMailClient
*/
published service SimpleCommandMail
{
/** Provides access to a <type>XSimpleMailClientSupplier</type> interface.
*/
interface XSimpleMailClientSupplier;
/** Service should always support this interface.
*/
interface com::sun::star::lang::XTypeProvider;
};
published service SimpleCommandMail : XSimpleMailClientSupplier;
}; }; }; };

16
offapi/com/sun/star/system/SimpleSystemMail.idl
View file

@ -20,14 +20,11 @@
#ifndef __com_sun_star_system_SimpleSystemMail_idl__
#define __com_sun_star_system_SimpleSystemMail_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
module com { module sun { module star { module system {
published interface XSimpleMailClientSupplier;
published interface XSimpleMailClientSupplier;
/** Specifies a SimpleSystemMail service. Implementations of such a service
implement an interface to send mail messages via the currently configured
@ -36,16 +33,7 @@ module com { module sun { module star { module system {
@see com::sun::star::system::XSimpleMailClient
*/
published service SimpleSystemMail
{
/** Provides access to a <type>XSimpleMailClientSupplier</type> interface.
*/
interface XSimpleMailClientSupplier;
/** Service should always support this interface.
*/
interface com::sun::star::lang::XTypeProvider;
};
published service SimpleSystemMail : XSimpleMailClientSupplier;
}; }; }; };

2
offapi/com/sun/star/system/SystemProxySettings.idl
View file

@ -20,8 +20,6 @@
#ifndef __com_sun_star_system_SystemProxySettings_idl__
#define __com_sun_star_system_SystemProxySettings_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
#include <com/sun/star/system/ProxySettings.idl>

16
offapi/com/sun/star/system/SystemShellExecute.idl
View file

@ -20,14 +20,11 @@
#ifndef __com_sun_star_system_SystemShellExecute_idl__
#define __com_sun_star_system_SystemShellExecute_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
module com { module sun { module star { module system {
published interface XSystemShellExecute;
published interface XSystemShellExecute;
/** Specifies a system executer service. Such a service makes it possible
to execute an arbitrary system command.
@ -35,16 +32,7 @@ module com { module sun { module star { module system {
@see com::sun::star::system::XSystemShellExecute
*/
published service SystemShellExecute
{
/** Provides access to a <type>XSystemShellExecute</type> interface.
*/
interface XSystemShellExecute;
/** Service should always support this interface.
*/
interface com::sun::star::lang::XTypeProvider;
};
published service SystemShellExecute : XSystemShellExecute;
}; }; }; };

4
offapi/com/sun/star/ui/dialogs/FilePicker.idl
View file

@ -30,7 +30,6 @@
#define __com_sun_star_ui_dialogs_FilePicker_idl__
#include <com/sun/star/lang/XComponent.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/util/XCancellable.idl>
@ -120,9 +119,6 @@ published service FilePicker
*/
interface com::sun::star::lang::XComponent;
/** Service should always support this interface.
*/
interface com::sun::star::lang::XTypeProvider;
};

8
offapi/com/sun/star/ui/dialogs/FolderPicker.idl
View file

@ -30,15 +30,13 @@
#define __com_sun_star_ui_dialogs_FolderPicker_idl__
#include <com/sun/star/lang/XComponent.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
#include <com/sun/star/util/XCancellable.idl>
module com { module sun { module star { module ui { module dialogs {
published interface XFolderPicker;
published interface XFolderPicker;
/** A FolderPicker service.
*/
@ -50,10 +48,6 @@ published service FolderPicker
*/
interface XFolderPicker;
/** Service should always support this interface.
*/
interface com::sun::star::lang::XTypeProvider;
/** For canceling a running dialog instance.
<p>This may be useful for automatic test tools for instance.</p>
*/

BIN
offapi/type_reference/types.rdb
View file

Binary file not shown.