From 6d1e22a9b8c197673f43dcb00f3270dae812c8ae Mon Sep 17 00:00:00 2001 From: Szymon Kłos Date: Thu, 23 Feb 2017 17:24:31 +0100 Subject: Make ToolbarMode's "IsExperimental" property non-nillable Change-Id: Ia83776d7ee23fa56c0fc541c228c68b1832c3d11 Reviewed-on: https://gerrit.libreoffice.org/34585 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- framework/source/uielement/toolbarmodemenucontroller.cxx | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'framework') 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() ) -- cgit