vcl/qt5/QtInstanceBuilder.cxx | 1 +
vcl/qt5/QtInstanceMenu.cxx | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 5ffdd394c4354dfd7d232a34ea44b0d42f497afb
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Sep 11 22:32:28 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Sep 12 07:19:08 2025 +0200
tdf#130857 qt weld: Address clazy-range-loop-detach warning
Address this warning shown in Qt Creator:
.../vcl/qt5/QtInstanceMenu.cxx:240:5: c++11 range-loop might detach Qt
container (QList) [clazy-range-loop-detach]
Change-Id: Ib6b0c64216914b73932027977710f14fffefdf6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190839
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/qt5/QtInstanceMenu.cxx b/vcl/qt5/QtInstanceMenu.cxx
index f8039d468b4e..6df66cf2c2bc 100644
--- a/vcl/qt5/QtInstanceMenu.cxx
+++ b/vcl/qt5/QtInstanceMenu.cxx
@@ -236,7 +236,7 @@ void QtInstanceMenu::insertAction(QAction& rAction, const
OUString& rId, int nPo
QAction* QtInstanceMenu::getAction(const OUString& rIdent) const
{
- QList<QAction*> aActions = m_pMenu->actions();
+ const QList<QAction*> aActions = m_pMenu->actions();
for (QAction* pAction : aActions)
{
if (pAction && pAction->objectName() == toQString(rIdent))
commit 48d21de3763203875280d0572c1e112c259c4e12
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Sep 11 22:17:35 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Sep 12 07:19:03 2025 +0200
tdf#130857 tdf#160838 qt weld: Conditionally support sd comment menu
Declare conditional support for the menu shown for
the Impress comment popup, i.e. declare it as supported
when the parent is a native Qt widget as well.
While the comment popup is currently not supported
with Qt widgets yet, this commit prepares for the
point in time when it is, at which point the
menu will also be a native Qt menu.
The menu already works as expected in a WIP branch
experimenting with using native widgets for that
popup with SAL_VCL_QT_USE_WELDED_WIDGETS=1, but
more work is needed for the popup itself before
that one can also be declared as supported for real.
To trigger the menu:
* start Impress
* "Insert Comment"
* right-click on the comment area (or alternatively,
type and select some text and press the context menu
button)
Change-Id: Ie8a1b045c2efe39d645b96dec6ddcabef399da45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190836
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx
index 810f13869939..e2b83eb89a3c 100644
--- a/vcl/qt5/QtInstanceBuilder.cxx
+++ b/vcl/qt5/QtInstanceBuilder.cxx
@@ -234,6 +234,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString&
rUIFile, const weld::W
u"cui/ui/textanimtabpage.ui"_ustr,
u"cui/ui/textcolumnstabpage.ui"_ustr,
u"modules/scalc/ui/statisticsinfopage.ui"_ustr,
+ u"modules/simpress/ui/annotationtagmenu.ui"_ustr,
u"modules/swriter/ui/printoptionspage.ui"_ustr,
u"modules/swriter/ui/statisticsinfopage.ui"_ustr,
u"sfx/ui/custominfopage.ui"_ustr,
commit ca538367e77a9f5711df28d609d4d0a563f9f5c0
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Sep 11 22:15:12 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Sep 12 07:18:56 2025 +0200
tdf#130857 tdf#160838 qt weld: Convert accelerator in menu item text
This will e.g. be used by the menu in the comment
popup in Impress.
To trigger the menu:
* start Impress
* "Insert Comment"
* right-click on the comment area
This doesn't actually use native Qt widgets yet,
but this commit is one step towards declaring support
for using native widgets there. More work is
still needed before that can be done.
In a WIP branch without this commit in place,
menu entries with literal text "Cop~y" and "~Paste"
were seen in the menu.
Now they are displayed as expected.
Change-Id: Ic7071b3aa41c98e121f7b325e70070cc31dd6129
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190835
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/qt5/QtInstanceMenu.cxx b/vcl/qt5/QtInstanceMenu.cxx
index 6e6fe3d605b5..f8039d468b4e 100644
--- a/vcl/qt5/QtInstanceMenu.cxx
+++ b/vcl/qt5/QtInstanceMenu.cxx
@@ -142,7 +142,7 @@ void QtInstanceMenu::insert(int nPos, const OUString& rId,
const OUString& rStr,
SolarMutexGuard g;
GetQtInstance().RunInMainThread([&] {
- QAction* pAction = new QAction(toQString(rStr));
+ QAction* pAction = new QAction(vclToQtStringWithAccelerator(rStr));
insertAction(*pAction, rId, nPos);
