convert Link<> to typed

Change-Id: I51faff15782238620de5abf424aa237648a5c55f

4 files changed, 30 insertions, 33 deletions

diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 2559f13094bc..53067062f9d0 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -264,7 +264,7 @@ ScHTMLLayoutParser::~ScHTMLLayoutParser()
 
 sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const OUString& rBaseURL )
 {
-    Link<> aOldLink = pEdit->GetImportHdl();
+    Link<ImportInfo&,void> aOldLink = pEdit->GetImportHdl();
     pEdit->SetImportHdl( LINK( this, ScHTMLLayoutParser, HTMLImportHdl ) );
 
     SfxObjectShell* pObjSh = mpDoc->GetDocumentShell();
@@ -881,32 +881,32 @@ void ScHTMLLayoutParser::CloseEntry( ImportInfo* pInfo )
     NewActEntry( pActEntry ); // New free flying pActEntry
 }
 
-IMPL_LINK( ScHTMLLayoutParser, HTMLImportHdl, ImportInfo*, pInfo )
+IMPL_LINK_TYPED( ScHTMLLayoutParser, HTMLImportHdl, ImportInfo&, rInfo, void )
 {
-    switch ( pInfo->eState )
+    switch ( rInfo.eState )
     {
         case HTMLIMP_NEXTTOKEN:
-            ProcToken( pInfo );
+            ProcToken( &rInfo );
             break;
         case HTMLIMP_UNKNOWNATTR:
-            ProcToken( pInfo );
+            ProcToken( &rInfo );
             break;
         case HTMLIMP_START:
             break;
         case HTMLIMP_END:
-            if ( pInfo->aSelection.nEndPos )
+            if ( rInfo.aSelection.nEndPos )
             {
                 // If text remains: create paragraph, without calling CloseEntry().
                 if( bInCell )   // ...but only in opened table cells.
                 {
                     bInCell = false;
-                    NextRow( pInfo );
+                    NextRow( &rInfo );
                     bInCell = true;
                 }
-                CloseEntry( pInfo );
+                CloseEntry( &rInfo );
             }
             while ( nTableLevel > 0 )
-                TableOff( pInfo );      // close tables, if </TABLE> missing
+                TableOff( &rInfo );      // close tables, if </TABLE> missing
             break;
         case HTMLIMP_SETATTR:
             break;
@@ -915,8 +915,8 @@ IMPL_LINK( ScHTMLLayoutParser, HTMLImportHdl, ImportInfo*, pInfo )
         case HTMLIMP_INSERTPARA:
             if ( nTableLevel < 1 )
             {
-                CloseEntry( pInfo );
-                NextRow( pInfo );
+                CloseEntry( &rInfo );
+                NextRow( &rInfo );
             }
             break;
         case HTMLIMP_INSERTFIELD:
@@ -924,7 +924,6 @@ IMPL_LINK( ScHTMLLayoutParser, HTMLImportHdl, ImportInfo*, pInfo )
         default:
             OSL_FAIL("HTMLImportHdl: unknown ImportInfo.eState");
     }
-    return 0;
 }
 
 // Greatest common divisor (Euclid)
@@ -2874,7 +2873,7 @@ sal_uLong ScHTMLQueryParser::Read( SvStream& rStrm, const OUString& rBaseURL  )
         }
     }
 
-    Link<> aOldLink = pEdit->GetImportHdl();
+    Link<ImportInfo&,void> aOldLink = pEdit->GetImportHdl();
     pEdit->SetImportHdl( LINK( this, ScHTMLQueryParser, HTMLImportHdl ) );
     sal_uLong nErr = pEdit->Read( rStrm, rBaseURL, EE_FORMAT_HTML, pAttributes );
     pEdit->SetImportHdl( aOldLink );
@@ -3215,20 +3214,20 @@ void ScHTMLQueryParser::ParseStyle(const OUString&) {}
 
 #endif
 
