From f3c1af57010033c40bfda0711cce7b83e2afdf51 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Fri, 27 Jan 2012 11:49:20 +0100 Subject: Pick additional cleanups from -3-5-0 branch. This cherry-picks the extra cleanups from the UNO type publishing revert. --- offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl | 2 +- .../com/sun/star/drawing/framework/ConfigurationChangeEvent.idl | 1 - offapi/com/sun/star/rendering/StrokeAttributes.idl | 8 -------- offapi/com/sun/star/rendering/XBitmap.idl | 2 -- offapi/com/sun/star/rendering/XSpriteCanvas.idl | 2 +- offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl | 2 +- offapi/com/sun/star/security/CertificateContainerStatus.idl | 2 -- offapi/com/sun/star/security/SecurityInfrastructureException.idl | 4 ---- offapi/com/sun/star/security/XCertificate.idl | 4 ---- offapi/com/sun/star/security/XCertificateExtension.idl | 4 ---- offapi/com/sun/star/ucb/URLAuthenticationRequest.idl | 2 +- offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl | 2 +- offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl | 5 ++--- 13 files changed, 7 insertions(+), 33 deletions(-) (limited to 'offapi') diff --git a/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl b/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl index 3b3bb7e9218c..c06eb9569e61 100644 --- a/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl +++ b/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl @@ -45,7 +45,7 @@ service UnoControlTabPageModel : XTabPageModel */ create([in] short tabPageID); - /** Creates a new XTabPageModel with a given ID and a url which is used to load teh tab page model. + /** Creates a new XTabPageModel with a given ID and a url which is used to load the tab page model. */ load([in] short tabPageID,[in] string url); }; diff --git a/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl b/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl index d78a57a7ed83..550f3015e220 100644 --- a/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl +++ b/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl @@ -36,7 +36,6 @@ module com { module sun { module star { module uno { interface XInterface; }; }; module com { module sun { module star { module drawing { module framework { interface XConfiguration; -interface XConfigurationController; interface XResourceId; /** Objects of this class are used for notifying changes of the diff --git a/offapi/com/sun/star/rendering/StrokeAttributes.idl b/offapi/com/sun/star/rendering/StrokeAttributes.idl index 5393872060e1..885bc78221e5 100644 --- a/offapi/com/sun/star/rendering/StrokeAttributes.idl +++ b/offapi/com/sun/star/rendering/StrokeAttributes.idl @@ -28,14 +28,6 @@ #ifndef __com_sun_star_rendering_StrokeAttributes_idl__ #define __com_sun_star_rendering_StrokeAttributes_idl__ -#ifndef __com_sun_star_rendering_PathCapType_idl__ -#include -#endif -#ifndef __com_sun_star_rendering_PathJoinType_idl__ -#include -#endif - - module com { module sun { module star { module rendering { /** This structure contains all attributes required for path stroking.

diff --git a/offapi/com/sun/star/rendering/XBitmap.idl b/offapi/com/sun/star/rendering/XBitmap.idl index 704acec578ab..68643b951917 100644 --- a/offapi/com/sun/star/rendering/XBitmap.idl +++ b/offapi/com/sun/star/rendering/XBitmap.idl @@ -36,8 +36,6 @@ module com { module sun { module star { module rendering { -interface XBitmapCanvas; - /** This is a generic interface to a bitmap.

This interface contains the generic functionality to be used on diff --git a/offapi/com/sun/star/rendering/XSpriteCanvas.idl b/offapi/com/sun/star/rendering/XSpriteCanvas.idl index 3faa7e5a5910..00cd1ac03f49 100644 --- a/offapi/com/sun/star/rendering/XSpriteCanvas.idl +++ b/offapi/com/sun/star/rendering/XSpriteCanvas.idl @@ -123,7 +123,7 @@ interface XSpriteCanvas : XBitmapCanvas raises (com::sun::star::lang::IllegalArgumentException); /** Tells the sprite canvas to now update the screen - representation. + representation. Required to display rendered changes to the canvas, and updates to stopped animations and XCustomSprites in diff --git a/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl b/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl index d432142219f0..59bd3cdb8b17 100644 --- a/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl +++ b/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl @@ -204,7 +204,7 @@ interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer if a database access error occurs. */ void appendOrderByColumn([in] com::sun::star::beans::XPropertySet column, - [in] boolean ascending) + [in] boolean ascending) raises (com::sun::star::sdbc::SQLException); //------------------------------------------------------------------------- diff --git a/offapi/com/sun/star/security/CertificateContainerStatus.idl b/offapi/com/sun/star/security/CertificateContainerStatus.idl index 730484f824e6..6b184c2e7158 100644 --- a/offapi/com/sun/star/security/CertificateContainerStatus.idl +++ b/offapi/com/sun/star/security/CertificateContainerStatus.idl @@ -26,8 +26,6 @@ * ************************************************************************/ -/** -- idl definition -- **/ - #ifndef __com_sun_star_security_CertificateContainerStatus_idl_ #define __com_sun_star_security_CertificateContainerStatus_idl_ diff --git a/offapi/com/sun/star/security/SecurityInfrastructureException.idl b/offapi/com/sun/star/security/SecurityInfrastructureException.idl index e2f95c82ef6a..8e4cb7b1b26c 100644 --- a/offapi/com/sun/star/security/SecurityInfrastructureException.idl +++ b/offapi/com/sun/star/security/SecurityInfrastructureException.idl @@ -26,10 +26,6 @@ * ************************************************************************/ -//i20156 - new file for xmlsecurity module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_security_SecurityInfrastructureException_idl__ #define __com_sun_star_security_SecurityInfrastructureException_idl__ diff --git a/offapi/com/sun/star/security/XCertificate.idl b/offapi/com/sun/star/security/XCertificate.idl index e501e75e5319..983ac351ddac 100644 --- a/offapi/com/sun/star/security/XCertificate.idl +++ b/offapi/com/sun/star/security/XCertificate.idl @@ -26,10 +26,6 @@ * ************************************************************************/ -//i20156 - new file for xmlsecurity module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_security_XCertificate_idl_ #define __com_sun_star_security_XCertificate_idl_ diff --git a/offapi/com/sun/star/security/XCertificateExtension.idl b/offapi/com/sun/star/security/XCertificateExtension.idl index 678c6b7e0664..4f837a5364f8 100644 --- a/offapi/com/sun/star/security/XCertificateExtension.idl +++ b/offapi/com/sun/star/security/XCertificateExtension.idl @@ -26,10 +26,6 @@ * ************************************************************************/ -//i20156 - new file for xmlsecurity module - -/** -- idl definition -- **/ - #ifndef __com_sun_star_security_XCertificateExtension_idl_ #define __com_sun_star_security_XCertificateExtension_idl_ diff --git a/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl b/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl index 7fcceb37fdce..8f0aa364386c 100644 --- a/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl +++ b/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl @@ -41,7 +41,7 @@ module com { module sun { module star { module ucb { @since OOo 3.2 */ -/*published*/ exception URLAuthenticationRequest : AuthenticationRequest +exception URLAuthenticationRequest : AuthenticationRequest { //------------------------------------------------------------------------- /** The URL for which authentication is requested. diff --git a/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl b/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl index 697c142da34e..3abf7ee3ffe6 100644 --- a/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl +++ b/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl @@ -44,7 +44,7 @@ module com { module sun { module star { module ucb { @since OOo 3.2 */ -/*published*/ interface XInteractionSupplyAuthentication2 : XInteractionSupplyAuthentication +interface XInteractionSupplyAuthentication2 : XInteractionSupplyAuthentication { //------------------------------------------------------------------------- /** Specifies if "system credentials" can be obtained and used by the issuer diff --git a/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl b/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl index dcfdd4203df2..d1d293b6fc61 100644 --- a/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl +++ b/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl @@ -43,7 +43,6 @@ module com { module sun { module star { module ucb { XCommandEnvironment implementation, when executing a command using XCommandProcessor. */ -/* published */ interface XWebDAVCommandEnvironment : com::sun::star::uno::XInterface { //------------------------------------------------------------------------- @@ -63,8 +62,8 @@ interface XWebDAVCommandEnvironment : com::sun::star::uno::XInterface The header value must be an Any containing a string. */ sequence getUserRequestHeaders( - [in] string aURI, - [in] string aMethod); + [in] string aURI, + [in] string aMethod); }; //============================================================================= -- cgit