strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Related fdo#49379: Some old Paths need to be nillable after all

Browse source 
Those had been changed to non-nillable with the wholesale
e8bb827571 "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
This commit is contained in:
Stephan Bergmann 2012-05-03 08:47:44 +02:00
parent 89ef290c89
commit 920db17e94
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
officecfg/registry/schema/org/openoffice/Office/Common.xcs
View file

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