diff options
| author | Thomas Lange [tl] <tl@openoffice.org> | 2010-11-19 09:51:15 +0100 |
|---|---|---|
| committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-11-19 09:51:15 +0100 |
| commit | e26c527f8163cd6effbd1958144dd9214cf17677 (patch) | |
| tree | ff8b6eba05b4a724dde177bb5319e7a976525861 /offapi | |
| parent | 5cee5c1628048b352c2c6c170c518f11cbdb953b (diff) | |
| parent | 1ed36293dcf8c363b3889c83a7eb7898a8b131d0 (diff) | |
cws tl84: merge with DEV300_m93
Diffstat (limited to 'offapi')
| -rw-r--r-- | offapi/com/sun/star/awt/XDialog2.idl | 2 | ||||
| -rw-r--r-- | offapi/com/sun/star/inspection/LineDescriptor.idl | 4 | ||||
| -rw-r--r-- | offapi/com/sun/star/text/PrintPreviewSettings.idl | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/offapi/com/sun/star/awt/XDialog2.idl b/offapi/com/sun/star/awt/XDialog2.idl index cd42d792cd0a..fbc5313aeb47 100644 --- a/offapi/com/sun/star/awt/XDialog2.idl +++ b/offapi/com/sun/star/awt/XDialog2.idl @@ -25,7 +25,7 @@ interface XDialog2: com::sun::star::awt::XDialog /** sets the help id so that the standard help button action will show the appropriate help page. */ - void setHelpId ( [in] long Id ); + void setHelpId ( [in] string Id ); }; //============================================================================= diff --git a/offapi/com/sun/star/inspection/LineDescriptor.idl b/offapi/com/sun/star/inspection/LineDescriptor.idl index 5bf9486f82ee..df8d72c9edd2 100644 --- a/offapi/com/sun/star/inspection/LineDescriptor.idl +++ b/offapi/com/sun/star/inspection/LineDescriptor.idl @@ -94,7 +94,7 @@ struct LineDescriptor <p>If a primary button exists for a property's UI representation (<member>HasPrimaryButton</member>), it gets the ID specified herein.</p> */ - long PrimaryButtonId; + string PrimaryButtonId; /** describes the URL of an image to display on the primary button, if any. @@ -139,7 +139,7 @@ struct LineDescriptor @see PrimaryButtonId */ - long SecondaryButtonId; + string SecondaryButtonId; /** describes the URL of an image to display on the secondary button, if any. diff --git a/offapi/com/sun/star/text/PrintPreviewSettings.idl b/offapi/com/sun/star/text/PrintPreviewSettings.idl index 392143d061a7..e282cf76536f 100644 --- a/offapi/com/sun/star/text/PrintPreviewSettings.idl +++ b/offapi/com/sun/star/text/PrintPreviewSettings.idl @@ -39,6 +39,8 @@ //============================================================================= /** These properties describe the printing of the content of a text document. + * + * @deprecated since OOo 3.3 */ published service PrintPreviewSettings { |