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

Fix some 'bRet' is reassigned a value before the old one has been used

Browse Source 
Change-Id: I815b943871f11ae2bbe2d5ecfa6e096fb7bb463f
This commit is contained in:
Julien Nabet
2013-01-01 15:17:21 +01:00
parent 4f21a0de36
commit 2e1abe1c59
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sc/source/core/tool/autoform.cxx
View File

@@ -746,10 +746,9 @@ void ScAutoFormatData::GetFromItemSet( sal_uInt16 nIndex, const SfxItemSet& rIte
bool ScAutoFormatData::Load( SvStream& rStream, const ScAfVersions& rVersions )
{
sal_Bool bRet = true;
sal_uInt16 nVer = 0;
rStream >> nVer;
bRet = 0 == rStream.GetError();
bool bRet = 0 == rStream.GetError();
if( bRet && (nVer == AUTOFORMAT_DATA_ID_X ||
(AUTOFORMAT_DATA_ID_504 <= nVer && nVer <= AUTOFORMAT_DATA_ID)) )
{
@@ -1016,8 +1015,6 @@ ScAutoFormat::iterator ScAutoFormat::end()
bool ScAutoFormat::Load()
{
bool bRet = true;
INetURLObject aURL;
SvtPathOptions aPathOpt;
aURL.SetSmartURL( aPathOpt.GetUserConfigPath() );
@@ -1026,7 +1023,7 @@ bool ScAutoFormat::Load()
SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), STREAM_READ );
SvStream* pStream = aMedium.GetInStream();
bRet = (pStream && pStream->GetError() == 0);
bool bRet = (pStream && pStream->GetError() == 0);
if (bRet)
{
SvStream& rStream = *pStream;
@@ -1079,8 +1076,6 @@ bool ScAutoFormat::Load()
bool ScAutoFormat::Save()
{
bool bRet = true;
INetURLObject aURL;
SvtPathOptions aPathOpt;
aURL.SetSmartURL( aPathOpt.GetUserConfigPath() );
@@ -1089,7 +1084,7 @@ bool ScAutoFormat::Save()
SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), STREAM_WRITE );
SvStream* pStream = aMedium.GetOutStream();
bRet = (pStream && pStream->GetError() == 0);
bool bRet = (pStream && pStream->GetError() == 0);
if (bRet)
{
const sal_uInt16 fileVersion = SOFFICE_FILEFORMAT_50;