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/source/uibase/dbui | |
| 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/source/uibase/dbui')
| -rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
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; } |