summaryrefslogtreecommitdiff
path: root/officecfg/registry/schema/org
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-09-16 13:55:36 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-09-16 13:55:36 +0000
commita9ac4fe6fd5b3ee921a8eee85a715c3ef881e47e (patch)
treeb0c9049bd6bf5188a2ff1712aa8ce1189e4dc349 /officecfg/registry/schema/org
parentf9d126374cdc88d4d9a0d6002bb36d6576d24546 (diff)
CWS-TOOLING: integrate CWS impressnotes01
2009-09-11 13:52:41 +0200 cl r276061 : CWS-TOOLING: rebase CWS impressnotes01 to trunk@276043 (milestone: DEV300:m58) 2009-09-10 15:44:57 +0200 cl r276039 : #i103139# continued work on the impress annotation feature 2009-09-10 14:52:31 +0200 cl r276032 : #i103139# continued work on the impress annotation feature 2009-09-10 14:50:32 +0200 cl r276031 : #i103139# continued work on the impress annotation feature 2009-09-10 14:48:29 +0200 cl r276030 : #i103139# continued work on the impress annotation feature 2009-09-10 11:36:11 +0200 cl r276027 : #i103139# continued work on the impress annotation feature 2009-09-09 20:22:41 +0200 cl r276018 : #i103139# continued work on the impress annotation feature 2009-09-09 20:21:45 +0200 cl r276017 : #i103139# continued work on the impress annotation feature 2009-09-09 19:32:29 +0200 sj r276015 : #i103139# added import of comments (ppt binary) 2009-09-09 19:31:07 +0200 sj r276014 : #i103139# added import of comments (ppt binary) 2009-09-09 19:16:41 +0200 cl r276011 : #i103139# continued work on the impress annotation feature 2009-09-09 19:15:19 +0200 cl r276010 : #i103139# continued work on the impress annotation feature 2009-09-09 16:27:19 +0200 cl r276001 : #i104579# fixed isEmptyPresObj() 2009-09-09 15:12:02 +0200 cl r275997 : #i103139# continued work on the impress annotation feature 2009-09-09 15:06:29 +0200 sj r275996 : #i103139# added import of comments (ppt binary) 2009-09-09 14:53:01 +0200 cl r275995 : #i103139# continued work on the impress annotation feature 2009-09-09 14:51:32 +0200 cl r275994 : #i103139# continued work on the impress annotation feature 2009-09-09 12:11:17 +0200 cl r275982 : #i103139# continued work on the impress annotation feature 2009-09-09 11:47:55 +0200 cl r275981 : #i103139# continued work on the impress annotation feature 2009-09-09 11:47:23 +0200 cl r275980 : #i103139# continued work on the impress annotation feature 2009-09-09 11:44:47 +0200 cl r275978 : #i104315# added missing tab pages 2009-09-08 16:04:44 +0200 cl r275936 : #i103139# continued work on the impress annotation feature 2009-09-08 16:03:28 +0200 cl r275935 : #i103139# continued work on the impress annotation feature 2009-09-08 11:45:47 +0200 cl r275920 : #i103139# continued work on the impress annotation feature 2009-09-08 11:41:51 +0200 cl r275919 : #i103139# continued work on the impress annotation feature 2009-09-07 18:30:55 +0200 cl r275910 : #i103139# continued work on the impress annotation feature 2009-09-07 18:29:37 +0200 cl r275909 : #i103139# continued work on the impress annotation feature 2009-09-07 17:25:43 +0200 cl r275905 : #i103139# continued work on the impress annotation feature 2009-09-07 12:00:28 +0200 cl r275884 : #i103139# continued work on the impress annotation feature 2009-09-06 14:14:00 +0200 cl r275859 : #i103139# continued work on the impress annotation feature 2009-09-05 20:57:24 +0200 cl r275854 : #i103139# continued work on the impress annotation feature 2009-09-05 20:56:29 +0200 cl r275853 : #i103139# continued work on the impress annotation feature 2009-09-05 20:55:27 +0200 cl r275852 : #i103139# continued work on the impress annotation feature 2009-09-05 20:11:42 +0200 cl r275851 : #i103139# continued work on the impress annotation feature 2009-09-05 20:11:09 +0200 cl r275850 : #i103139# continued work on the impress annotation feature 2009-09-05 17:43:33 +0200 cl r275845 : #i103139# continued work on the impress annotation feature 2009-09-05 17:04:41 +0200 cl r275843 : #i103139# continued work on the impress annotation feature 2009-09-05 17:03:26 +0200 cl r275842 : #i103139# continued work on the impress annotation feature 2009-09-05 17:02:53 +0200 cl r275841 : #i103139# continued work on the impress annotation feature 2009-09-05 13:15:04 +0200 pl r275839 : #i104823# WB_NEEDSFOCUS 2009-09-05 13:14:41 +0200 pl r275838 : #i104823# WB_NEEDSFOCUS 2009-09-04 17:48:21 +0200 cl r275826 : #i103139# continued work on the impress annotation feature 2009-09-04 17:35:03 +0200 cl r275825 : #i103139# continued work on the impress annotation feature 2009-09-04 17:15:46 +0200 cl r275824 : #i103139# continued work on the impress annotation feature 2009-09-04 17:12:54 +0200 cl r275823 : #i103139# continued work on the impress annotation feature 2009-09-04 17:05:23 +0200 cl r275822 : #i103139# continued work on the impress annotation feature 2009-09-04 16:48:28 +0200 cl r275820 : #i103139# continued work on the impress annotation feature 2009-09-04 16:44:02 +0200 cl r275818 : #i103139# continued work on the impress annotation feature 2009-09-04 16:43:23 +0200 cl r275817 : #i103139# continued work on the impress annotation feature 2009-09-04 16:06:04 +0200 cl r275812 : #i103139# continued work on the impress annotation feature 2009-09-04 16:05:45 +0200 cl r275811 : #i103139# continued work on the impress annotation feature 2009-09-04 15:04:33 +0200 cl r275806 : #i103139# continued work on the impress annotation feature 2009-09-04 11:43:14 +0200 cl r275795 : #i103139# continued work on the impress annotation feature 2009-09-04 11:27:10 +0200 cl r275793 : #i103139# continued work on the impress annotation feature 2009-09-04 11:10:02 +0200 cl r275792 : #i103139# continued work on the impress annotation feature 2009-09-04 11:07:05 +0200 cl r275790 : #i103139# continued work on the impress annotation feature 2009-09-04 11:05:01 +0200 cl r275789 : #i103139# continued work on the impress annotation feature 2009-09-04 10:55:51 +0200 cl r275785 : #i103139# renamed notes to comments 2009-09-04 10:54:57 +0200 cl r275784 : #i103139# renamed notes to comments 2009-09-03 20:37:35 +0200 cl r275772 : #i103139# continued work on the impress annotation feature 2009-09-03 20:35:31 +0200 cl r275771 : #i103139# continued work on the impress annotation feature 2009-09-01 18:17:55 +0200 cl r275680 : #i103139# continued work on the impress annotation feature 2009-09-01 18:15:08 +0200 cl r275678 : #i103139# continued work on the impress annotation feature 2009-09-01 18:13:38 +0200 cl r275677 : #i103139# continued work on the impress annotation feature 2009-08-18 12:35:42 +0200 cl r275089 : fixed merge error 2009-08-18 11:39:58 +0200 cl r275086 : CWS-TOOLING: rebase CWS impressnotes01 to trunk@275001 (milestone: DEV300:m55) 2009-07-30 13:45:10 +0200 cl r274481 : fixed merge errrors 2009-07-30 13:41:21 +0200 cl r274480 : fixed merge errrors 2009-07-30 13:39:40 +0200 cl r274478 : fixed merge errrors 2009-07-22 18:07:30 +0200 cl r274256 : CWS-TOOLING: rebase CWS impressnotes01 to trunk@273858 (milestone: DEV300:m52) 2009-07-21 17:21:31 +0200 cl r274208 : merging 2009-07-20 14:28:34 +0200 cl r274137 : #i103139# annotation support for impress 2009-07-20 14:28:04 +0200 cl r274136 : #i103139# annotation support for impress 2009-07-20 14:27:20 +0200 cl r274135 : #i103139# annotation support for impress 2009-07-20 14:21:17 +0200 cl r274134 : #i103139# annotation support for impress 2009-07-20 14:20:56 +0200 cl r274133 : #i103139# annotation support for impress 2009-07-20 14:20:09 +0200 cl r274132 : #i103139# annotation support for impress 2009-07-20 14:19:00 +0200 cl r274131 : #i103139# annotation support for impress 2009-07-20 14:17:50 +0200 cl r274130 : #i103139# annotation support for impress 2009-07-20 14:12:24 +0200 cl r274129 : #i103139# annotation support for impress 2009-07-20 13:52:03 +0200 cl r274128 : #i103139# annotation support for impress 2009-07-20 13:51:11 +0200 cl r274127 : #i103139# annotation support for impress 2009-07-20 13:48:59 +0200 cl r274126 : #i103139# annotation support for impress 2009-07-20 13:43:56 +0200 cl r274125 : #i103139# annotation support for impress 2009-07-20 13:31:55 +0200 cl r274123 : #i103139# annotation support for impress 2009-07-20 13:30:45 +0200 cl r274122 : #i103139# annotation support for impress
Diffstat (limited to 'officecfg/registry/schema/org')
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Calc.xcs4
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Common.xcs15
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Draw.xcs24
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Impress.xcs10
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/UI.xcs4
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Writer.xcs16
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs8
7 files changed, 51 insertions, 30 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index fd7c52ef4df2..1ab6b58b4d13 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -124,8 +124,8 @@
<!-- UIHints: Tools - Options -Spreadsheets - Contents - [Section] Display -->
<info>
<author>NN</author>
- <desc>Indicates whether notes are marked.</desc>
- <label>Note tags</label>
+ <desc>Indicates whether comments are marked.</desc>
+ <label>Comment tags</label>
</info>
<value>true</value>
</prop>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index e6218530561c..e834f97d4df9 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2358,14 +2358,19 @@ Dymamic border coloring means that when the mouse is hovered over a control, and
<desc>ODFVER_011</desc>
</info>
</enumeration>
- <enumeration oor:value="3">
+ <enumeration oor:value="4">
<info>
<desc>ODFVER_012</desc>
</info>
</enumeration>
- </constraints>
- <value>3</value>
- </prop>
+ <enumeration oor:value="3">
+ <info>
+ <desc>ODFVER_LATEST</desc>
+ </info>
+ </enumeration>
+ </constraints>
+ <value>3</value>
+ </prop>
</group>
</group>
<group oor:name="Load">
@@ -6003,7 +6008,7 @@ Dymamic border coloring means that when the mouse is hovered over a control, and
<!-- UIHints: Edit Search/Replace -->
<info>
<author>mod</author>
- <desc>Specifies if search includes notes(SwPostItFields)</desc>
+ <desc>Specifies if search includes comments(SwPostItFields)</desc>
</info>
<value>false</value>
</prop>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
index f29972ca7fcf..c7e4f71c677c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
@@ -359,18 +359,26 @@
</constraints>
<value>0</value>
</prop>
- <prop oor:name="SimpleHandles" oor:type="xs:boolean">
- <!-- OldPath: Draw/Other -->
- <!-- OldLocation: soffice.cfg -->
- <!-- UIHints: Optionbar -->
+ <prop oor:name="ShowComments" oor:type="xs:boolean">
<info>
- <author>AF</author>
- <desc>Indicates whether to show simple (true) or 3D-handles (false).</desc>
- <label>Simple Handles</label>
+ <author>CL</author>
+ <desc>Indicates whether to show comments (true) or hide them (false).</desc>
+ <label>Show Comments</label>
</info>
<value>true</value>
</prop>
- <prop oor:name="BigHandles" oor:type="xs:boolean">
+ <prop oor:name="SimpleHandles" oor:type="xs:boolean">
+ <!-- OldPath: Draw/Other -->
+ <!-- OldLocation: soffice.cfg -->
+ <!-- UIHints: Optionbar -->
+ <info>
+ <author>AF</author>
+ <desc>Indicates whether to show simple (true) or 3D-handles (false).</desc>
+ <label>Simple Handles</label>
+ </info>
+ <value>true</value>
+ </prop>
+ <prop oor:name="BigHandles" oor:type="xs:boolean">
<!-- OldPath: Draw/Other -->
<!-- OldLocation: soffice.cfg -->
<!-- UIHints: Optionbar -->
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 6cf3a7abdc68..bfa2e7dce407 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -398,7 +398,15 @@
</constraints>
<value>0</value>
</prop>
- <prop oor:name="SimpleHandles" oor:type="xs:boolean">
+ <prop oor:name="ShowComments" oor:type="xs:boolean">
+ <info>
+ <author>CL</author>
+ <desc>Indicates whether to show comments (true) or hide them (false).</desc>
+ <label>Show Comments</label>
+ </info>
+ <value>true</value>
+ </prop>
+ <prop oor:name="SimpleHandles" oor:type="xs:boolean">
<!-- OldPath: Impress/Other -->
<!-- OldLocation: soffice.cfg -->
<!-- UIHints: Optionbar -->
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI.xcs b/officecfg/registry/schema/org/openoffice/Office/UI.xcs
index 02e90d75daef..48368c263b34 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI.xcs
@@ -418,11 +418,11 @@
</group>
<group oor:name="CalcNotesBackground">
<info>
- <desc>Specifies the settings used for the background of notes in Calc.</desc>
+ <desc>Specifies the settings used for the background of comments in Calc.</desc>
</info>
<prop oor:name="Color" oor:type="xs:int">
<info>
- <desc>Specifies the color used for the background of notes.</desc>
+ <desc>Specifies the color used for the background of comments.</desc>
</info>
</prop>
</group>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 1b21017e3f3c..cb22883eba09 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1097,8 +1097,8 @@
<!-- UIHints: Tools - Options - Text document - Contents - [Section] Display -->
<info>
<author>OS</author>
- <desc>Specifies if notes are displayed.</desc>
- <label>Notes</label>
+ <desc>Specifies if comments are displayed.</desc>
+ <label>Comments</label>
</info>
<value>true</value>
</prop>
@@ -2145,7 +2145,7 @@
<!-- UIHints: Tools - Options - Text document - Print - [Section] Notes -->
<info>
<author>OS</author>
- <desc>Specifies if and how notes are printed.</desc>
+ <desc>Specifies if and how comments are printed.</desc>
</info>
<constraints>
<enumeration oor:value="0">
@@ -2155,7 +2155,7 @@
</enumeration>
<enumeration oor:value="1">
<info>
- <desc>Notes only</desc>
+ <desc>Comments only</desc>
</info>
</enumeration>
<enumeration oor:value="2">
@@ -5659,13 +5659,13 @@
</group>
<group oor:name="Notes">
<info>
- <desc>Contains settings for notes</desc>
+ <desc>Contains settings for comments</desc>
</info>
<prop oor:name="ShowAnkor" oor:type="xs:boolean">
<info>
<author>mod</author>
- <desc>configures if note anchor should be shown or hidden when display is off</desc>
- <label>Notes Ankor on/off</label>
+ <desc>configures if comment anchor should be shown or hidden when display is off</desc>
+ <label>Comments Ankor on/off</label>
</info>
<value>false</value>
</prop>
@@ -6983,7 +6983,7 @@
</prop>
<prop oor:type="xs:boolean" oor:name="ShowNotes">
<info>
- <desc>Show the "notes" heading ? </desc>
+ <desc>Show the "comments" heading ? </desc>
</info>
</prop>
diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
index 6063ce1b55c9..ebb9fca30962 100644
--- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
@@ -93,8 +93,8 @@
<!-- UIHints: Tools - Option - HTML-Document Contents - [Section] Display -->
<info>
<author>OS</author>
- <desc>Specifies if notes are displayed.</desc>
- <label>Notes</label>
+ <desc>Specifies if comments are displayed.</desc>
+ <label>Comments</label>
</info>
<value>true</value>
</prop>
@@ -686,7 +686,7 @@
<!-- UIHints: Tools - Option - HTML-Document Print - [Section] Notes -->
<info>
<author>OS</author>
- <desc>Specifies if notes are printed and how they are printed.</desc>
+ <desc>Specifies if comments are printed and how they are printed.</desc>
</info>
<constraints>
<enumeration oor:value="0">
@@ -696,7 +696,7 @@
</enumeration>
<enumeration oor:value="1">
<info>
- <desc>Notes only</desc>
+ <desc>Comments only</desc>
</info>
</enumeration>
<enumeration oor:value="2">