From cf94d9eb9d4e98316176cad6d2fdee0d47eef517 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Mon, 6 Jul 2009 09:00:26 +0000
Subject: CWS-TOOLING: integrate CWS dba32d 2009-06-30 08:58:13 +0200 fs 
 r273488 : merging latest changes from CWS dba32c 2009-06-29 11:40:42 +0200 oj
  r273459 : #i101652# fix token handling 2009-06-26 09:27:30 +0200 oj  r273394
 : #i101994# wrong condition checked 2009-06-22 12:09:04 +0200 fs  r273210 :
 merging latest changes from CWS dba32c 2009-06-18 11:01:06 +0200 fs  r273108
 : merge latest changes from CWS dba32c 2009-06-17 14:19:33 +0200 oj  r273072
 : handle images at the correct position 2009-06-17 13:37:19 +0200 oj  r273067
 : compile error 2009-06-17 13:35:58 +0200 oj  r273066 : #i102201# handle
 images 2009-06-17 13:27:21 +0200 oj  r273065 : #i80917# disable checkbox for
 internal copy 2009-06-17 13:25:38 +0200 oj  r273064 : #i80917# disable
 checkbox for internal copy 2009-06-15 12:59:16 +0200 fs  r272978 : merging
 latest changes from CWS dba32c 2009-06-15 10:45:58 +0200 fs  r272967 :
 CWS-TOOLING: rebase CWS dba32d to trunk@272827 (milestone: DEV300:m50)
 2009-06-15 08:41:05 +0200 fs  r272960 : merging changes from CWS dba32c
 (resulting from rebasing dba32c to m50) 2009-06-03 12:22:32 +0200 fs  r272554
 : merging latest changes from CWS dba32c 2009-06-03 11:11:27 +0200 fs 
 r272549 : #i100818# special treatment for DataAwareness not needed anymore
 2009-06-03 11:07:01 +0200 fs  r272548 : #i10000# removed package declaration
 2009-06-03 09:21:03 +0200 oj  r272537 : #i93465# save window states
 2009-06-03 08:56:25 +0200 oj  r272535 : solve compiler warnings 2009-06-03
 08:55:02 +0200 oj  r272534 : #i102295# export shapes i the first cell
 2009-06-03 07:35:18 +0200 oj  r272533 : #i101994# check for - and + prefix
 2009-06-03 06:51:38 +0200 oj  r272531 : #i101463# use uncomposed table name
 2009-06-03 06:33:06 +0200 oj  r272530 : #i102019# word corrected 2009-06-02
 14:58:28 +0200 fs  r272507 : #i102443# call initializeParser from
 LoadFinished 2009-06-02 14:30:10 +0200 oj  r272504 : #i102019# introduce
 static ints 2009-06-02 13:51:02 +0200 oj  r272501 : #i102439# wrong method
 used 2009-06-02 13:44:09 +0200 fs  r272500 : #i102440# when tampering with
 Order/GroupBy, reset the cached columns 2009-06-02 10:53:01 +0200 fs  r272487
 : #i102234# preserve the original filter when using a 0=1 filter 2009-06-02
 10:21:21 +0200 oj  r272486 : #i100535# handle time values as float 2009-06-02
 10:19:07 +0200 fs  r272485 : merging latest changes from CWS dba32c
 2009-05-29 16:00:15 +0200 fs  r272467 : merging latest changes from dba32c
 2009-05-29 15:31:25 +0200 fs  r272462 : merging latest changes from dba32c
 2009-05-29 10:58:03 +0200 oj  r272438 : #101135# export embedded-text
 2009-05-29 08:17:57 +0200 oj  r272431 : #i80917# make attribute not optional
 2009-05-29 08:17:32 +0200 oj  r272430 : remoe unused token 2009-05-29
 07:17:15 +0200 oj  r272429 : #i80917# make attribute not optional 2009-05-28
 12:48:14 +0200 oj  r272401 : #i102201# insert images in context menu
 2009-05-28 12:47:44 +0200 oj  r272400 : #i80917# add new attribute to handle
 first line 2009-05-28 12:16:12 +0200 oj  r272397 : #i96134# add / to path
 when it doesn't exist 2009-05-28 12:11:08 +0200 oj  r272390 : #i80917# add
 new attribute to handle first line 2009-05-28 11:33:35 +0200 oj  r272388 :
 #i101652# add new checkbox to handle header line as column names 2009-05-28
 11:30:15 +0200 oj  r272387 : #i101652# add localize 2009-05-28 11:15:53 +0200
 oj  r272386 : merge from dba32c 2009-05-28 09:08:25 +0200 fs  r272378 :
 merged a build fix from CWS dba32c

---
 .../registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'officecfg/registry')

diff --git a/officecfg/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs b/officecfg/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs
index 4f44ec04de5c..7105c0be5d1d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs
@@ -64,7 +64,7 @@
 			<info>
 				<desc>Specifies the UI name for the color or group name of the component.</desc>
 			</info>
-			<prop oor:name="DisplayName" oor:type="xs:string">
+			<prop oor:name="DisplayName" oor:type="xs:string" oor:localized="true">
 				<info>
 					<desc>Specifies the localized name that is used when presenting the entry to the user.</desc>
 				</info>
@@ -74,7 +74,7 @@
 			<info>
 				<desc>Specifies the ui strings for the component.</desc>
 			</info>
-			<prop oor:name="DisplayName" oor:type="xs:string">
+			<prop oor:name="DisplayName" oor:type="xs:string" oor:localized="true">
 				<info>
 					<desc>Specifies the localized name that is used when presenting the entry to the user.</desc>
 				</info>
-- 
cgit