vcl/qt5/QtInstanceBuilder.cxx | 1 +
vcl/qt5/QtInstanceWidget.cxx | 1 +
2 files changed, 2 insertions(+)
New commits:
commit bd7029c28db18592041eaebf36542586f4d73434
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Jan 10 21:15:08 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Jan 11 13:22:38 2025 +0100
tdf#130857 qt weld: Support Calc "Move/Copy Sheet" dialog
Declare support for Calc's "Move/Copy Sheet" dialog that shows
up when right-clicking on a sheet in the bottom tabbar showing
sheets and selecting the "Move or Copy Sheet" context menu entry.
This means that native Qt widgets are used for that dialog
now when using the qt5 or qt6 VCL plugin and starting LO with
environment variable SAL_VCL_QT_USE_WELDED_WIDGETS=1 set.
Change-Id: Ibabfd1188a21c2d6b50595b8133ef297e995642d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180088
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx
index 479be26bcf1d..2977131d827f 100644
--- a/vcl/qt5/QtInstanceBuilder.cxx
+++ b/vcl/qt5/QtInstanceBuilder.cxx
@@ -74,6 +74,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString&
rUIFile)
u"cui/ui/toolbarmodedialog.ui"_ustr,
u"modules/scalc/ui/inputstringdialog.ui"_ustr,
u"modules/scalc/ui/insertcells.ui"_ustr,
+ u"modules/scalc/ui/movecopysheet.ui"_ustr,
u"modules/scalc/ui/selectsource.ui"_ustr,
u"modules/scalc/ui/showsheetdialog.ui"_ustr,
u"modules/schart/ui/insertaxisdlg.ui"_ustr,
commit ceeb93657bdc1a232d99c8e0a061590408722ac1
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Jan 10 21:06:10 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Jan 11 13:22:32 2025 +0100
tdf#130857 qt weld: Traverse widget hierarchy to detect child focus
Actually traverse the hierarchy instead of
looping infinitely in
QtInstanceWidget::has_child_focus when the
initial `pParent` doesn't have focus.
Change-Id: I91daad8c39b21f7874fc6bc77c5ae868f44a301c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180086
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/qt5/QtInstanceWidget.cxx b/vcl/qt5/QtInstanceWidget.cxx
index 7aec0cbaad1b..3c016ef91902 100644
--- a/vcl/qt5/QtInstanceWidget.cxx
+++ b/vcl/qt5/QtInstanceWidget.cxx
@@ -156,6 +156,7 @@ bool QtInstanceWidget::has_child_focus() const
{
if (pParent == m_pWidget)
return true;
+ pParent = pParent->parentWidget();
}
return false;
}
