diff options
| author | Noel Grandin <noel@peralex.com> | 2012-06-21 17:07:29 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-06-25 20:13:15 +0200 |
| commit | 1c6fcbc2df45ab18a97373195ca21967e3c10e13 (patch) | |
| tree | f91696a7c84c1264c338f0eca562ac1e834b30ee /sw | |
| parent | dfd96d4f6c4726f466ca62bc4a925086f69228dc (diff) | |
Convert aRubyCharFmts member from Svptrarr to std:vector
Change-Id: I397953f1e2a52a2de7fbdf4ad14cad715fe6fd28
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/rtf/rtffld.cxx | 9 | ||||
| -rw-r--r-- | sw/source/filter/rtf/swparrtf.hxx | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx index da3ba11d13a9..b7888b0b7046 100644 --- a/sw/source/filter/rtf/rtffld.cxx +++ b/sw/source/filter/rtf/rtffld.cxx @@ -712,9 +712,9 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr ) nFntWhich = GetWhichOfScript( RES_CHRATR_FONT, nScript ); //Check to see if we already have a ruby charstyle that this fits - for(sal_uInt16 i=0; i < aRubyCharFmts.Count(); ++i ) + for(sal_uInt16 i=0; i < aRubyCharFmts.size(); ++i ) { - SwCharFmt *pFmt = (SwCharFmt *)aRubyCharFmts[i]; + SwCharFmt *pFmt = aRubyCharFmts[i]; const SvxFontHeightItem &rF = (const SvxFontHeightItem &) pFmt->GetFmtAttr( nFntHWhich ); if( rF.GetHeight() == sal_uInt16(aData.nFontSize * 10 )) @@ -735,7 +735,7 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr ) String sNm; //Take this as the base name SwStyleNameMapper::FillUIName( RES_POOLCHR_RUBYTEXT, sNm ); - sNm += String::CreateFromInt32( aRubyCharFmts.Count() + 1 ); + sNm += String::CreateFromInt32( aRubyCharFmts.size() + 1 ); pCharFmt = pDoc->MakeCharFmt( sNm, ( SwCharFmt*)pDoc->GetDfltCharFmt() ); @@ -747,8 +747,7 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr ) pCharFmt->SetFmtAttr( aHeightItem ); pCharFmt->SetFmtAttr( aFontItem ); - void* p = pCharFmt; - aRubyCharFmts.Insert( p, aRubyCharFmts.Count() ); + aRubyCharFmts.push_back( pCharFmt ); } } diff --git a/sw/source/filter/rtf/swparrtf.hxx b/sw/source/filter/rtf/swparrtf.hxx index 8d06a9cbaac0..5e1cf16f49f8 100644 --- a/sw/source/filter/rtf/swparrtf.hxx +++ b/sw/source/filter/rtf/swparrtf.hxx @@ -304,7 +304,7 @@ class SwRTFParser : public SvxRTFParser std::vector<bool> aMergeBoxes; // Flags fuer gemergte Zellen SwListArr aListArr; SvPtrarr aTblFmts; - SvPtrarr aRubyCharFmts; + std::vector<SwCharFmt*> aRubyCharFmts; BookmarkPosition* mpBookmarkStart; sw::util::RedlineStack *mpRedlineStack; sw::util::AuthorInfos m_aAuthorInfos; |