summaryrefslogtreecommitdiff
path: root/sot
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-09-19 13:23:59 +0100
committerMichael Meeks <michael.meeks@suse.com>2012-09-19 14:58:02 +0100
commit3b3d738c167c04541fd16022ef7221cedd1e3b66 (patch)
tree07b41ce6043feb3c66a80ee996ef2898f467e2f2 /sot
parent045227f10568d3ef64d8e1066c027fc86d576733 (diff)
sot: remove unused Owner construct on StgPage
Change-Id: Idd6616ac11e16b4c4631c607a3dc92417a796521
Diffstat (limited to 'sot')
-rw-r--r--sot/source/sdstor/stgcache.cxx1
-rw-r--r--sot/source/sdstor/stgcache.hxx2
-rw-r--r--sot/source/sdstor/stgstrms.cxx5
3 files changed, 0 insertions, 8 deletions
diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx
index cf6f8cbaf699..fc2c8778e5d8 100644
--- a/sot/source/sdstor/stgcache.cxx
+++ b/sot/source/sdstor/stgcache.cxx
@@ -70,7 +70,6 @@ StgPage::StgPage( StgCache* p, short n )
pNext2 =
pLast1 =
pLast2 = NULL;
- pOwner = NULL;
}
StgPage::~StgPage()
diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx
index 517e27a04c3c..a9fcc85fa1a5 100644
--- a/sot/source/sdstor/stgcache.hxx
+++ b/sot/source/sdstor/stgcache.hxx
@@ -85,7 +85,6 @@ class StgPage {
StgCache* pCache; // the cache
StgPage *pNext1, *pLast1; // LRU chain
StgPage *pNext2, *pLast2; // ordered chain
- StgDirEntry* pOwner; // owner
sal_Int32 nPage; // page #
sal_uInt8* pData; // nPageSize characters
short nData; // size of this page
@@ -97,7 +96,6 @@ public:
sal_Int32 GetPage() { return nPage; }
void* GetData() { return pData; }
short GetSize() { return nData; }
- void SetOwner( StgDirEntry* p ) { pOwner = p; }
// routines for accessing FAT pages
// Assume that the data is a FAT page and get/put FAT data.
sal_Int32 GetPage( short nOff )
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index 927fb5391517..feb90c4ad2eb 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -868,7 +868,6 @@ void* StgDataStrm::GetPtr( sal_Int32 Pos, sal_Bool bForce, sal_Bool bDirty )
StgPage* pPg = rIo.Get( nPage, bForce );
if (pPg && nOffset < pPg->GetSize())
{
- pPg->SetOwner( pEntry );
if( bDirty )
pPg->SetDirty();
return ((sal_uInt8 *)pPg->GetData()) + nOffset;
@@ -905,7 +904,6 @@ sal_Int32 StgDataStrm::Read( void* pBuf, sal_Int32 n )
if( pPg )
{
// data is present, so use the cached data
- pPg->SetOwner( pEntry );
memcpy( p, pPg->GetData(), nBytes );
nRes = nBytes;
}
@@ -919,7 +917,6 @@ sal_Int32 StgDataStrm::Read( void* pBuf, sal_Int32 n )
pPg = rIo.Get( nPage, sal_False );
if( !pPg )
break;
- pPg->SetOwner( pEntry );
memcpy( p, (sal_uInt8*)pPg->GetData() + nOffset, nBytes );
nRes = nBytes;
}
@@ -966,7 +963,6 @@ sal_Int32 StgDataStrm::Write( const void* pBuf, sal_Int32 n )
if( pPg )
{
// data is present, so use the cached data
- pPg->SetOwner( pEntry );
memcpy( pPg->GetData(), p, nBytes );
pPg->SetDirty();
nRes = nBytes;
@@ -981,7 +977,6 @@ sal_Int32 StgDataStrm::Write( const void* pBuf, sal_Int32 n )
pPg = rIo.Get( nPage, sal_False );
if( !pPg )
break;
- pPg->SetOwner( pEntry );
memcpy( (sal_uInt8*)pPg->GetData() + nOffset, p, nBytes );
pPg->SetDirty();
nRes = nBytes;