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

[Caolán McNamara]

 cui/source/options/tsaurls.cxx                             |   11 +++++++----
 officecfg/registry/schema/org/openoffice/Office/Calc.xcs   |    1 +
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |    2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit bd1a3e75738d65a3bdd615c106ea57a999d51376
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 14 09:27:53 2016 +0000

    configuration warnings about non-nillable properties with no default set
    
    Change-Id: I5814f2e474e0ef5a37c5f43f8bb853219fd7981f

diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx
index d812f37..2c5e8a8 100644
--- a/cui/source/options/tsaurls.cxx
+++ b/cui/source/options/tsaurls.cxx
@@ -36,11 +36,14 @@ TSAURLsDialog::TSAURLsDialog(vcl::Window* pParent)
 
     try
     {
-        css::uno::Sequence<OUString> aUserSetTSAURLs(officecfg::Office::Common::Security::Scripting::TSAURLs::get());
-
-        for (auto i = aUserSetTSAURLs.begin(); i != aUserSetTSAURLs.end(); ++i)
+        boost::optional<css::uno::Sequence<OUString>> aUserSetTSAURLs(officecfg::Office::Common::Security::Scripting::TSAURLs::get());
+        if (aUserSetTSAURLs)
         {
-            AddTSAURL(*i);
+            const css::uno::Sequence<OUString>& rUserSetTSAURLs = aUserSetTSAURLs.get();
+            for (auto i = rUserSetTSAURLs.begin(); i != rUserSetTSAURLs.end(); ++i)
+            {
+                AddTSAURL(*i);
+            }
         }
     }
     catch (const uno::Exception &e)
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 69b3f5c..8e068a8 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -400,6 +400,7 @@
             <desc>Selects a set of functions that are calculated for the selected cells, and which show the results in the status bar.</desc>
             <label>Statusbar Functions</label>
           </info>
+          <value>0</value>
         </prop>
         <prop oor:name="StatusbarFunction" oor:type="xs:int" oor:nillable="false">
           <!-- OldPath: Calc/Layout -->
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 99fc0ef..3fc789d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2536,7 +2536,7 @@
             <desc>Contains the path to the users NSS certificate directory.</desc>
           </info>
         </prop>
-        <prop oor:name="TSAURLs" oor:type="oor:string-list" oor:nillable="false">
+        <prop oor:name="TSAURLs" oor:type="oor:string-list">
           <info>
             <desc>Contains the URLs or Time Stamping Authority servers.</desc>
           </info>