diff options
| author | Daniel Di Marco <d.dimarco@gmx.de> | 2011-10-29 13:24:48 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-01 12:19:05 +0000 |
| commit | f7303fcac779f99931bfba48e8bfcf9c081af67f (patch) | |
| tree | 2ebd76bd8d6d8db36bc87020accf5b22e05afec9 /editeng/source/rtf/rtfitem.cxx | |
| parent | cca7126c2908c5b9b6693326a3861bb96fae1be3 (diff) | |
eliminate SvUShorts type
Diffstat (limited to 'editeng/source/rtf/rtfitem.cxx')
| -rw-r--r-- | editeng/source/rtf/rtfitem.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index d97c05b3d67f..e04113ef6a87 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -109,14 +109,14 @@ inline const SvxLRSpaceItem& GetLRSpace(const SfxItemSet& rSet,sal_uInt16 nId,sa inline const SvxULSpaceItem& GetULSpace(const SfxItemSet& rSet,sal_uInt16 nId,sal_Bool bInP=sal_True) { return (const SvxULSpaceItem&)rSet.Get( nId,bInP); } -#define PARDID ((RTFPardAttrMapIds*)aPardMap.GetData()) -#define PLAINID ((RTFPlainAttrMapIds*)aPlainMap.GetData()) +#define PARDID ((RTFPardAttrMapIds*)&aPardMap[0]) +#define PLAINID ((RTFPlainAttrMapIds*)&aPlainMap[0]) void SvxRTFParser::SetScriptAttr( RTF_CharTypeDef eType, SfxItemSet& rSet, SfxPoolItem& rItem ) { const sal_uInt16 *pNormal = 0, *pCJK = 0, *pCTL = 0; - const RTFPlainAttrMapIds* pIds = (RTFPlainAttrMapIds*)aPlainMap.GetData(); + const RTFPlainAttrMapIds* pIds = (RTFPlainAttrMapIds*)&aPlainMap[0]; switch( rItem.Which() ) { case SID_ATTR_CHAR_FONT: @@ -1761,13 +1761,13 @@ void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet ) if( bPard ) { pAkt->nStyleNo = 0; - pPtr = aPardMap.GetData(); - nCnt = aPardMap.Count(); + pPtr = &aPardMap[0]; + nCnt = aPardMap.size(); } else { - pPtr = aPlainMap.GetData(); - nCnt = aPlainMap.Count(); + pPtr = &aPlainMap[0]; + nCnt = aPlainMap.size(); } for( sal_uInt16 n = 0; n < nCnt; ++n, ++pPtr ) @@ -1827,7 +1827,7 @@ void SvxRTFParser::SetDefault( int nToken, int nValue ) if( !bNewDoc ) return; - SfxItemSet aTmp( *pAttrPool, aWhichMap.GetData() ); + SfxItemSet aTmp( *pAttrPool, &aWhichMap[0] ); sal_Bool bOldFlag = bIsLeftToRightDef; bIsLeftToRightDef = sal_True; switch( nToken ) |