sd/source/console/PresenterAccessibility.cxx | 3 ---
sd/source/console/PresenterController.cxx | 16 +++++++---------
sd/source/console/PresenterController.hxx | 2 +-
3 files changed, 8 insertions(+), 13 deletions(-)
New commits:
commit c7ff6b049e4e61680c9c767d7404fcf6c0254f63
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed May 14 17:39:49 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu May 15 06:51:22 2025 +0200
sd presenter a11y: Drop unused local xPreviewPane
Change-Id: Iad9c19d0a633c6735e8f2d9ea3450313dd88316d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185328
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/sd/source/console/PresenterAccessibility.cxx
b/sd/source/console/PresenterAccessibility.cxx
index 173e8353c6a0..a800a19c5a93 100644
--- a/sd/source/console/PresenterAccessibility.cxx
+++ b/sd/source/console/PresenterAccessibility.cxx
@@ -137,9 +137,6 @@ void PresenterAccessible::UpdateAccessibilityHierarchy()
// Get the preview pane (standard or notes view) or the slide overview
// pane.
PresenterPaneContainer::SharedPaneDescriptor
pPreviewPane(GetPreviewPane());
- Reference<drawing::framework::XPane> xPreviewPane;
- if (pPreviewPane)
- xPreviewPane = pPreviewPane->mxPane.get();
// Get the notes pane.
PresenterPaneContainer::SharedPaneDescriptor pNotesPane(
commit 3b92011191ca994d47e68ab50d963034586cc8ff
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed May 14 17:36:08 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu May 15 06:51:15 2025 +0200
sd presenter a11y: Use "x" prefix for Reference
Change-Id: I8b687f15f6992ec7ba89d3bde3e3aae1816313a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185327
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 271cf7bc2961..ceb065987b9d 100644
--- a/sd/source/console/PresenterController.cxx
+++ b/sd/source/console/PresenterController.cxx
@@ -219,8 +219,8 @@ void PresenterController::UpdateCurrentSlide (const
sal_Int32 nOffset)
UpdateViews();
// Update the accessibility object.
- if (mpAccessibleObject.is())
- mpAccessibleObject->NotifyCurrentSlideChange();
+ if (mxAccessibleObject.is())
+ mxAccessibleObject->NotifyCurrentSlideChange();
}
void PresenterController::GetSlides (const sal_Int32 nOffset)
@@ -731,8 +731,8 @@ void SAL_CALL
PresenterController::notifyConfigurationChange (
break;
case ConfigurationUpdateEndEventType:
- if (mpAccessibleObject.is())
- mpAccessibleObject->UpdateAccessibilityHierarchy();
+ if (mxAccessibleObject.is())
+ mxAccessibleObject->UpdateAccessibilityHierarchy();
UpdateCurrentSlide(0);
break;
}
@@ -743,8 +743,8 @@ void SAL_CALL
PresenterController::notifyConfigurationChange (
void SAL_CALL PresenterController::disposing (
const lang::EventObject& rEvent)
{
- if (mpAccessibleObject)
- mpAccessibleObject->dispose();
+ if (mxAccessibleObject)
+ mxAccessibleObject->dispose();
if (rEvent.Source.get() ==
static_cast<cppu::OWeakObject*>(mxController.get()))
mxController = nullptr;
@@ -1027,9 +1027,7 @@ void PresenterController::InitializeMainPane (const
Reference<XPane>& rxPane)
if ( ! rxPane.is())
return;
- mpAccessibleObject = new PresenterAccessible(
- this,
- rxPane);
+ mxAccessibleObject = new PresenterAccessible(this, rxPane);
LoadTheme(rxPane);
diff --git a/sd/source/console/PresenterController.hxx
b/sd/source/console/PresenterController.hxx
index 76d9367f5372..0b01e1d4d035 100644
--- a/sd/source/console/PresenterController.hxx
+++ b/sd/source/console/PresenterController.hxx
@@ -194,7 +194,7 @@ private:
std::shared_ptr<PresenterPaintManager> mpPaintManager;
sal_Int32 mnPendingSlideNumber;
css::uno::Reference<css::util::XURLTransformer> mxUrlTransformer;
- ::rtl::Reference<PresenterAccessible> mpAccessibleObject;
+ ::rtl::Reference<PresenterAccessible> mxAccessibleObject;
IPresentationTime* mpPresentationTime;
void GetSlides (const sal_Int32 nOffset);
