cui/uiconfig/ui/rotationtabpage.ui | 2 - svx/inc/spacing.hrc | 6 +++++ svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 22 +++++++++++++++++++++ vcl/source/window/window.cxx | 7 ++++++ 4 files changed, 36 insertions(+), 1 deletion(-)
New commits: commit 76de996c9d72493b29bbe30b825e11979125b1c7 Author: Henry Castro <[email protected]> AuthorDate: Wed Feb 25 07:53:33 2026 -0400 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Feb 27 09:16:02 2026 +0100 cui: set focusable on dial control for rotation Make control handle key inputs for accessibility Signed-off-by: Henry Castro <[email protected]> Change-Id: I9719a448cd3cc8b9761f44b308c91d7355f5e271 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200311 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200544 diff --git a/cui/uiconfig/ui/rotationtabpage.ui b/cui/uiconfig/ui/rotationtabpage.ui index 1e5bda3d6a04..d7b69f156e32 100644 --- a/cui/uiconfig/ui/rotationtabpage.ui +++ b/cui/uiconfig/ui/rotationtabpage.ui @@ -337,7 +337,7 @@ <child> <object class="GtkDrawingArea" id="CTL_ANGLE"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can-focus">True</property> <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property> <property name="tooltip-text" translatable="yes" context="rotationtabpage|CTL_ANGLE|tooltip_text">Rotation Angle</property> <property name="halign">center</property> commit 548e791b1aafdb98e17650bb67ec18b6629663bb Author: Henry Castro <[email protected]> AuthorDate: Tue Feb 24 10:56:24 2026 -0400 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Feb 27 09:15:54 2026 +0100 fix the label for the 'beforetextindent' type/ID Signed-off-by: Henry Castro <[email protected]> Change-Id: I4fc3bbd3a1813220634c487b9d293533a5122236 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200228 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200543 Reviewed-by: Caolán McNamara <[email protected]> diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index ef42722a6790..90ec7f0786d8 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -647,7 +647,7 @@ ParaPropertyPanel::ParaPropertyPanel(weld::Widget* pParent, std::unique_ptr<weld::Widget> xBox = m_xBuilder->weld_widget(u"aboveparaspacingbox"_ustr); xBox->set_cargo_text(MakeCustomProperty(SvxResId(RID_ABOVE), u"aboveparaspacing")); xBox = m_xBuilder->weld_widget(u"belowparaspacingbox"_ustr); - xBox->set_cargo_text(MakeCustomProperty(SvxResId(RID_BELOW), u"beforetextindentbox")); + xBox->set_cargo_text(MakeCustomProperty(SvxResId(RID_BELOW), u"beforetextindent")); xBox = m_xBuilder->weld_widget(u"beforetextindentbox"_ustr); xBox->set_cargo_text(MakeCustomProperty(SvxResId(RID_BEFORE), u"beforetextindent")); xBox = m_xBuilder->weld_widget(u"aftertextindentbox"_ustr); commit b0c83ee34a2cde3b2d2120a8bfde3839e88d74c5 Author: Henry Castro <[email protected]> AuthorDate: Wed Feb 4 09:27:59 2026 -0400 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Feb 27 09:15:47 2026 +0100 vcl: add custom-label and custom-label-for properties Add those custom properties to the client side so that the client side can adjust the container to include a label without interfering with the original UI file. Signed-off-by: Henry Castro <[email protected]> Change-Id: I7717b5f9b4e368885e767ab447fccd6806de0c9f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198685 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200542 diff --git a/svx/inc/spacing.hrc b/svx/inc/spacing.hrc index 742b499dc32c..26ada64b12a3 100644 --- a/svx/inc/spacing.hrc +++ b/svx/inc/spacing.hrc @@ -13,6 +13,12 @@ #define NC_(Context, String) TranslateId(Context, u8##String) +#define RID_ABOVE NC_("RID_ABOVE", "Above:") +#define RID_BELOW NC_("RID_BELOW", "Below:") +#define RID_BEFORE NC_("RID_BEFORE", "Before:") +#define RID_AFTER NC_("RID_AFTER", "After:") +#define RID_FIRST NC_("RID_FIRST", "First:") + struct measurement { TranslateId key; diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index 1e963565bb7a..ef42722a6790 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -26,9 +26,12 @@ #include <svx/dlgctrl.hxx> #include <svx/svxids.hrc> #include <svl/intitem.hxx> +#include <svx/dialmgr.hxx> #include <sfx2/objsh.hxx> #include <svtools/unitconv.hxx> #include <sal/log.hxx> +#include <rtl/ustrbuf.hxx> +#include <spacing.hrc> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <utility> @@ -566,6 +569,14 @@ FieldUnit ParaPropertyPanel::GetCurrentUnit( SfxItemState eState, const SfxPoolI return eUnit; } +namespace { + OUString MakeCustomProperty(std::u16string_view sCustomLabel, std::u16string_view sCustomLabelFor) + { + return OUString::Concat(u"\"custom-label\":\"") + sCustomLabel + "\", \"custom-label-for\":\"" + + sCustomLabelFor + "\""; + } +} + ParaPropertyPanel::ParaPropertyPanel(weld::Widget* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, @@ -633,6 +644,17 @@ ParaPropertyPanel::ParaPropertyPanel(weld::Widget* pParent, mpBindings(pBindings), mxSidebar(std::move(xSidebar)) { + std::unique_ptr<weld::Widget> xBox = m_xBuilder->weld_widget(u"aboveparaspacingbox"_ustr); + xBox->set_cargo_text(MakeCustomProperty(SvxResId(RID_ABOVE), u"aboveparaspacing")); + xBox = m_xBuilder->weld_widget(u"belowparaspacingbox"_ustr); + xBox->set_cargo_text(MakeCustomProperty(SvxResId(RID_BELOW), u"beforetextindentbox")); + xBox = m_xBuilder->weld_widget(u"beforetextindentbox"_ustr); + xBox->set_cargo_text(MakeCustomProperty(SvxResId(RID_BEFORE), u"beforetextindent")); + xBox = m_xBuilder->weld_widget(u"aftertextindentbox"_ustr); + xBox->set_cargo_text(MakeCustomProperty(SvxResId(RID_AFTER), u"aftertextindent")); + xBox = m_xBuilder->weld_widget(u"firstlineindentbox"_ustr); + xBox->set_cargo_text(MakeCustomProperty(SvxResId(RID_FIRST), u"firstlineindent")); + mxTBxHyphenation->connect_clicked(LINK( this, ParaPropertyPanel, HyphenationToggleButtonHdl_Impl)); // tdf#130197 We want to give this toolbar a width as if it had 5 entries // (the parent grid has homogeneous width set so both columns will have the diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index d3a481d03d66..8482e0649bda 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3410,6 +3410,13 @@ void Window::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter) } } + const OUString& aCargo = GetCargoText(); + if (!aCargo.isEmpty()) + { + auto node = rJsonWriter.startNode("cargo"); + rJsonWriter.putRaw(OUStringToOString(aCargo, RTL_TEXTENCODING_UTF8)); + } + OUString sAccRole; sal_uInt16 nAccessibleRole = GetAccessibleRole(); if (nAccessibleRole == css::accessibility::AccessibleRole::PAGE_TAB_LIST)
