diff options
Diffstat (limited to 'sdext/source/presenter/PresenterScreen.cxx')
| -rw-r--r-- | sdext/source/presenter/PresenterScreen.cxx | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index 015884abfb25..52ad08583539 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -467,9 +467,7 @@ void PresenterScreen::InitializePresenterScreen (void) SetupPaneFactory(xContext); SetupViewFactory(xContext); - mpPresenterController->GetWindowManager()->SetSlideSorterState(false); - mpPresenterController->GetWindowManager()->SetLayoutMode( - PresenterWindowManager::Standard); + mpPresenterController->GetWindowManager()->RestoreViewMode(); } catch (RuntimeException&) { @@ -790,10 +788,11 @@ void PresenterScreen::ProcessViewDescriptions ( rConfiguration.GetConfigurationNode(A2S("Presenter/Views")), UNO_QUERY_THROW); - ::std::vector<rtl::OUString> aProperties (3); + ::std::vector<rtl::OUString> aProperties (4); aProperties[0] = OUString::createFromAscii("ViewURL"); aProperties[1] = OUString::createFromAscii("Title"); - aProperties[2] = OUString::createFromAscii("IsOpaque"); + aProperties[2] = OUString::createFromAscii("AccessibleTitle"); + aProperties[3] = OUString::createFromAscii("IsOpaque"); mnComponentIndex = 1; PresenterConfigurationAccess::ForAll( xViewDescriptionsNode, @@ -865,7 +864,7 @@ void PresenterScreen::ProcessViewDescription ( { (void)rsKey; - if (rValues.size() != 3) + if (rValues.size() != 4) return; try @@ -874,7 +873,10 @@ void PresenterScreen::ProcessViewDescription ( OUString sViewURL; rValues[0] >>= sViewURL; rValues[1] >>= aViewDescriptor.msTitle; - rValues[2] >>= aViewDescriptor.mbIsOpaque; + rValues[2] >>= aViewDescriptor.msAccessibleTitle; + rValues[3] >>= aViewDescriptor.mbIsOpaque; + if (aViewDescriptor.msAccessibleTitle.getLength()==0) + aViewDescriptor.msAccessibleTitle = aViewDescriptor.msTitle; maViewDescriptors[sViewURL] = aViewDescriptor; } catch (Exception&) @@ -913,6 +915,7 @@ void PresenterScreen::SetupView( xPaneId, rsViewURL, aViewDescriptor.msTitle, + aViewDescriptor.msAccessibleTitle, aViewDescriptor.mbIsOpaque, rViewInitialization, nLeft, |