diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-15 14:36:33 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-16 06:19:38 +0000 |
commit | 96e9ffa64706f523d67659a20a0ccce6fbd0cb91 (patch) | |
tree | 81b9eaa904d20da4b6d3997a4cb69b29416c12c9 /tools | |
parent | 7fc7fad400c619e518448ee521b2aba099dccf9b (diff) |
loplogin:singlevalfields in include/
Change-Id: I27842162fcf82120ecb811ee8e89e187430931fc
Reviewed-on: https://gerrit.libreoffice.org/28931
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/source/generic/b3dtrans.cxx | 10 | ||||
-rw-r--r-- | tools/source/generic/config.cxx | 9 | ||||
-rw-r--r-- | tools/source/ref/pstm.cxx | 8 |
3 files changed, 5 insertions, 22 deletions
diff --git a/tools/source/generic/b3dtrans.cxx b/tools/source/generic/b3dtrans.cxx index c6364b7c23e1..2b8929433540 100644 --- a/tools/source/generic/b3dtrans.cxx +++ b/tools/source/generic/b3dtrans.cxx @@ -153,7 +153,6 @@ void B3dTransformationSet::Reset() mbPerspective = true; mbProjectionValid = false; - mbObjectToDeviceValid = false; CalcViewport(); } @@ -171,8 +170,6 @@ void B3dTransformationSet::SetOrientation(const basegfx::B3DPoint& rVRP, const b maOrientation.identity(); Orientation(maOrientation, rVRP, rVPN, rVUP); - mbObjectToDeviceValid = false; - PostSetOrientation(); } @@ -202,9 +199,6 @@ void B3dTransformationSet::PostSetProjection() // Assign and compute inverse maInvProjection = GetProjection(); maInvProjection.invert(); - - // invalidate dependent matrices - mbObjectToDeviceValid = false; } /// Transformations for viewport @@ -292,7 +286,6 @@ void B3dTransformationSet::SetRatio(double fNew) { mfRatio = fNew; mbProjectionValid = false; - mbObjectToDeviceValid = false; } } @@ -306,7 +299,6 @@ void B3dTransformationSet::SetDeviceRectangle(double fL, double fR, double fB, d mfTopBound = fT; mbProjectionValid = false; - mbObjectToDeviceValid = false; // Broadcast changes DeviceRectangleChange(); @@ -323,7 +315,6 @@ void B3dTransformationSet::SetPerspective(bool bNew) { mbPerspective = bNew; mbProjectionValid = false; - mbObjectToDeviceValid = false; } } @@ -335,7 +326,6 @@ void B3dTransformationSet::SetViewportRectangle(Rectangle const & rRect, Rectang maVisibleRectangle = rVisible; mbProjectionValid = false; - mbObjectToDeviceValid = false; } } diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx index 879678f25b09..ce8245452e1e 100644 --- a/tools/source/generic/config.cxx +++ b/tools/source/generic/config.cxx @@ -659,7 +659,6 @@ Config::Config( const OUString& rFileName ) mpActGroup = nullptr; mnDataUpdateId = 0; mnLockCount = 1; - mbPersistence = true; #ifdef DBG_UTIL OString aTraceStr("Config::Config( " + OUStringToOString(maFileName, RTL_TEXTENCODING_UTF8) + " )"); @@ -727,7 +726,7 @@ void Config::DeleteGroup(const OString& rGroup) delete pGroup; // Rewrite config data - if ( !mnLockCount && mbPersistence ) + if ( !mnLockCount ) ImplWriteConfig( mpData ); else { @@ -885,7 +884,7 @@ void Config::WriteKey(const OString& rKey, const OString& rStr) { pKey->maValue = rStr; - if ( !mnLockCount && mbPersistence ) + if ( !mnLockCount ) ImplWriteConfig( mpData ); else { @@ -929,7 +928,7 @@ void Config::DeleteKey(const OString& rKey) delete pKey; // Rewrite config file - if ( !mnLockCount && mbPersistence ) + if ( !mnLockCount ) ImplWriteConfig( mpData ); else { @@ -1026,7 +1025,7 @@ OString Config::ReadKey(sal_uInt16 nKey) const void Config::Flush() { - if ( mpData->mbModified && mbPersistence ) + if ( mpData->mbModified ) ImplWriteConfig( mpData ); } diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx index c63459209a7d..997512141368 100644 --- a/tools/source/ref/pstm.cxx +++ b/tools/source/ref/pstm.cxx @@ -56,7 +56,6 @@ SvPersistStream::SvPersistStream( SvClassManager & rMgr, SvStream * pStream ) , pStm( pStream ) , aPUIdx( 1 ) , nStartIdx( 1 ) - , pRefStm( nullptr ) { DBG_ASSERT( nStartIdx != 0, "zero index not allowed" ); m_isWritable = true; @@ -123,10 +122,7 @@ SvPersistStream::Index SvPersistStream::GetIndex( SvPersistBase * pObj ) const PersistBaseMap::const_iterator it = aPTable.find( pObj ); if( it == aPTable.end() ) { - if ( pRefStm ) - return pRefStm->GetIndex( pObj ); - else - return 0; + return 0; } return it->second; } @@ -135,8 +131,6 @@ SvPersistBase * SvPersistStream::GetObject( Index nIdx ) const { if( nIdx >= nStartIdx ) return aPUIdx.Get( nIdx ); - else if( pRefStm ) - return pRefStm->GetObject( nIdx ); return nullptr; } |