diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2023-09-19 13:16:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-09-19 17:56:37 +0200 |
| commit | 6ae1794736666b2a483120977479fc6f12406021 (patch) | |
| tree | 2677c2684044e23572516887aeb72f624abd96d6 /sw | |
| parent | 9e92a17cb6e03beedeeca40bfc8524c2623d31eb (diff) | |
rename SfxObjectShell::GetError -> GetErrorIgnoreWarning
to distinguish it from the very similar GetErrorCode()
Change-Id: Ic863742a7546e2835826d12181bf073ccbbbfb83
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157046
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/doc/docglbl.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/app/docsh2.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx index 737506ca275e..6a87836d75e8 100644 --- a/sw/source/core/doc/docglbl.cxx +++ b/sw/source/core/doc/docglbl.cxx @@ -331,7 +331,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline, xDocSh->DoSaveCompleted( pTmpMed ); // do not insert a FileLinkSection in case of error - if( xDocSh->GetError() ) + if( xDocSh->GetErrorIgnoreWarning() ) sFileName.clear(); } xDocSh->DoClose(); diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 5bf5b65c3af3..e4363df4fdf0 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -632,7 +632,7 @@ void SwDocShell::Execute(SfxRequest& rReq) aOpt.SetMerge( !bMerge ); SetError(LoadStylesFromFile(aFileName, aOpt, false)); - if ( !GetError() ) + if ( !GetErrorIgnoreWarning() ) rReq.Done(); } } diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index f16fadeaa395..0cc225e0c3de 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -797,7 +797,7 @@ static void lcl_SaveDebugDoc( SfxObjectShell *xTargetDocShell, StreamMode::STD_READWRITE ); bool bAnyError = !xTargetDocShell->DoSaveAs( *pDstMed ); // xObjectShell->DoSaveCompleted crashes the mail merge unit tests, so skip it - bAnyError |= (ERRCODE_NONE != xTargetDocShell->GetError()); + bAnyError |= (ERRCODE_NONE != xTargetDocShell->GetErrorIgnoreWarning()); if( bAnyError ) SAL_WARN( "sw.mailmerge", "Error saving: " << aTempFile.GetURL() ); else @@ -837,11 +837,11 @@ static bool lcl_SaveDoc( // Actually this should be a bool... so in case of email and individual // files, where this is set, we skip the recently used handling bAnyError |= !xObjectShell->DoSaveCompleted( pDstMed, !decodedURL ); - bAnyError |= (ERRCODE_NONE != xObjectShell->GetError()); + bAnyError |= (ERRCODE_NONE != xObjectShell->GetErrorIgnoreWarning()); if( bAnyError ) { // error message ?? - ErrorHandler::HandleError( xObjectShell->GetError() ); + ErrorHandler::HandleError( xObjectShell->GetErrorIgnoreWarning() ); } return !bAnyError; } |