-IMPL_LINK( ScHTMLQueryParser, HTMLImportHdl, const ImportInfo*, pInfo )
+IMPL_LINK_TYPED( ScHTMLQueryParser, HTMLImportHdl, ImportInfo&, rInfo, void )
 {
-    switch( pInfo->eState )
+    switch( rInfo.eState )
     {
         case HTMLIMP_START:
         break;
 
         case HTMLIMP_NEXTTOKEN:
         case HTMLIMP_UNKNOWNATTR:
-            ProcessToken( *pInfo );
+            ProcessToken( rInfo );
         break;
 
         case HTMLIMP_INSERTPARA:
-            mpCurrTable->InsertPara( *pInfo );
+            mpCurrTable->InsertPara( rInfo );
         break;
 
         case HTMLIMP_SETATTR:
@@ -3238,13 +3237,12 @@ IMPL_LINK( ScHTMLQueryParser, HTMLImportHdl, const ImportInfo*, pInfo )
 
         case HTMLIMP_END:
             while( mpCurrTable->GetTableId() != SC_HTML_GLOBAL_TABLE )
-                CloseTable( *pInfo );
+                CloseTable( rInfo );
         break;
 
         default:
             OSL_FAIL( "ScHTMLQueryParser::HTMLImportHdl - unknown ImportInfo::eState" );
     }
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx
index 2b5c2c4315ca..27d2b85fdf3b 100644
--- a/sc/source/filter/inc/htmlpars.hxx
+++ b/sc/source/filter/inc/htmlpars.hxx
@@ -178,7 +178,7 @@ private:
     bool                bInCell:1;
     bool                bInTitle:1;
 
-    DECL_LINK( HTMLImportHdl, ImportInfo* );
+    DECL_LINK_TYPED( HTMLImportHdl, ImportInfo&, void );
     void                NewActEntry( ScEEParseEntry* );
     static void         EntryEnd( ScEEParseEntry*, const ESelection& );
     void                ProcToken( ImportInfo* );
@@ -619,7 +619,7 @@ private:
 
     void                ParseStyle(const OUString& rStrm);
 
-    DECL_LINK( HTMLImportHdl, const ImportInfo* );
+    DECL_LINK_TYPED( HTMLImportHdl, ImportInfo&, void );
 
 private:
     typedef ::std::unique_ptr< ScHTMLGlobalTable >    ScHTMLGlobalTablePtr;
diff --git a/sc/source/filter/inc/rtfparse.hxx b/sc/source/filter/inc/rtfparse.hxx
index 6d3b8c417c42..857ed87fe0f3 100644
--- a/sc/source/filter/inc/rtfparse.hxx
+++ b/sc/source/filter/inc/rtfparse.hxx
@@ -61,7 +61,7 @@ private:
     sal_uInt16          nLastWidth;
     bool                bNewDef;
 
-    DECL_LINK( RTFImportHdl, ImportInfo* );
+    DECL_LINK_TYPED( RTFImportHdl, ImportInfo&, void );
     inline void         NextRow();
     void                EntryEnd( ScEEParseEntry*, const ESelection& );
     void                ProcToken( ImportInfo* );
diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx
index b436ebfb457e..729a8fffce12 100644
--- a/sc/source/filter/rtf/rtfparse.cxx
+++ b/sc/source/filter/rtf/rtfparse.cxx
@@ -58,7 +58,7 @@ ScRTFParser::~ScRTFParser()
 
 sal_uLong ScRTFParser::Read( SvStream& rStream, const OUString& rBaseURL )
 {
-    Link<> aOldLink = pEdit->GetImportHdl();
+    Link<ImportInfo&,void> aOldLink = pEdit->GetImportHdl();
     pEdit->SetImportHdl( LINK( this, ScRTFParser, RTFImportHdl ) );
     sal_uLong nErr = pEdit->Read( rStream, rBaseURL, EE_FORMAT_RTF );
     if ( nLastToken == RTF_PAR )
@@ -154,19 +154,19 @@ void ScRTFParser::ColAdjust()
     }
 }
 
-IMPL_LINK( ScRTFParser, RTFImportHdl, ImportInfo*, pInfo )
+IMPL_LINK_TYPED( ScRTFParser, 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( pPool );
             RTFPardAttrMapIds& rMap = pParser->GetPardMap();
             rMap.nBrush = ATTR_BACKGROUND;
@@ -175,14 +175,14 @@ IMPL_LINK( ScRTFParser, RTFImportHdl, ImportInfo*, pInfo )
         }
             break;
         case RTFIMP_END:
-            if ( pInfo->aSelection.nEndPos )
+            if ( rInfo.aSelection.nEndPos )
             {   // If still text: create last paragraph
                 pActDefault = NULL;
-                pInfo->nToken = RTF_PAR;
+                rInfo.nToken = RTF_PAR;
                 // EditEngine did not attach an empty paragraph anymore
                 // which EntryEnd could strip
-                pInfo->aSelection.nEndPara++;
-                ProcToken( pInfo );
+                rInfo.aSelection.nEndPara++;
+                ProcToken( &rInfo );
             }
             break;
         case RTFIMP_SETATTR:
@@ -194,7 +194,6 @@ IMPL_LINK( ScRTFParser, RTFImportHdl, ImportInfo*, pInfo )
         default:
             OSL_FAIL("unknown ImportInfo.eState");
     }
-    return 0;
 }
 
 // Bad behavior: