PresenterToolBar.cxx (5d03e972) | PresenterToolBar.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 --- 14 unchanged lines hidden (view full) --- 23 24// MARKER(update_precomp.py): autogen include statement, do not remove 25#include "precompiled_sdext.hxx" 26 27#include "PresenterToolBar.hxx" 28 29#include "PresenterBitmapContainer.hxx" 30#include "PresenterCanvasHelper.hxx" | 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 --- 14 unchanged lines hidden (view full) --- 23 24// MARKER(update_precomp.py): autogen include statement, do not remove 25#include "precompiled_sdext.hxx" 26 27#include "PresenterToolBar.hxx" 28 29#include "PresenterBitmapContainer.hxx" 30#include "PresenterCanvasHelper.hxx" |
31#include "PresenterComponent.hxx" |
|
31#include "PresenterGeometryHelper.hxx" 32#include "PresenterPaintManager.hxx" 33#include "PresenterPaneBase.hxx" 34#include "PresenterPaneFactory.hxx" 35#include "PresenterTimer.hxx" 36#include "PresenterWindowManager.hxx" 37 38#include <cppuhelper/compbase2.hxx> --- 82 unchanged lines hidden (view full) --- 121 122} // end of anonymous namespace 123 124 125class PresenterToolBar::Context 126 : private ::boost::noncopyable 127{ 128public: | 32#include "PresenterGeometryHelper.hxx" 33#include "PresenterPaintManager.hxx" 34#include "PresenterPaneBase.hxx" 35#include "PresenterPaneFactory.hxx" 36#include "PresenterTimer.hxx" 37#include "PresenterWindowManager.hxx" 38 39#include <cppuhelper/compbase2.hxx> --- 82 unchanged lines hidden (view full) --- 122 123} // end of anonymous namespace 124 125 126class PresenterToolBar::Context 127 : private ::boost::noncopyable 128{ 129public: |
130 ::rtl::OUString msBasePath; |
|
129 Reference<drawing::XPresenterHelper> mxPresenterHelper; 130 css::uno::Reference<css::rendering::XCanvas> mxCanvas; 131}; 132 133 134 135 136//===== PresenterToolBar::Element ============================================= --- 629 unchanged lines hidden (view full) --- 766 const ::rtl::OUString& rsConfigurationPath) 767{ 768 if ( ! mxWindow.is()) 769 return; 770 771 // Expand the macro in the bitmap file names. 772 PresenterConfigurationAccess aConfiguration ( 773 mxComponentContext, | 131 Reference<drawing::XPresenterHelper> mxPresenterHelper; 132 css::uno::Reference<css::rendering::XCanvas> mxCanvas; 133}; 134 135 136 137 138//===== PresenterToolBar::Element ============================================= --- 629 unchanged lines hidden (view full) --- 768 const ::rtl::OUString& rsConfigurationPath) 769{ 770 if ( ! mxWindow.is()) 771 return; 772 773 // Expand the macro in the bitmap file names. 774 PresenterConfigurationAccess aConfiguration ( 775 mxComponentContext, |
774 OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"), | 776 OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), |
775 PresenterConfigurationAccess::READ_ONLY); 776 | 777 PresenterConfigurationAccess::READ_ONLY); 778 |
779 const OUString sBasePath (PresenterComponent::GetBasePath(mxComponentContext)); 780 |
|
777 mpCurrentContainerPart.reset(new ElementContainerPart()); 778 maElementContainer.clear(); 779 maElementContainer.push_back(mpCurrentContainerPart); 780 781 Reference<container::XHierarchicalNameAccess> xToolBarNode ( 782 aConfiguration.GetConfigurationNode(rsConfigurationPath), 783 UNO_QUERY); 784 if (xToolBarNode.is()) 785 { 786 Reference<container::XNameAccess> xEntries ( 787 PresenterConfigurationAccess::GetConfigurationNode(xToolBarNode, A2S("Entries")), 788 UNO_QUERY); 789 Context aContext; | 781 mpCurrentContainerPart.reset(new ElementContainerPart()); 782 maElementContainer.clear(); 783 maElementContainer.push_back(mpCurrentContainerPart); 784 785 Reference<container::XHierarchicalNameAccess> xToolBarNode ( 786 aConfiguration.GetConfigurationNode(rsConfigurationPath), 787 UNO_QUERY); 788 if (xToolBarNode.is()) 789 { 790 Reference<container::XNameAccess> xEntries ( 791 PresenterConfigurationAccess::GetConfigurationNode(xToolBarNode, A2S("Entries")), 792 UNO_QUERY); 793 Context aContext; |
794 aContext.msBasePath = sBasePath; |
|
790 aContext.mxPresenterHelper = mpPresenterController->GetPresenterHelper(); 791 aContext.mxCanvas = mxCanvas; 792 if (xEntries.is() 793 && aContext.mxPresenterHelper.is() 794 && aContext.mxCanvas.is()) 795 { 796 PresenterConfigurationAccess::ForAll( 797 xEntries, --- 860 unchanged lines hidden (view full) --- 1658 1659 // Read bitmaps to display as icons. 1660 Reference<container::XHierarchicalNameAccess> xIconNode ( 1661 PresenterConfigurationAccess::GetProperty(xProperties, A2S("Icon")), UNO_QUERY); 1662 mpIcon = PresenterBitmapContainer::LoadBitmap( 1663 xIconNode, 1664 A2S(""), 1665 rContext.mxPresenterHelper, | 795 aContext.mxPresenterHelper = mpPresenterController->GetPresenterHelper(); 796 aContext.mxCanvas = mxCanvas; 797 if (xEntries.is() 798 && aContext.mxPresenterHelper.is() 799 && aContext.mxCanvas.is()) 800 { 801 PresenterConfigurationAccess::ForAll( 802 xEntries, --- 860 unchanged lines hidden (view full) --- 1663 1664 // Read bitmaps to display as icons. 1665 Reference<container::XHierarchicalNameAccess> xIconNode ( 1666 PresenterConfigurationAccess::GetProperty(xProperties, A2S("Icon")), UNO_QUERY); 1667 mpIcon = PresenterBitmapContainer::LoadBitmap( 1668 xIconNode, 1669 A2S(""), 1670 rContext.mxPresenterHelper, |
1671 rContext.msBasePath, |
|
1666 rContext.mxCanvas, 1667 rpDefaultMode.get()!=NULL ? rpDefaultMode->mpIcon : SharedBitmapDescriptor()); 1668 } 1669 catch(Exception&) 1670 { 1671 OSL_ASSERT(false); 1672 } 1673} --- 775 unchanged lines hidden --- | 1672 rContext.mxCanvas, 1673 rpDefaultMode.get()!=NULL ? rpDefaultMode->mpIcon : SharedBitmapDescriptor()); 1674 } 1675 catch(Exception&) 1676 { 1677 OSL_ASSERT(false); 1678 } 1679} --- 775 unchanged lines hidden --- |