include/vcl/toolkit/dialog.hxx | 1 - vcl/qa/cppunit/lifecycle.cxx | 1 - vcl/qt5/QtInstanceEntry.cxx | 11 ++++++++++- vcl/source/window/dialog.cxx | 9 --------- 4 files changed, 10 insertions(+), 12 deletions(-)
New commits: commit 8ca7c97770b541f631e8024b0b1d139e3ee2f399 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Dec 17 23:31:04 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Dec 18 09:32:33 2025 +0100 vcl: Drop unused Dialog ctor This one would have called SystemWindow::loadUI and thus created a VclBuilder instance with bLegacy=true passed to its ctor. It's unused in "real" code by now however, only used in a test. Drop it and the corresponding test case. Change-Id: I90c5f115653462d735053ad4702b69b780392394 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195818 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/include/vcl/toolkit/dialog.hxx b/include/vcl/toolkit/dialog.hxx index 2207e11d8acd..0a2a38c660d0 100644 --- a/include/vcl/toolkit/dialog.hxx +++ b/include/vcl/toolkit/dialog.hxx @@ -92,7 +92,6 @@ public: protected: explicit Dialog( WindowType eType ); - explicit Dialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription); virtual void Draw( OutputDevice* pDev, const Point& rPos, SystemTextColorFlags nFlags ) override; virtual void settingOptimalLayoutSize(Window *pBox) override; diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx index de5aeb64d65e..148af8784683 100644 --- a/vcl/qa/cppunit/lifecycle.cxx +++ b/vcl/qa/cppunit/lifecycle.cxx @@ -267,7 +267,6 @@ void LifecycleTest::testLeakage() aObjects.push_back(LeakTestObject::Create<VclVButtonBox>(xVBox)); } - aObjects.push_back(LeakTestObject::Create<Dialog>(xParent, u"PrintProgressDialog"_ustr, "vcl/ui/printprogressdialog.ui")); xParent.reset(); for (auto i = aObjects.rbegin(); i != aObjects.rend(); ++i) diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 30ab9f1457a3..1c069b8b08e2 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -570,15 +570,6 @@ void Dialog::ImplDeferredInit(vcl::Window* pParent, WinBits nBits) ImplInitDialog(pParent, nBits | WB_BORDER, mnInitFlag); } -Dialog::Dialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription) - : SystemWindow(WindowType::DIALOG, "vcl::Dialog maLayoutIdle", true) - , mnInitFlag(InitFlag::Default) -{ - ImplLOKNotifier(pParent); - ImplInitDialogData(); - loadUI(pParent, rID, rUIXMLDescription); -} - Dialog::Dialog(vcl::Window* pParent, WinBits nStyle, InitFlag eFlag) : SystemWindow(WindowType::DIALOG, "vcl::Dialog maLayoutIdle", true) , mnInitFlag(eFlag) commit 94bc7cd92cb9359376274d5f300b50dcd7c2b3d4 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Dec 18 07:43:11 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Dec 18 09:32:24 2025 +0100 tdf#130857 qt weld: Implement QtInstanceEntry::set_alignment Change-Id: I095b65f42399dcdc4aadd25ae37a05ee43a52b3c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195822 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceEntry.cxx b/vcl/qt5/QtInstanceEntry.cxx index 8fbbe2f94d85..5775bf86457c 100644 --- a/vcl/qt5/QtInstanceEntry.cxx +++ b/vcl/qt5/QtInstanceEntry.cxx @@ -186,7 +186,16 @@ void QtInstanceEntry::copy_clipboard() { assert(false && "Not implemented yet"); void QtInstanceEntry::paste_clipboard() { assert(false && "Not implemented yet"); } -void QtInstanceEntry::set_alignment(TxtAlign) { assert(false && "Not implemented yet"); } +void QtInstanceEntry::set_alignment(TxtAlign eXAlign) +{ + SolarMutexGuard g; + + GetQtInstance().RunInMainThread([&] { + const Qt::Alignment eAlign + = (m_pLineEdit->alignment() & Qt::AlignVertical_Mask) | toQtAlignment(eXAlign); + m_pLineEdit->setAlignment(eAlign); + }); +} void QtInstanceEntry::handleTextChanged() {
