Kaydet (Commit) 5f87aafe authored tarafından Noel Grandin's avatar Noel Grandin

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

Change-Id: Ia0f22c5bb3594331626d931a8a271b0183962d55
üst 4d427eb6
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
#include <oox/token/tokens.hxx> #include <oox/token/tokens.hxx>
#include <boost/ptr_container/ptr_vector.hpp> #include <boost/ptr_container/ptr_vector.hpp>
#include <o3tl/make_unique.hxx>
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace oox; using namespace oox;
...@@ -3090,7 +3091,7 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot ) ...@@ -3090,7 +3091,7 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot )
pNumFormat = new XclExpNumFmt( nScNumFmt, nXclNumFmt, GetNumberFormatCode( *this, nScNumFmt, mxFormatter.get(), mpKeywordTable.get() )); pNumFormat = new XclExpNumFmt( nScNumFmt, nXclNumFmt, GetNumberFormatCode( *this, nScNumFmt, mxFormatter.get(), mpKeywordTable.get() ));
} }
maDxf.push_back(new XclExpDxf( rRoot, pAlign, pBorder, pFont, pNumFormat, pCellProt, pColor )); maDxf.push_back(o3tl::make_unique<XclExpDxf>( rRoot, pAlign, pBorder, pFont, pNumFormat, pCellProt, pColor ));
++nIndex; ++nIndex;
} }
...@@ -3120,7 +3121,7 @@ void XclExpDxfs::SaveXml( XclExpXmlStream& rStrm ) ...@@ -3120,7 +3121,7 @@ void XclExpDxfs::SaveXml( XclExpXmlStream& rStrm )
for ( DxfContainer::iterator itr = maDxf.begin(); itr != maDxf.end(); ++itr ) for ( DxfContainer::iterator itr = maDxf.begin(); itr != maDxf.end(); ++itr )
{ {
itr->SaveXml( rStrm ); (*itr)->SaveXml( rStrm );
} }
rStyleSheet->endElement( XML_dxfs ); rStyleSheet->endElement( XML_dxfs );
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "conditio.hxx" #include "conditio.hxx"
#include "fonthelper.hxx" #include "fonthelper.hxx"
#include <memory> #include <memory>
#include <boost/ptr_container/ptr_vector.hpp> #include <vector>
/* ============================================================================ /* ============================================================================
- Buffers for style records (PALETTE, FONT, FORMAT, XF, STYLE). - Buffers for style records (PALETTE, FONT, FORMAT, XF, STYLE).
...@@ -735,7 +735,7 @@ public: ...@@ -735,7 +735,7 @@ public:
virtual void SaveXml( XclExpXmlStream& rStrm) override; virtual void SaveXml( XclExpXmlStream& rStrm) override;
private: private:
typedef boost::ptr_vector<XclExpDxf> DxfContainer; typedef std::vector< std::unique_ptr<XclExpDxf> > DxfContainer;
std::map<OUString, sal_Int32> maStyleNameToDxfId; std::map<OUString, sal_Int32> maStyleNameToDxfId;
DxfContainer maDxf; DxfContainer maDxf;
SvNumberFormatterPtr mxFormatter; /// Special number formatter for conversion. SvNumberFormatterPtr mxFormatter; /// Special number formatter for conversion.
......
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