svtools/source/control/ctrlbox.cxx | 2 +-
svx/source/tbxctrls/tbcontrl.cxx | 3 ++-
vcl/jsdialog/enabled.cxx | 5 ++++-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 664a8658f720a7d784d717416170ca3d4b2498ad
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Tue Aug 8 06:48:10 2023 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Sat Oct 7 17:04:56 2023 +0200
jsdialog: enable font name & size combobox
This enables font selector with font rendering in Online
Change-Id: I2b57c0831e84a957374c2b1733f6526ca80ac7bd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156242
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157503
Tested-by: Jenkins
diff --git a/svtools/source/control/ctrlbox.cxx
b/svtools/source/control/ctrlbox.cxx
index 5c24d36e6607..e5b0883ad87e 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 (comphelper::LibreOfficeKit::isActive() || IsRunningUnitTest())
+ if (IsRunningUnitTest())
return;
if (mbWYSIWYG == bEnable)
return;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 9fdb74a73c21..94bfef34f44d 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -42,6 +42,7 @@
#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>
@@ -1740,7 +1741,7 @@
SvxFontNameBox_Base::SvxFontNameBox_Base(std::unique_ptr<weld::ComboBox> xWidget
SvxFontNameBox_Impl::SvxFontNameBox_Impl(vcl::Window* pParent, const
Reference<XFrame>& rFrame,
SvxFontNameToolBoxControl& rCtrl)
- : InterimItemWindow(pParent, "svx/ui/fontnamebox.ui", "FontNameBox")
+ : InterimItemWindow(pParent, "svx/ui/fontnamebox.ui", "FontNameBox", true,
reinterpret_cast<sal_uInt64>(SfxViewShell::Current()))
, SvxFontNameBox_Base(m_xBuilder->weld_combo_box("fontnamecombobox"),
rFrame, rCtrl)
{
set_id("fontnamecombobox");
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index db4bd04f9f46..13d45dd06849 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -371,7 +371,10 @@ bool isBuilderEnabledForSidebar(std::u16string_view
rUIFile)
bool isInterimBuilderEnabledForNotebookbar(std::u16string_view rUIFile)
{
- if (rUIFile == u"modules/scalc/ui/numberbox.ui" || rUIFile ==
u"svx/ui/stylespreview.ui")
+ 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")
{
return true;
}
