summaryrefslogtreecommitdiff
path: root/offapi/com
diff options
context:
space:
mode:
authorThomas Lange [tl] <tl@openoffice.org>2010-11-19 09:51:15 +0100
committerThomas Lange [tl] <tl@openoffice.org>2010-11-19 09:51:15 +0100
commitd7923dbe2eff68b516ca842c27c492bebb3cf93d (patch)
tree1b2383c2c87ea76aa8f2d1271a99f2970e2aff7b /offapi/com
parent24803eb03a013c72b77941f35c2cb975f1b8865a (diff)
parentac8cf22ffe3b2e18e349babc59a287f395acee13 (diff)
cws tl84: merge with DEV300_m93
Diffstat (limited to 'offapi/com')
-rw-r--r--offapi/com/sun/star/awt/XDialog2.idl2
-rw-r--r--offapi/com/sun/star/inspection/LineDescriptor.idl4
-rw-r--r--offapi/com/sun/star/text/PrintPreviewSettings.idl2
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
{