svx/uiconfig/ui/themecoloreditdialog.ui | 10 +++++----- xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-)
New commits: commit e50e460a2eb590c33e1274f27bd0f4821166fa7c Author: Caolán McNamara <[email protected]> AuthorDate: Thu Jul 3 19:58:37 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Jul 4 21:10:33 2025 +0200 column width missing in signature treeview column list which causes some problems. reproduce on desktop with: SAL_USE_VCLPLUGIN=gen ./instdir/program/soffice xmlsecurity/qa/unit/signing/data/signatureline.odt and the column with heading "Signature type" appears blank unless you select the seperator between it and Description and move it, at which point "XAdES" appears while in lokit there is a out-of-bound crash: #8 0x00007f830d436902 in abort () from target:/lib64/libc.so.6 #9 0x00007f830d6a84e9 in __gnu_debug::_Error_formatter::_M_error() const [clone .cold] () from target:/lib64/libstdc++.so.6 #10 0x00007f830518aa13 in std::__debug::vector<std::unique_ptr<SvLBoxTab, std::default_delete<SvLBoxTab> >, std::allocator<std::unique_ptr<SvLBoxTab, std::default_delete<SvLBoxTab> > > >::operator[] (this=0x4e31dfa8, __n=6) at /usr/include/c++/14/debug/vector:517 #11 0x00007f8305183b4d in SvTreeListBox::GetTab (this=0x4e31dbb0, pEntry=0x4e349e00, pItem=0x4b857ab0) at vcl/source/treelist/treelistbox.cxx:3203 #12 0x00007f830513529c in lcl_DumpEntryAndSiblings (rJsonWriter=..., pEntry=0x4e349e00, pTabListBox=0x4e31dbb0, bCheckButtons=false) at vcl/source/treelist/svtabbx.cxx:102 #13 0x00007f8305135f7b in SvTabListBox::DumpAsPropertyTree (this=0x4e31dbb0, rJsonWriter=...) at vcl/source/treelist/svtabbx.cxx:217 #14 0x00007f830513868b in SvHeaderTabListBox::DumpAsPropertyTree (this=0x4e31dbb0, rJsonWriter=...) at vcl/source/treelist/svtabbx.cxx:647 #15 0x00007f83058951b1 in JSDialogNotifyIdle::generateWidgetUpdate (this=0x4e32b530, pWindow=...) at vcl/jsdialog/jsdialogsender.cxx:111 Change-Id: Ia617d18c9cdf1170f50cbda3082e548777196dcd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187351 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Szymon Kłos <[email protected]> (cherry picked from commit 1cb5d4338d8467645494b5723b35aba031aea51b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187360 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins (cherry picked from commit 9e96f6977cee732d96b582cfb0622267c99fa454) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187371 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index d1a9b2af1cb8..35c8ce97aab5 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -225,7 +225,8 @@ DigitalSignaturesDialog::DigitalSignaturesDialog( // Give the first column 6 percent, try to distribute the rest equally. std::vector<int> aWidths; aWidths.push_back(6*nControlWidth/100); - auto nColWidth = (nControlWidth - aWidths[0]) / 4; + auto nColWidth = (nControlWidth - aWidths[0]) / 5; + aWidths.push_back(nColWidth); aWidths.push_back(nColWidth); aWidths.push_back(nColWidth); aWidths.push_back(nColWidth); commit c5d042c66ea96ccf467a6f132cdf704c3e5f081c Author: SilverGreen93 <[email protected]> AuthorDate: Fri Jun 27 17:09:39 2025 +0300 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Jul 4 21:10:27 2025 +0200 tdf#167273: Fix typos in Theme Color Edit dialog Change-Id: I675b9fb8eb3e02e4630227868b60638d580ea6eb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187118 Reviewed-by: Xisco Fauli <[email protected]> Reviewed-by: Adolfo Jayme Barrientos <[email protected]> Tested-by: Jenkins (cherry picked from commit 53abfabf8f4080fde688789f966b70ef3caa387b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187396 Reviewed-by: Mihai Vasiliu <[email protected]> diff --git a/svx/uiconfig/ui/themecoloreditdialog.ui b/svx/uiconfig/ui/themecoloreditdialog.ui index ac0114ab4be1..9adfc8e00c50 100644 --- a/svx/uiconfig/ui/themecoloreditdialog.ui +++ b/svx/uiconfig/ui/themecoloreditdialog.ui @@ -226,7 +226,7 @@ <property name="can-focus">False</property> <property name="margin-start">6</property> <property name="margin-end">12</property> - <property name="label" translatable="yes" context="themecoloreditdialog|labelLight1">Light1:</property> + <property name="label" translatable="yes" context="themecoloreditdialog|labelLight1">Light 1:</property> <property name="xalign">0</property> <accessibility> <relation type="label-for" target="buttonLight1"/> @@ -260,7 +260,7 @@ <property name="can-focus">False</property> <property name="margin-start">6</property> <property name="margin-end">12</property> - <property name="label" translatable="yes" context="themecoloreditdialog|labelLight2">Light2:</property> + <property name="label" translatable="yes" context="themecoloreditdialog|labelLight2">Light 2:</property> <property name="xalign">0</property> <accessibility> <relation type="label-for" target="buttonLight2"/> @@ -531,12 +531,12 @@ </packing> </child> <child> - <object class="GtkLabel" id="labelFollowHyperlink"> + <object class="GtkLabel" id="labelFollowedHyperlink"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="margin-start">6</property> <property name="margin-end">12</property> - <property name="label" translatable="yes" context="themecoloreditdialog|labelFollowHyperlink">Follow Hyperlink:</property> + <property name="label" translatable="yes" context="themecoloreditdialog|labelFollowedHyperlink">Followed Hyperlink:</property> <property name="xalign">0</property> <accessibility> <relation type="label-for" target="buttonFollowHyperlink"/> @@ -579,7 +579,7 @@ <placeholder/> </child> <accessibility> - <relation type="labelled-by" target="labelFollowHyperlink"/> + <relation type="labelled-by" target="labelFollowedHyperlink"/> </accessibility> </object> <packing>
