mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert Link<> to typed

Browse Source 
Change-Id: Ia8dd531759ab4d609d1c3eeb31283612c0d70219
This commit is contained in:
Noel Grandin
2015-09-10 09:54:30 +02:00
parent 240d1f289c
commit 52a949e538
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sot/source/sdstor/stg.cxx
View File

@@ -895,7 +895,7 @@ OUString Storage::GetUserName()
bool Storage::ValidateFAT() bool Storage::ValidateFAT()
{ {
Link<> aLink = StgIo::GetErrorLink(); Link<StgLinkArg&,void> aLink = StgIo::GetErrorLink();
ErrCode nErr = pIo->ValidateFATs(); ErrCode nErr = pIo->ValidateFATs();
StgIo::SetErrorLink( aLink ); StgIo::SetErrorLink( aLink );
return nErr == ERRCODE_NONE; return nErr == ERRCODE_NONE;

8
sot/source/sdstor/stgio.cxx
View File

@@ -336,14 +336,14 @@ sal_uLong Validator::FindUnrefedChains()
return FAT_OK; return FAT_OK;
} }
namespace { struct ErrorLink : public rtl::Static<Link<>, ErrorLink > {}; } namespace { struct ErrorLink : public rtl::Static<Link<StgLinkArg&,void>, ErrorLink > {}; }
void StgIo::SetErrorLink( const Link<>& rLink ) void StgIo::SetErrorLink( const Link<StgLinkArg&,void>& rLink )
{ {
ErrorLink::get() = rLink; ErrorLink::get() = rLink;
} }
const Link<>& StgIo::GetErrorLink() const Link<StgLinkArg&,void>& StgIo::GetErrorLink()
{ {
return ErrorLink::get(); return ErrorLink::get();
} }
@@ -379,7 +379,7 @@ sal_uLong StgIo::ValidateFATs()
StgLinkArg aArg; StgLinkArg aArg;
aArg.aFile = pFileStrm->GetFileName(); aArg.aFile = pFileStrm->GetFileName();
aArg.nErr = nErr; aArg.nErr = nErr;
ErrorLink::get().Call( &aArg ); ErrorLink::get().Call( aArg );
bCopied = true; bCopied = true;
} }
// DBG_ASSERT( nErr == FAT_OK ,"Storage kaputt"); // DBG_ASSERT( nErr == FAT_OK ,"Storage kaputt");

4
sot/source/sdstor/stgio.hxx
View File

@@ -64,8 +64,8 @@ public:
bool Init(); // set up an empty file bool Init(); // set up an empty file
bool CommitAll(); // commit everything (root commit) bool CommitAll(); // commit everything (root commit)
static void SetErrorLink( const Link<>& ); static void SetErrorLink( const Link<StgLinkArg&,void>& );
static const Link<>& GetErrorLink(); static const Link<StgLinkArg&,void>& GetErrorLink();
sal_uLong ValidateFATs( ); sal_uLong ValidateFATs( );
}; };