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

[Noel Grandin]

 include/sot/storage.hxx       |    2 +-
 sot/source/sdstor/storage.cxx |   20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 890e13344ba83ef9f06bb5a8cde0f068ecb3c7a6
Author: Noel Grandin <noel at peralex.com>
Date:   Mon Apr 4 09:32:02 2016 +0200

    loplugin:constantparam in sot
    
    Change-Id: I8bf1ee672f035831d197e4a65bd40bae41278da0
    Reviewed-on: https://gerrit.libreoffice.org/23800
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 2df5af5..06a1b78 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -75,7 +75,7 @@ friend class SotStorageStream;
 
 protected:
                         virtual ~SotStorage();
-   void                 CreateStorage( bool bUCBStorage, StreamMode, bool transacted );
+   void                 CreateStorage( bool bUCBStorage, StreamMode );
 public:
                         SotStorage( const OUString &,
                                     StreamMode = STREAM_STD_READWRITE );
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 936a7cf..54c40f8 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -298,12 +298,12 @@ SotStorage::SotStorage( const OUString & rName, StreamMode nMode )
     INIT_SotStorage()
 {
     m_aName = rName; // Namen merken
-    CreateStorage( true, nMode, false );
+    CreateStorage( true, nMode );
     if ( IsOLEStorage() )
         m_nVersion = SOFFICE_FILEFORMAT_50;
 }
 
-void SotStorage::CreateStorage( bool bForceUCBStorage, StreamMode nMode, bool transacted )
+void SotStorage::CreateStorage( bool bForceUCBStorage, StreamMode nMode )
 {
     DBG_ASSERT( !m_pStorStm && !m_pOwnStg, "Use only in ctor!" );
     if( !m_aName.isEmpty() )
@@ -339,31 +339,31 @@ void SotStorage::CreateStorage( bool bForceUCBStorage, StreamMode nMode, bool tr
                 if ( !(UCBStorage::GetLinkedFile( *m_pStorStm ).isEmpty()) )
                 {
                     // detect special unpacked storages
-                    m_pOwnStg = new UCBStorage( *m_pStorStm, !transacted );
+                    m_pOwnStg = new UCBStorage( *m_pStorStm, true );
                     m_bDelStm = true;
                 }
                 else
                 {
                     // UCBStorage always works directly on the UCB content, so discard the stream first
                     DELETEZ( m_pStorStm );
-                    m_pOwnStg = new UCBStorage( m_aName, nMode, !transacted );
+                    m_pOwnStg = new UCBStorage( m_aName, nMode, true );
                 }
             }
             else
             {
                 // OLEStorage can be opened with a stream
-                m_pOwnStg = new Storage( *m_pStorStm, !transacted );
+                m_pOwnStg = new Storage( *m_pStorStm, true );
                 m_bDelStm = true;
             }
         }
         else if ( bForceUCBStorage )
         {
-            m_pOwnStg = new UCBStorage( m_aName, nMode, !transacted );
+            m_pOwnStg = new UCBStorage( m_aName, nMode, true );
             SetError( ERRCODE_IO_NOTSUPPORTED );
         }
         else
         {
-            m_pOwnStg = new Storage( m_aName, nMode, !transacted );
+            m_pOwnStg = new Storage( m_aName, nMode, true );
             SetError( ERRCODE_IO_NOTSUPPORTED );
         }
     }
@@ -371,9 +371,9 @@ void SotStorage::CreateStorage( bool bForceUCBStorage, StreamMode nMode, bool tr
     {
         // temporary storage
         if ( bForceUCBStorage )
-            m_pOwnStg = new UCBStorage( m_aName, nMode, !transacted );
+            m_pOwnStg = new UCBStorage( m_aName, nMode, true );
         else
-            m_pOwnStg = new Storage( m_aName, nMode, !transacted );
+            m_pOwnStg = new Storage( m_aName, nMode, true );
         m_aName = m_pOwnStg->GetName();
     }
 
@@ -386,7 +386,7 @@ SotStorage::SotStorage( bool bUCBStorage, const OUString & rName, StreamMode nMo
     INIT_SotStorage()
 {
     m_aName = rName;
-    CreateStorage( bUCBStorage, nMode, false );
+    CreateStorage( bUCBStorage, nMode );
     if ( IsOLEStorage() )
         m_nVersion = SOFFICE_FILEFORMAT_50;
 }