diff --git a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu index 520bcaaa456b..f89c549e4117 100644 --- a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu +++ b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu @@ -1882,7 +1882,7 @@ Current Slide (%CURRENT_SLIDE_NUMBER% of %SLIDE_COUNT%) - Current Slide, %CURRENT_SLIDE_NAME%, %CURRENT_SLIDE_NUMBER% of %SLIDE_COUNT% + Current Slide (%CURRENT_SLIDE_NUMBER% of %SLIDE_COUNT%), %CURRENT_SLIDE_NAME% true diff --git a/sd/source/console/PresenterAccessibility.cxx b/sd/source/console/PresenterAccessibility.cxx index 3631bb279232..336b7a387b19 100644 --- a/sd/source/console/PresenterAccessibility.cxx +++ b/sd/source/console/PresenterAccessibility.cxx @@ -163,7 +163,7 @@ void PresenterAccessible::UpdateAccessibilityHierarchy() UpdateAccessibilityHierarchy( pPreviewPane ? pPreviewPane->mxContentWindow : Reference(), pPreviewPane ? pPreviewPane->mxBorderWindow : Reference(), - pPreviewPane ? pPreviewPane->msTitle : OUString(), + pPreviewPane ? pPreviewPane->msAccessibleName : OUString(), pNotesPane ? pNotesPane->mxContentWindow : Reference(), pNotesPane ? pNotesPane->mxBorderWindow : Reference(), pNotesView.is() @@ -233,7 +233,7 @@ void PresenterAccessible::NotifyCurrentSlideChange () { PresenterPaneContainer::SharedPaneDescriptor pPreviewPane (GetPreviewPane()); mpAccessiblePreview->SetAccessibleName( - pPreviewPane ? pPreviewPane->msTitle : OUString()); + pPreviewPane ? pPreviewPane->msAccessibleName : OUString()); } // Play some focus ping-pong to trigger AT tools. diff --git a/sd/source/console/PresenterController.cxx b/sd/source/console/PresenterController.cxx index bfa766f4a8fb..afa9ddcdfddf 100644 --- a/sd/source/console/PresenterController.cxx +++ b/sd/source/console/PresenterController.cxx @@ -360,13 +360,13 @@ void PresenterController::UpdatePaneTitles() { OSL_ASSERT(rxPane != nullptr); - OUString sTemplate (IsAccessibilityActive() - ? rxPane->msAccessibleTitleTemplate - : rxPane->msTitleTemplate); - if (sTemplate.isEmpty()) + rxPane->msAccessibleName = lcl_replacePlaceholders(rxPane->msAccessibleNameTemplate, sCurrentSlideNumber, + sCurrentSlideName, sSlideCount); + + if (rxPane->msTitleTemplate.isEmpty()) continue; - rxPane->msTitle = lcl_replacePlaceholders(sTemplate, sCurrentSlideNumber, sCurrentSlideName, + rxPane->msTitle = lcl_replacePlaceholders(rxPane->msTitleTemplate, sCurrentSlideNumber, sCurrentSlideName, sSlideCount); if (rxPane->mxPane.is()) rxPane->mxPane->SetTitle(rxPane->msTitle); @@ -595,11 +595,7 @@ bool PresenterController::HasCustomAnimation (Reference cons void PresenterController::SetAccessibilityActiveState (const bool bIsActive) { - if ( mbIsAccessibilityActive != bIsActive) - { - mbIsAccessibilityActive = bIsActive; - UpdatePaneTitles(); - } + mbIsAccessibilityActive = bIsActive; } diff --git a/sd/source/console/PresenterPaneContainer.cxx b/sd/source/console/PresenterPaneContainer.cxx index 6d81dfa370ed..9b71efc7349d 100644 --- a/sd/source/console/PresenterPaneContainer.cxx +++ b/sd/source/console/PresenterPaneContainer.cxx @@ -65,7 +65,7 @@ void PresenterPaneContainer::PreparePane ( pDescriptor->msTitleTemplate = rsTitle; pDescriptor->msTitle.clear(); } - pDescriptor->msAccessibleTitleTemplate = rsAccessibleTitle; + pDescriptor->msAccessibleNameTemplate = rsAccessibleTitle; pDescriptor->maViewInitialization = rViewInitialization; pDescriptor->mbIsActive = true; pDescriptor->mbIsOpaque = bIsOpaque; diff --git a/sd/source/console/PresenterPaneContainer.hxx b/sd/source/console/PresenterPaneContainer.hxx index e999b4b74e4d..f2de216a15f1 100644 --- a/sd/source/console/PresenterPaneContainer.hxx +++ b/sd/source/console/PresenterPaneContainer.hxx @@ -77,8 +77,9 @@ public: css::uno::Reference mxContentWindow; css::uno::Reference mxBorderWindow; OUString msTitleTemplate; - OUString msAccessibleTitleTemplate; + OUString msAccessibleNameTemplate; OUString msTitle; + OUString msAccessibleName; ViewInitializationFunction maViewInitialization; bool mbIsActive; bool mbIsOpaque;