sd/source/console/PresenterConfigurationAccess.cxx | 2 +-
sd/source/console/PresenterConfigurationAccess.hxx | 3 +--
sd/source/console/PresenterController.cxx | 5 +----
sd/source/console/PresenterScreen.cxx | 2 +-
4 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 725a051050bf3158cec8241136363d8ac0afe857
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed May 14 16:02:14 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu May 15 06:50:31 2025 +0200
sd: Make PresenterConfigurationAccess::GetConfigurationNode const
Change-Id: If4093a967757c93669fce4e97b2939425348e4f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185321
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/sd/source/console/PresenterConfigurationAccess.cxx
b/sd/source/console/PresenterConfigurationAccess.cxx
index 4e8494c1115c..f01bc1274ad8 100644
--- a/sd/source/console/PresenterConfigurationAccess.cxx
+++ b/sd/source/console/PresenterConfigurationAccess.cxx
@@ -76,7 +76,7 @@ bool PresenterConfigurationAccess::IsValid() const
return mxRoot.is();
}
-Any PresenterConfigurationAccess::GetConfigurationNode (const OUString&
sPathToNode)
+Any PresenterConfigurationAccess::GetConfigurationNode(const OUString&
sPathToNode) const
{
return GetConfigurationNode(
Reference<container::XHierarchicalNameAccess>(mxRoot, UNO_QUERY),
diff --git a/sd/source/console/PresenterConfigurationAccess.hxx
b/sd/source/console/PresenterConfigurationAccess.hxx
index 68e03f8fe51d..a11b088ac0d2 100644
--- a/sd/source/console/PresenterConfigurationAccess.hxx
+++ b/sd/source/console/PresenterConfigurationAccess.hxx
@@ -75,8 +75,7 @@ public:
@param rsPathToNode
The relative path from the root (as given the constructor) to the
node.
*/
- css::uno::Any GetConfigurationNode (
- const OUString& rsPathToNode);
+ css::uno::Any GetConfigurationNode(const OUString& rsPathToNode) const;
/** Return <TRUE/> when opening the configuration (via creating a new
PresenterConfigurationAccess object) or previous calls to
commit fec4b0c5d18ef338283ed96da1801ba7e87020bf
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed May 14 15:58:21 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu May 15 06:50:25 2025 +0200
sd: OSL_ASSERT -> assert
Change-Id: Id5dddac8b07d6982ea1e8e10f985726484c9898c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185320
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sd/source/console/PresenterScreen.cxx
b/sd/source/console/PresenterScreen.cxx
index a73bfffeb732..29f41eaa5666 100644
--- a/sd/source/console/PresenterScreen.cxx
+++ b/sd/source/console/PresenterScreen.cxx
@@ -855,7 +855,7 @@ void PresenterScreen::SetupView(
aViewDescriptor = iDescriptor->second;
// Prepare the pane.
- OSL_ASSERT(mpPaneContainer);
+ assert(mpPaneContainer);
mpPaneContainer->PreparePane(
xPaneId,
rsViewURL,
commit 8b2017276d79975412c4739a46580ccd3a67da7e
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed May 14 15:47:41 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu May 15 06:50:18 2025 +0200
sd: Simplify retrieving slide count for pane title
Use XSlideShowController::getSlideCount instead
of XIndexAccess::getCount, which also avoids the
need to query for the XIndexAccess interface.
The implementation in SlideshowImpl::getCount
even just calls SlideshowImpl::getSlideCount.
Change-Id: Ia1d5d4fb5b246b21fe8583c77e3bcb00b5e894ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185319
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sd/source/console/PresenterController.cxx
b/sd/source/console/PresenterController.cxx
index ab612f95f0b3..55114cacca01 100644
--- a/sd/source/console/PresenterController.cxx
+++ b/sd/source/console/PresenterController.cxx
@@ -283,10 +283,7 @@ void PresenterController::UpdatePaneTitles()
static constexpr OUStringLiteral sSlideCountPlaceholder (u"SLIDE_COUNT");
// Get string for slide count.
- OUString sSlideCount (u"---"_ustr);
- Reference<container::XIndexAccess> xIndexAccess(mxSlideShowController,
UNO_QUERY);
- if (xIndexAccess.is())
- sSlideCount = OUString::number(xIndexAccess->getCount());
+ const OUString sSlideCount =
OUString::number(mxSlideShowController->getSlideCount());
// Get string for current slide index.
OUString sCurrentSlideNumber (OUString::number(mnCurrentSlideIndex + 1));
