revert for mac and win unit case crashes after boost->std

Change-Id: I82c7084f203a834c2d42f9527705288e6036019b

5 files changed, 12 insertions, 12 deletions

diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx
index 293551cb2c45..39a7d3e4b7fe 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -36,8 +36,8 @@ using namespace ::com::sun::star::table;
 using namespace ::com::sun::star::sheet;
 using namespace ::com::sun::star::container;
 
+#include <boost/scoped_ptr.hpp>
 #include <boost/noncopyable.hpp>
-#include <memory>
 
 namespace oox { namespace xls {
 
@@ -250,7 +250,7 @@ void applyArrayFormulas(
         ScCompiler aComp(&rDoc.getDoc(), aPos);
         aComp.SetNumberFormatter(&rFormatter);
         aComp.SetGrammar(formula::FormulaGrammar::GRAM_OOXML);
-        std::unique_ptr<ScTokenArray> pArray(aComp.CompileString(it->maTokenAndAddress.maTokenStr));
+        boost::scoped_ptr<ScTokenArray> pArray(aComp.CompileString(it->maTokenAndAddress.maTokenStr));
         if (pArray)
             rDoc.setMatrixCells(aRange, *pArray, formula::FormulaGrammar::GRAM_OOXML);
     }
@@ -318,7 +318,7 @@ class WorkerThread: public salhelper::Thread, private boost::noncopyable
 {
     ScDocumentImport& mrDoc;
     FormulaBuffer::SheetItem& mrItem;
-    std::unique_ptr<SvNumberFormatter> mpFormatter;
+    boost::scoped_ptr<SvNumberFormatter> mpFormatter;
     const uno::Sequence<sheet::ExternalLinkInfo>& mrExternalLinks;
 
 public:
diff --git a/sc/source/filter/oox/revisionfragment.cxx b/sc/source/filter/oox/revisionfragment.cxx
index 14fb06f471ba..e4ca60819958 100644
--- a/sc/source/filter/oox/revisionfragment.cxx
+++ b/sc/source/filter/oox/revisionfragment.cxx
@@ -27,7 +27,7 @@
 #include <chgviset.hxx>
 #include <richstringcontext.hxx>
 
-#include <memory>
+#include <boost/scoped_ptr.hpp>
 
 #include <com/sun/star/util/DateTime.hpp>
 
@@ -266,7 +266,7 @@ void RevisionHeadersFragment::finalizeImport()
         const RevisionMetadata& rData = it->second;
         pCT->SetUser(rData.maUserName);
         pCT->SetFixDateTimeLocal(rData.maDateTime);
-        std::unique_ptr<oox::core::FastParser> xParser(getOoxFilter().createParser());
+        boost::scoped_ptr<oox::core::FastParser> xParser(getOoxFilter().createParser());
         rtl::Reference<oox::core::FragmentHandler> xFragment(new RevisionLogFragment(*this, aPath, *pCT));
         importOoxFragment(xFragment, *xParser);
     }
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index a3c126730c44..bf63786e9725 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -2273,7 +2273,7 @@ void Xf::writeToDoc( ScDocumentImport& rDoc, const table::CellRangeAddress& rRan
         }
     }
 
-    std::unique_ptr<ScPatternAttr> pAttr(new ScPatternAttr(rDoc.getDoc().GetPool()));
+    boost::scoped_ptr<ScPatternAttr> pAttr(new ScPatternAttr(rDoc.getDoc().GetPool()));
 
     {
         SvxRotateMode eRotateMode = SVX_ROTATE_MODE_STANDARD;
diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx
index 681883f9f222..0560ad52bc8e 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -64,7 +64,7 @@
 #include <algorithm>
 #include <queue>
 #include <thread>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
 
 #include <oox/ole/vbaproject.hxx>
 
@@ -235,7 +235,7 @@ public:
         SolarMutexGuard maGuard;
         SAL_INFO( "sc.filter",  "got solar\n" );
 
-        std::unique_ptr<oox::core::FastParser> xParser(
+        boost::scoped_ptr<oox::core::FastParser> xParser(
                 mrWorkbookHandler.getOoxFilter().createParser() );
 
         SAL_INFO( "sc.filter",  "start import\n" );
@@ -503,7 +503,7 @@ void WorkbookFragment::finalizeImport()
     OUString aRevHeadersPath = getFragmentPathFromFirstType(CREATE_OFFICEDOC_RELATION_TYPE("revisionHeaders"));
     if (!aRevHeadersPath.isEmpty())
     {
-        std::unique_ptr<oox::core::FastParser> xParser(getOoxFilter().createParser());
+        boost::scoped_ptr<oox::core::FastParser> xParser(getOoxFilter().createParser());
         rtl::Reference<oox::core::FragmentHandler> xFragment(new RevisionHeadersFragment(*this, aRevHeadersPath));
         importOoxFragment(xFragment, *xParser);
     }
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index 250a129ae623..883a58d1a7ab 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -86,7 +86,7 @@
 #include <officecfg/Office/Calc.hxx>
 
 #include <boost/noncopyable.hpp>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
 
 namespace oox {
 namespace xls {
@@ -247,7 +247,7 @@ private:
     typedef ::std::unique_ptr< WorkbookSettings >       WorkbookSettPtr;
     typedef ::std::unique_ptr< ViewSettings >           ViewSettingsPtr;
     typedef ::std::unique_ptr< WorksheetBuffer >        WorksheetBfrPtr;
-    typedef ::std::shared_ptr< ThemeBuffer >          ThemeBfrRef;
+    typedef ::boost::shared_ptr< ThemeBuffer >          ThemeBfrRef;
     typedef ::std::unique_ptr< StylesBuffer >           StylesBfrPtr;
     typedef ::std::unique_ptr< SharedStringsBuffer >    SharedStrBfrPtr;
     typedef ::std::unique_ptr< ExternalLinkBuffer >     ExtLinkBfrPtr;
@@ -312,7 +312,7 @@ private:
     bool                mbHasCodePage;          /// True = CODEPAGE record exists in imported stream.
     ScDocument* mpDoc;
     ScDocShell* mpDocShell;
-    std::unique_ptr<ScDocumentImport> mxDocImport;
+    boost::scoped_ptr<ScDocumentImport> mxDocImport;
 };
 
 WorkbookGlobals::WorkbookGlobals( ExcelFilter& rFilter ) :