basctl/source/basicide/baside2.cxx | 4 +-
include/sfx2/docfile.hxx | 2 -
sc/source/filter/html/htmlexp.cxx | 2 -
sc/source/ui/docshell/docsh.cxx | 10 +++----
sc/source/ui/docshell/externalrefmgr.cxx | 2 -
sc/source/ui/docshell/tablink.cxx | 10 +++----
sfx2/source/appl/appopen.cxx | 2 -
sfx2/source/doc/DocumentMetadataAccess.cxx | 2 -
sfx2/source/doc/SfxDocumentMetaData.cxx | 2 -
sfx2/source/doc/docfile.cxx | 40 ++++++++++++++---------------
sfx2/source/doc/objstor.cxx | 12 ++++----
sfx2/source/doc/sfxbasemodel.cxx | 2 -
svx/source/core/graphichelper.cxx | 4 +-
svx/source/xoutdev/_xoutbmp.cxx | 6 ++--
sw/source/filter/writer/writer.cxx | 2 -
sw/source/uibase/app/docsh2.cxx | 2 -
16 files changed, 52 insertions(+), 52 deletions(-)
New commits:
commit ed774e9fb5fe33ac93699e6f1f6773f7c63deef5
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Thu Sep 28 19:46:04 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Sep 29 08:02:55 2023 +0200
rename SfxMedium::GetError -> GetErrorIgnoreWarning
to distinguish it from the very similar GetErrorCode()
Change-Id: I937e3dcfd6ce116046ac7b1c98cf79479b322f1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157388
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index ef80ae5b017c..bb6f0bb1f876 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -442,7 +442,7 @@ void ModulWindow::LoadBasic()
GetEditorWindow().PaintImmediately();
GetEditorWindow().ForceSyntaxTimeout();
GetEditorWindow().DestroyProgress();
- ErrCode nError = aMedium.GetError();
+ ErrCode nError = aMedium.GetErrorIgnoreWarning();
if ( nError )
ErrorHandler::HandleError( nError );
}
@@ -484,7 +484,7 @@ void ModulWindow::SaveBasicSource()
GetEditEngine()->Write( *pStream );
aMedium.Commit();
LeaveWait();
- ErrCode nError = aMedium.GetError();
+ ErrCode nError = aMedium.GetErrorIgnoreWarning();
if ( nError )
ErrorHandler::HandleError( nError );
}
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index 2af13be14a0a..0b1c417247f5 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -144,7 +144,7 @@ public:
void SetDoneLink( const Link<void*,void>& rLink );
ErrCode GetErrorCode() const;
- ErrCode GetError() const
+ ErrCode GetErrorIgnoreWarning() const
{ return GetErrorCode().IgnoreWarning(); }
ErrCode GetWarningError() const;
ErrCode const & GetLastStorageCreationState() const;
diff --git a/sc/source/filter/html/htmlexp.cxx
b/sc/source/filter/html/htmlexp.cxx
index 150a4ef66dd8..9ef9c555da91 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -1377,7 +1377,7 @@ void ScHTMLExport::CopyLocalFileToINet( OUString& rFileNm,
aMedium.Close();
aMedium.Commit();
- bRet = ERRCODE_NONE == aMedium.GetError();
+ bRet = ERRCODE_NONE == aMedium.GetErrorIgnoreWarning();
if( bRet )
{
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 2b568c5d8d54..32c7aa03022f 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -651,11 +651,11 @@ bool ScDocShell::Load( SfxMedium& rMedium )
}
}
- if (!bRet && !rMedium.GetError())
+ if (!bRet && !rMedium.GetErrorIgnoreWarning())
rMedium.SetError(SVSTREAM_FILEFORMAT_ERROR);
- if (rMedium.GetError())
- SetError(rMedium.GetError());
+ if (rMedium.GetErrorIgnoreWarning())
+ SetError(rMedium.GetErrorIgnoreWarning());
InitItems();
CalcOutputFactor();
@@ -2580,7 +2580,7 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed )
bRet = true;
if (m_pDocument->GetTableCount() > 1)
- if (!rMed.GetError())
+ if (!rMed.GetErrorIgnoreWarning())
rMed.SetError(SCWARN_EXPORT_ASCII);
}
}
@@ -2679,7 +2679,7 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed )
bRet = true;
if (m_pDocument->GetTableCount() > 1)
- if (!rMed.GetError())
+ if (!rMed.GetErrorIgnoreWarning())
rMed.SetError(SCWARN_EXPORT_ASCII);
}
}
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx
b/sc/source/ui/docshell/externalrefmgr.cxx
index 8e1f8e40ed55..523bd746cb84 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -2591,7 +2591,7 @@ SfxObjectShellRef
ScExternalRefManager::loadSrcDocument(sal_uInt16 nFileId, OUSt
}
unique_ptr<SfxMedium> pMedium(new SfxMedium(aFile, StreamMode::STD_READ,
pFilter, std::move(pSet)));
- if (pMedium->GetError() != ERRCODE_NONE)
+ if (pMedium->GetErrorIgnoreWarning() != ERRCODE_NONE)
return nullptr;
// To load encrypted documents with password, user interaction needs to be
enabled.
diff --git a/sc/source/ui/docshell/tablink.cxx
b/sc/source/ui/docshell/tablink.cxx
index b4343cb3c96a..711434298ebd 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -252,7 +252,7 @@ bool ScTableLink::Refresh(const OUString& rNewFile, const
OUString& rNewFilter,
/* #i71497# check if external document is loaded successfully,
otherwise we may find the empty default sheet "Sheet1" in
rSrcDoc, even if the document does not exist. */
- if( pMed->GetError() == ERRCODE_NONE )
+ if( pMed->GetErrorIgnoreWarning() == ERRCODE_NONE )
{
// no sheet name -> use first sheet
if ( !aTabName.isEmpty() && !bAutoTab )
@@ -433,7 +433,7 @@ bool ScDocumentLoader::GetFilterName( const OUString&
rFileName,
std::shared_ptr<const SfxFilter> pSfxFilter;
auto pMedium = std::make_unique<SfxMedium>( rFileName,
StreamMode::STD_READ );
- if (pMedium->GetError() == ERRCODE_NONE &&
!utl::ConfigManager::IsFuzzing())
+ if (pMedium->GetErrorIgnoreWarning() == ERRCODE_NONE &&
!utl::ConfigManager::IsFuzzing())
{
if ( bWithInteraction )
pMedium->UseInteractionHandler(true); // #i73992# no longer
called from GuessFilter
@@ -446,7 +446,7 @@ bool ScDocumentLoader::GetFilterName( const OUString&
rFileName,
}
bool bOK = false;
- if ( pMedium->GetError() == ERRCODE_NONE )
+ if ( pMedium->GetErrorIgnoreWarning() == ERRCODE_NONE )
{
if ( pSfxFilter )
rFilter = pSfxFilter->GetFilterName();
@@ -502,7 +502,7 @@ ScDocumentLoader::ScDocumentLoader(const OUString&
rFileName,
pMedium = CreateMedium(rFileName, pFilter, rOptions, pInteractionParent);
if (xInputStream.is())
pMedium->setStreamToLoadFrom(xInputStream, true);
- if ( pMedium->GetError() != ERRCODE_NONE )
+ if ( pMedium->GetErrorIgnoreWarning() != ERRCODE_NONE )
return ;
pDocShell = new ScDocShell( SfxModelFlags::EMBEDDED_OBJECT |
SfxModelFlags::DISABLE_EMBEDDED_SCRIPTS );
@@ -553,7 +553,7 @@ ScDocument* ScDocumentLoader::GetDocument()
bool ScDocumentLoader::IsError() const
{
if ( pDocShell && pMedium )
- return pMedium->GetError() != ERRCODE_NONE;
+ return pMedium->GetErrorIgnoreWarning() != ERRCODE_NONE;
else
return true;
}
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 3d11988c2c75..5d35c403903d 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -295,7 +295,7 @@ ErrCode SfxApplication::LoadTemplate( SfxObjectShellLock&
xDoc, const OUString &
if ( !aMedium.GetStorage( false ).is() )
aMedium.GetInStream();
- if ( aMedium.GetError() )
+ if ( aMedium.GetErrorIgnoreWarning() )
{
return aMedium.GetErrorCode();
}
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx
b/sfx2/source/doc/DocumentMetadataAccess.cxx
index d551e0a8f985..71ce92d22766 100644
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.cxx
@@ -1361,7 +1361,7 @@ DocumentMetadataAccess::storeMetadataToMedium(
const bool bOk = aMedium.Commit();
aMedium.Close();
if ( !bOk ) {
- ErrCode nError = aMedium.GetError();
+ ErrCode nError = aMedium.GetErrorIgnoreWarning();
if ( nError == ERRCODE_NONE ) {
nError = ERRCODE_IO_GENERAL;
}
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx
b/sfx2/source/doc/SfxDocumentMetaData.cxx
index da34b3cad2de..1e47fa955b48 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -2127,7 +2127,7 @@ SfxDocumentMetaData::storeToMedium(const OUString & URL,
const bool bOk = aMedium.Commit();
aMedium.Close();
if ( !bOk ) {
- ErrCode nError = aMedium.GetError();
+ ErrCode nError = aMedium.GetErrorIgnoreWarning();
if ( nError == ERRCODE_NONE ) {
nError = ERRCODE_IO_GENERAL;
}
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index f195552210ae..7b65615da4df 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -691,7 +691,7 @@ SvStream* SfxMedium::GetInStream()
GetMedium_Impl();
- if ( GetError() )
+ if ( GetErrorIgnoreWarning() )
return nullptr;
return pImpl->m_pInStream.get();
@@ -845,13 +845,13 @@ bool SfxMedium::Commit()
else if( pImpl->m_pInStream )
pImpl->m_pInStream->FlushBuffer();
- if ( GetError() == ERRCODE_NONE )
+ if ( GetErrorIgnoreWarning() == ERRCODE_NONE )
{
// does something only in case there is a temporary file ( means aName
points to different location than aLogicName )
Transfer_Impl();
}
- bool bResult = ( GetError() == ERRCODE_NONE );
+ bool bResult = ( GetErrorIgnoreWarning() == ERRCODE_NONE );
if ( bResult && DocNeedsFileDateCheck() )
GetInitFileDate( true );
@@ -948,7 +948,7 @@ OUString const & SfxMedium::GetBackup_Impl()
uno::Reference < embed::XStorage > SfxMedium::GetOutputStorage()
{
- if ( GetError() )
+ if ( GetErrorIgnoreWarning() )
return uno::Reference< embed::XStorage >();
// if the medium was constructed with a Storage: use this one, not a temp.
storage
@@ -1420,7 +1420,7 @@ SfxMedium::LockFileResult
SfxMedium::LockOrigFileOnDemand(bool bLoading, bool bN
pImpl->m_bLocked = bResult;
- if ( !bResult && GetError() == ERRCODE_NONE )
+ if ( !bResult && GetErrorIgnoreWarning() == ERRCODE_NONE )
{
// the error should be set in case it is storing process
// or the document has been opened for editing explicitly
@@ -1503,7 +1503,7 @@ SfxMedium::LockFileResult
SfxMedium::LockOrigFileOnDemand(bool bLoading, bool bN
{
// let the stream be opened to check the system file
locking
GetMedium_Impl();
- if (GetError() != ERRCODE_NONE) {
+ if (GetErrorIgnoreWarning() != ERRCODE_NONE) {
return eResult;
}
}
@@ -1671,7 +1671,7 @@ SfxMedium::LockFileResult
SfxMedium::LockOrigFileOnDemand(bool bLoading, bool bN
}
}
- if ( !bResult && GetError() == ERRCODE_NONE )
+ if ( !bResult && GetErrorIgnoreWarning() == ERRCODE_NONE )
{
// the error should be set in case it is storing process
// or the document has been opened for editing explicitly
@@ -1717,7 +1717,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage(
bool bCreateTempFile )
GetMedium_Impl();
- if ( GetError() )
+ if ( GetErrorIgnoreWarning() )
return pImpl->xStorage;
const SfxBoolItem* pRepairItem = GetItemSet().GetItem(SID_REPAIRPACKAGE,
false);
@@ -1786,7 +1786,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage(
bool bCreateTempFile )
// impossibility to create the storage is no error
}
- if( ( pImpl->nLastStorageError = GetError() ) != ERRCODE_NONE )
+ if( ( pImpl->nLastStorageError = GetErrorIgnoreWarning() ) != ERRCODE_NONE
)
{
pImpl->xStorage = nullptr;
if ( pImpl->m_pInStream )
@@ -1877,7 +1877,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage(
bool bCreateTempFile )
uno::Reference< embed::XStorage > const & SfxMedium::GetZipStorageToSign_Impl(
bool bReadOnly )
{
- if ( !GetError() && !pImpl->m_xZipStorage.is() )
+ if ( !GetErrorIgnoreWarning() && !pImpl->m_xZipStorage.is() )
{
GetMedium_Impl();
@@ -1899,7 +1899,7 @@ uno::Reference< embed::XStorage > const &
SfxMedium::GetZipStorageToSign_Impl( b
SAL_WARN( "sfx.doc", "No possibility to get readonly version of
storage from medium!" );
}
- if ( GetError() ) // do not remove warnings
+ if ( GetErrorIgnoreWarning() ) // do not remove warnings
ResetError();
}
@@ -2009,7 +2009,7 @@ bool SfxMedium::StorageCommit_Impl()
if ( pImpl->xStorage.is() )
{
- if ( !GetError() )
+ if ( !GetErrorIgnoreWarning() )
{
uno::Reference < embed::XTransactedObject > xTrans(
pImpl->xStorage, uno::UNO_QUERY );
if ( xTrans.is() )
@@ -2044,7 +2044,7 @@ bool SfxMedium::StorageCommit_Impl()
}
}
- if (!GetError())
+ if (!GetErrorIgnoreWarning())
SetError(ERRCODE_IO_GENERAL);
}
catch ( const uno::Exception& )
@@ -2205,7 +2205,7 @@ void SfxMedium::TransactedTransferForFS_Impl( const
INetURLObject& aSource,
bool SfxMedium::TryDirectTransfer( const OUString& aURL, SfxItemSet const &
aTargetSet )
{
- if ( GetError() )
+ if ( GetErrorIgnoreWarning() )
return false;
// if the document had no password it should be stored without password
@@ -2894,10 +2894,10 @@ void SfxMedium::GetMedium_Impl()
}
//TODO/MBA: ErrorHandling - how to transport error from MediaDescriptor
- if ( !GetError() && !pImpl->xStream.is() && !pImpl->xInputStream.is() )
+ if ( !GetErrorIgnoreWarning() && !pImpl->xStream.is() &&
!pImpl->xInputStream.is() )
SetError(ERRCODE_IO_ACCESSDENIED);
- if ( !GetError() && !pImpl->m_pInStream )
+ if ( !GetErrorIgnoreWarning() && !pImpl->m_pInStream )
{
if ( pImpl->xStream.is() )
pImpl->m_pInStream = utl::UcbStreamHelper::CreateStream(
pImpl->xStream );
@@ -2907,7 +2907,7 @@ void SfxMedium::GetMedium_Impl()
pImpl->bDownloadDone = true;
pImpl->aDoneLink.ClearPendingCall();
- ErrCode nError = GetError();
+ ErrCode nError = GetErrorIgnoreWarning();
pImpl->aDoneLink.Call( reinterpret_cast<void*>(sal_uInt32(nError)) );
}
@@ -3405,7 +3405,7 @@ void SfxMedium::CompleteReOpen()
GetMedium_Impl();
- if ( GetError() )
+ if ( GetErrorIgnoreWarning() )
{
if ( pImpl->pTempFile )
{
@@ -4017,7 +4017,7 @@ bool SfxMedium::SignDocumentContentUsingCertificate(
{
bool bChanges = false;
- if (IsOpen() || GetError())
+ if (IsOpen() || GetErrorIgnoreWarning())
{
SAL_WARN("sfx.doc", "The medium must be closed by the signer!");
return bChanges;
@@ -4148,7 +4148,7 @@ bool SfxMedium::SignContents_Impl(weld::Window*
pDialogParent,
{
bool bChanges = false;
- if (IsOpen() || GetError())
+ if (IsOpen() || GetErrorIgnoreWarning())
{
SAL_WARN("sfx.doc", "The medium must be closed by the signer!");
return bChanges;
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index a62271fa9ccf..ee7358eed5be 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -638,7 +638,7 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed )
if ( GetErrorIgnoreWarning() == ERRCODE_NONE && bOwnStorageFormat && (
!pFilter || !( pFilter->GetFilterFlags() & SfxFilterFlags::STARONEFILTER ) ) )
{
uno::Reference< embed::XStorage > xStorage;
- if ( pMedium->GetError() == ERRCODE_NONE )
+ if ( pMedium->GetErrorIgnoreWarning() == ERRCODE_NONE )
xStorage = pMedium->GetStorage();
if( xStorage.is() && pMedium->GetLastStorageCreationState() ==
ERRCODE_NONE )
@@ -1247,7 +1247,7 @@ bool SfxObjectShell::SaveTo_Impl
if ( bDoBackup )
{
rMedium.DoBackup_Impl(/*bForceUsingBackupPath=*/false);
- if ( rMedium.GetError() )
+ if ( rMedium.GetErrorIgnoreWarning() )
{
SetError(rMedium.GetErrorCode());
rMedium.ResetError();
@@ -1947,7 +1947,7 @@ bool SfxObjectShell::DoSaveCompleted( SfxMedium* pNewMed,
bool bRegisterRecent )
bool bOk = true;
bool bMedChanged = pNewMed && pNewMed!=pMedium;
- DBG_ASSERT( !pNewMed || pNewMed->GetError() == ERRCODE_NONE,
"DoSaveCompleted: Medium has error!" );
+ DBG_ASSERT( !pNewMed || pNewMed->GetErrorIgnoreWarning() == ERRCODE_NONE,
"DoSaveCompleted: Medium has error!" );
// delete Medium (and Storage!) after all notifications
SfxMedium* pOld = pMedium;
@@ -2596,7 +2596,7 @@ bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs
)
pMediumTmp->SetLongName( pRetrMedium->GetLongName() );
if ( pMediumTmp->GetErrorCode() != ERRCODE_NONE )
{
- SetError(pMediumTmp->GetError());
+ SetError(pMediumTmp->GetErrorIgnoreWarning());
delete pMediumTmp;
return false;
}
@@ -2640,7 +2640,7 @@ bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs
)
else
{
// transfer error code from medium to objectshell
- ErrCode errCode = pMediumTmp->GetError();
+ ErrCode errCode = pMediumTmp->GetErrorIgnoreWarning();
SetError(errCode);
if (errCode == ERRCODE_ABORT)
@@ -2965,7 +2965,7 @@ bool SfxObjectShell::PreDoSaveAs_Impl(const OUString&
rFileName, const OUString&
if ( pNewFile->GetErrorCode() != ERRCODE_NONE )
{
// creating temporary file failed ( f.e. floppy disk not inserted! )
- SetError(pNewFile->GetError());
+ SetError(pNewFile->GetErrorIgnoreWarning());
delete pNewFile;
return false;
}
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 3b8bcd160018..e5eb0177fe6d 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2028,7 +2028,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence<
beans::PropertyValue >& seqA
}
if ( !nError )
- nError = pMedium->GetError();
+ nError = pMedium->GetErrorIgnoreWarning();
m_pData->m_pObjectShell->ResetError();
diff --git a/svx/source/core/graphichelper.cxx
b/svx/source/core/graphichelper.cxx
index 4d800542a38f..f9376d4d719d 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -287,11 +287,11 @@ OUString GraphicHelper::ExportGraphic(weld::Window*
pParent, const Graphic& rGra
if( aOut.GetOutStream() &&
!aOut.GetOutStream()->GetError())
{
aOut.GetOutStream()->WriteStream( *aIn.GetInStream() );
- if ( ERRCODE_NONE == aIn.GetError() )
+ if ( ERRCODE_NONE == aIn.GetErrorIgnoreWarning() )
{
aOut.Close();
aOut.Commit();
- if ( ERRCODE_NONE == aOut.GetError() )
+ if ( ERRCODE_NONE == aOut.GetErrorIgnoreWarning() )
return sPath;
}
}
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 43cdf5ded05d..9211b2aafc50 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -210,7 +210,7 @@ ErrCode XOutBitmap::WriteGraphic( const Graphic& rGraphic,
OUString& rFileName,
rGraphic.getVectorGraphicData()->getBinaryDataContainer().writeToStream(*pOStm);
aMedium.Commit();
- if (!aMedium.GetError())
+ if (!aMedium.GetErrorIgnoreWarning())
return ERRCODE_NONE;
}
}
@@ -239,7 +239,7 @@ ErrCode XOutBitmap::WriteGraphic( const Graphic& rGraphic,
OUString& rFileName,
pOStm->WriteBytes(aGfxLink.GetData(), aGfxLink.GetDataSize());
aMedium.Commit();
- if( !aMedium.GetError() )
+ if( !aMedium.GetErrorIgnoreWarning() )
return ERRCODE_NONE;
}
}
@@ -417,7 +417,7 @@ ErrCode XOutBitmap::ExportGraphic( const Graphic& rGraphic,
const INetURLObject&
aMedium.Commit();
- if( aMedium.GetError() && ( ERRCODE_NONE == nRet ) )
+ if( aMedium.GetErrorIgnoreWarning() && ( ERRCODE_NONE == nRet ) )
nRet = ERRCODE_GRFILTER_IOERROR;
}
diff --git a/sw/source/filter/writer/writer.cxx
b/sw/source/filter/writer/writer.cxx
index 6c7565e5dcc4..475da8cc5ab8 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -295,7 +295,7 @@ bool Writer::CopyLocalFileToINet( OUString& rFileNm )
aSrcFile.Close();
aDstFile.Commit();
- bRet = ERRCODE_NONE == aDstFile.GetError();
+ bRet = ERRCODE_NONE == aDstFile.GetErrorIgnoreWarning();
if( bRet )
{
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index e4363df4fdf0..7258b119e7a1 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -1760,7 +1760,7 @@ int SwFindDocShell( SfxObjectShellRef& xDocSh,
xMed->Download(); // Touch the medium (download it)
std::shared_ptr<const SfxFilter> pSfxFlt;
- if (!xMed->GetError())
+ if (!xMed->GetErrorIgnoreWarning())
{
SfxFilterMatcher aMatcher( rFilter == "writerglobal8"
? SwGlobalDocShell::Factory().GetFactoryName()
