diff options
| author | Noel Grandin <noel@peralex.com> | 2012-04-25 12:12:02 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-04-25 12:35:35 +0200 |
| commit | 36394723ac332424d4b74b69ce8d125da4c915fa (patch) | |
| tree | 9a1207caa5bfa28b2cad83e16b3bee22543bdb20 /sw/source/filter/rtf | |
| parent | 2915069a67c81f2ee8607112379c65de66648ff0 (diff) | |
Convert SV_DECL_PTRARR_DEL(SwColumns) to boost::ptr_vector
Diffstat (limited to 'sw/source/filter/rtf')
| -rw-r--r-- | sw/source/filter/rtf/rtffly.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/rtf/swparrtf.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/filter/rtf/rtffly.cxx b/sw/source/filter/rtf/rtffly.cxx index 026fc4a496ad..826cb7e50726 100644 --- a/sw/source/filter/rtf/rtffly.cxx +++ b/sw/source/filter/rtf/rtffly.cxx @@ -963,7 +963,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet ) { for( sal_uInt16 n = 0, i = 0; n < aColumns.size(); n += 2, ++i ) { - SwColumn* pCol = aCol.GetColumns()[ i ]; + SwColumn* pCol = &aCol.GetColumns()[ i ]; sal_uLong nTmp = aColumns[ n ]; nTmp *= USHRT_MAX; nTmp /= nWidth; diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index 30263be0de56..ccc8124e8e3b 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -601,7 +601,7 @@ bool rtfSections::SetCols(SwFrmFmt &rFmt, const rtfSection &rSection, sal_uInt16 nWishWidth = 0, nHalfPrev = 0; for(sal_uInt16 n=0, i=0; n < rSection.maPageInfo.maColumns.size() && i < nCols; n += 2, ++i ) { - SwColumn* pCol = aCol.GetColumns()[ i ]; + SwColumn* pCol = &aCol.GetColumns()[ i ]; pCol->SetLeft( nHalfPrev ); sal_uInt16 nSp = static_cast< sal_uInt16 >(rSection.maPageInfo.maColumns[ n+1 ]); nHalfPrev = nSp / 2; @@ -2757,7 +2757,7 @@ sal_Bool lcl_SetFmtCol( SwFmt& rFmt, sal_uInt16 nCols, sal_uInt16 nColSpace, sal_uInt16 nWishWidth = 0, nHalfPrev = 0; for( sal_uInt16 n = 0, i = 0; n < rColumns.size(); n += 2, ++i ) { - SwColumn* pCol = aCol.GetColumns()[ i ]; + SwColumn* pCol = &aCol.GetColumns()[ i ]; pCol->SetLeft( nHalfPrev ); sal_uInt16 nSp = rColumns[ n+1 ]; nHalfPrev = nSp / 2; |