diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-12 09:51:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-12 10:45:04 +0200 |
| commit | 3d85664ffc00122f421d80ef417c09d0a8bd2eac (patch) | |
| tree | 25bfa1d2113d1ab3f8a72a48426789a03abe5ff7 /sc | |
| parent | ece92b9aabfcf12f44416da14578b2c58ec1a015 (diff) | |
sc: boost::ptr_vector->std::vector<std::unique_ptr>
Change-Id: I930114dd44fadfcd98d1204d51ef271a4c556388
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/xml/xmlcelli.cxx | 6 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlcelli.hxx | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index 34a15fd7d303..ded2e1941fd0 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -361,8 +361,8 @@ void ScXMLTableRowCellContext::PushParagraphSpan(const OUString& rSpan, const OU void ScXMLTableRowCellContext::PushParagraphField(SvxFieldData* pData, const OUString& rStyleName) { mbHasFormatRuns = true; - maFields.push_back(new Field(pData)); - Field& rField = maFields.back(); + maFields.push_back(o3tl::make_unique<Field>(pData)); + Field& rField = *maFields.back().get(); sal_Int32 nPos = maParagraph.getLength(); maParagraph.append('\1'); // Placeholder text for inserted field item. @@ -1114,7 +1114,7 @@ void ScXMLTableRowCellContext::PutTextCell( const ScAddress& rCurrentPos, { FieldsType::const_iterator it = maFields.begin(), itEnd = maFields.end(); for (; it != itEnd; ++it) - mpEditEngine->QuickInsertField(SvxFieldItem(*it->mpData, EE_FEATURE_FIELD), it->maSelection); + mpEditEngine->QuickInsertField(SvxFieldItem(*(*it)->mpData, EE_FEATURE_FIELD), (*it)->maSelection); } // This edit engine uses the SfxItemPool instance returned diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx index 534085c471f2..56090ca95bcf 100644 --- a/sc/source/filter/xml/xmlcelli.hxx +++ b/sc/source/filter/xml/xmlcelli.hxx @@ -28,7 +28,6 @@ #include <editeng/flditem.hxx> #include <boost/optional.hpp> -#include <boost/ptr_container/ptr_vector.hpp> #include <boost/noncopyable.hpp> #include <memory> #include <vector> @@ -58,7 +57,7 @@ class ScXMLTableRowCellContext : public ScXMLImportContext }; typedef std::vector<std::unique_ptr<ParaFormat> > ParaFormatsType; - typedef boost::ptr_vector<Field> FieldsType; + typedef std::vector<std::unique_ptr<Field> > FieldsType; typedef std::pair<OUString, OUString> FormulaWithNamespace; boost::optional<FormulaWithNamespace> maFormula; /// table:formula attribute |