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

[Libreoffice Gerrit user]

 sot/source/sdstor/stgcache.hxx |    2 +-
 sot/source/sdstor/stgio.cxx    |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 810eed8646eacd665004d95359f21ce5e23fc795
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Jul 23 11:52:54 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Jul 23 13:28:10 2018 +0200

    make some fields in StgCache private
    
    Change-Id: Ia44131f2ebee0c162b05c8019cf3600181aea5e0
    Reviewed-on: https://gerrit.libreoffice.org/57842
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx
index b4262c80a1bc..f0bd2e1d25a3 100644
--- a/sot/source/sdstor/stgcache.hxx
+++ b/sot/source/sdstor/stgcache.hxx
@@ -56,9 +56,9 @@ class StgCache
 
     void Erase( const rtl::Reference< StgPage >& ); // delete a cache element
     rtl::Reference< StgPage > Create( sal_Int32  ); // create a cached page
-protected:
     SvStream* m_pStrm;                        // physical stream
     bool  m_bMyStream;                        // true: delete stream in dtor
+protected:
     bool  m_bFile;                            // true: file stream
     sal_Int32 Page2Pos( sal_Int32 ) const;    // page address --> file position
 public:
diff --git a/sot/source/sdstor/stgio.cxx b/sot/source/sdstor/stgio.cxx
index a7e8863c6efd..e05460f4ae39 100644
--- a/sot/source/sdstor/stgio.cxx
+++ b/sot/source/sdstor/stgio.cxx
@@ -54,7 +54,7 @@ StgIo::~StgIo()
 
 bool StgIo::Load()
 {
-    if( m_pStrm )
+    if( GetStrm() )
     {
         if( m_aHdr.Load( *this ) )
         {
@@ -141,8 +141,8 @@ bool StgIo::CommitAll()
             m_aHdr.SetTOCStart( m_pTOC->GetStart() );
             if( m_aHdr.Store( *this ) )
             {
-                m_pStrm->Flush();
-                const ErrCode n = m_pStrm->GetError();
+                GetStrm()->Flush();
+                const ErrCode n = GetStrm()->GetError();
                 SetError( n );
 #ifdef DBG_UTIL
                 if( n==ERRCODE_NONE ) ValidateFATs();