core.git: 2 commits - svl/source

[Caolán McNamara (via logerrit)]

 svl/source/fsstor/fsstorage.cxx      |    2 +-
 svl/source/misc/sharecontrolfile.cxx |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 990490781cdea757a25a14da30e575a6a9dfb6a7
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Jul 13 21:11:03 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun Jul 14 15:16:31 2024 +0200

    cid#1555646 COPY_INSTEAD_OF_MOVE
    
    Change-Id: I477cb9b74c99b32eb06e054fa38dd3ffa6bb77da
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170447
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Jenkins

diff --git a/svl/source/misc/sharecontrolfile.cxx 
b/svl/source/misc/sharecontrolfile.cxx
index ac8e42fb28cc..3a3579594240 100644
--- a/svl/source/misc/sharecontrolfile.cxx
+++ b/svl/source/misc/sharecontrolfile.cxx
@@ -177,7 +177,6 @@ std::vector< o3tl::enumarray< LockFileComponent, OUString > 
> ShareControlFile::
     return m_aUsersData;
 }
 
-
 void ShareControlFile::SetUsersDataAndStore( std::unique_lock<std::mutex>& 
/*rGuard*/, std::vector< LockFileEntry >&& aUsersData )
 {
     if ( !IsValid() )
@@ -205,10 +204,9 @@ void ShareControlFile::SetUsersDataAndStore( 
std::unique_lock<std::mutex>& /*rGu
     OString aStringData( OUStringToOString( aBuffer, RTL_TEXTENCODING_UTF8 ) );
     uno::Sequence< sal_Int8 > aData( reinterpret_cast<sal_Int8 const 
*>(aStringData.getStr()), aStringData.getLength() );
     m_xOutputStream->writeBytes( aData );
-    m_aUsersData = aUsersData;
+    m_aUsersData = std::move(aUsersData);
 }
 
-
 LockFileEntry ShareControlFile::InsertOwnEntry()
 {
     std::unique_lock aGuard( m_aMutex );
commit 2f3d6cf4d8d6a6aa48bf5d080451214360c9a81c
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Jul 13 21:03:19 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun Jul 14 15:16:18 2024 +0200

    cid#1608181 Double lock
    
    Change-Id: Id6121213f11c4ce0c855a0937fd2d7c81946c076
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170446
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index 74895d153536..95f498b71ce2 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -546,7 +546,7 @@ void SAL_CALL FSStorage::copyStorageElementLastCommitTo(
 {
     std::unique_lock aGuard( m_aMutex );
 
-    uno::Reference< embed::XStorage > xSourceStor( openStorageElement( 
aStorName, embed::ElementModes::READ ),
+    uno::Reference< embed::XStorage > xSourceStor( 
openStorageElementImpl(aGuard, aStorName, embed::ElementModes::READ),
                                                     uno::UNO_SET_THROW );
     xSourceStor->copyToStorage( xTargetStorage );
 }