sd/source/ui/unoidl/unomodel.cxx | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit a00acd19d15a3c45b417eee572f0312fc422319d
Author: Hubert Figuière <h...@collabora.com>
AuthorDate: Wed Sep 18 17:22:14 2024 -0400
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Feb 11 13:36:16 2025 +0100
lok: getSlideShowInfo: return the slide names
This allow finding slides by bookmark
Change-Id: Ia951aebdd04b67f4138138f7c0e1404078cc23ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178345
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 91eb985ee651..577666448bfd 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -4504,13 +4504,19 @@ OString SdXImpressDocument::getPresentationInfo() const
}
else
{
- SdrPage* pPage = pSlide->GetSdrPage();
+ SdPage* pPage = SdPage::getImplementation(pSlide);
auto aSlideNode = aJsonWriter.startStruct();
std::string sSlideHash =
GetInterfaceHash(cppu::getXWeak(pSlide));
aJsonWriter.put("hash", sSlideHash);
aJsonWriter.put("index", i);
+ if (pPage)
+ {
+ auto aName =
SdDrawPage::getPageApiNameFromUiName(pPage->GetName());
+ aJsonWriter.put("name", aName);
+ }
+
bool bIsDrawPageEmpty = pSlide->getCount() == 0;
aJsonWriter.put("empty", bIsDrawPageEmpty);
commit 3e4f902ac5f78473f62f1b10faf92d353b3a51bf
Author: Hubert Figuière <h...@collabora.com>
AuthorDate: Tue Sep 10 14:24:28 2024 -0400
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Feb 11 13:35:05 2025 +0100
lok: impress: Fix variable name
Was missed in https://gerrit.libreoffice.org/c/core/+/172847
Change-Id: I8e5ece6be2253106df6b6e535afa5efaa86850a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178291
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index db5c5ce45a4e..91eb985ee651 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -4592,7 +4592,7 @@ OString SdXImpressDocument::getPresentationInfo() const
uno::Reference<drawing::XShapes> const
xShapes(cppu::getXWeak(pSlide), uno::UNO_QUERY_THROW);
if (xShapes.is())
{
- auto aVideoList = aJsonWriter.startArray("interactions");
+ auto aInteractions =
aJsonWriter.startArray("interactions");
auto count = xShapes->getCount();
for (auto j = 0; j < count; j++)
{
