svtools/source/control/ctrlbox.cxx | 2 +- svx/source/tbxctrls/tbcontrl.cxx | 3 +-- vcl/jsdialog/enabled.cxx | 5 +---- 3 files changed, 3 insertions(+), 7 deletions(-)
New commits: commit d1e570a270c6e7274cd515aa6f53b9c042272efe Author: Szymon Kłos <[email protected]> AuthorDate: Mon Aug 28 17:50:35 2023 +0200 Commit: Szymon Kłos <[email protected]> CommitDate: Mon Aug 28 17:52:35 2023 +0200 Revert "jsdialog: enable font name & size combobox" This reverts commit 8d3d55115da3cc2e693adf3acdd92dca5fc8fa31. Reason for revert: Feature not complete yet Change-Id: Idbf769118ec40cdf0f6c6e760cd183208059acc7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156147 Tested-by: Szymon Kłos <[email protected]> Reviewed-by: Szymon Kłos <[email protected]> diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index fc151b0ca37d..2973f326c221 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -510,7 +510,7 @@ static bool IsRunningUnitTest() { return getenv("LO_TESTNAME") != nullptr; } void FontNameBox::EnableWYSIWYG(bool bEnable) { - if (IsRunningUnitTest()) + if (comphelper::LibreOfficeKit::isActive() || IsRunningUnitTest()) return; if (mbWYSIWYG == bEnable) return; diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 835598d23c0e..2eda9b2be745 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -42,7 +42,6 @@ #include <sfx2/tbxctrl.hxx> #include <sfx2/tplpitem.hxx> #include <sfx2/sfxstatuslistener.hxx> -#include <sfx2/viewsh.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <sfx2/viewfrm.hxx> #include <vcl/svapp.hxx> @@ -1744,7 +1743,7 @@ SvxFontNameBox_Base::SvxFontNameBox_Base(std::unique_ptr<weld::ComboBox> xWidget SvxFontNameBox_Impl::SvxFontNameBox_Impl(vcl::Window* pParent, const Reference<XDispatchProvider>& rDispatchProvider, const Reference<XFrame>& rFrame, SvxFontNameToolBoxControl& rCtrl) - : InterimItemWindow(pParent, "svx/ui/fontnamebox.ui", "FontNameBox", true, reinterpret_cast<sal_uInt64>(SfxViewShell::Current())) + : InterimItemWindow(pParent, "svx/ui/fontnamebox.ui", "FontNameBox") , SvxFontNameBox_Base(m_xBuilder->weld_combo_box("fontnamecombobox"), rDispatchProvider, rFrame, rCtrl) { set_id("fontnamecombobox"); diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 50e90455c2e6..4db6b0da9113 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -372,10 +372,7 @@ bool isBuilderEnabledForSidebar(std::u16string_view rUIFile) bool isInterimBuilderEnabledForNotebookbar(std::u16string_view rUIFile) { - if (rUIFile == u"modules/scalc/ui/numberbox.ui" - || rUIFile == u"svx/ui/fontnamebox.ui" - || rUIFile == u"svx/ui/fontsizebox.ui" - || rUIFile == u"svx/ui/stylespreview.ui") + if (rUIFile == u"modules/scalc/ui/numberbox.ui" || rUIFile == u"svx/ui/stylespreview.ui") { return true; }
