diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
commit | 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed (patch) | |
tree | bdfd28afe5a452060e3d985c5f01b45f4b7bc2cd /sw/source/core/txtnode/txtatr2.cxx | |
parent | 57d254d42b6e1d836bd21e6fb2e968af2b511c7d (diff) |
Gradually typed Link
Turn the Link class into a template abstracting over the link's argument and
return types, but provide default template arguments that keep the generic,
unsafe "void* in, sal_IntPtr out" behvior. That way, individual uses of the
Link class can be updated over time.
All the related macros are duplicated with ..._TYPED counterparts, that
additionally take the RetType (except for LINK_TYPED, which manages to infer the
relevant types from the supplied Member).
(It would have been attractive to change the "untyped" LinkStubs from taking a
void* to a properly typed ArgType parameter, too, but that would cause
-fsanitize=function to flag uses of "untyped" Link::Call.)
Change-Id: I3b0140378bad99abbf240140ebb4a46a05d2d2f8
Diffstat (limited to 'sw/source/core/txtnode/txtatr2.cxx')
-rw-r--r-- | sw/source/core/txtnode/txtatr2.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/txtnode/txtatr2.cxx b/sw/source/core/txtnode/txtatr2.cxx index 9761a38ba60c..7af7b015a9aa 100644 --- a/sw/source/core/txtnode/txtatr2.cxx +++ b/sw/source/core/txtnode/txtatr2.cxx @@ -141,11 +141,11 @@ SwCharFmt* SwTxtINetFmt::GetCharFmt() // JP 10.02.2000, Bug 72806: dont modify the doc for getting the // correct charstyle. bool bResetMod = !pDoc->getIDocumentState().IsModified(); - Link aOle2Lnk; + Link<> aOle2Lnk; if ( bResetMod ) { aOle2Lnk = pDoc->GetOle2Link(); - ( (SwDoc*) pDoc )->SetOle2Link( Link() ); + ( (SwDoc*) pDoc )->SetOle2Link( Link<>() ); } pRet = IsPoolUserFmt( nId ) @@ -263,11 +263,11 @@ SwCharFmt* SwTxtRuby::GetCharFmt() // JP 10.02.2000, Bug 72806: dont modify the doc for getting the // correct charstyle. const bool bResetMod = !pDoc->getIDocumentState().IsModified(); - Link aOle2Lnk; + Link<> aOle2Lnk; if( bResetMod ) { aOle2Lnk = pDoc->GetOle2Link(); - const_cast<SwDoc*>(pDoc)->SetOle2Link( Link() ); + const_cast<SwDoc*>(pDoc)->SetOle2Link( Link<>() ); } pRet = IsPoolUserFmt( nId ) |