summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2009-01-06 16:42:28 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2009-01-06 16:42:28 +0000
commit4dd68b6dd54647f82a2c60348b8a1fa19a5d3c09 (patch)
tree7225b2744ceb0e1dc519fcd46f649ef81f5d8d5a
parentc6906e1b37c39f5e3981e21c3b9adb1af11d938b (diff)
CWS-TOOLING: integrate CWS os123
2008-12-10 10:15:09 +0100 os r265154 : #i94987# DateTimeValue added 2008-12-10 09:00:58 +0100 os r265150 : #i96045# ctl languages enabled 2008-12-09 18:09:10 +0100 os r265129 : syntax error fixed 2008-12-09 09:35:09 +0100 os r265056 : vertical/horizonatal metric: no bool value 2008-12-08 09:56:50 +0100 os r264974 : CWS-TOOLING: rebase CWS os123 to trunk@264807 (milestone: DEV300:m37) 2008-12-03 11:41:13 +0100 os r264762 : #i96822# database removed, too 2008-12-03 11:35:26 +0100 os r264760 : #i96822# business cards and labels should not be part of the document list 2008-12-01 11:38:26 +0100 os r264592 : #i96322# command name of ActivateStyleApply added 2008-11-27 14:59:46 +0100 va r264491 : #i95322#: Initial Revision 2008-11-27 14:53:20 +0100 va r264490 : #i95322#: New Language Directory for Persian (Farsi) 2008-11-21 08:48:55 +0100 os r264107 : #i94409# recording/executing split table 2008-11-13 13:18:57 +0100 os r263636 : #i93924# string reconversion 2008-11-12 15:58:48 +0100 os r263604 : #i94987# Date property re-add to Annotation service 2008-11-12 15:44:24 +0100 os r263603 : #i88766# ruler metric 2008-11-12 15:43:33 +0100 os r263602 : #i88766# 2008-11-11 09:15:28 +0100 os r263545 : #i94839# get real filter name from dialog instead of guessing from UI name
-rw-r--r--offapi/com/sun/star/text/ViewSettings.idl12
-rw-r--r--offapi/com/sun/star/text/textfield/Annotation.idl4
2 files changed, 16 insertions, 0 deletions
diff --git a/offapi/com/sun/star/text/ViewSettings.idl b/offapi/com/sun/star/text/ViewSettings.idl
index 7d7010b8ecc4..f9e356f64732 100644
--- a/offapi/com/sun/star/text/ViewSettings.idl
+++ b/offapi/com/sun/star/text/ViewSettings.idl
@@ -340,6 +340,18 @@ published service ViewSettings
@since OOo 3.0.0
*/
[optional, property] boolean ShowNonprintingCharacters;
+ //-------------------------------------------------------------------------
+ /** metric unit of the horizontal ruler
+ @since OOo 3.1.0
+ <p>Uses values from com::sun::star::awt::FieldUnit</p>
+ */
+ [optional, property] long HorizontalRulerMetric;
+ //-------------------------------------------------------------------------
+ /** metric unit of the vertical ruler
+ @since OOo 3.1.0
+ <p>Uses values from com::sun::star::awt::FieldUnit</p>
+ */
+ [optional, property] long VerticalRulerMetric;
};
//=============================================================================
diff --git a/offapi/com/sun/star/text/textfield/Annotation.idl b/offapi/com/sun/star/text/textfield/Annotation.idl
index 7ce02964cdcc..200262482ace 100644
--- a/offapi/com/sun/star/text/textfield/Annotation.idl
+++ b/offapi/com/sun/star/text/textfield/Annotation.idl
@@ -33,6 +33,7 @@
#include <com/sun/star/text/TextField.idl>
#include <com/sun/star/util/Date.idl>
+#include <com/sun/star/util/DateTime.idl>
//=============================================================================
@@ -54,6 +55,9 @@ published service Annotation
/** contains the creation date.
*/
[property]com::sun::star::util::Date Date;
+ /** contains the creation date.
+ */
+ [optional, property]com::sun::star::util::DateTime DateTimeValue;
};
//=============================================================================