diff options
Diffstat (limited to 'editeng/source/rtf')
| -rw-r--r-- | editeng/source/rtf/rtfitem.cxx | 8 | ||||
| -rw-r--r-- | editeng/source/rtf/svxrtf.cxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index fdfda0726f7f..67a574bac6e2 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -303,14 +303,14 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) case RTF_KEEP: if( aPardMap.nSplit ) { - pSet->Put( SvxFmtSplitItem( false, aPardMap.nSplit )); + pSet->Put( SvxFormatSplitItem( false, aPardMap.nSplit )); } break; case RTF_KEEPN: if( aPardMap.nKeep ) { - pSet->Put( SvxFmtKeepItem( true, aPardMap.nKeep )); + pSet->Put( SvxFormatKeepItem( true, aPardMap.nKeep )); } break; @@ -358,7 +358,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) CalcValue(); nSz = sal_uInt16(nTokenValue); } - aLR.SetTxtFirstLineOfst( nSz ); + aLR.SetTextFirstLineOfst( nSz ); pSet->Put( aLR ); } break; @@ -375,7 +375,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) CalcValue(); nSz = sal_uInt16(nTokenValue); } - aLR.SetTxtLeft( nSz ); + aLR.SetTextLeft( nSz ); pSet->Put( aLR ); } break; diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index 552c52a77b27..56ef7368e8fc 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -129,7 +129,7 @@ SvParserState SvxRTFParser::CallParser() sBaseURL.clear(); // generate the correct WhichId table from the set WhichIds. - BuildWhichTbl(); + BuildWhichTable(); return SvRTFParser::CallParser(); } @@ -1089,7 +1089,7 @@ void SvxRTFParser::SetAttrInDoc( SvxRTFItemStackType & ) { } -void SvxRTFParser::BuildWhichTbl() +void SvxRTFParser::BuildWhichTable() { aWhichMap.clear(); aWhichMap.push_back( 0 ); @@ -1097,8 +1097,8 @@ void SvxRTFParser::BuildWhichTbl() // Building a Which-Map 'rWhichMap' from an array of // 'pWhichIds' from Which-Ids. It has the long 'nWhichIds'. // The Which-Map is not going to be deleted. - SvParser::BuildWhichTbl( aWhichMap, reinterpret_cast<sal_uInt16*>(&aPardMap), sizeof(aPardMap) / sizeof(sal_uInt16) ); - SvParser::BuildWhichTbl( aWhichMap, reinterpret_cast<sal_uInt16*>(&aPlainMap), sizeof(aPlainMap) / sizeof(sal_uInt16) ); + SvParser::BuildWhichTable( aWhichMap, reinterpret_cast<sal_uInt16*>(&aPardMap), sizeof(aPardMap) / sizeof(sal_uInt16) ); + SvParser::BuildWhichTable( aWhichMap, reinterpret_cast<sal_uInt16*>(&aPlainMap), sizeof(aPlainMap) / sizeof(sal_uInt16) ); } const SfxItemSet& SvxRTFParser::GetRTFDefaults() |