Kaydet (Commit) 3d85664f authored tarafından Noel Grandin's avatar Noel Grandin

sc: boost::ptr_vector->std::vector<std::unique_ptr>

Change-Id: I930114dd44fadfcd98d1204d51ef271a4c556388
üst ece92b9a
...@@ -361,8 +361,8 @@ void ScXMLTableRowCellContext::PushParagraphSpan(const OUString& rSpan, const OU ...@@ -361,8 +361,8 @@ void ScXMLTableRowCellContext::PushParagraphSpan(const OUString& rSpan, const OU
void ScXMLTableRowCellContext::PushParagraphField(SvxFieldData* pData, const OUString& rStyleName) void ScXMLTableRowCellContext::PushParagraphField(SvxFieldData* pData, const OUString& rStyleName)
{ {
mbHasFormatRuns = true; mbHasFormatRuns = true;
maFields.push_back(new Field(pData)); maFields.push_back(o3tl::make_unique<Field>(pData));
Field& rField = maFields.back(); Field& rField = *maFields.back().get();
sal_Int32 nPos = maParagraph.getLength(); sal_Int32 nPos = maParagraph.getLength();
maParagraph.append('\1'); // Placeholder text for inserted field item. maParagraph.append('\1'); // Placeholder text for inserted field item.
...@@ -1114,7 +1114,7 @@ void ScXMLTableRowCellContext::PutTextCell( const ScAddress& rCurrentPos, ...@@ -1114,7 +1114,7 @@ void ScXMLTableRowCellContext::PutTextCell( const ScAddress& rCurrentPos,
{ {
FieldsType::const_iterator it = maFields.begin(), itEnd = maFields.end(); FieldsType::const_iterator it = maFields.begin(), itEnd = maFields.end();
for (; it != itEnd; ++it) 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 // This edit engine uses the SfxItemPool instance returned
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <editeng/flditem.hxx> #include <editeng/flditem.hxx>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <memory> #include <memory>
#include <vector> #include <vector>
...@@ -58,7 +57,7 @@ class ScXMLTableRowCellContext : public ScXMLImportContext ...@@ -58,7 +57,7 @@ class ScXMLTableRowCellContext : public ScXMLImportContext
}; };
typedef std::vector<std::unique_ptr<ParaFormat> > ParaFormatsType; 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; typedef std::pair<OUString, OUString> FormulaWithNamespace;
boost::optional<FormulaWithNamespace> maFormula; /// table:formula attribute boost::optional<FormulaWithNamespace> maFormula; /// table:formula attribute
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment