[Libreoffice-commits] .: 2 commits - cui/source officecfg/registry

[Stephan Bergmann]

 cui/source/options/optpath.cxx                             |    4 +--
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   17 +++++--------
 2 files changed, 9 insertions(+), 12 deletions(-)

New commits:
commit 920db17e94a8880658090f0887f788db0b15e2a2
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu May 3 08:47:44 2012 +0200

    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

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 7dd0e7e..00036cd 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
commit 89ef290c89759571b74a9fbc63647cd90eb3490a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu May 3 08:44:19 2012 +0200

    Improved error reporting
    
    Change-Id: I5e9bb4c5ebfc92547e13d4ec04ce1af85591c4a5

diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 63593c0..b4478c8 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -839,9 +839,9 @@ void SvxPathTabPage::SetPathList(
             pImpl->m_xPathSettings->setPropertyValue( sProp, aValue );
         }
     }
-    catch( const Exception& )
+    catch( const Exception& e )
     {
-        OSL_FAIL( "SvxPathTabPage::SetPathList(): caught an exception!" );
+        SAL_WARN("cui", "caught: " << e.Message);
     }
 }