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

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

Change-Id: I5495205d376284f2310e5dc67e897e7a9ccf010f
üst e6f57421
...@@ -561,15 +561,15 @@ const XclImpFont* XclImpFontBuffer::GetFont( sal_uInt16 nFontIndex ) const ...@@ -561,15 +561,15 @@ const XclImpFont* XclImpFontBuffer::GetFont( sal_uInt16 nFontIndex ) const
void XclImpFontBuffer::ReadFont( XclImpStream& rStrm ) void XclImpFontBuffer::ReadFont( XclImpStream& rStrm )
{ {
XclImpFont* pFont = new XclImpFont( GetRoot() ); maFontList.push_back( XclImpFont( GetRoot() ) );
pFont->ReadFont( rStrm ); XclImpFont& rFont = maFontList.back();
maFontList.push_back( pFont ); rFont.ReadFont( rStrm );
if( maFontList.size() == 1 ) if( maFontList.size() == 1 )
{ {
UpdateAppFont( pFont->GetFontData(), pFont->HasCharSet() ); UpdateAppFont( rFont.GetFontData(), rFont.HasCharSet() );
// #i71033# set text encoding from application font, if CODEPAGE is missing // #i71033# set text encoding from application font, if CODEPAGE is missing
SetAppFontEncoding( pFont->GetFontEncoding() ); SetAppFontEncoding( rFont.GetFontEncoding() );
} }
} }
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <list> #include <list>
#include <memory> #include <memory>
#include <vector>
#include <tools/mempool.hxx> #include <tools/mempool.hxx>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <boost/ptr_container/ptr_vector.hpp> #include <boost/ptr_container/ptr_vector.hpp>
...@@ -194,7 +195,7 @@ private: ...@@ -194,7 +195,7 @@ private:
void UpdateAppFont( const XclFontData& rFontData, bool bHasCharSet ); void UpdateAppFont( const XclFontData& rFontData, bool bHasCharSet );
private: private:
boost::ptr_vector< XclImpFont > maFontList; /// List of all FONT records in the Excel file. std::vector< XclImpFont > maFontList; /// List of all FONT records in the Excel file.
XclFontData maAppFont; /// Application font (for column width). XclFontData maAppFont; /// Application font (for column width).
XclImpFont maFont4; /// Built-in font with index 4. XclImpFont maFont4; /// Built-in font with index 4.
XclImpFont maCtrlFont; /// BIFF5 default form controls font (Helv,8pt,bold). XclImpFont maCtrlFont; /// BIFF5 default form controls font (Helv,8pt,bold).
......
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