cui/source/inc/chardlg.hxx | 6 +++--- cui/source/tabpages/chardlg.cxx | 16 ++++++---------- vcl/qt5/QtInstanceBuilder.cxx | 6 ++++++ 3 files changed, 15 insertions(+), 13 deletions(-)
New commits: commit 516cf7bef46ad1367947c5d8ceb125e17fcd2edc Author: Michael Weghorn <[email protected]> AuthorDate: Sat Jan 17 00:35:15 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Jan 17 06:39:47 2026 +0100 tdf#130857 qt weld: Support print dialog 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. The dialog can be triggered by pressing Ctrl+P when a document is open. Besides the general options that apply for all modules (Writer, Calc,...), each of them provides its own printing options in a separate tab page in the dialog. Change-Id: Ieda2b2d5512ff01b6a0c262f1f049c4960bbd8b7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197480 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index c6c222aa5a68..260530993ce6 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -247,6 +247,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"uui/ui/password.ui"_ustr, u"uui/ui/setmasterpassworddlg.ui"_ustr, u"vcl/ui/openlockedquerybox.ui"_ustr, + u"vcl/ui/printdialog.ui"_ustr, u"vcl/ui/printerdevicepage.ui"_ustr, u"vcl/ui/printerpaperpage.ui"_ustr, u"vcl/ui/printerpropertiesdialog.ui"_ustr, @@ -283,6 +284,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"filter/ui/pdfuserinterfacepage.ui"_ustr, u"filter/ui/pdfviewpage.ui"_ustr, u"modules/scalc/ui/conditionalentry.ui"_ustr, + u"modules/scalc/ui/printeroptions.ui"_ustr, u"modules/scalc/ui/sortcriteriapage.ui"_ustr, u"modules/scalc/ui/sortkey.ui"_ustr, u"modules/scalc/ui/sortoptionspage.ui"_ustr, @@ -290,7 +292,10 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"modules/scalc/ui/subtotalgrppage.ui"_ustr, u"modules/scalc/ui/subtotaloptionspage.ui"_ustr, u"modules/schart/ui/tp_ChartType.ui"_ustr, + u"modules/sdraw/ui/drawprinteroptions.ui"_ustr, u"modules/simpress/ui/annotationtagmenu.ui"_ustr, + u"modules/simpress/ui/impressprinteroptions.ui"_ustr, + u"modules/smath/ui/printeroptions.ui"_ustr, u"modules/swriter/ui/bibliofragment.ui"_ustr, u"modules/swriter/ui/columnpage.ui"_ustr, u"modules/swriter/ui/flddbpage.ui"_ustr, @@ -300,6 +305,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"modules/swriter/ui/fldrefpage.ui"_ustr, u"modules/swriter/ui/fldvarpage.ui"_ustr, u"modules/swriter/ui/optcaptionpage.ui"_ustr, + u"modules/swriter/ui/printeroptions.ui"_ustr, u"modules/swriter/ui/printoptionspage.ui"_ustr, u"modules/swriter/ui/statisticsinfopage.ui"_ustr, u"modules/swriter/ui/wrappage.ui"_ustr, commit 4a54d0cc57ab6c36fbe2402d0104d344fd6e56d3 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Jan 16 23:09:49 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Jan 17 06:39:38 2026 +0100 cui: Drop intermediate local vars in SvxCharNamePage ctor Assign to the class members right away, and switch their type to the weld::EntryTreeView subclass instead of just the weld::ComboBox base class that doesn't provide the methods that were previously called on the local vars before assigning to the class members. Change-Id: Ia9e6ad10bee831bd7b00d0815a4627f43a21f98d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197479 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 7cb50806eea0..5a391b136473 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -71,7 +71,7 @@ private: std::unique_ptr<weld::Notebook> m_xWestern; std::unique_ptr<weld::Label> m_xWestFontNameFT; - std::unique_ptr<weld::ComboBox> m_xWestFontNameLB; + std::unique_ptr<weld::EntryTreeView> m_xWestFontNameLB; std::unique_ptr<weld::Label> m_xWestFontStyleFT; std::unique_ptr<FontStyleBox> m_xWestFontStyleLB; std::unique_ptr<weld::Label> m_xWestFontSizeFT; @@ -83,7 +83,7 @@ private: std::unique_ptr<weld::Notebook> m_xCJK_CTL; std::unique_ptr<weld::Label> m_xEastFontNameFT; - std::unique_ptr<weld::ComboBox> m_xEastFontNameLB; + std::unique_ptr<weld::EntryTreeView> m_xEastFontNameLB; std::unique_ptr<weld::Label> m_xEastFontStyleFT; std::unique_ptr<FontStyleBox> m_xEastFontStyleLB; std::unique_ptr<weld::Label> m_xEastFontSizeFT; @@ -94,7 +94,7 @@ private: std::unique_ptr<weld::Label> m_xEastFontTypeFT; std::unique_ptr<weld::Label> m_xCTLFontNameFT; - std::unique_ptr<weld::ComboBox> m_xCTLFontNameLB; + std::unique_ptr<weld::EntryTreeView> m_xCTLFontNameLB; std::unique_ptr<weld::Label> m_xCTLFontStyleFT; std::unique_ptr<FontStyleBox> m_xCTLFontStyleLB; std::unique_ptr<weld::Label> m_xCTLFontSizeFT; diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index da9e62a6913a..5507e176436f 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -235,18 +235,14 @@ SvxCharNamePage::SvxCharNamePage(weld::Container* pPage, weld::DialogController* #endif m_pImpl->m_aNoStyleText = CuiResId( RID_CUISTR_CHARNAME_NOSTYLE ); - std::unique_ptr<weld::EntryTreeView> xWestFontName = m_xBuilder->weld_entry_tree_view(u"gdWestern"_ustr, u"edWestFontName"_ustr, u"trWestFontName"_ustr); - std::unique_ptr<weld::EntryTreeView> xCJKFontName = m_xBuilder->weld_entry_tree_view(u"gdCJK"_ustr, u"edCJKFontName"_ustr, u"trCJKFontName"_ustr); - std::unique_ptr<weld::EntryTreeView> xCTLFontName = m_xBuilder->weld_entry_tree_view(u"gdCTL"_ustr, u"edCTLFontName"_ustr, u"trCTLFontName"_ustr); + m_xWestFontNameLB = m_xBuilder->weld_entry_tree_view(u"gdWestern"_ustr, u"edWestFontName"_ustr, u"trWestFontName"_ustr); + m_xEastFontNameLB = m_xBuilder->weld_entry_tree_view(u"gdCJK"_ustr, u"edCJKFontName"_ustr, u"trCJKFontName"_ustr); + m_xCTLFontNameLB = m_xBuilder->weld_entry_tree_view(u"gdCTL"_ustr, u"edCTLFontName"_ustr, u"trCTLFontName"_ustr); // 7 lines in the treeview - xWestFontName->set_height_request_by_rows(7); - xCJKFontName->set_height_request_by_rows(7); - xCTLFontName->set_height_request_by_rows(7); - - m_xWestFontNameLB = std::move(xWestFontName); - m_xEastFontNameLB = std::move(xCJKFontName); - m_xCTLFontNameLB = std::move(xCTLFontName); + m_xWestFontNameLB->set_height_request_by_rows(7); + m_xEastFontNameLB->set_height_request_by_rows(7); + m_xCTLFontNameLB->set_height_request_by_rows(7); bool bShowCJK = SvtCJKOptions::IsCJKFontEnabled(); bool bShowCTL = SvtCTLOptions::IsCTLFontEnabled();
