| PresenterScreen.cxx (5d03e972) | PresenterScreen.cxx (45b93914) |
|---|---|
| 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 527 unchanged lines hidden (view full) --- 536 if (nScreenCount < 2 || nDisplayNumber > nScreenCount) 537 { 538 // There is either only one screen or the full screen 539 // presentation spans all available screens. The presenter 540 // screen is shown only when a special flag in the configuration 541 // is set. 542 PresenterConfigurationAccess aConfiguration ( 543 xContext, | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 527 unchanged lines hidden (view full) --- 536 if (nScreenCount < 2 || nDisplayNumber > nScreenCount) 537 { 538 // There is either only one screen or the full screen 539 // presentation spans all available screens. The presenter 540 // screen is shown only when a special flag in the configuration 541 // is set. 542 PresenterConfigurationAccess aConfiguration ( 543 xContext, |
| 544 OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"), | 544 OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), |
| 545 PresenterConfigurationAccess::READ_ONLY); 546 bool bStartAlways (false); 547 if (aConfiguration.GetConfigurationNode( 548 OUString::createFromAscii("Presenter/StartAlways")) >>= bStartAlways) 549 { 550 if (bStartAlways) 551 return nScreenNumber; 552 } --- 146 unchanged lines hidden (view full) --- 699void PresenterScreen::SetupConfiguration ( 700 const Reference<XComponentContext>& rxContext, 701 const Reference<XResourceId>& rxAnchorId) 702{ 703 try 704 { 705 PresenterConfigurationAccess aConfiguration ( 706 rxContext, | 545 PresenterConfigurationAccess::READ_ONLY); 546 bool bStartAlways (false); 547 if (aConfiguration.GetConfigurationNode( 548 OUString::createFromAscii("Presenter/StartAlways")) >>= bStartAlways) 549 { 550 if (bStartAlways) 551 return nScreenNumber; 552 } --- 146 unchanged lines hidden (view full) --- 699void PresenterScreen::SetupConfiguration ( 700 const Reference<XComponentContext>& rxContext, 701 const Reference<XResourceId>& rxAnchorId) 702{ 703 try 704 { 705 PresenterConfigurationAccess aConfiguration ( 706 rxContext, |
| 707 OUString::createFromAscii("org.openoffice.Office.PresenterScreen"), | 707 OUString::createFromAscii("org.openoffice.Office.extension.PresenterScreen"), |
| 708 PresenterConfigurationAccess::READ_ONLY); 709 maViewDescriptors.clear(); 710 ProcessViewDescriptions(aConfiguration); 711 OUString sLayoutName (OUString::createFromAscii("DefaultLayout")); 712 aConfiguration.GetConfigurationNode( 713 OUString::createFromAscii("Presenter/CurrentLayout")) >>= sLayoutName; 714 ProcessLayout(aConfiguration, sLayoutName, rxContext, rxAnchorId); 715 } --- 215 unchanged lines hidden --- | 708 PresenterConfigurationAccess::READ_ONLY); 709 maViewDescriptors.clear(); 710 ProcessViewDescriptions(aConfiguration); 711 OUString sLayoutName (OUString::createFromAscii("DefaultLayout")); 712 aConfiguration.GetConfigurationNode( 713 OUString::createFromAscii("Presenter/CurrentLayout")) >>= sLayoutName; 714 ProcessLayout(aConfiguration, sLayoutName, rxContext, rxAnchorId); 715 } --- 215 unchanged lines hidden --- |