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

[Szymon Kłos]

 framework/source/uielement/toolbarmodemenucontroller.cxx           |    9 
+--------
 officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs |    5 ++++-
 2 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 6d1e22a9b8c197673f43dcb00f3270dae812c8ae
Author: Szymon Kłos <eszka...@gmail.com>
Date:   Thu Feb 23 17:24:31 2017 +0100

    Make ToolbarMode's "IsExperimental" property non-nillable
    
    Change-Id: Ia83776d7ee23fa56c0fc541c228c68b1832c3d11
    Reviewed-on: https://gerrit.libreoffice.org/34585
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx 
b/framework/source/uielement/toolbarmodemenucontroller.cxx
index 1e6cc36..018253b 100644
--- a/framework/source/uielement/toolbarmodemenucontroller.cxx
+++ b/framework/source/uielement/toolbarmodemenucontroller.cxx
@@ -128,14 +128,7 @@ void ToolbarModeMenuController::fillPopupMenu( Reference< 
css::awt::XPopupMenu >
         OUString aLabel = comphelper::getString( aModeNode.getNodeValue( 
"Label" ) );
         OUString aCommandArg = comphelper::getString( aModeNode.getNodeValue( 
"CommandArg" ) );
         long nPosition = comphelper::getINT32( aModeNode.getNodeValue( 
"MenuPosition" ) );
-
-        bool isExperimental = false;
-        if ( aModeNode.hasByName( "IsExperimental" ) )
-        {
-            Any aExperimentalNode = aModeNode.getNodeValue( "IsExperimental" );
-            if( aExperimentalNode.hasValue() )
-                isExperimental = comphelper::getBOOL( aExperimentalNode );
-        }
+        bool isExperimental = comphelper::getBOOL( aModeNode.getNodeValue( 
"IsExperimental" ) );
 
         // Allow Notebookbar only in experimental mode
         if ( isExperimental && !aMiscOptions.IsExperimentalMode() )
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs 
b/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
index 50759f8..5d0f418 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
@@ -41,10 +41,13 @@
           <desc>Position in the menu.</desc>
         </info>
       </prop>
-      <prop oor:name="IsExperimental" oor:type="xs:boolean" 
oor:nillable="true">
+      <prop oor:name="IsExperimental" oor:type="xs:boolean" 
oor:nillable="false">
         <info>
           <desc>Enables entry only in the experimental mode.</desc>
         </info>
+        <value>
+          false
+        </value>
       </prop>
       <prop oor:name="HasNotebookbar" oor:type="xs:boolean" 
oor:nillable="false">
         <info>

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits