From 7270c44e43a1c681dc55ce25f114b402bd8cf935 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Sat, 9 Nov 2024 21:23:04 +0100 Subject: tdf#130857 VclBuilder: Split XML parsing + applying tab child props Split the existing VclBuilder::handleTabChild into two methods and make the logic not specific to vcl::Window available to other subclasses as well, to make it available for reuse by QtBuilder in the future. In order to do that, move the existing XML parsing logic from the beginning of VclBuilder::handleTabChild to the base class into WidgetBuilder::handleTabChild. Add a new purely virtual method `applyTabChildProperties` to WidgetBuilder and move the corresponding logic for vcl::Window to the new VclBuilder override of this method. Call that method at the end of WidgetBuilder::handleTabChild. For QtBuilder, just add a dummy implementation that triggers an assert initially, which matches what would have happened right at the beginning of the previous WidgetBuilder::handleTabChild implementation without this commit in place. Change-Id: Ie5664bd341182fa51035b547accf9393d65a0702 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176320 Tested-by: Jenkins Reviewed-by: Michael Weghorn --- vcl/qt5/QtBuilder.cxx | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'vcl/qt5/QtBuilder.cxx') diff --git a/vcl/qt5/QtBuilder.cxx b/vcl/qt5/QtBuilder.cxx index 347e342fb9ed..68ecf56c4126 100644 --- a/vcl/qt5/QtBuilder.cxx +++ b/vcl/qt5/QtBuilder.cxx @@ -477,6 +477,13 @@ void QtBuilder::applyPackingProperties(QObject* pCurrentChild, QObject* pParent, SAL_WARN("vcl.qt", "QtBuilder::applyPackingProperties not yet implemented for this case"); } +void QtBuilder::applyTabChildProperties(QObject*, const std::vector&, + std::vector&, stringmap&, + stringmap&) +{ + assert(false && "Not implemented yet"); +} + void QtBuilder::set_response(std::u16string_view sID, short nResponse) { QPushButton* pPushButton = get(sID); -- cgit