diff options
author | Juergen Schmidt <jsc@openoffice.org> | 2010-11-09 15:50:17 +0100 |
---|---|---|
committer | Juergen Schmidt <jsc@openoffice.org> | 2010-11-09 15:50:17 +0100 |
commit | 724b812e95995ae2d4170805e059c96cbb69098e (patch) | |
tree | eb1df8dfe6cfeb13cf7921e5d88ec5094be17d2a /offapi/com | |
parent | 098c825385ecf980e571dd6d9a985bf747d805fc (diff) | |
parent | b849d06fae7466bd94542c6c06ec23c906fb73a6 (diff) |
jsc340: merge with DEV300m92
Diffstat (limited to 'offapi/com')
-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 83d4ca85b..6237a7f3b 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 fc300d041..7787ea77a 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 bec086e30..bd6c61d2f 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 { |