sfx2/source/view/viewfrm.cxx | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
New commits:
commit d0bbc16b1715a3711d872a36c7e525e8d3811669
Author: Justin Luth <jl...@mail.com>
AuthorDate: Sat Jul 1 11:30:46 2023 -0400
Commit: Justin Luth <jl...@mail.com>
CommitDate: Sat Jul 1 18:59:58 2023 +0200
Revert "tdf#126006 sc SID_RELOAD: restart notebookbar"
This reverts 24.2 commit 0211c88f884065aa179725bd2eb846edd4c5bb6b.
Although it passed on Jenkins, my own computer seems to hang
on UITests - both Writer and Calc.
Change-Id: I57e8a176cce55a514490db81f211582c0ad86675
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153829
Tested-by: Jenkins
Reviewed-by: Justin Luth <jl...@mail.com>
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 0766eec86088..196a18d3d335 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -838,18 +838,8 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
UpdateDocument_Impl();
- auto sModule =
vcl::CommandInfoProvider::GetModuleIdentifier(GetFrame().GetFrameInterface());
- OUString sReloadNotebookBar;
- if (sModule == "com.sun.star.text.TextDocument")
- sReloadNotebookBar = u"modules/swriter/ui/";
- else if (sModule ==
"com.sun.star.sheet.SpreadsheetDocument")
- sReloadNotebookBar = u"modules/scalc/ui/";
- else if (sfx2::SfxNotebookBar::IsActive()
- && sModule != "presentation.PresentationDocument"
- && sModule !=
"com.sun.star.drawing.DrawingDocument")
- {
- assert(false && "SID_RELOAD Notebookbar active, but
not refreshed here");
- }
+ if
(vcl::CommandInfoProvider::GetModuleIdentifier(GetFrame().GetFrameInterface())
== "com.sun.star.text.TextDocument")
+
sfx2::SfxNotebookBar::ReloadNotebookBar(u"modules/swriter/ui/");
try
{
@@ -888,10 +878,6 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
// Propagate document closure.
SfxGetpApp()->NotifyEvent( SfxEventHint(
SfxEventHintId::CloseDoc, GlobalEventConfig::GetEventName(
GlobalEventId::CLOSEDOC ), xOldObj ) );
-
- // tdf#126006 Calc needs to reload the notebookbar after
closing the document
- if (!sReloadNotebookBar.isEmpty())
-
sfx2::SfxNotebookBar::ReloadNotebookBar(sReloadNotebookBar);
}
// Record as done
