From 920db17e94a8880658090f0887f788db0b15e2a2 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 3 May 2012 08:47:44 +0200
Subject: [PATCH] Related fdo#49379: Some old Paths need to be nillable after
 all

Those had been changed to non-nillable with the wholesale
e8bb827571f540ac4af2247cb11239bb96876669 "Fixed cppheader.xsl nillable
treatment," but code in PathSettings::impl_storePath
(framework/source/services/pathsettings.cxx) wants to nil them out ("remove the
whole path from the old configuration").

Change-Id: Ibce77eee179658940ed9ff2466af9b990e6a513d
---
 .../schema/org/openoffice/Office/Common.xcs     | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 7dd0e7ed8eff..00036cd4ecbd 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1811,9 +1811,7 @@
           </info>
           <value>$(progpath)/addin</value>
         </prop>
-        <prop
-            oor:name="AutoCorrect" oor:type="oor:string-list"
-            oor:nillable="false">
+        <prop oor:name="AutoCorrect" oor:type="oor:string-list">
           <info>
             <author>OS</author>
             <desc>Specifies the settings of the AutoCorrect dialog.</desc>
@@ -1823,8 +1821,7 @@
             <it>$(userurl)/autocorr</it>
           </value>
         </prop>
-        <prop
-            oor:name="AutoText" oor:type="oor:string-list" oor:nillable="false">
+        <prop oor:name="AutoText" oor:type="oor:string-list">
           <info>
             <author>OS</author>
             <desc>Contains the directory which contains the AutoText
@@ -1835,7 +1832,7 @@
             <it>$(userurl)/autotext</it>
           </value>
         </prop>
-        <prop oor:name="Backup" oor:type="xs:string" oor:nillable="false">
+        <prop oor:name="Backup" oor:type="xs:string">
           <info>
             <author>MBA</author>
             <desc>Stores the automatic backup copies of documents.</desc>
@@ -1892,7 +1889,7 @@
           <value>$(progpath)/filter</value>
         </prop>
         <prop
-            oor:name="Gallery" oor:type="oor:string-list" oor:nillable="false">
+            oor:name="Gallery" oor:type="oor:string-list">
           <info>
             <author>AF</author>
             <desc>Specifies the directory which contains the Gallery database
@@ -1903,7 +1900,7 @@
             <it>$(userurl)/gallery</it>
           </value>
         </prop>
-        <prop oor:name="Graphic" oor:type="xs:string" oor:nillable="false">
+        <prop oor:name="Graphic" oor:type="xs:string">
           <info>
             <author>DL</author>
             <desc>Specifies the directory that is displayed when the dialog for
@@ -1958,7 +1955,7 @@
           </info>
           <value>$(userpath)/store</value>
         </prop>
-        <prop oor:name="Temp" oor:type="xs:string" oor:nillable="false">
+        <prop oor:name="Temp" oor:type="xs:string">
           <info>
             <deprecated>Replaced by
             org.openoffice.Office.Paths/Temp</deprecated>
@@ -2007,7 +2004,7 @@
           </info>
           <value>$(userurl)/wordbook</value>
         </prop>
-        <prop oor:name="Work" oor:type="xs:string" oor:nillable="false">
+        <prop oor:name="Work" oor:type="xs:string">
           <info>
             <author>MBA</author>
             <desc>Specifies the path of the work folder, which can be modified