From 52a949e538de531d35792b59b62c897773ef5ed7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 10 Sep 2015 09:54:30 +0200 Subject: [PATCH] convert Link<> to typed Change-Id: Ia8dd531759ab4d609d1c3eeb31283612c0d70219 --- sot/source/sdstor/stg.cxx | 2 +- sot/source/sdstor/stgio.cxx | 8 ++++---- sot/source/sdstor/stgio.hxx | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx index af2de0e86dc7..3ebd1c21a553 100644 --- a/sot/source/sdstor/stg.cxx +++ b/sot/source/sdstor/stg.cxx @@ -895,7 +895,7 @@ OUString Storage::GetUserName() bool Storage::ValidateFAT() { - Link<> aLink = StgIo::GetErrorLink(); + Link aLink = StgIo::GetErrorLink(); ErrCode nErr = pIo->ValidateFATs(); StgIo::SetErrorLink( aLink ); return nErr == ERRCODE_NONE; diff --git a/sot/source/sdstor/stgio.cxx b/sot/source/sdstor/stgio.cxx index 74817eb61bfa..b26ee9f1d7d9 100644 --- a/sot/source/sdstor/stgio.cxx +++ b/sot/source/sdstor/stgio.cxx @@ -336,14 +336,14 @@ sal_uLong Validator::FindUnrefedChains() return FAT_OK; } -namespace { struct ErrorLink : public rtl::Static, ErrorLink > {}; } +namespace { struct ErrorLink : public rtl::Static, ErrorLink > {}; } -void StgIo::SetErrorLink( const Link<>& rLink ) +void StgIo::SetErrorLink( const Link& rLink ) { ErrorLink::get() = rLink; } -const Link<>& StgIo::GetErrorLink() +const Link& StgIo::GetErrorLink() { return ErrorLink::get(); } @@ -379,7 +379,7 @@ sal_uLong StgIo::ValidateFATs() StgLinkArg aArg; aArg.aFile = pFileStrm->GetFileName(); aArg.nErr = nErr; - ErrorLink::get().Call( &aArg ); + ErrorLink::get().Call( aArg ); bCopied = true; } // DBG_ASSERT( nErr == FAT_OK ,"Storage kaputt"); diff --git a/sot/source/sdstor/stgio.hxx b/sot/source/sdstor/stgio.hxx index 8922d809cc01..f53652d7604e 100644 --- a/sot/source/sdstor/stgio.hxx +++ b/sot/source/sdstor/stgio.hxx @@ -64,8 +64,8 @@ public: bool Init(); // set up an empty file bool CommitAll(); // commit everything (root commit) - static void SetErrorLink( const Link<>& ); - static const Link<>& GetErrorLink(); + static void SetErrorLink( const Link& ); + static const Link& GetErrorLink(); sal_uLong ValidateFATs( ); };