Skip to content

C
core
Kaydet (Commit) 5c573a2f authored tarafından Kshitij Pathania's avatar Kshitij Pathania Kaydeden (comit) Heiko Tietze
Dosyalara gözat
Seçenekler

tdf#115131 made a common submenu for toolbars and notebookbars 

Also added the submenu in base, maths and draw

Change-Id: I94850c09c08fd3848eabe2597679634f30fbc735
Reviewed-on: https://gerrit.libreoffice.org/49575Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarandreas_kainz <kainz.a@gmail.com>
Reviewed-by: 's avatarSzymon Kłos <szymon.klos@collabora.com>
üst e075ee96
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 290 deletions
dbaccess/uiconfig/dbapp/menubar/menubar.xml
Dosyayı görüntüle @ 5c573a2f
......@@ -86,6 +86,7 @@
</menu:menupopup>
</menu:menu>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ToolbarMode"/>
<menu:menuitem menu:id=".uno:AvailableToolbars"/>
<menu:menuitem menu:id=".uno:StatusBarVisible"/>
<menu:menuitem menu:id=".uno:DBPreview"/>
......
framework/Library_fwl.mk
Dosyayı görüntüle @ 5c573a2f
......@@ -70,7 +70,6 @@ $(eval $(call gb_Library_add_exception_objects,fwl,\
framework/source/uielement/newmenucontroller \
framework/source/uielement/toolbarmodemenucontroller \
framework/source/uielement/toolbarsmenucontroller \
framework/source/uielement/notebookbarmenucontroller \
))
# vim: set noet sw=4 ts=4:
framework/inc/services.h
Dosyayı görüntüle @ 5c573a2f
......@@ -53,7 +53,6 @@ namespace framework{
#define IMPLEMENTATIONNAME_NEWMENUCONTROLLER "com.sun.star.comp.framework.NewMenuController"
#define IMPLEMENTATIONNAME_TOOLBARMODEMENUCONTROLLER "com.sun.star.comp.framework.ToolbarModeMenuController"
#define IMPLEMENTATIONNAME_TOOLBARSMENUCONTROLLER "com.sun.star.comp.framework.ToolBarsMenuController"
#define IMPLEMENTATIONNAME_NOTEBOOKBARMENUCONTROLLER "com.sun.star.comp.framework.NotebookbarMenuController"
#define IMPLEMENTATIONNAME_HELPONSTARTUP "com.sun.star.comp.framework.HelpOnStartup"
#define IMPLEMENTATIONNAME_SHELLJOB "com.sun.star.comp.framework.ShellJob"
#define IMPLEMENTATIONNAME_FWK_TASKCREATOR "com.sun.star.comp.framework.TaskCreator"
......
framework/source/register/registertemp.cxx
Dosyayı görüntüle @ 5c573a2f
......@@ -64,7 +64,6 @@ COMPONENTGETFACTORY ( fwl,
IFFACTORY( ::framework::DispatchRecorderSupplier ) else
IFFACTORY( ::framework::ToolbarModeMenuController ) else
IFFACTORY( ::framework::ToolbarsMenuController ) else
IFFACTORY( ::framework::NotebookbarMenuController ) else
IFFACTORY( ::framework::FontMenuController ) else
IFFACTORY( ::framework::MacrosMenuController ) else
IFFACTORY( ::framework::NewMenuController ) else
......
framework/source/uielement/toolbarmodemenucontroller.cxx
Dosyayı görüntüle @ 5c573a2f
......@@ -18,7 +18,6 @@
*/
#include <uielement/toolbarmodemenucontroller.hxx>
#include <services.h>
#include <framework/sfxhelperfunctions.hxx>
......@@ -101,6 +100,12 @@ void ToolbarModeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
case vcl::EnumContext::Application::Draw:
aPath.append("Draw");
break;
case vcl::EnumContext::Application::Formula:
aPath.append("Formula");
break;
case vcl::EnumContext::Application::Base:
aPath.append("Base");
break;
default:
break;
}
......@@ -116,6 +121,7 @@ void ToolbarModeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
const Sequence<OUString> aModeNodeNames (aModesNode.getNodeNames());
const sal_Int32 nCount(aModeNodeNames.getLength());
SvtMiscOptions aMiscOptions;
long nCountToolbar = 0;
for ( sal_Int32 nReadIndex = 0; nReadIndex < nCount; ++nReadIndex )
{
......@@ -131,10 +137,13 @@ void ToolbarModeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
// Allow Notebookbar only in experimental mode
if ( isExperimental && !aMiscOptions.IsExperimentalMode() )
continue;
if ( !isExperimental )
nCountToolbar++;
m_xPopupMenu->insertItem( nReadIndex+1, aLabel, css::awt::MenuItemStyle::RADIOCHECK, nPosition );
rPopupMenu->setCommand( nReadIndex+1, aCommandArg );
}
rPopupMenu->insertSeparator(nCountToolbar);
}
// XEventListener
......@@ -223,8 +232,30 @@ void SAL_CALL ToolbarModeMenuController::itemSelected( const css::awt::MenuEvent
{
SolarMutexGuard aSolarMutexGuard;
PopupMenu* pVCLPopupMenu = static_cast<PopupMenu *>(pPopupMenu->GetMenu());
OUString aCmd( pVCLPopupMenu->GetItemCommand( rEvent.MenuId ));
{
OUStringBuffer aBuf(".uno:Notebookbar?File:string=");
aBuf.append( aCmd );
URL aTargetURL;
Sequence<PropertyValue> aArgs;
aTargetURL.Complete = aBuf.makeStringAndClear();
xURLTransformer->parseStrict( aTargetURL );
Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
if ( xDispatchProvider.is() )
{
Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch(
aTargetURL, OUString(), 0 );
ExecuteInfo* pExecuteInfo = new ExecuteInfo;
pExecuteInfo->xDispatch = xDispatch;
pExecuteInfo->aTargetURL = aTargetURL;
pExecuteInfo->aArgs = aArgs;
Application::PostUserEvent( LINK(nullptr,ToolbarModeMenuController, ExecuteHdl_Impl), pExecuteInfo );
}
}
OUStringBuffer aBuf(".uno:ToolbarMode?Mode:string=");
aBuf.append( aCmd );
URL aTargetURL;
......@@ -268,6 +299,12 @@ void SAL_CALL ToolbarModeMenuController::itemActivated( const css::awt::MenuEven
case vcl::EnumContext::Application::Draw:
aPath.append("Draw");
break;
case vcl::EnumContext::Application::Formula:
aPath.append("Formula");
break;
case vcl::EnumContext::Application::Base:
aPath.append("Base");
break;
default:
break;
}
......
framework/util/fwl.component
Dosyayı görüntüle @ 5c573a2f
......@@ -67,9 +67,6 @@
<implementation name="com.sun.star.comp.framework.ToolBarsMenuController">
<service name="com.sun.star.frame.PopupMenuController"/>
</implementation>
<implementation name="com.sun.star.comp.framework.NotebookbarMenuController">
<service name="com.sun.star.frame.PopupMenuController"/>
</implementation>
<implementation name="com.sun.star.comp.framework.UriAbbreviation">
<service name="com.sun.star.util.UriAbbreviation"/>
</implementation>
......
include/vcl/EnumContext.hxx
Dosyayı görüntüle @ 5c573a2f
......@@ -43,6 +43,8 @@ public:
Chart,
Draw,
Impress,
Formula,
Base,
// For your convenience to avoid duplicate code in the common
// case that Draw and Impress use identical context configurations.
......
officecfg/Configuration_officecfg.mk
Dosyayı görüntüle @ 5c573a2f
......@@ -164,7 +164,6 @@ $(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/d
org/openoffice/Office/UI/DrawWindowState.xcu \
org/openoffice/Office/UI/ImpressWindowState.xcu \
org/openoffice/Office/UI/MathWindowState.xcu \
org/openoffice/Office/UI/Notebookbar.xcu \
org/openoffice/Office/UI/ReportCommands.xcu \
org/openoffice/Office/UI/Sidebar.xcu \
org/openoffice/Office/UI/StartModuleWindowState.xcu \
......
officecfg/files.mk
Dosyayı görüntüle @ 5c573a2f
......@@ -79,7 +79,6 @@ officecfg_XCSFILES := \
Office/UI/ImpressWindowState \
Office/UI/MathCommands \
Office/UI/MathWindowState \
Office/UI/Notebookbar \
Office/UI/ReportCommands \
Office/UI/Sidebar \
Office/UI/StartModuleCommands \
......
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
Dosyayı görüntüle @ 5c573a2f
......@@ -355,7 +355,7 @@
<value/>
</prop>
<prop oor:name="Controller">
<value>com.sun.star.comp.framework.NotebookbarMenuController</value>
<value>com.sun.star.comp.framework.ToolbarModeMenuController</value>
</prop>
</node>
<node oor:name="c30" oor:op="replace">
......
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
Dosyayı görüntüle @ 5c573a2f
......@@ -5937,7 +5937,7 @@
</node>
<node oor:name=".uno:ToolbarMode" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Toolbar ~Layout</value>
<value xml:lang="en-US">User ~Interface</value>
</prop>
</node>
<node oor:name=".uno:AvailableToolbars" oor:op="replace">
......
officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu deleted 100644 → 0
Dosyayı görüntüle @ e075ee96
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE oor:component-data SYSTEM "../../../../../component-update.dtd">
<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:install="http://openoffice.org/2004/installation" oor:name="Notebookbar" oor:package="org.openoffice.Office.UI">
<prop oor:name="ActiveWriter">
<value>notebookbar.ui</value>
</prop>
<prop oor:name="ActiveCalc">
<value>notebookbar.ui</value>
</prop>
<prop oor:name="ActiveImpress">
<value>notebookbar.ui</value>
</prop>
<node oor:name="Applications">
<node oor:name="Writer" oor:op="replace">
<node oor:name="Implementations">
<node oor:name="Tabbed" oor:op="replace">
<prop oor:name="Label">
<value xml:lang="en-US">Tabbed</value>
</prop>
<prop oor:name="File">
<value>notebookbar.ui</value>
</prop>
<prop oor:name="HasMenubar">
<value>false</value>
</prop>
</node>
<node oor:name="TabbedCompact" oor:op="replace">
<prop oor:name="Label">
<value xml:lang="en-US">Tabbed Compact</value>
</prop>
<prop oor:name="File">
<value>notebookbar_compact.ui</value>
</prop>
<prop oor:name="HasMenubar">
<value>false</value>
</prop>
</node>
<node oor:name="GroupedbarCompact" oor:op="replace">
<prop oor:name="Label">
<value xml:lang="en-US">Groupedbar Compact</value>
</prop>
<prop oor:name="File">
<value>notebookbar_groupedbar_compact.ui</value>
</prop>
<prop oor:name="HasMenubar">
<value>false</value>
</prop>
</node>
<node oor:name="GroupedbarFull" oor:op="replace">
<prop oor:name="Label">
<value xml:lang="en-US">Groupedbar Full</value>
</prop>
<prop oor:name="File">
<value>notebookbar_groupedbar_full.ui</value>
</prop>
<prop oor:name="HasMenubar">
<value>false</value>
</prop>
</node>
<node oor:name="Groups" oor:op="replace">
<prop oor:name="Label">
<value xml:lang="en-US">Contextual groups</value>
</prop>
<prop oor:name="File">
<value>notebookbar_groups.ui</value>
</prop>
<prop oor:name="HasMenubar">
<value>true</value>
</prop>
</node>
<node oor:name="Single" oor:op="replace">
<prop oor:name="Label">
<value xml:lang="en-US">Contextual single</value>
</prop>
<prop oor:name="File">
<value>notebookbar_single.ui</value>
</prop>
<prop oor:name="HasMenubar">
<value>true</value>
</prop>
</node>
</node>
</node>
<node oor:name="Calc" oor:op="replace">
<node oor:name="Implementations">
<node oor:name="Tabbed" oor:op="replace">
<prop oor:name="Label">
<value xml:lang="en-US">Tabbed</value>
</prop>
<prop oor:name="File">
<value>notebookbar.ui</value>
</prop>
<prop oor:name="HasMenubar">
<value>false</value>
</prop>
</node>
<node oor:name="GroupedbarCompact" oor:op="replace">
<prop oor:name="Label">
<value xml:lang="en-US">Groupedbar Compact</value>
</prop>
<prop oor:name="File">
<value>notebookbar_groupedbar_compact.ui</value>
</prop>
<prop oor:name="HasMenubar">
<value>false</value>
</prop>
</node>
<node oor:name="GroupedbarFull" oor:op="replace">
<prop oor:name="Label">
<value xml:lang="en-US">Groupedbar Full</value>
</prop>
<prop oor:name="File">
<value>notebookbar_groupedbar_full.ui</value>
</prop>
<prop oor:name="HasMenubar">
<value>false</value>
</prop>
</node>
<node oor:name="Groups" oor:op="replace">
<prop oor:name="Label">
<value xml:lang="en-US">Contextual groups</value>
</prop>
<prop oor:name="File">
<value>notebookbar_groups.ui</value>
</prop>
<prop oor:name="HasMenubar">
<value>true</value>
</prop>
</node>
</node>
</node>
<node oor:name="Impress" oor:op="replace">
<node oor:name="Implementations">
<node oor:name="Tabbed" oor:op="replace">
<prop oor:name="Label">
<value xml:lang="en-US">Tabbed</value>
</prop>
<prop oor:name="File">
<value>notebookbar.ui</value>
</prop>
<prop oor:name="HasMenubar">
<value>false</value>
</prop>
</node>
<node oor:name="Groups" oor:op="replace">
<prop oor:name="Label">
<value xml:lang="en-US">Contextual groups</value>
</prop>
<prop oor:name="File">
<value>notebookbar_groups.ui</value>
</prop>
<prop oor:name="HasMenubar">
<value>true</value>
</prop>
</node>
<node oor:name="GroupedbarCompact" oor:op="replace">
<prop oor:name="Label">
<value xml:lang="en-US">Groupedbar Compact</value>
</prop>
<prop oor:name="File">
<value>notebookbar_groupedbar_compact.ui</value>
</prop>
<prop oor:name="HasMenubar">
<value>false</value>
</prop>
</node>
<node oor:name="GroupedbarFull" oor:op="replace">
<prop oor:name="Label">
<value xml:lang="en-US">Groupedbar Full</value>
</prop>
<prop oor:name="File">
<value>notebookbar_groupedbar_full.ui</value>
</prop>
<prop oor:name="HasMenubar">
<value>false</value>
</prop>
</node>
</node>
</node>
</node>
</oor:component-data>
officecfg/registry/schema/org/openoffice/Office/UI/Notebookbar.xcs deleted 100644 → 0
Dosyayı görüntüle @ e075ee96
<?xml version="1.0" encoding="UTF-8"?>
<!--
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<!DOCTYPE oor:component-schema SYSTEM "../../../../../component-schema.dtd">
<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Notebookbar" oor:package="org.openoffice.Office.UI" xml:lang="en-US">
<info>
<desc>Contains information about Notebookbar.</desc>
</info>
<templates>
<group oor:name="Implementation">
<info>
<desc>The implementation description container.</desc>
</info>
<prop oor:name="Label" oor:type="xs:string" oor:nillable="false" oor:localized="true">
<info>
<desc>The implementation name.</desc>
</info>
</prop>
<prop oor:name="File" oor:type="xs:string" oor:nillable="false">
<info>
<desc>The .ui file name.</desc>
</info>
</prop>
<prop oor:name="HasMenubar" oor:type="xs:boolean" oor:nillable="false">
<info>
<desc>Determines if menubar is visible.</desc>
</info>
</prop>
</group>
<group oor:name="Application">
<info>
<desc>Describes notebookbar settings for one application.</desc>
</info>
<set oor:name="Implementations" oor:node-type="Implementation">
<info>
<desc>List of implementations.</desc>
</info>
</set>
</group>
</templates>
<component>
<prop oor:name="ActiveWriter" oor:type="xs:string" oor:nillable="false">
<info>
<desc>Contains name of currently used implementation in the Writer module.</desc>
</info>
</prop>
<prop oor:name="ActiveCalc" oor:type="xs:string" oor:nillable="false">
<info>
<desc>Contains name of currently used implementation in the Calc module.</desc>
</info>
</prop>
<prop oor:name="ActiveImpress" oor:type="xs:string" oor:nillable="false">
<info>
<desc>Contains name of currently used implementation in the Impress module.</desc>
</info>
</prop>
<set oor:name="Applications" oor:node-type="Application">
<info>
<desc>List of implementations.</desc>
</info>
</set>
</component>
</oor:component-schema>
officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
Dosyayı görüntüle @ 5c573a2f
......@@ -74,6 +74,12 @@
</desc>
</info>
</prop>
<prop oor:name="HasMenubar" oor:type="xs:boolean" oor:nillable="false">
<info>
<desc>Determines if menubar is visible.</desc>
</info>
<value>false</value>
</prop>
</group>
<group oor:name="Application">
<info>
......@@ -92,6 +98,21 @@
</group>
</templates>
<component>
<prop oor:name="ActiveWriter" oor:type="xs:string" oor:nillable="false">
<info>
<desc>Contains name of currently used implementation in the Writer module.</desc>
</info>
</prop>
<prop oor:name="ActiveCalc" oor:type="xs:string" oor:nillable="false">
<info>
<desc>Contains name of currently used implementation in the Calc module.</desc>
</info>
</prop>
<prop oor:name="ActiveImpress" oor:type="xs:string" oor:nillable="false">
<info>
<desc>Contains name of currently used implementation in the Impress module.</desc>
</info>
</prop>
<set oor:name="Applications" oor:node-type="Application">
<info>
<desc>Contains list of toolbar mode settings for each application.</desc>
......
postprocess/CustomTarget_registry.mk
Dosyayı görüntüle @ 5c573a2f
......@@ -182,7 +182,6 @@ postprocess_FILES_main := \
$(postprocess_XCS)/Office/UI/GenericCategories.xcs \
$(postprocess_XCS)/Office/UI/GenericCommands.xcs \
$(postprocess_XCS)/Office/UI/GlobalSettings.xcs \
$(postprocess_XCS)/Office/UI/Notebookbar.xcs \
$(postprocess_XCS)/Office/UI/Sidebar.xcs \
$(postprocess_XCS)/Office/UI/StartModuleCommands.xcs \
$(postprocess_XCS)/Office/UI/StartModuleWindowState.xcs \
......@@ -247,7 +246,6 @@ postprocess_FILES_main := \
$(postprocess_XCU)/Office/UI/Factories.xcu \
$(postprocess_XCU)/Office/UI/GenericCategories.xcu \
$(postprocess_XCU)/Office/UI/GenericCommands.xcu \
$(postprocess_XCU)/Office/UI/Notebookbar.xcu \
$(postprocess_XCU)/Office/UI/Sidebar.xcu \
$(postprocess_XCU)/Office/UI/StartModuleWindowState.xcu \
$(postprocess_XCU)/Office/UI/ToolbarMode.xcu \
......
sc/uiconfig/scalc/menubar/menubar.xml
Dosyayı görüntüle @ 5c573a2f
......@@ -143,7 +143,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ToolbarMode"/>
<menu:menuitem menu:id=".uno:AvailableToolbars"/>
<menu:menuitem menu:id=".uno:Notebookbar"/>
<menu:menuitem menu:id=".uno:InputLineVisible"/>
<menu:menuitem menu:id=".uno:StatusBarVisible"/>
<menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
......
sd/uiconfig/sdraw/menubar/menubar.xml
Dosyayı görüntüle @ 5c573a2f
......@@ -102,6 +102,7 @@
<menu:menuitem menu:id=".uno:PageMode" menu:style="radio"/>
<menu:menuitem menu:id=".uno:MasterPage" menu:style="radio"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ToolbarMode"/>
<menu:menuitem menu:id=".uno:AvailableToolbars"/>
<menu:menuitem menu:id=".uno:StatusBarVisible"/>
<menu:menuitem menu:id=".uno:ShowRuler"/>
......
sd/uiconfig/simpress/menubar/menubar.xml
Dosyayı görüntüle @ 5c573a2f
......@@ -114,7 +114,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ToolbarMode"/>
<menu:menuitem menu:id=".uno:AvailableToolbars"/>
<menu:menuitem menu:id=".uno:Notebookbar"/>
<menu:menuitem menu:id=".uno:StatusBarVisible"/>
<menu:menuitem menu:id=".uno:ShowRuler"/>
<menu:menuitem menu:id=".uno:LeftPaneImpress"/>
......
sfx2/source/appl/appserv.cxx
Dosyayı görüntüle @ 5c573a2f
......@@ -165,6 +165,12 @@ namespace
case vcl::EnumContext::Application::Draw:
return OUString( "Draw" );
break;
case vcl::EnumContext::Application::Formula:
return OUString( "Formula" );
break;
case vcl::EnumContext::Application::Base:
return OUString( "Base" );
break;
default:
return OUString();
break;
......
sfx2/source/notebookbar/SfxNotebookBar.cxx
Dosyayı görüntüle @ 5c573a2f
......@@ -22,7 +22,7 @@
#include <com/sun/star/ui/XContextChangeEventMultiplexer.hpp>
#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
#include <officecfg/Office/UI/Notebookbar.hxx>
#include <officecfg/Office/UI/ToolbarMode.hxx>
#include <com/sun/star/frame/XModuleManager.hpp>
#include <com/sun/star/frame/ModuleManager.hpp>
#include <unotools/confignode.hxx>
......@@ -82,13 +82,13 @@ static void lcl_setNotebookbarFileName( vcl::EnumContext::Application eApp, cons
switch ( eApp )
{
case vcl::EnumContext::Application::Writer:
officecfg::Office::UI::Notebookbar::ActiveWriter::set( sFileName, aBatch );
officecfg::Office::UI::ToolbarMode::ActiveWriter::set( sFileName, aBatch );
break;
case vcl::EnumContext::Application::Calc:
officecfg::Office::UI::Notebookbar::ActiveCalc::set( sFileName, aBatch );
officecfg::Office::UI::ToolbarMode::ActiveCalc::set( sFileName, aBatch );
break;
case vcl::EnumContext::Application::Impress:
officecfg::Office::UI::Notebookbar::ActiveImpress::set( sFileName, aBatch );
officecfg::Office::UI::ToolbarMode::ActiveImpress::set( sFileName, aBatch );
break;
default:
break;
......@@ -101,13 +101,13 @@ static OUString lcl_getNotebookbarFileName( vcl::EnumContext::Application eApp )
switch ( eApp )
{
case vcl::EnumContext::Application::Writer:
return officecfg::Office::UI::Notebookbar::ActiveWriter::get();
return officecfg::Office::UI::ToolbarMode::ActiveWriter::get();
break;
case vcl::EnumContext::Application::Calc:
return officecfg::Office::UI::Notebookbar::ActiveCalc::get();
return officecfg::Office::UI::ToolbarMode::ActiveCalc::get();
break;
case vcl::EnumContext::Application::Impress:
return officecfg::Office::UI::Notebookbar::ActiveImpress::get();
return officecfg::Office::UI::ToolbarMode::ActiveImpress::get();
break;
default:
break;
......@@ -118,7 +118,7 @@ static OUString lcl_getNotebookbarFileName( vcl::EnumContext::Application eApp )
static utl::OConfigurationTreeRoot lcl_getCurrentImplConfigRoot()
{
return utl::OConfigurationTreeRoot(::comphelper::getProcessComponentContext(),
"org.openoffice.Office.UI.Notebookbar/",
"org.openoffice.Office.UI.ToolbarMode/",
true);
}
......@@ -133,7 +133,7 @@ static const utl::OConfigurationNode lcl_getCurrentImplConfigNode(const Referenc
vcl::EnumContext::Application eApp = vcl::EnumContext::GetApplicationEnum( xModuleManager->identify( xFrame ) );
OUString aActive = lcl_getNotebookbarFileName( eApp );
const utl::OConfigurationNode aImplsNode = rNotebookbarNode.openNode("Applications/" + lcl_getAppName( eApp) + "/Implementations");
const utl::OConfigurationNode aImplsNode = rNotebookbarNode.openNode("Applications/" + lcl_getAppName( eApp) + "/Modes");
const Sequence<OUString> aModeNodeNames( aImplsNode.getNodeNames() );
const sal_Int32 nCount( aModeNodeNames.getLength() );
......@@ -143,7 +143,7 @@ static const utl::OConfigurationNode lcl_getCurrentImplConfigNode(const Referenc
if ( !aImplNode.isValid() )
continue;
OUString aCommandArg = comphelper::getString( aImplNode.getNodeValue( "File" ) );
OUString aCommandArg = comphelper::getString( aImplNode.getNodeValue( "CommandArg" ) );
if ( aCommandArg == aActive )
{
......
solenv/clang-format/blacklist
Dosyayı görüntüle @ 5c573a2f
......@@ -5282,7 +5282,6 @@ framework/inc/uielement/menubarmanager.hxx
framework/inc/uielement/menubarmerger.hxx
framework/inc/uielement/menubarwrapper.hxx
framework/inc/uielement/newmenucontroller.hxx
framework/inc/uielement/notebookbarmenucontroller.hxx
framework/inc/uielement/progressbarwrapper.hxx
framework/inc/uielement/rootitemcontainer.hxx
framework/inc/uielement/spinfieldtoolbarcontroller.hxx
......@@ -5478,7 +5477,6 @@ framework/source/uielement/menubarmanager.cxx
framework/source/uielement/menubarmerger.cxx
framework/source/uielement/menubarwrapper.cxx
framework/source/uielement/newmenucontroller.cxx
framework/source/uielement/notebookbarmenucontroller.cxx
framework/source/uielement/objectmenucontroller.cxx
framework/source/uielement/popuptoolbarcontroller.cxx
framework/source/uielement/progressbarwrapper.cxx
......
starmath/uiconfig/smath/menubar/menubar.xml
Dosyayı görüntüle @ 5c573a2f
......@@ -77,6 +77,7 @@
<menu:menuitem menu:id=".uno:Draw"/>
<menu:menuitem menu:id=".uno:RedrawAutomatic"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ToolbarMode"/>
<menu:menuitem menu:id=".uno:AvailableToolbars"/>
<menu:menuitem menu:id=".uno:StatusBarVisible"/>
<menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
......
sw/uiconfig/sglobal/menubar/menubar.xml
Dosyayı görüntüle @ 5c573a2f
......@@ -170,7 +170,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ToolbarMode"/>
<menu:menuitem menu:id=".uno:AvailableToolbars"/>
<menu:menuitem menu:id=".uno:Notebookbar"/>
<menu:menuitem menu:id=".uno:StatusBarVisible"/>
<menu:menu menu:id=".uno:RulerMenu">
<menu:menupopup>
......
sw/uiconfig/swriter/menubar/menubar.xml
Dosyayı görüntüle @ 5c573a2f
......@@ -170,7 +170,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ToolbarMode"/>
<menu:menuitem menu:id=".uno:AvailableToolbars"/>
<menu:menuitem menu:id=".uno:Notebookbar"/>
<menu:menuitem menu:id=".uno:StatusBarVisible"/>
<menu:menu menu:id=".uno:RulerMenu">
<menu:menupopup>
......
vcl/source/window/EnumContext.cxx
Dosyayı görüntüle @ 5c573a2f
......@@ -124,7 +124,8 @@ void EnumContext::ProvideApplicationContainers()
AddEntry("com.sun.star.chart2.ChartDocument", EnumContext::Application::Chart);
AddEntry("com.sun.star.drawing.DrawingDocument", EnumContext::Application::Draw);
AddEntry("com.sun.star.presentation.PresentationDocument", EnumContext::Application::Impress);
AddEntry("com.sun.star.formula.FormulaProperties", EnumContext::Application::Formula);
AddEntry("com.sun.star.sdb.OfficeDatabaseDocument", EnumContext::Application::Base);
AddEntry("any", EnumContext::Application::Any);
AddEntry("none", EnumContext::Application::NONE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment