From 7a2ef79376c306c457f98f8574d13c7fa7f92dda Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 28 Aug 2012 16:17:16 +0200 Subject: [PATCH] Remove unnecessary XTypeProvider from IDL 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 --- offapi/UnoApi_offapi.mk | 18 ++++++++++-------- .../datatransfer/DataFormatTranslator.idl | 15 +++------------ .../datatransfer/MimeContentTypeFactory.idl | 18 +----------------- .../clipboard/ClipboardManager.idl | 5 ----- .../clipboard/GenericClipboard.idl | 5 ----- .../clipboard/SystemClipboard.idl | 5 ----- .../star/datatransfer/dnd/OleDragSource.idl | 5 ----- .../star/datatransfer/dnd/OleDropTarget.idl | 7 +------ .../star/datatransfer/dnd/X11DragSource.idl | 5 ----- .../star/datatransfer/dnd/X11DropTarget.idl | 5 ----- offapi/com/sun/star/system/ProxySettings.idl | 16 ++-------------- .../star/system/SOffice52ProxySettings.idl | 2 -- .../com/sun/star/system/SimpleCommandMail.idl | 16 ++-------------- .../com/sun/star/system/SimpleSystemMail.idl | 16 ++-------------- .../sun/star/system/SystemProxySettings.idl | 2 -- .../sun/star/system/SystemShellExecute.idl | 16 ++-------------- offapi/com/sun/star/ui/dialogs/FilePicker.idl | 4 ---- .../com/sun/star/ui/dialogs/FolderPicker.idl | 8 +------- offapi/type_reference/types.rdb | Bin 7653888 -> 7653888 bytes 19 files changed, 24 insertions(+), 144 deletions(-) diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 42c32488037d..db5c89d24304 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -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 \ diff --git a/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl b/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl index f8c174767698..3dfa5e869fc5 100644 --- a/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl +++ b/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl @@ -20,8 +20,6 @@ #ifndef __com_sun_star_datatransfer_DataFormatTranslator_idl__ #define __com_sun_star_datatransfer_DataFormatTranslator_idl__ -#include - 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 DataFlavor to system data types and vice versa. - */ - interface XDataFormatTranslator; - /** Service should always support this interface. - */ - interface com::sun::star::lang::XTypeProvider; -}; + Converts a DataFlavor to system data types and vice versa. +*/ +published service DataFormatTranslator : XDataFormatTranslator; }; }; }; }; diff --git a/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl b/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl index 0e7934091e9b..093f74dc5fdc 100644 --- a/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl +++ b/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl @@ -20,9 +20,6 @@ #ifndef __com_sun_star_datatransfer_MimeContentType_idl__ #define __com_sun_star_datatransfer_MimeContentType_idl__ -#include -#include - 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 - XMimeContentType from the string - representation of such a MIME content-types that is conform to - Rfc2045, - Rfc2046. - */ - interface XMimeContentTypeFactory; - - /** Service should always support this interface. - */ - interface com::sun::star::lang::XTypeProvider; -}; +published service MimeContentTypeFactory : XMimeContentTypeFactory; }; }; }; }; diff --git a/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl b/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl index 7e9a5289ce5e..de4b4f77bfd6 100644 --- a/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl +++ b/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl @@ -21,7 +21,6 @@ #define __com_sun_star_datatransfer_clipboard_ClipboardManager_idl__ #include -#include 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; }; diff --git a/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl index 6f46b34f776d..880b30a03743 100644 --- a/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl +++ b/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl @@ -22,7 +22,6 @@ #include #include -#include 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; }; diff --git a/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl index c34181ceb3d7..35707087efa6 100644 --- a/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl +++ b/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl @@ -21,7 +21,6 @@ #define __com_sun_star_datatransfer_clipboard_SystemClipboard_idl__ #include -#include #include @@ -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; }; diff --git a/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl b/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl index a51f8102dc85..12b55b215d15 100644 --- a/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl +++ b/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl @@ -31,7 +31,6 @@ #include #include -#include 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; }; diff --git a/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl b/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl index e1e1a27d9c8f..87f62c4a0305 100644 --- a/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl +++ b/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl @@ -31,13 +31,12 @@ #include #include -#include 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; }; diff --git a/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl b/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl index c987b479f717..8f72a0897713 100644 --- a/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl +++ b/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl @@ -22,7 +22,6 @@ #include #include -#include 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; }; diff --git a/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl b/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl index 624afdc6b4b4..120557aa97ad 100644 --- a/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl +++ b/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl @@ -22,7 +22,6 @@ #include #include -#include 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; }; diff --git a/offapi/com/sun/star/system/ProxySettings.idl b/offapi/com/sun/star/system/ProxySettings.idl index 76e9292dbe7a..307a56cb1faf 100644 --- a/offapi/com/sun/star/system/ProxySettings.idl +++ b/offapi/com/sun/star/system/ProxySettings.idl @@ -20,14 +20,11 @@ #ifndef __com_sun_star_system_ProxySettings_idl__ #define __com_sun_star_system_ProxySettings_idl__ -#include -#include - 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 XProxySettings interface. - */ - interface XProxySettings; - - /** Service should always support this interface. - */ - interface com::sun::star::lang::XTypeProvider; -}; +published service ProxySettings : XProxySettings; }; }; }; }; diff --git a/offapi/com/sun/star/system/SOffice52ProxySettings.idl b/offapi/com/sun/star/system/SOffice52ProxySettings.idl index dbbf5f1bfc78..241ef3e9ba7a 100644 --- a/offapi/com/sun/star/system/SOffice52ProxySettings.idl +++ b/offapi/com/sun/star/system/SOffice52ProxySettings.idl @@ -20,8 +20,6 @@ #ifndef __com_sun_star_system_SOffice52ProxySettings_idl__ #define __com_sun_star_system_SOffice52ProxySettings_idl__ -#include -#include #include diff --git a/offapi/com/sun/star/system/SimpleCommandMail.idl b/offapi/com/sun/star/system/SimpleCommandMail.idl index 542f930678a0..0f89735a4749 100644 --- a/offapi/com/sun/star/system/SimpleCommandMail.idl +++ b/offapi/com/sun/star/system/SimpleCommandMail.idl @@ -21,14 +21,12 @@ #define __com_sun_star_system_SimpleCommandMail_idl__ #include -#include -#include 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 XSimpleMailClientSupplier interface. - */ - interface XSimpleMailClientSupplier; - - /** Service should always support this interface. - */ - interface com::sun::star::lang::XTypeProvider; - -}; +published service SimpleCommandMail : XSimpleMailClientSupplier; }; }; }; }; diff --git a/offapi/com/sun/star/system/SimpleSystemMail.idl b/offapi/com/sun/star/system/SimpleSystemMail.idl index 7feebf676095..54cc8b163c4e 100644 --- a/offapi/com/sun/star/system/SimpleSystemMail.idl +++ b/offapi/com/sun/star/system/SimpleSystemMail.idl @@ -20,14 +20,11 @@ #ifndef __com_sun_star_system_SimpleSystemMail_idl__ #define __com_sun_star_system_SimpleSystemMail_idl__ -#include -#include - 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 XSimpleMailClientSupplier interface. - */ - interface XSimpleMailClientSupplier; - - /** Service should always support this interface. - */ - interface com::sun::star::lang::XTypeProvider; -}; +published service SimpleSystemMail : XSimpleMailClientSupplier; }; }; }; }; diff --git a/offapi/com/sun/star/system/SystemProxySettings.idl b/offapi/com/sun/star/system/SystemProxySettings.idl index 3b06a55f1070..668ac25e3cd6 100644 --- a/offapi/com/sun/star/system/SystemProxySettings.idl +++ b/offapi/com/sun/star/system/SystemProxySettings.idl @@ -20,8 +20,6 @@ #ifndef __com_sun_star_system_SystemProxySettings_idl__ #define __com_sun_star_system_SystemProxySettings_idl__ -#include -#include #include diff --git a/offapi/com/sun/star/system/SystemShellExecute.idl b/offapi/com/sun/star/system/SystemShellExecute.idl index e5b714306f04..1b33e7b53805 100644 --- a/offapi/com/sun/star/system/SystemShellExecute.idl +++ b/offapi/com/sun/star/system/SystemShellExecute.idl @@ -20,14 +20,11 @@ #ifndef __com_sun_star_system_SystemShellExecute_idl__ #define __com_sun_star_system_SystemShellExecute_idl__ -#include -#include - 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 XSystemShellExecute interface. - */ - interface XSystemShellExecute; - - /** Service should always support this interface. - */ - interface com::sun::star::lang::XTypeProvider; -}; +published service SystemShellExecute : XSystemShellExecute; }; }; }; }; diff --git a/offapi/com/sun/star/ui/dialogs/FilePicker.idl b/offapi/com/sun/star/ui/dialogs/FilePicker.idl index a009820008f1..b2683c2a28a4 100644 --- a/offapi/com/sun/star/ui/dialogs/FilePicker.idl +++ b/offapi/com/sun/star/ui/dialogs/FilePicker.idl @@ -30,7 +30,6 @@ #define __com_sun_star_ui_dialogs_FilePicker_idl__ #include -#include #include #include @@ -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; }; diff --git a/offapi/com/sun/star/ui/dialogs/FolderPicker.idl b/offapi/com/sun/star/ui/dialogs/FolderPicker.idl index c0490c92bfe2..d2d5f39e0d2e 100644 --- a/offapi/com/sun/star/ui/dialogs/FolderPicker.idl +++ b/offapi/com/sun/star/ui/dialogs/FolderPicker.idl @@ -30,15 +30,13 @@ #define __com_sun_star_ui_dialogs_FolderPicker_idl__ #include -#include -#include #include 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.

