vcl/qt5/QtBuilder.cxx | 6 ++++++
vcl/qt5/QtFrame.cxx | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit e9761fb11c41f18655e33fce82171e3737111686
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Sep 27 19:22:53 2024 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Sep 28 09:34:34 2024 +0200
tdf#130857 qt weld: SAL_WARN and assert on unsupported widget type
Change-Id: I45b0eac84a5820d0ef8a3bb36de35827f0ae1e33
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174069
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/qt5/QtBuilder.cxx b/vcl/qt5/QtBuilder.cxx
index cda2d5866c58..09e90354fc6e 100644
--- a/vcl/qt5/QtBuilder.cxx
+++ b/vcl/qt5/QtBuilder.cxx
@@ -125,6 +125,12 @@ QObject* QtBuilder::makeObject(QObject* pParent,
std::u16string_view sName, cons
pObject = new QPushButton(pParentWidget);
}
}
+ else
+ {
+ SAL_WARN("vcl.qt", "Widget type not supported yet: "
+ << OUStringToOString(sName,
RTL_TEXTENCODING_UTF8));
+ assert(false && "Widget type not supported yet");
+ }
m_aChildren.emplace_back(sID, pObject);
commit 685c4aea78af552418e072a2951da31f91149fd4
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Sep 27 11:17:05 2024 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Sep 28 09:34:21 2024 +0200
qt: No longer use SalFrame::maGeometry in QtFrame at all
With previous commit
Change-Id: Icaf712c956297dbc7a774bbd995d42eb8a63a1bb
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Fri Sep 27 11:06:55 2024 +0200
qt: Query screen on demand in QtFrame
in place, all relevant members are explicitly set
for the returned SalFrameGeometry in
QtFrame::GetUnmirroredGeometry, so there's no more
reason to start with a copy of `maGeometry` instead of
a default-constructed SalFrameGeometry.
Margins for decorations are never set for the Qt-based
VCL plugins (using methods like SalFrameGeometry::setLeftDecoration),
so the default of 0 is fine for all of these.
Change-Id: Ibed98c665e61a4ba06bf9087a159048417598798
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174035
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx
index 09807c941638..d8afccf189de 100644
--- a/vcl/qt5/QtFrame.cxx
+++ b/vcl/qt5/QtFrame.cxx
@@ -566,7 +566,7 @@ void QtFrame::GetClientSize(tools::Long& rWidth,
tools::Long& rHeight)
SalFrameGeometry QtFrame::GetUnmirroredGeometry() const
{
- SalFrameGeometry aGeometry = maGeometry;
+ SalFrameGeometry aGeometry;
const qreal fRatio = devicePixelRatioF();
const QPoint aScreenPos = m_pQWidget->mapToGlobal(QPoint(0, 0));
