diff options
Diffstat (limited to 'sdext/source/presenter/PresenterToolBar.cxx')
| -rw-r--r-- | sdext/source/presenter/PresenterToolBar.cxx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 60e44faaed9f..ac69c76720a8 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -22,7 +22,6 @@ #include "PresenterBitmapContainer.hxx" #include "PresenterCanvasHelper.hxx" -#include "PresenterComponent.hxx" #include "PresenterGeometryHelper.hxx" #include "PresenterPaintManager.hxx" #include "PresenterPaneBase.hxx" @@ -120,7 +119,6 @@ class PresenterToolBar::Context : private ::boost::noncopyable { public: - ::rtl::OUString msBasePath; Reference<drawing::XPresenterHelper> mxPresenterHelper; css::uno::Reference<css::rendering::XCanvas> mxCanvas; }; @@ -633,11 +631,9 @@ void PresenterToolBar::CreateControls ( // Expand the macro in the bitmap file names. PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString("/org.openoffice.Office.extension.PresenterScreen/"), + OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); - const OUString sBasePath (PresenterComponent::GetBasePath(mxComponentContext)); - mpCurrentContainerPart.reset(new ElementContainerPart()); maElementContainer.clear(); maElementContainer.push_back(mpCurrentContainerPart); @@ -651,7 +647,6 @@ void PresenterToolBar::CreateControls ( PresenterConfigurationAccess::GetConfigurationNode(xToolBarNode, A2S("Entries")), UNO_QUERY); Context aContext; - aContext.msBasePath = sBasePath; aContext.mxPresenterHelper = mpPresenterController->GetPresenterHelper(); aContext.mxCanvas = mxCanvas; if (xEntries.is() @@ -1468,7 +1463,6 @@ void ElementMode::ReadElementMode ( xIconNode, A2S(""), rContext.mxPresenterHelper, - rContext.msBasePath, rContext.mxCanvas, rpDefaultMode.get()!=NULL ? rpDefaultMode->mpIcon : SharedBitmapDescriptor()); } |