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/sidebar/DocumentHelper.cxx | |
| parent | 558b08d55f69b04eea42a37abd97fbb4dbe3602f (diff) | |
revert for mac and win unit case crashes after boost->std
Change-Id: I82c7084f203a834c2d42f9527705288e6036019b
Diffstat (limited to 'sd/source/ui/sidebar/DocumentHelper.cxx')
| -rw-r--r-- | sd/source/ui/sidebar/DocumentHelper.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx index 38c3d36c4d3f..4dedf6d69d4e 100644 --- a/sd/source/ui/sidebar/DocumentHelper.cxx +++ b/sd/source/ui/sidebar/DocumentHelper.cxx @@ -287,7 +287,7 @@ void DocumentHelper::ProvideStyles ( void DocumentHelper::AssignMasterPageToPageList ( SdDrawDocument& rTargetDocument, SdPage* pMasterPage, - const std::shared_ptr<std::vector<SdPage*> >& rpPageList) + const ::boost::shared_ptr<std::vector<SdPage*> >& rpPageList) { if (pMasterPage == NULL || !pMasterPage->IsMasterPage()) return; @@ -467,7 +467,7 @@ void DocumentHelper::AssignMasterPageToPage ( SdPage* DocumentHelper::ProvideMasterPage ( SdDrawDocument& rTargetDocument, SdPage* pMasterPage, - const std::shared_ptr<std::vector<SdPage*> >& rpPageList) + const ::boost::shared_ptr<std::vector<SdPage*> >& rpPageList) { // Make sure that both the master page and its notes master exist // in the source document. If one is missing then return without |