diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-16 10:29:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-17 08:19:32 +0200 |
| commit | cd015186a0b30eefba1ce283a7cbb9e0f0d5e598 (patch) | |
| tree | 20fcad4464d42621bbd1c74e10ddd379eb462d32 /svx/source/table/tablertfimporter.cxx | |
| parent | b98fb89598a400b33a47ceebafe1604c03c829dc (diff) | |
convert Link<> to typed
Change-Id: I51faff15782238620de5abf424aa237648a5c55f
Diffstat (limited to 'svx/source/table/tablertfimporter.cxx')
| -rw-r--r-- | svx/source/table/tablertfimporter.cxx | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index 3974b367dc89..d37f07cac3b2 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -92,7 +92,7 @@ public: void FillTable(); - DECL_LINK( RTFImportHdl, ImportInfo* ); + DECL_LINK_TYPED( RTFImportHdl, ImportInfo&, void ); private: SdrTableObj& mrTableObj; @@ -154,7 +154,7 @@ void SdrTableRTFParser::Read( SvStream& rStream ) { EditEngine& rEdit = const_cast< EditEngine& >( mpOutliner->GetEditEngine() ); - Link<> aOldLink( rEdit.GetImportHdl() ); + Link<ImportInfo&,void> aOldLink( rEdit.GetImportHdl() ); rEdit.SetImportHdl( LINK( this, SdrTableRTFParser, RTFImportHdl ) ); mpOutliner->Read( rStream, OUString(), EE_FORMAT_RTF ); rEdit.SetImportHdl( aOldLink ); @@ -162,31 +162,31 @@ void SdrTableRTFParser::Read( SvStream& rStream ) FillTable(); } -IMPL_LINK( SdrTableRTFParser, RTFImportHdl, ImportInfo*, pInfo ) +IMPL_LINK_TYPED( SdrTableRTFParser, RTFImportHdl, ImportInfo&, rInfo, void ) { - switch ( pInfo->eState ) + switch ( rInfo.eState ) { case RTFIMP_NEXTTOKEN: - ProcToken( pInfo ); + ProcToken( &rInfo ); break; case RTFIMP_UNKNOWNATTR: - ProcToken( pInfo ); + ProcToken( &rInfo ); break; case RTFIMP_START: { - SvxRTFParser* pParser = static_cast<SvxRTFParser*>(pInfo->pParser); + SvxRTFParser* pParser = static_cast<SvxRTFParser*>(rInfo.pParser); pParser->SetAttrPool( &mrItemPool ); RTFPardAttrMapIds& rMap = pParser->GetPardMap(); rMap.nBox = SDRATTR_TABLE_BORDER; } break; case RTFIMP_END: - if ( pInfo->aSelection.nEndPos ) + if ( rInfo.aSelection.nEndPos ) { mpActDefault = NULL; - pInfo->nToken = RTF_PAR; - pInfo->aSelection.nEndPara++; - ProcToken( pInfo ); + rInfo.nToken = RTF_PAR; + rInfo.aSelection.nEndPara++; + ProcToken( &rInfo ); } break; case RTFIMP_SETATTR: @@ -198,7 +198,6 @@ IMPL_LINK( SdrTableRTFParser, RTFImportHdl, ImportInfo*, pInfo ) default: SAL_WARN( "svx.table","unknown ImportInfo.eState"); } - return 0; } void SdrTableRTFParser::NextRow() |