diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
| commit | 106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb (patch) | |
| tree | e55ab4706654d10a5f9b75acfdecec72fda804c3 /rsc | |
| parent | 36efdec23b86fe28c79fe672bb6862fb57b6e09a (diff) | |
Remove _TYPED suffix from tools/link.hxx macros
...which was introduced with 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed "Gradually
typed Link" to distinguish the new, typed versions from the old, untyped ones,
but is no longer necessary since 382eb1a23c390154619c385414bdbe6f6e461173
"remove untyped Link<>" removed the old versions.
Change-Id: I494025df486a16a45861fcd8192dfe0275b1103c
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/source/parser/rscdb.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index 05638fbb8710..0d4452421ebe 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.cxx @@ -298,8 +298,8 @@ private: { } - DECL_LINK_TYPED( CallBackWriteRc, const NameNode&, void ); - DECL_LINK_TYPED( CallBackWriteSrc, const NameNode&, void ); + DECL_LINK( CallBackWriteRc, const NameNode&, void ); + DECL_LINK( CallBackWriteSrc, const NameNode&, void ); void WriteRc( RscTop * pCl, ObjNode * pRoot ) { @@ -316,7 +316,7 @@ public: void WriteRcFile( RscWriteRc & rMem, FILE * fOutput ); }; -IMPL_LINK_TYPED( RscEnumerateObj, CallBackWriteRc, const NameNode&, rNode, void ) +IMPL_LINK( RscEnumerateObj, CallBackWriteRc, const NameNode&, rNode, void ) { const ObjNode& rObjNode = static_cast<const ObjNode&>(rNode); RscWriteRc aMem( pTypCont->GetByteOrder() ); @@ -330,7 +330,7 @@ IMPL_LINK_TYPED( RscEnumerateObj, CallBackWriteRc, const NameNode&, rNode, void WriteRcFile( aMem, fOutput ); } -IMPL_LINK_TYPED( RscEnumerateObj, CallBackWriteSrc, const NameNode&, rNode, void ) +IMPL_LINK( RscEnumerateObj, CallBackWriteSrc, const NameNode&, rNode, void ) { const ObjNode& rObjNode = static_cast<const ObjNode&>(rNode); if( rObjNode.GetFileKey() == lFileKey ) @@ -391,8 +391,8 @@ class RscEnumerateRef private: RscTop * pRoot; - DECL_LINK_TYPED( CallBackWriteRc, const NameNode&, void ); - DECL_LINK_TYPED( CallBackWriteSrc, const NameNode&, void ); + DECL_LINK( CallBackWriteRc, const NameNode&, void ); + DECL_LINK( CallBackWriteSrc, const NameNode&, void ); public: RscEnumerateObj aEnumObj; @@ -416,13 +416,13 @@ public: } }; -IMPL_LINK_TYPED( RscEnumerateRef, CallBackWriteRc, const NameNode&, rNode, void ) +IMPL_LINK( RscEnumerateRef, CallBackWriteRc, const NameNode&, rNode, void ) { const RscTop& rRef = static_cast<const RscTop&>(rNode); aEnumObj.WriteRc( const_cast<RscTop*>(&rRef), rRef.GetObjNode() ); } -IMPL_LINK_TYPED( RscEnumerateRef, CallBackWriteSrc, const NameNode&, rNode, void ) +IMPL_LINK( RscEnumerateRef, CallBackWriteSrc, const NameNode&, rNode, void ) { const RscTop& rRef = static_cast<const RscTop&>(rNode); aEnumObj.WriteSrc( const_cast<RscTop*>(&rRef), rRef.GetObjNode() ); @@ -473,7 +473,7 @@ void RscTypCont::WriteSrc( FILE * fOutput, RscFileTab::Index nFileKey ) class RscDel { sal_uLong lFileKey; - DECL_LINK_TYPED( Delete, const NameNode&, void ); + DECL_LINK( Delete, const NameNode&, void ); public: RscDel( RscTop * pRoot, sal_uLong lKey ); }; @@ -485,7 +485,7 @@ inline RscDel::RscDel( RscTop * pRoot, sal_uLong lKey ) pRoot->EnumNodes( LINK( this, RscDel, Delete ) ); } -IMPL_LINK_TYPED( RscDel, Delete, const NameNode&, r, void ) +IMPL_LINK( RscDel, Delete, const NameNode&, r, void ) { RscTop* pNode = const_cast<RscTop*>(static_cast<const RscTop*>(&r)); if( pNode->GetObjNode() ) |