loplugin:staticmethods

Change-Id: I3ae555fd9f0dc3c11ea301ee1cb2c799fbec820d

3 files changed, 9 insertions, 9 deletions

diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx
index 6b5970dab54a..bef0c76bd49b 100644
--- a/sot/source/sdstor/stgcache.hxx
+++ b/sot/source/sdstor/stgcache.hxx
@@ -87,7 +87,7 @@ public:
     // two routines for accessing FAT pages
     // Assume that the data is a FAT page and get/put FAT data.
     void  SetToPage   ( const rtl::Reference< StgPage >& rPage, short nOff, sal_Int32 nVal );
-    inline sal_Int32 GetFromPage ( const rtl::Reference< StgPage >& rPage, short nOff );
+    static inline sal_Int32 GetFromPage ( const rtl::Reference< StgPage >& rPage, short nOff );
     void  SetDirty    ( const rtl::Reference< StgPage > &rPage );
     bool  SetSize( sal_Int32 nPages );
     rtl::Reference< StgPage > Find( sal_Int32 );                 // find a cached page
diff --git a/sot/source/sdstor/stgio.cxx b/sot/source/sdstor/stgio.cxx
index 953bee3c4cb0..b9671bf0f33c 100644
--- a/sot/source/sdstor/stgio.cxx
+++ b/sot/source/sdstor/stgio.cxx
@@ -177,7 +177,7 @@ EasyFat::EasyFat( StgIo& rIo, StgStrm* pFatStream, sal_Int32 nPSize )
             pPage = rIo.Get( nPhysPage, true );
         }
 
-        pFat[ nPage ] = rIo.GetFromPage( pPage, short( nPage % nFatPageSize ) );
+        pFat[ nPage ] = StgCache::GetFromPage( pPage, short( nPage % nFatPageSize ) );
         pFree[ nPage ] = true;
     }
 }
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index e90e823ccae3..cd99b76f7388 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -73,7 +73,7 @@ sal_Int32 StgFAT::GetNextPage( sal_Int32 nPg )
     if( nPg >= 0 )
     {
       rtl::Reference< StgPage > pPg = GetPhysPage( nPg << 2 );
-      nPg = pPg.is() ? rStrm.GetIo().GetFromPage( pPg, nOffset >> 2 ) : STG_EOF;
+      nPg = pPg.is() ? StgCache::GetFromPage( pPg, nOffset >> 2 ) : STG_EOF;
     }
     return nPg;
 }
@@ -103,7 +103,7 @@ sal_Int32 StgFAT::FindBlock( sal_Int32& nPgs )
             if( !pPg.is() )
                 return STG_EOF;
         }
-        sal_Int32 nCur = rStrm.GetIo().GetFromPage( pPg, nEntry );
+        sal_Int32 nCur = StgCache::GetFromPage( pPg, nEntry );
         if( nCur == STG_FREE )
         {
             // count the size of this area
@@ -291,7 +291,7 @@ bool StgFAT::FreePages( sal_Int32 nStart, bool bAll )
         rtl::Reference< StgPage > pPg = GetPhysPage( nStart << 2 );
         if( !pPg.is() )
             return false;
-        nStart = rStrm.GetIo().GetFromPage( pPg, nOffset >> 2 );
+        nStart = StgCache::GetFromPage( pPg, nOffset >> 2 );
         // The first released page is either set to EOF or FREE
         rStrm.GetIo().SetToPage( pPg, nOffset >> 2, bAll ? STG_FREE : STG_EOF );
         bAll = true;
@@ -644,13 +644,13 @@ sal_Int32 StgFATStrm::GetPage( short nOff, bool bMake, sal_uInt16 *pnMasterAlloc
             pMaster = rIo.Get( nFAT, true );
             if ( pMaster.is() )
             {
-                nFAT = rIo.GetFromPage( pMaster, nMasterCount );
+                nFAT = StgCache::GetFromPage( pMaster, nMasterCount );
                 pOldPage = pMaster;
             }
         }
     }
     if( pMaster.is() )
-        return rIo.GetFromPage( pMaster, nOff );
+        return StgCache::GetFromPage( pMaster, nOff );
     rIo.SetError( SVSTREAM_GENERALERROR );
     return STG_EOF;
 }
@@ -686,7 +686,7 @@ bool StgFATStrm::SetPage( short nOff, sal_Int32 nNewPage )
             }
             pMaster = rIo.Get( nFAT, true );
             if ( pMaster.is() )
-                nFAT = rIo.GetFromPage( pMaster, nMasterCount );
+                nFAT = StgCache::GetFromPage( pMaster, nMasterCount );
         }
         if( pMaster.is() )
             rIo.SetToPage( pMaster, nOff, nNewPage );
@@ -789,7 +789,7 @@ bool StgFATStrm::SetSize( sal_Int32 nBytes )
                     }
                     rtl::Reference< StgPage > pPage = rIo.Get( nFAT, true );
                     if( !pPage.is() ) return false;
-                    nFAT = rIo.GetFromPage( pPage, (nPageSize >> 2 ) - 1 );
+                    nFAT = StgCache::GetFromPage( pPage, (nPageSize >> 2 ) - 1 );
                 }
 
             nOld++;