Kaydet (Commit) 67bc8568 authored tarafından Caolán McNamara's avatar Caolán McNamara

rename SetKey to informative SetCryptMaskKey

üst 80ec3cb6
...@@ -1360,7 +1360,7 @@ sal_Bool BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurSt ...@@ -1360,7 +1360,7 @@ sal_Bool BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurSt
else else
{ {
// Perhaps there are additional information in the stream... // Perhaps there are additional information in the stream...
xBasicStream->SetKey( szCryptingKey ); xBasicStream->SetCryptMaskKey(szCryptingKey);
xBasicStream->RefreshBuffer(); xBasicStream->RefreshBuffer();
sal_uInt32 nPasswordMarker = 0; sal_uInt32 nPasswordMarker = 0;
*xBasicStream >> nPasswordMarker; *xBasicStream >> nPasswordMarker;
...@@ -1370,7 +1370,7 @@ sal_Bool BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurSt ...@@ -1370,7 +1370,7 @@ sal_Bool BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurSt
xBasicStream->ReadByteString(aPassword); xBasicStream->ReadByteString(aPassword);
pLibInfo->SetPassword( aPassword ); pLibInfo->SetPassword( aPassword );
} }
xBasicStream->SetKey( ByteString() ); xBasicStream->SetCryptMaskKey(rtl::OString());
CheckModules( pLibInfo->GetLib(), pLibInfo->IsReference() ); CheckModules( pLibInfo->GetLib(), pLibInfo->IsReference() );
} }
return bLoaded; return bLoaded;
...@@ -1390,7 +1390,7 @@ sal_Bool BasicManager::ImplEncryptStream( SvStream& rStrm ) const ...@@ -1390,7 +1390,7 @@ sal_Bool BasicManager::ImplEncryptStream( SvStream& rStrm ) const
{ {
// Should only be the case for encrypted Streams // Should only be the case for encrypted Streams
bProtected = sal_True; bProtected = sal_True;
rStrm.SetKey( szCryptingKey ); rStrm.SetCryptMaskKey(szCryptingKey);
rStrm.RefreshBuffer(); rStrm.RefreshBuffer();
} }
return bProtected; return bProtected;
...@@ -1426,7 +1426,7 @@ sal_Bool BasicManager::ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) ...@@ -1426,7 +1426,7 @@ sal_Bool BasicManager::ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic )
} }
} }
if ( bProtected ) if ( bProtected )
rStrm.SetKey( ByteString() ); rStrm.SetCryptMaskKey(rtl::OString());
return bLoaded; return bLoaded;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment