commit 6a308d2bfaf1d756aa4cfca6a40b80cf5e88e5fa
author Eike Rathke <erack@redhat.com> Mon Jan 20 21:37:18 2020 +0100
committer Eike Rathke <erack@redhat.com> Tue Jan 21 00:24:14 2020 +0100
tree 35ed158f2fa1f5c70b4606803fae9a0b55873493
parent 0f4729f5d4f52b8b30af7003b846e0d4cd0844c0

Propagate warning error code from dBASE export, tdf#130020

Long time existing code cleared all warnings set by the actual
export routine. I could not figure out why this ever was done. It
started short after the initial OOo import with

    commit 0ec1e9cbdfb4be18ea18b6b9be567d23bff5963f
    CommitDate: Fri Oct 27 18:00:10 2000 +0000

        dBase export: don't set warning errorcodes

that did not set warnings at the medium anymore without giving a
rationale.

Change-Id: I0f26d0644890c53557076ac7b99ffe7c8756a047
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87109
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins

sc/source/ui/docshell/docsh.cxx

diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index d932944..aee27cb 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2447,15 +2447,10 @@
        ErrCode eError = DBaseExport(
            rMed.GetPhysicalName(), ScGlobal::GetCharsetValue(sCharSet), bHasMemo);

        if ( eError != ERRCODE_NONE && eError.IsWarning() )
        {
            eError = ERRCODE_NONE;
        }

        INetURLObject aTmpFile( rMed.GetPhysicalName(), INetProtocol::File );
        if ( bHasMemo )
            aTmpFile.setExtension("dbt");
        if ( eError != ERRCODE_NONE )
        if ( eError != ERRCODE_NONE && !eError.IsWarning() )
        {
            if (!GetError())
                SetError(eError);
@@ -2473,8 +2468,13 @@

                // tdf#40713: don't lose dbt file
                // if aDbtFile corresponds exactly to aTmpFile, we just have to return
                if (aDbtFile.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ) == aTmpFile.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ))
                if (aDbtFile.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ) ==
                    aTmpFile.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ))
                {
                    if (eError != ERRCODE_NONE && !GetError())
                        SetError(eError);
                    return bRet;
                }

                if ( IsDocument( aDbtFile ) && !KillFile( aDbtFile ) )
                    bRet = false;
@@ -2483,10 +2483,12 @@
                if ( !bRet )
                {
                    KillFile( aTmpFile );
                    if ( !GetError() )
                        SetError(SCERR_EXPORT_DATA);
                    if (eError == ERRCODE_NONE || eError.IsWarning())
                        eError = SCERR_EXPORT_DATA;
                }
            }
            if (eError != ERRCODE_NONE && !GetError())
                SetError(eError);
        }
    }
    else if (aFltName == pFilterDif)