Kaydet (Commit) 0c40653c authored tarafından Vladimir Glazounov's avatar Vladimir Glazounov

INTEGRATION: CWS presenterscreen (1.2.4); FILE MERGED

2008/04/23 11:57:36 af 1.2.4.3: #i18486# Made caching optional, defaults to off.
2008/04/22 08:25:16 af 1.2.4.2: RESYNC: (1.2-1.3); FILE MERGED
2008/04/16 15:48:46 af 1.2.4.1: #i18486# Added support for caching unused panes.
üst 38a8e974
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* $RCSfile: PresenterPaneFactory.hxx,v $ * $RCSfile: PresenterPaneFactory.hxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
...@@ -42,6 +42,8 @@ ...@@ -42,6 +42,8 @@
#include <com/sun/star/drawing/framework/XResourceFactory.hpp> #include <com/sun/star/drawing/framework/XResourceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#include <boost/scoped_ptr.hpp>
#include <map>
namespace css = ::com::sun::star; namespace css = ::com::sun::star;
...@@ -71,8 +73,7 @@ public: ...@@ -71,8 +73,7 @@ public:
static const ::rtl::OUString msNotesPaneURL; static const ::rtl::OUString msNotesPaneURL;
static const ::rtl::OUString msToolBarPaneURL; static const ::rtl::OUString msToolBarPaneURL;
static const ::rtl::OUString msSlideSorterPaneURL; static const ::rtl::OUString msSlideSorterPaneURL;
static const ::rtl::OUString msClockPaneURL; static const ::rtl::OUString msHelpPaneURL;
static const ::rtl::OUString msDebugPaneURL;
static const ::rtl::OUString msOverlayPaneURL; static const ::rtl::OUString msOverlayPaneURL;
/** Create a new instance of this class and register it as resource /** Create a new instance of this class and register it as resource
...@@ -115,6 +116,9 @@ private: ...@@ -115,6 +116,9 @@ private:
css::uno::WeakReference<css::drawing::framework::XConfigurationController> css::uno::WeakReference<css::drawing::framework::XConfigurationController>
mxConfigurationControllerWeak; mxConfigurationControllerWeak;
::rtl::Reference<PresenterController> mpPresenterController; ::rtl::Reference<PresenterController> mpPresenterController;
typedef ::std::map<rtl::OUString, css::uno::Reference<css::drawing::framework::XResource> >
ResourceContainer;
::boost::scoped_ptr<ResourceContainer> mpResourceCache;
PresenterPaneFactory ( PresenterPaneFactory (
const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::uno::XComponentContext>& rxContext,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment