summaryrefslogtreecommitdiff
path: root/sc/source/filter/xml/xmlimprt.hxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-09-17 18:59:32 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-09-17 18:59:32 +0100
commitd030c4a2a54418b17e87f837092a33eae21f0588 (patch)
treedd80ff3ba78eaa03e98efeb87e9160c6cd7524c5 /sc/source/filter/xml/xmlimprt.hxx
parent558b08d55f69b04eea42a37abd97fbb4dbe3602f (diff)
revert for mac and win unit case crashes after boost->std
Change-Id: I82c7084f203a834c2d42f9527705288e6036019b
Diffstat (limited to 'sc/source/filter/xml/xmlimprt.hxx')
-rw-r--r--sc/source/filter/xml/xmlimprt.hxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index 81a9520891e3..ae5ffe1747f9 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -42,12 +42,12 @@
#include <com/sun/star/util/XNumberFormatTypes.hpp>
#include <com/sun/star/sheet/XSheetCellRangeContainer.hpp>
-#include <memory>
#include <unordered_map>
#include <vector>
#include <boost/ptr_container/ptr_list.hpp>
#include <boost/ptr_container/ptr_map.hpp>
#include <boost/noncopyable.hpp>
+#include <boost/scoped_ptr.hpp>
class ScMyStyleNumberFormats;
class XMLNumberFormatAttributesExportHelper;
@@ -828,12 +828,12 @@ class ScXMLImport: public SvXMLImport, boost::noncopyable
CellTypeMap aCellTypeMap;
ScDocument* pDoc;
- std::unique_ptr<ScDocumentImport> mpDocImport;
- std::unique_ptr<ScCompiler> mpComp; // For error-checking of cached string cell values.
- std::unique_ptr<ScEditEngineDefaulter> mpEditEngine;
- std::unique_ptr<sc::PivotTableSources> mpPivotSources;
+ boost::scoped_ptr<ScDocumentImport> mpDocImport;
+ boost::scoped_ptr<ScCompiler> mpComp; // For error-checking of cached string cell values.
+ boost::scoped_ptr<ScEditEngineDefaulter> mpEditEngine;
+ boost::scoped_ptr<sc::PivotTableSources> mpPivotSources;
- mutable std::unique_ptr<ScXMLEditAttributeMap> mpEditAttrMap;
+ mutable boost::scoped_ptr<ScXMLEditAttributeMap> mpEditAttrMap;
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
std::list<SvXMLImportContext*> aViewContextList;
ScMyStylesImportHelper* pStylesImportHelper;