include/sfx2/sidebar/Panel.hxx | 1 +
sfx2/source/sidebar/Deck.cxx | 4 +++-
vcl/inc/scrollbarvalue.hxx | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 1d3595f789101e37ac97e584d94c135ee112a1cc
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Mon Apr 28 15:11:58 2025 +0000
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Thu May 15 12:00:15 2025 +0200
jsdialog: sidebar: use vcl ids for panels
JSDialog API cannot communicate without vcl id of a widget
Change-Id: Ic6bd0d430207f32cf631564102511eae7130b7bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184721
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185348
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
Tested-by: Jenkins
diff --git a/include/sfx2/sidebar/Panel.hxx b/include/sfx2/sidebar/Panel.hxx
index 0e81ba3a4a15..9a4ec617bbf3 100644
--- a/include/sfx2/sidebar/Panel.hxx
+++ b/include/sfx2/sidebar/Panel.hxx
@@ -62,6 +62,7 @@ public:
SAL_DLLPRIVATE PanelTitleBar* GetTitleBar() const;
SAL_DLLPRIVATE weld::Box* GetContents() const;
+ SAL_DLLPRIVATE const weld::Box* GetContainer() const { return
mxContainer.get(); }
SAL_DLLPRIVATE void Show(bool bShow);
bool IsTitleBarOptional() const { return mbIsTitleBarOptional; }
SAL_DLLPRIVATE void SetUIElement(const
css::uno::Reference<css::ui::XUIElement>& rxElement);
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index d534e74a2493..587824cbf5ec 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -152,7 +152,9 @@ void Deck::DumpAsPropertyTree(tools::JsonWriter&
rJsonWriter)
continue;
auto childNode = rJsonWriter.startStruct();
- rJsonWriter.put("id", it->GetId());
+ // JSDialog references widget by vcl id
+ rJsonWriter.put("id", it->GetContainer()->get_buildable_name());
+ rJsonWriter.put("name", it->GetId());
rJsonWriter.put("type", "panel");
rJsonWriter.put("text", it->GetTitle());
rJsonWriter.put("enabled", true);
commit d0f6c4c0dac847112ca83b7b646fc7aa431f480d
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Thu May 15 10:04:41 2025 +0200
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Thu May 15 12:00:10 2025 +0200
UBSan vclplug_gtk3 needs ScrollbarValue RTTI now
...as running soffice started to report
> warn:sal.osl:2389442:2389442:sal/osl/unx/module.cxx:103:
dlopen(.../instdir/program/libvclplug_gtk3lo.so, 257):
.../instdir/program/libvclplug_gtk3lo.so: undefined symbol: _ZTI14ScrollbarValue
for me after 7bb189c3c2c3fb414484e81b9c6bd2f446784cb3 "tdf#97228 change
scrollbarvalue code from include/vcl to vcl/" had removed the
SAL_DLLPUBLIC_RTTI
that had been present in the old include/vcl/salnativewidgets.hxx
Change-Id: I4c8b7c1e94f1e3d823a59b8bb4479dc32b005854
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185347
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/vcl/inc/scrollbarvalue.hxx b/vcl/inc/scrollbarvalue.hxx
index 823232cefe0e..2b0f9d394bf0 100644
--- a/vcl/inc/scrollbarvalue.hxx
+++ b/vcl/inc/scrollbarvalue.hxx
@@ -25,7 +25,7 @@
*
* Value container for scrollbars.
*/
-class ScrollbarValue final : public ImplControlValue
+class SAL_DLLPUBLIC_RTTI ScrollbarValue final : public ImplControlValue
{
public:
tools::Long mnMin;
