diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 18:59:32 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 18:59:32 +0100 |
commit | d030c4a2a54418b17e87f837092a33eae21f0588 (patch) | |
tree | dd80ff3ba78eaa03e98efeb87e9160c6cd7524c5 /sd/source/ui/framework/factories/BasicViewFactory.cxx | |
parent | 558b08d55f69b04eea42a37abd97fbb4dbe3602f (diff) |
revert for mac and win unit case crashes after boost->std
Change-Id: I82c7084f203a834c2d42f9527705288e6036019b
Diffstat (limited to 'sd/source/ui/framework/factories/BasicViewFactory.cxx')
-rw-r--r-- | sd/source/ui/framework/factories/BasicViewFactory.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index dee1ae7c07a4..065499bac8e5 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -58,10 +58,10 @@ class BasicViewFactory::ViewDescriptor { public: Reference<XResource> mxView; - std::shared_ptr<sd::ViewShell> mpViewShell; + ::boost::shared_ptr<sd::ViewShell> mpViewShell; ViewShellWrapper* mpWrapper; Reference<XResourceId> mxViewId; - static bool CompareView (const std::shared_ptr<ViewDescriptor>& rpDescriptor, + static bool CompareView (const ::boost::shared_ptr<ViewDescriptor>& rpDescriptor, const Reference<XResource>& rxView) { return rpDescriptor->mxView.get() == rxView.get(); } }; @@ -69,14 +69,14 @@ public: //===== BasicViewFactory::ViewShellContainer ================================== class BasicViewFactory::ViewShellContainer - : public ::std::vector<std::shared_ptr<ViewDescriptor> > + : public ::std::vector<boost::shared_ptr<ViewDescriptor> > { public: ViewShellContainer() {}; }; class BasicViewFactory::ViewCache - : public ::std::vector<std::shared_ptr<ViewDescriptor> > + : public ::std::vector<boost::shared_ptr<ViewDescriptor> > { public: ViewCache() {}; @@ -164,7 +164,7 @@ Reference<XResource> SAL_CALL BasicViewFactory::createResource ( if (pFrame != NULL && mpBase!=NULL && pWindow!=NULL) { // Try to get the view from the cache. - std::shared_ptr<ViewDescriptor> pDescriptor (GetViewFromCache(rxViewId, xPane)); + ::boost::shared_ptr<ViewDescriptor> pDescriptor (GetViewFromCache(rxViewId, xPane)); // When the requested view is not in the cache then create a new view. if (pDescriptor.get() == NULL) @@ -201,7 +201,7 @@ void SAL_CALL BasicViewFactory::releaseResource (const Reference<XResource>& rxV ::boost::bind(&ViewDescriptor::CompareView, _1, rxView))); if (iViewShell != mpViewShellContainer->end()) { - std::shared_ptr<ViewShell> pViewShell ((*iViewShell)->mpViewShell); + ::boost::shared_ptr<ViewShell> pViewShell ((*iViewShell)->mpViewShell); if ((*iViewShell)->mxViewId->isBoundToURL( FrameworkHelper::msCenterPaneURL, AnchorBindingMode_DIRECT)) @@ -278,7 +278,7 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments) } } -std::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::CreateView ( +::boost::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::CreateView ( const Reference<XResourceId>& rxViewId, SfxViewFrame& rFrame, vcl::Window& rWindow, @@ -286,7 +286,7 @@ std::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::CreateView ( FrameView* pFrameView, const bool bIsCenterPane) { - std::shared_ptr<ViewDescriptor> pDescriptor (new ViewDescriptor()); + ::boost::shared_ptr<ViewDescriptor> pDescriptor (new ViewDescriptor()); pDescriptor->mpViewShell = CreateViewShell( rxViewId, @@ -323,14 +323,14 @@ std::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::CreateView ( return pDescriptor; } -std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell ( +::boost::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell ( const Reference<XResourceId>& rxViewId, SfxViewFrame& rFrame, vcl::Window& rWindow, FrameView* pFrameView, const bool bIsCenterPane) { - std::shared_ptr<ViewShell> pViewShell; + ::boost::shared_ptr<ViewShell> pViewShell; const OUString& rsViewURL (rxViewId->getResourceURL()); if (rsViewURL.equals(FrameworkHelper::msImpressViewURL)) { @@ -403,7 +403,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell ( } void BasicViewFactory::ReleaseView ( - const std::shared_ptr<ViewDescriptor>& rpDescriptor, + const ::boost::shared_ptr<ViewDescriptor>& rpDescriptor, bool bDoNotCache) { bool bIsCacheable (!bDoNotCache && IsCacheable(rpDescriptor)); @@ -441,7 +441,7 @@ void BasicViewFactory::ReleaseView ( } } -bool BasicViewFactory::IsCacheable (const std::shared_ptr<ViewDescriptor>& rpDescriptor) +bool BasicViewFactory::IsCacheable (const ::boost::shared_ptr<ViewDescriptor>& rpDescriptor) { bool bIsCacheable (false); @@ -451,7 +451,7 @@ bool BasicViewFactory::IsCacheable (const std::shared_ptr<ViewDescriptor>& rpDes static ::std::vector<Reference<XResourceId> > maCacheableResources; if (maCacheableResources.empty() ) { - std::shared_ptr<FrameworkHelper> pHelper (FrameworkHelper::Instance(*mpBase)); + ::boost::shared_ptr<FrameworkHelper> pHelper (FrameworkHelper::Instance(*mpBase)); // The slide sorter and the task panel are cacheable and relocatable. maCacheableResources.push_back(FrameworkHelper::CreateResourceId( @@ -474,11 +474,11 @@ bool BasicViewFactory::IsCacheable (const std::shared_ptr<ViewDescriptor>& rpDes return bIsCacheable; } -std::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::GetViewFromCache ( +::boost::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::GetViewFromCache ( const Reference<XResourceId>& rxViewId, const Reference<XPane>& rxPane) { - std::shared_ptr<ViewDescriptor> pDescriptor; + ::boost::shared_ptr<ViewDescriptor> pDescriptor; // Search for the requested view in the cache. ViewCache::iterator iEntry; @@ -515,7 +515,7 @@ std::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::GetViewFromC } void BasicViewFactory::ActivateCenterView ( - const std::shared_ptr<ViewDescriptor>& rpDescriptor) + const ::boost::shared_ptr<ViewDescriptor>& rpDescriptor) { mpBase->GetDocShell()->Connect(rpDescriptor->mpViewShell.get()); |