diff options
| author | Szymon Kłos <eszkadev@gmail.com> | 2017-02-23 17:24:31 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-02-24 07:42:53 +0000 |
| commit | 6d1e22a9b8c197673f43dcb00f3270dae812c8ae (patch) | |
| tree | bf1b8df95c00f73a63041a586c1f90dce867a420 | |
| parent | b65f742d7a3d843570c75ffcab99d5029b01a772 (diff) | |
Make ToolbarMode's "IsExperimental" property non-nillable
Change-Id: Ia83776d7ee23fa56c0fc541c228c68b1832c3d11
Reviewed-on: https://gerrit.libreoffice.org/34585
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | framework/source/uielement/toolbarmodemenucontroller.cxx | 9 | ||||
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs | 5 |
2 files changed, 5 insertions, 9 deletions
diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx b/framework/source/uielement/toolbarmodemenucontroller.cxx index 1e6cc36f31ca..018253bdfb94 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 50759f83d8ed..5d0f418abd2a 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> |