summaryrefslogtreecommitdiff
path: root/sot
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-06-20 19:54:23 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-06-21 08:43:05 +0200
commit18f513145477d4621290253d936dad7a40ee4c05 (patch)
tree488acddc766727dc28c28c026c9bc2a2a5e10900 /sot
parent742c0838f29bd09505e2cb9ca35debf401c18c23 (diff)
loplugin:unusedfields store..svl
Change-Id: I6070a683e5128271b84a10caccb548d07c950927 Reviewed-on: https://gerrit.libreoffice.org/39021 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sot')
-rw-r--r--sot/source/sdstor/stgdir.cxx5
-rw-r--r--sot/source/sdstor/stgdir.hxx6
-rw-r--r--sot/source/sdstor/stgio.cxx1
-rw-r--r--sot/source/sdstor/stgio.hxx1
-rw-r--r--sot/source/sdstor/ucbstorage.cxx10
5 files changed, 2 insertions, 21 deletions
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index bc0d042065ef..ffc6d38ce76b 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -67,7 +67,6 @@ void StgDirEntry::InitMembers()
m_aSave = m_aEntry;
m_pUp =
m_pDown = nullptr;
- m_ppRoot = nullptr;
m_pStgStrm = nullptr;
m_pCurStrm =
m_pTmpStrm = nullptr;
@@ -727,11 +726,9 @@ void StgDirEntry::Invalidate( bool bDel )
StgDirStrm::StgDirStrm( StgIo& r )
: StgDataStrm( r, r.m_aHdr.GetTOCStart(), -1 )
, m_pRoot( nullptr )
- , m_nEntries( 0 )
{
if( r.GetError() )
return;
- m_nEntries = m_nPageSize / STGENTRY_SIZE;
if( m_nStart == STG_EOF )
{
StgEntry aRoot;
@@ -817,7 +814,6 @@ void StgDirStrm::SetupEntry( sal_Int32 n, StgDirEntry* pUpper )
( reinterpret_cast<StgAvlNode**>( pUpper ? &pUpper->m_pDown : &m_pRoot ), pCur ) )
{
pCur->m_pUp = pUpper;
- pCur->m_ppRoot = &m_pRoot;
}
else
{
@@ -972,7 +968,6 @@ StgDirEntry* StgDirStrm::Create( StgDirEntry& rStg, const OUString& rName, StgEn
if( StgAvlNode::Insert( reinterpret_cast<StgAvlNode**>(&rStg.m_pDown), pRes ) )
{
pRes->m_pUp = &rStg;
- pRes->m_ppRoot = &m_pRoot;
pRes->m_bCreated =
pRes->m_bDirty = true;
}
diff --git a/sot/source/sdstor/stgdir.hxx b/sot/source/sdstor/stgdir.hxx
index ca80ab6f3ffa..5809703602dd 100644
--- a/sot/source/sdstor/stgdir.hxx
+++ b/sot/source/sdstor/stgdir.hxx
@@ -35,9 +35,8 @@ class StgDirEntry : public StgAvlNode
friend class StgIterator;
friend class StgDirStrm;
StgEntry m_aSave; // original dir entry
- StgDirEntry* m_pUp; // parent directory
- StgDirEntry* m_pDown; // child directory for storages
- StgDirEntry** m_ppRoot; // root of TOC tree
+ StgDirEntry* m_pUp; // parent directory
+ StgDirEntry* m_pDown; // child directory for storages
StgStrm* m_pStgStrm; // storage stream
StgTmpStrm* m_pTmpStrm; // temporary stream
StgTmpStrm* m_pCurStrm; // temp stream after commit
@@ -92,7 +91,6 @@ class StgDirStrm : public StgDataStrm
{
friend class StgIterator;
StgDirEntry* m_pRoot; // root of dir tree
- short m_nEntries; // entries per page
void SetupEntry( sal_Int32, StgDirEntry* );
public:
explicit StgDirStrm( StgIo& );
diff --git a/sot/source/sdstor/stgio.cxx b/sot/source/sdstor/stgio.cxx
index c5d92be67590..1ac21705ad03 100644
--- a/sot/source/sdstor/stgio.cxx
+++ b/sot/source/sdstor/stgio.cxx
@@ -383,7 +383,6 @@ FatError StgIo::ValidateFATs()
{
StgLinkArg aArg;
aArg.aFile = pFileStrm->GetFileName();
- aArg.nErr = nErr;
ErrorLink::get().Call( aArg );
m_bCopied = true;
}
diff --git a/sot/source/sdstor/stgio.hxx b/sot/source/sdstor/stgio.hxx
index 7b7948645ff3..3474b2829849 100644
--- a/sot/source/sdstor/stgio.hxx
+++ b/sot/source/sdstor/stgio.hxx
@@ -44,7 +44,6 @@ enum class FatError
struct StgLinkArg
{
OUString aFile;
- FatError nErr;
};
class StgIo : public StgCache {
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 14675908d142..67c7582a3b05 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -424,7 +424,6 @@ public:
SvStream* m_pStream; // the stream worked on; for readonly streams it is the original stream of the content
// for read/write streams it's a copy into a temporary file
OUString m_aTempURL; // URL of this temporary stream
- RepresentMode m_nRepresentMode; // should it be used as XInputStream or as SvStream
ErrCode m_nError;
StreamMode m_nMode; // open mode ( read/write/trunc/nocreate/sharing )
bool m_bSourceRead; // Source still contains useful information
@@ -484,7 +483,6 @@ public:
// this means that the root storage does an autocommit when its external
// reference is destroyed
bool m_bIsRoot; // marks this storage as root storages that manages all commits and reverts
- bool m_bDirty; // ???
bool m_bIsLinked;
bool m_bListCreated;
SotClipboardFormatId m_nFormat;
@@ -638,7 +636,6 @@ UCBStorageStream_Impl::UCBStorageStream_Impl( const OUString& rName, StreamMode
, m_aURL( rName )
, m_pContent( nullptr )
, m_pStream( nullptr )
- , m_nRepresentMode( RepresentMode::NONE )
, m_nError( ERRCODE_NONE )
, m_nMode( nMode )
, m_bSourceRead( !( nMode & StreamMode::TRUNC ) )
@@ -698,8 +695,6 @@ bool UCBStorageStream_Impl::Init()
// no temporary stream was created
// create one
- m_nRepresentMode = RepresentMode::svstream; // can not be used as XInputStream
-
if ( m_aTempURL.isEmpty() )
m_aTempURL = ::utl::TempFile().GetURL();
@@ -1186,7 +1181,6 @@ void UCBStorageStream_Impl::Free()
}
#endif
- m_nRepresentMode = RepresentMode::NONE;
m_rSource.clear();
DELETEZ( m_pStream );
}
@@ -1475,7 +1469,6 @@ UCBStorage_Impl::UCBStorage_Impl( const ::ucbhelper::Content& rContent, const OU
, m_bCommited( false )
, m_bDirect( bDirect )
, m_bIsRoot( bIsRoot )
- , m_bDirty( false )
, m_bIsLinked( true )
, m_bListCreated( false )
, m_nFormat( SotClipboardFormatId::NONE )
@@ -1507,7 +1500,6 @@ UCBStorage_Impl::UCBStorage_Impl( const OUString& rName, StreamMode nMode, UCBSt
, m_bCommited( false )
, m_bDirect( bDirect )
, m_bIsRoot( bIsRoot )
- , m_bDirty( false )
, m_bIsLinked( false )
, m_bListCreated( false )
, m_nFormat( SotClipboardFormatId::NONE )
@@ -1557,7 +1549,6 @@ UCBStorage_Impl::UCBStorage_Impl( SvStream& rStream, UCBStorage* pStorage, bool
, m_bCommited( false )
, m_bDirect( bDirect )
, m_bIsRoot( true )
- , m_bDirty( false )
, m_bIsLinked( false )
, m_bListCreated( false )
, m_nFormat( SotClipboardFormatId::NONE )
@@ -2353,7 +2344,6 @@ bool UCBStorage::IsRoot() const
void UCBStorage::SetDirty()
{
- pImp->m_bDirty = true;
}
void UCBStorage::SetClass( const SvGlobalName & rClass, SotClipboardFormatId nOriginalClipFormat, const OUString & rUserTypeName )