This may be useful for automatic test tools for instance.

*/ diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb index a248de7973981ff3a70e8dd3156f2101a1d30116..1969d252fda5e4f83a749d3c263bea1f71413cd1 100644 GIT binary patch delta 1384 zcmaLVe@v8h90&04areLjoZb%)?zlS;yhDh4!Xti|{3x{eAp~4usF3_h!BB+m`{-b` z<{#fJH=CQ{?z1MXKWfaDElKlPiq%Sxw-#s!=%qDznXsy&T6q4d;xFRlxCR=Pa>M!;u($C|*Mk-oU zo=jJGhlMtdnc_cZpc#+fZj5Ip$}4M5q4o=oSTeunlxg5XiQQ;miFDuN_ZVU* z!`M7KS{`RO6l;3Zl;(#_SP5B>4Ua(%1VDkuAs1Fb5c1#&$cF+bgd$iCPr@1~h7u@+ zGI$D}hH_X7>);u97Al|;s-POyLk-lzb5IBM&;TKL9$tV(*Z?m=6KsS{uo;@61zv(J z&8>i!L_F6{GBS?=iC}eRw+Trc;0BSjl(8Wux{fo~+$E&$A75@ot`%l(&Oc zI(EQ$=E1l5hAS3%bo==q*(H6&=3KmgaQ))@w|?R`wU6t!W=EgB!tp&*$BU-eygoCV zUrObNo0iZobKDb|=Q!a}?xkP%bB|Vg);<~y-{wk|oR<1~H*>519AjuWQ=zYCS6k_L zlNv{tQ`C&e)dUln+^U0GJ5?{ucc^Bn`=l*V3mz@}G+O0Vv3|rhc7vt=TSdb&=F-KQ zWe-rD5J}Y>Y}*{ z)e;#iKvSjah~X-^D%A`+^8L;S(~KD+C$l6?s#XJ%JY3cNC9BuB{NVJ{*`a`Iai%(~ b)-R)~9;>0pOglPN%cJ|9ijEah?+yM9|18gs delta 1644 zcmajfUrbwN7{~F`(w0MQq3!t7mX1Gb2a}#|xVa&0V22KnG3)>t*fCoM;@lXs?{R^| z5S(wKi$R0k`hLGH)dI=r_5ubU#_|v zN%?-Gg$6=q15LG>EwrW7pGi|JoJJQ%N?ppwl_??3kY5+u7t|~Iaksb8)NMD(3uxJIXkR&Yrj5L<*amHL8 z2RSNzsq{y-CyOd7eJS)&R0^N>w`e{v=-$@lcwj9QKq0Jy$Ds(kAb}6o!v-jZCtxFN zf+t}!Y=IJZ3QD02w!$_jhYENa{IDG=;Td=qc0d(WLk&C!wXhTFU>DTG^ALdD&;X6l z1TR1{?12_&g%=?Rd!Y^X!AlT=Fto#d=zvam8M@#VH~_E0K{y26a2R^v2)w4~aw5_x z@oV97t}q%|d|%iEa~(E8lVPFIJ!Ydjmm`_l{XMbKh@I^51{1Y?!^|{2iNDt>4yyJ; z>8dRp(!{rsKrJ5>EUU%c9vymO{00W{kyI@A5}GX{c#WY`vlz zXHt?_T-4Mo+)%elw9e=yuZ7%q>{bfhV42Fyb+%5ktV8U{abmF?n1o+){_nc<>o#Wm>4CaL;Nw{24RS%n$7DvamAUBxxTGIK}Y#&YHeD zB+RKh-H9cr_N9~mM6;QGon_ft!4#WgSg+AYHch|FoHTf?L%kK)tigxPc_tN#bY?7H zaLTHcs7_p7yIofLQIeDCwnNT~KKRZ+I;WgYp?29xb79#;Ge_;qs>7P-eSNZ`bICZ% zbEU^m33=-5TS>^47Fp=?W@LZLmGiZ%FP0}ejB;o9hL%92r?-#V`nS23ZZS*ZD;UNG z+ZK*;jf~y1PI$6~Ds{KjSN30Whn!Cj-ZWy=DvWBc$CL$Caz?Zn%dm9wE;hy3g+hE> vHL_PP7Q7Sd66)2_vxzeZS{H}il_+m6N4Xy5aJ%ey^daCDUl=za-|PDqh8Q1{