tdf#130857 qt weld: Only use native print widgets if native parent
Don't unconditionally use a native widget for the
Calc and Math print options widgets for which support
was added in
commit 645a829671
Author: Michael Weghorn <m.weghorn@posteo.de>
Date: Sat Feb 15 22:46:15 2025 +0100
tdf#130857 qt weld: Support "Printer Options" dialog
, but only if the parent is native as well.
For that, make use of the logic introduced in
commit 2cd7bf1460
Author: Michael Weghorn <m.weghorn@posteo.de>
Date: Thu May 29 15:43:15 2025 +0200
tdf#130857 qt weld: Prepare for more conditional UI file support
. This avoids brokenness when using qt6 with
SAL_VCL_QT_USE_WELDED_WIDGETS=1 for the "Tools"
-> "Options" -> "LibreOfficeDev Calc" -> "Print"
page (and Math equivalent) while still using native
widgets for the dialog for which support was added in
the above commit.
(The "Tools" -> "Options" dialog
isn't supported with native Qt widgets yet,
and having a native non-toplevel Qt widget as a child for
a vcl widget parent is not supported.)
Change-Id: I068a68baaaf6be930c6c1438dace4c7f84f6191a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/204469
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
@@ -176,7 +176,6 @@ constexpr auto SUPPORTED_UI_FILES = frozen::make_unordered_set<std::u16string_vi
|
||||
u"modules/scalc/ui/insertcells.ui",
|
||||
u"modules/scalc/ui/insertsheet.ui",
|
||||
u"modules/scalc/ui/movecopysheet.ui",
|
||||
u"modules/scalc/ui/optdlg.ui",
|
||||
u"modules/scalc/ui/optimalcolwidthdialog.ui",
|
||||
u"modules/scalc/ui/optimalrowheightdialog.ui",
|
||||
u"modules/scalc/ui/pagetemplatedialog.ui",
|
||||
@@ -222,7 +221,6 @@ constexpr auto SUPPORTED_UI_FILES = frozen::make_unordered_set<std::u16string_vi
|
||||
u"modules/smath/ui/fonttypedialog.ui",
|
||||
u"modules/smath/ui/matrixeditor.ui",
|
||||
u"modules/smath/ui/savedefaultsdialog.ui",
|
||||
u"modules/smath/ui/smathsettings.ui",
|
||||
u"modules/smath/ui/spacingdialog.ui",
|
||||
u"modules/spropctrlr/ui/labelselectiondialog.ui",
|
||||
u"modules/spropctrlr/ui/taborder.ui",
|
||||
@@ -413,6 +411,7 @@ constexpr auto SUPPORTED_WITH_QT_PARENT = frozen::make_unordered_set<std::u16str
|
||||
u"modules/scalc/ui/conditionalentry.ui",
|
||||
u"modules/scalc/ui/conditionaliconset.ui",
|
||||
u"modules/scalc/ui/erroralerttabpage.ui",
|
||||
u"modules/scalc/ui/optdlg.ui",
|
||||
u"modules/scalc/ui/printeroptions.ui",
|
||||
u"modules/scalc/ui/sheetprintpage.ui",
|
||||
u"modules/scalc/ui/sortcriteriapage.ui",
|
||||
@@ -437,6 +436,7 @@ constexpr auto SUPPORTED_WITH_QT_PARENT = frozen::make_unordered_set<std::u16str
|
||||
u"modules/simpress/ui/impressprinteroptions.ui",
|
||||
u"modules/simpress/ui/interactionpage.ui",
|
||||
u"modules/smath/ui/printeroptions.ui",
|
||||
u"modules/smath/ui/smathsettings.ui",
|
||||
u"modules/spropctrlr/ui/browserline.ui",
|
||||
u"modules/spropctrlr/ui/browserpage.ui",
|
||||
u"modules/spropctrlr/ui/colorlistbox.ui",
|
||||
|
||||
Reference in New Issue
Block a user