[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - dbaccess/source

[Samuel Mehrbrodt (via logerrit)]

 dbaccess/source/core/dataaccess/ModelImpl.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a0b9a10f720a51b6c06fceb1bee031cc3e060fb1
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Fri May 8 12:14:50 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Fri Jun 26 16:58:52 2020 +0200

    Fix variable name
    
    Change-Id: I307f4bca16cc54de8c049df570ba36c635f4e4d4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93713
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit bed8c65ca4143f66ec5cfdcc3fb5213f04035220)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97125
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 89ed1bd81a19..95ea39859301 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -861,7 +861,7 @@ bool ODatabaseModelImpl::commitStorageIfWriteable_ignoreErrors( const Reference<
     bool bTryToPreserveScriptSignature = false;
     utl::TempFile aTempFile;
     aTempFile.EnableKillingFile();
-    OUString m_sTmpFileUrl = aTempFile.GetURL();
+    OUString sTmpFileUrl = aTempFile.GetURL();
     SignatureState aSignatureState = getScriptingSignatureState();
     if (aSignatureState == SignatureState::OK
         || aSignatureState == SignatureState::NOTVALIDATED
@@ -870,7 +870,7 @@ bool ODatabaseModelImpl::commitStorageIfWriteable_ignoreErrors( const Reference<
         bTryToPreserveScriptSignature = true;
         // We need to first save the file (which removes the macro signature), then add the macro signature again.
         // For that, we need a temporary copy of the original file.
-        osl::File::RC rc = osl::File::copy(getDocFileLocation(), m_sTmpFileUrl);
+        osl::File::RC rc = osl::File::copy(getDocFileLocation(), sTmpFileUrl);
         if (rc != osl::FileBase::E_None)
             throw uno::RuntimeException("Could not create temp file");
     }
@@ -902,9 +902,9 @@ bool ODatabaseModelImpl::commitStorageIfWriteable_ignoreErrors( const Reference<
             {
                 Reference<XStorage> xReadOrig
                     = comphelper::OStorageHelper::GetStorageOfFormatFromURL(
-                        ZIP_STORAGE_FORMAT_STRING, m_sTmpFileUrl, ElementModes::READ);
+                        ZIP_STORAGE_FORMAT_STRING, sTmpFileUrl, ElementModes::READ);
                 if (!xReadOrig.is())
-                    throw uno::RuntimeException("Could not read " + m_sTmpFileUrl);
+                    throw uno::RuntimeException("Could not read " + sTmpFileUrl);
                 uno::Reference<embed::XStorage> xMetaInf
                     = xReadOrig->openStorageElement("META-INF", embed::ElementModes::READ);