[Libreoffice-commits] core.git: sot/source

Stephan Bergmann sbergman at redhat.com
Fri Jun 30 14:45:24 UTC 2017


 sot/source/sdstor/ucbstorage.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit c91f05e1744ea5077fa2ce2793f0aef6378b5d42
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jun 30 16:43:48 2017 +0200

    aKey is demonstratedly always empty
    
    ...since cb958bb5e0e81d343c91c08a8513006a7bf1d913 "loplugin:constantparam in
    sot..svl"
    
    Change-Id: Id74078a26efb9b7a5a8b58ea28f3142cef4ac71f

diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index b6a8bae3eb2f..4e4e7382137b 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -2618,8 +2618,7 @@ BaseStorageStream* UCBStorage::OpenStream( const OUString& rEleName, StreamMode
             {
                 // check if stream is opened with the same keyword as before
                 // if not, generate a new stream because it could be encrypted vs. decrypted!
-                OString aKey;
-                if ( pElement->m_xStream->m_aKey == aKey )
+                if ( pElement->m_xStream->m_aKey.isEmpty() )
                 {
                     pElement->m_xStream->PrepareCachedForReopen( nMode );
 


More information about the Libreoffice-commits mailing list