diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 07e4b80db1dc..9de275d597cb 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -8329,35 +8329,6 @@ static void preloadData() namespace { -static void activateNotebookbar(std::u16string_view rApp) -{ - OUString aPath = OUString::Concat("org.openoffice.Office.UI.ToolbarMode/Applications/") + rApp; - - const utl::OConfigurationTreeRoot aAppNode(xContext, aPath, true); - - if (aAppNode.isValid()) - { - static constexpr OUString sNoteBookbarName(u"notebookbar_online.ui"_ustr); - aAppNode.setNodeValue(u"Active"_ustr, Any(sNoteBookbarName)); - - const utl::OConfigurationNode aImplsNode = aAppNode.openNode(u"Modes"_ustr); - const Sequence aModeNodeNames( aImplsNode.getNodeNames() ); - - for (const auto& rModeNodeName : aModeNodeNames) - { - const utl::OConfigurationNode aImplNode(aImplsNode.openNode(rModeNodeName)); - if (!aImplNode.isValid()) - continue; - - OUString aCommandArg = comphelper::getString(aImplNode.getNodeValue(u"CommandArg"_ustr)); - if (aCommandArg == "notebookbar.ui") - aImplNode.setNodeValue(u"CommandArg"_ustr, Any(sNoteBookbarName)); - } - - aAppNode.commit(); - } -} - void setHelpRootURL() { const char* pHelpRootURL = ::getenv("LOK_HELP_URL"); @@ -8433,7 +8404,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char static bool bPreInited = false; static bool bUnipoll = false; static bool bProfileZones = false; - static bool bNotebookbar = false; { // cf. string lifetime for preinit std::vector aOpts; @@ -8456,8 +8426,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char else if (it == "sc_print_twips_msgs") comphelper::LibreOfficeKit::setCompatFlag( comphelper::LibreOfficeKit::Compat::scPrintTwipsMsgs); - else if (it == "notebookbar") - bNotebookbar = true; } } @@ -8793,21 +8761,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char setDeeplConfig(); setLanguageToolConfig(); - if (bNotebookbar) - { - std::shared_ptr batch(comphelper::ConfigurationChanges::create()); - officecfg::Office::UI::ToolbarMode::ActiveWriter::set(u"notebookbar_online.ui"_ustr, batch); - officecfg::Office::UI::ToolbarMode::ActiveCalc::set(u"notebookbar_online.ui"_ustr, batch); - officecfg::Office::UI::ToolbarMode::ActiveImpress::set(u"notebookbar_online.ui"_ustr, batch); - officecfg::Office::UI::ToolbarMode::ActiveDraw::set(u"notebookbar_online.ui"_ustr, batch); - batch->commit(); - - activateNotebookbar(u"Writer"); - activateNotebookbar(u"Calc"); - activateNotebookbar(u"Impress"); - activateNotebookbar(u"Draw"); - } - // staticize all strings. if (eStage == PRE_INIT) rtl_alloc_preInit(0); diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 69483d0faa4f..6a3ade902228 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -171,7 +171,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/notebookbar_groups \ sc/uiconfig/scalc/ui/notebookbar_groupedbar_full \ sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact \ - sc/uiconfig/scalc/ui/notebookbar_online \ sc/uiconfig/scalc/ui/numberbox \ sc/uiconfig/scalc/ui/managenamesdialog \ sc/uiconfig/scalc/ui/mergecellsdialog \ diff --git a/sc/uiconfig/scalc/ui/notebookbar_online.ui b/sc/uiconfig/scalc/ui/notebookbar_online.ui deleted file mode 100644 index 0271b5c10397..000000000000 --- a/sc/uiconfig/scalc/ui/notebookbar_online.ui +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - True - False - - - True - False - vertical - - - True - True - True - - - True - True - .uno:CharFontName - - - True - True - - - - - True - True - 0 - - - - - True - True - 5 - - - True - .uno:FontHeight - - - True - True - - - - - False - True - 1 - - - - - True - True - icons - False - - - True - .uno:NumberFormatType - - - True - True - - - - - 0 - 0 - - - True - - - True - .uno:NumberFormatCurrency - - - True - True - - - - - False - True - 2 - - - - - True - True - center - True - icons - False - - - True - .uno:SelectSheetView - - - True - True - - - - - True - True - 3 - - - - - True - True - center - True - both - False - - - True - .uno:DatabaseSettings - - - True - True - - - - - True - True - 3 - - - - - 0 - 0 - - - - diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk index 276a1efc5cd8..73b1facd6868 100644 --- a/sd/UIConfig_sdraw.mk +++ b/sd/UIConfig_sdraw.mk @@ -120,7 +120,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\ sd/uiconfig/sdraw/ui/notebookbar_compact \ sd/uiconfig/sdraw/ui/notebookbar_single \ sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact \ - sd/uiconfig/sdraw/ui/notebookbar_online \ sd/uiconfig/sdraw/ui/paranumberingtab \ sd/uiconfig/sdraw/ui/queryunlinkimagedialog \ sd/uiconfig/sdraw/ui/selectlayerdialog \ diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk index ad21ed0e48fb..dd0dad4703e0 100644 --- a/sd/UIConfig_simpress.mk +++ b/sd/UIConfig_simpress.mk @@ -150,7 +150,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\ sd/uiconfig/simpress/ui/notebookbar_groups \ sd/uiconfig/simpress/ui/notebookbar_groupedbar_full \ sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact \ - sd/uiconfig/simpress/ui/notebookbar_online \ sd/uiconfig/simpress/ui/noteschildwindow \ sd/uiconfig/simpress/ui/notespanelcontextmenu \ sd/uiconfig/simpress/ui/optimpressgeneralpage \ diff --git a/sd/uiconfig/sdraw/ui/notebookbar_online.ui b/sd/uiconfig/sdraw/ui/notebookbar_online.ui deleted file mode 100644 index 836917f66967..000000000000 --- a/sd/uiconfig/sdraw/ui/notebookbar_online.ui +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - True - False - - - True - False - vertical - - - True - True - True - - - True - True - .uno:CharFontName - - - True - True - - - - - True - True - 0 - - - - - True - True - 5 - - - True - .uno:FontHeight - - - True - True - - - - - False - True - 1 - - - - - True - True - icons - False - - - - - - False - True - 0 - - - - - 0 - 0 - - - - diff --git a/sd/uiconfig/simpress/ui/notebookbar_online.ui b/sd/uiconfig/simpress/ui/notebookbar_online.ui deleted file mode 100644 index 8acefe49ff98..000000000000 --- a/sd/uiconfig/simpress/ui/notebookbar_online.ui +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - True - False - - - True - False - vertical - - - True - True - icons - False - - - False - True - 0 - - - - - True - True - True - - - True - False - True - .uno:CharFontName - - - True - True - - - - - True - True - 0 - - - - - True - True - 5 - - - True - False - .uno:FontHeight - - - True - True - - - - - False - True - 1 - - - - - True - True - 5 - - - True - False - .uno:SlideMasterPagesAll - True - - - False - True - - - - - False - True - 2 - - - - - True - True - 5 - - - True - False - .uno:SlideTransitionsPane - True - - - False - True - - - - - False - True - 2 - - - - - True - False - 5 - - - True - False - .uno:ThemeSelectorPanel - True - - - False - True - - - - - False - True - 5 - - - - - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx index e13379aa09c9..104d4f65e9ee 100644 --- a/sfx2/source/notebookbar/SfxNotebookBar.cxx +++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx @@ -353,9 +353,6 @@ bool SfxNotebookBar::IsActive(bool bConsiderSingleToolbar) if (bConsiderSingleToolbar && aActive == "Single") return true; - if (comphelper::LibreOfficeKit::isActive() && aActive == "notebookbar_online.ui") - return true; - const utl::OConfigurationNode aModesNode = aAppNode.openNode(u"Modes"_ustr); const Sequence aModeNodeNames( aModesNode.getNodeNames() ); @@ -450,11 +447,7 @@ bool SfxNotebookBar::StateMethod(SystemWindow* pSysWindow, vcl::EnumContext::Application eApp = vcl::EnumContext::GetApplicationEnum( aModuleName ); bool bIsLOK = comphelper::LibreOfficeKit::isActive(); - OUString sFile; - if (bIsLOK) - sFile = "notebookbar_online.ui"; - else - sFile = lcl_getNotebookbarFileName( eApp ); + OUString sFile = lcl_getNotebookbarFileName( eApp ); OUString sNewFile = rUIFile + sFile; OUString sCurrentFile; diff --git a/solenv/sanitizers/ui/modules/simpress.suppr b/solenv/sanitizers/ui/modules/simpress.suppr index 4c09ce5530d3..fb3d3dda5b3b 100644 --- a/solenv/sanitizers/ui/modules/simpress.suppr +++ b/solenv/sanitizers/ui/modules/simpress.suppr @@ -25,10 +25,5 @@ sd/uiconfig/simpress/ui/presentationdialog.ui://GtkLabel[@id='external_str'] orp sd/uiconfig/simpress/ui/sidebarslidebackground.ui://GtkComboBoxText[@id='masterslide'] no-labelled-by sd/uiconfig/simpress/ui/sidebarslidebackground.ui://GtkLabel[@id='masterlabel'] orphan-label sd/uiconfig/simpress/ui/sidebarslidebackground.ui://GtkLabel[@id='customlabel'] orphan-label -sd/uiconfig/simpress/ui/notebookbar_online.ui://GtkToolButton[@id='Home-CharFontName'] button-no-label -sd/uiconfig/simpress/ui/notebookbar_online.ui://GtkToolButton[@id='Home-FontHeight'] button-no-label -sd/uiconfig/simpress/ui/notebookbar_online.ui://GtkToolButton[@id='MasterSlide-MasterSlidePane'] button-no-label -sd/uiconfig/simpress/ui/notebookbar_online.ui://GtkToolButton[@id='Transitions-SlideTransitionsPane'] button-no-label -sd/uiconfig/simpress/ui/notebookbar_online.ui://GtkToolButton[@id='Theme-ThemeColorsPane'] button-no-label sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='Theme-ThemeColorsPane'] button-no-label diff --git a/static/CustomTarget_emscripten_fs_image.mk b/static/CustomTarget_emscripten_fs_image.mk index d16e8ffc7e4d..324e09c39533 100644 --- a/static/CustomTarget_emscripten_fs_image.mk +++ b/static/CustomTarget_emscripten_fs_image.mk @@ -692,7 +692,6 @@ gb_emscripten_fs_image_files += \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/notebookbar_groupedbar_compact.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/notebookbar_groupedbar_full.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/notebookbar_groups.ui \ - $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/notebookbar_online.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/notebookbar_single.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/notebookbar.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/numberingnamedialog.ui \ @@ -947,7 +946,6 @@ gb_emscripten_fs_image_files += \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/sdraw/ui/navigatorcontextmenu.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/sdraw/ui/notebookbar_compact.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/sdraw/ui/notebookbar_groupedbar_compact.ui \ - $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/sdraw/ui/notebookbar_online.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/sdraw/ui/notebookbar_single.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/sdraw/ui/notebookbar.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/sdraw/ui/paranumberingtab.ui \ @@ -1078,7 +1076,6 @@ gb_emscripten_fs_image_files += \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/simpress/ui/notebookbar_groupedbar_compact.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/simpress/ui/notebookbar_groupedbar_full.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/simpress/ui/notebookbar_groups.ui \ - $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/simpress/ui/notebookbar_online.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/simpress/ui/notebookbar_single.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/simpress/ui/notebookbar.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/simpress/ui/noteschildwindow.ui \ @@ -1301,7 +1298,6 @@ gb_emscripten_fs_image_files += \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/notebookbar_groupedbar_compact.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/notebookbar_groupedbar_full.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/notebookbar_groups.ui \ - $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/notebookbar_online.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/numberbox.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/numbertransformationentry.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/optcalculatepage.ui \ diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index f3d0515ff088..972fcc70c676 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -252,7 +252,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/notebookbar_groups \ sw/uiconfig/swriter/ui/notebookbar_groupedbar_full \ sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact \ - sw/uiconfig/swriter/ui/notebookbar_online \ sw/uiconfig/swriter/ui/pagecolumncontrol \ sw/uiconfig/swriter/ui/pagemargincontrol \ sw/uiconfig/swriter/ui/pagenumberdlg \ diff --git a/sw/uiconfig/swriter/ui/notebookbar_online.ui b/sw/uiconfig/swriter/ui/notebookbar_online.ui deleted file mode 100644 index b4b38c5203cd..000000000000 --- a/sw/uiconfig/swriter/ui/notebookbar_online.ui +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - True - False - - - True - False - vertical - - - True - True - True - - - True - True - .uno:CharFontName - - - True - True - - - - - True - True - 0 - - - - - True - True - 5 - - - True - .uno:FontHeight - - - True - True - - - - - False - True - 1 - - - - - True - True - icons - False - - - True - center - True - .uno:StylesPreview - - - True - True - - - - - False - True - 0 - - - - - True - True - icons - False - - - - - - False - True - 0 - - - - - 0 - 0 - - - -