CWS-TOOLING: integrate CWS sw33a11y01ooo/DEV300_m78

2 files changed, 72 insertions, 39 deletions

diff --git a/offapi/com/sun/star/accessibility/AccessibleRole.idl b/offapi/com/sun/star/accessibility/AccessibleRole.idl
index 7a887fc58..5fe65d04e 100644
--- a/offapi/com/sun/star/accessibility/AccessibleRole.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleRole.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@ module com { module sun { module star { module accessibility {
 
     @since OOo 1.1.2
 */
-published constants AccessibleRole 
+published constants AccessibleRole
 {
 
     /** Unknown role.
@@ -89,7 +89,7 @@ published constants AccessibleRole
     const short CHECK_BOX = 4;
 
     /** This role is used for check buttons that are menu items.
-       
+
         @see CHECK_BOX, MENU_ITEM
     */
     const short CHECK_MENU_ITEM = 5;
@@ -388,7 +388,7 @@ published constants AccessibleRole
         something.</p>
 
         <p>See also <const>CHECK_BOX</const>, <const>TOGGLE_BUTTON</const>,
-        <const>RADIO_BUTTON</const>, <const>BUTTON_MENU</const> and 
+        <const>RADIO_BUTTON</const>, <const>BUTTON_MENU</const> and
         <const>BUTTON_DROPDOWN</const>.</p>
     */
     const short PUSH_BUTTON = 44;
@@ -408,7 +408,7 @@ published constants AccessibleRole
     const short RADIO_BUTTON = 46;
 
     /** This role is used for radio buttons that are menu items.
-       
+
         @see RADIO_BUTTON, MENU_ITEM
     */
     const short RADIO_MENU_ITEM = 47;
@@ -569,42 +569,42 @@ published constants AccessibleRole
         <p>See also <const>FRAME</const> and <const>DIALOG</const>.</p>
     */
     const short WINDOW = 67;
-    
+
     /** Button dropdown role
-        
+
         <p>The object represents a button that drops down a list of items.</p>
-    
+
         <p>See also <const>PUSH_BUTTON</const> and <const>BUTTON_MENU</const>.</p>
-    
+
         @since OOo 3.0
-    */  
+    */
     const short BUTTON_DROPDOWN = 68;
-    
+
     /** Button menu role
-        
+
         <p>The object represents a button that drops down a menu.</p>
 
         <p>See also <const>PUSH_BUTTON</const> and <const>BUTTON_DROPDOWN</const>.</p>
-    
+
         @since OOo 3.0
     */
     const short BUTTON_MENU = 69;
-    
+
     /** Caption role
-    
-        <p>The object contains descriptive information, usually textual, about 
+
+        <p>The object contains descriptive information, usually textual, about
         another user interface element such as a table, chart, or image.</p>.
-    
+
         @since OOo 3.0
     */
     const short CAPTION = 70;
-    
+
     /** Chart role
 
         <p>The object is a graphical depiction of quantitative data. It may contain multiple
         subelements whose attributes and/or description may be queried to obtain both
         the quantitative data and information about how the data is being presented.</p>
-    
+
         @since OOo 3.0
     */
     const short CHART = 71;
@@ -621,16 +621,16 @@ published constants AccessibleRole
 
         <p>The object is a container for form controls, for instance as part of a web form
         or user-input form within a document.</p>
-    
+
         @since OOo 3.0
     */
     const short FORM = 73;
-    
+
     /** Image map role
 
-    <p>Usually a graphic with multiple hotspots, where each hotspot can be activated 
+    <p>Usually a graphic with multiple hotspots, where each hotspot can be activated
         resulting in the loading of another document or section of a document.</p>
-    
+
         @since OOo 3.0
     */
     const short IMAGE_MAP = 74;
@@ -638,54 +638,81 @@ published constants AccessibleRole
     /** Note role
 
         <p>An embedded note which is not visible until activated.</p>
-    
+
         @since OOo 3.0
     */
     const short NOTE = 75;
-    
+
     /** Page role
 
-        <p>An object representing a page of document content. It is used in documents 
+        <p>An object representing a page of document content. It is used in documents
         which are accessed by the user on a page by page basis.</p>
-    
+
         @since OOo 3.0
     */
     const short PAGE = 76;
-    
+
     /** Ruler role
 
-        <p>An object which describes margins and tab stops, etc. for text objects which it controls.</p>    
-    
+        <p>An object which describes margins and tab stops, etc. for text objects which it controls.</p>
+
         @since OOo 3.0
     */
     const short RULER = 77;
-    
+
     /** Section role
 
-        <p>The object is a containing instance of document content which constitutes a particular 
+        <p>The object is a containing instance of document content which constitutes a particular
         'logical' section of the document.</p>
-    
+
         @since OOo 3.0
     */
     const short SECTION = 78;
-    
+
     /** Tree item role
 
         <p>An object that presents an element in a tree</p>
 
         </p>See also <const>TREE</const> and <const>TREE_TABLE</const>.</p>
-    
+
         @since OOo 3.0
     */
     const short TREE_ITEM = 79;
 
     /** Tree table role
 
-        <p>An object which represents both hierarchical and tabular information.</p>    
-    
+        <p>An object which represents both hierarchical and tabular information.</p>
+
         @since OOo 3.0
     */
     const short TREE_TABLE = 80;
+
+    /** Comment role
+
+        <p>An object which represents a comment.</p>
+
+        <p>A comment is anchored at a certain content position in the document and
+        annotates this document content position or a certain text range of the document content.
+        In the OpenDocument file format a comment is known as an annotation.</p>
+
+        <p>See also <const>COMMENT_END</const>.</p>
+
+        @since OOo 3.2
+    */
+    const short COMMENT = 81;
+
+    /** Comment end role
+
+        <p>An invisible object which represents the end position of a text range which
+        is annotated by a comment - see <const>COMMENT</const>.</p>
+
+        <p>This object and the corresponding object representing the comment shall be
+        in relation of type <const>MEMBER_OF</const>.</p>
+
+        @since OOo 3.2
+    */
+    const short COMMENT_END = 82;
+
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/text/TextMarkupType.idl b/offapi/com/sun/star/text/TextMarkupType.idl
index bcf9be109..5137d47d2 100644
--- a/offapi/com/sun/star/text/TextMarkupType.idl
+++ b/offapi/com/sun/star/text/TextMarkupType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 module com {  module sun {  module star {  module text {
 
 //=============================================================================
-    
+
 /** Constants to specify the type of text markup.
 
     <p>These constants are used with
@@ -58,6 +58,12 @@ constants TextMarkupType
     /// An inivisible markup used to identify sentence boundaries.
     /// @since OOo 3.0.1
     const long SENTENCE = 4;
+
+    /// Markups originates from change tracking.
+        /// @since OOo 3.3
+    const long TRACK_CHANGE_INSERTION = 5;
+    const long TRACK_CHANGE_DELETION = 6;
+    const long TRACK_CHANGE_FORMATCHANGE = 7;
 };
 
 }; }; }; };