diff options
| -rw-r--r-- | include/vcl/gdimtf.hxx | 36 | ||||
| -rw-r--r-- | vcl/source/gdi/gdimtf.cxx | 244 |
2 files changed, 140 insertions, 140 deletions
diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index 47d78a467008..332e110c99b4 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -57,17 +57,17 @@ typedef BitmapEx (*BmpExchangeFnc)( const BitmapEx& rBmpEx, const void* pBmpPara class VCL_DLLPUBLIC GDIMetaFile { private: - ::std::vector< MetaAction* > aList; - size_t nCurrentActionElement; + ::std::vector< MetaAction* > m_aList; + size_t m_nCurrentActionElement; - MapMode aPrefMapMode; - Size aPrefSize; - GDIMetaFile* pPrev; - GDIMetaFile* pNext; - VclPtr<OutputDevice> pOutDev; - bool bPause; - bool bRecord; - bool bUseCanvas; + MapMode m_aPrefMapMode; + Size m_aPrefSize; + GDIMetaFile* m_pPrev; + GDIMetaFile* m_pNext; + VclPtr<OutputDevice> m_pOutDev; + bool m_bPause; + bool m_bRecord; + bool m_bUseCanvas; SAL_DLLPRIVATE static Color ImplColAdjustFnc( const Color& rColor, const void* pColParam ); @@ -143,7 +143,7 @@ public: GDIMetaFile GetMonochromeMtf( const Color& rCol ) const; void Record( OutputDevice* pOutDev ); - bool IsRecord() const { return bRecord; } + bool IsRecord() const { return m_bRecord; } void Play( GDIMetaFile& rMtf ); void Play( OutputDevice* pOutDev, size_t nPos = GDI_METAFILE_END ); @@ -151,7 +151,7 @@ public: const Size& rSize ); void Pause( bool bPause ); - bool IsPause() const { return bPause; } + bool IsPause() const { return m_bPause; } void Stop(); @@ -173,13 +173,13 @@ public: MetaAction* FirstAction(); MetaAction* NextAction(); MetaAction* GetAction( size_t nAction ) const; - MetaAction* GetCurAction() const { return GetAction( nCurrentActionElement ); } + MetaAction* GetCurAction() const { return GetAction( m_nCurrentActionElement ); } - const Size& GetPrefSize() const { return aPrefSize; } - void SetPrefSize( const Size& rSize ) { aPrefSize = rSize; } + const Size& GetPrefSize() const { return m_aPrefSize; } + void SetPrefSize( const Size& rSize ) { m_aPrefSize = rSize; } - const MapMode& GetPrefMapMode() const { return aPrefMapMode; } - void SetPrefMapMode( const MapMode& rMapMode ) { aPrefMapMode = rMapMode; } + const MapMode& GetPrefMapMode() const { return m_aPrefMapMode; } + void SetPrefMapMode( const MapMode& rMapMode ) { m_aPrefMapMode = rMapMode; } BitmapChecksum GetChecksum() const; @@ -202,7 +202,7 @@ public: BmpScaleFlag nScaleFlag = BmpScaleFlag::BestQuality) const; void UseCanvas( bool _bUseCanvas ); - bool GetUseCanvas() const { return bUseCanvas; } + bool GetUseCanvas() const { return m_bUseCanvas; } }; #endif // INCLUDED_VCL_GDIMTF_HXX diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 54252ab4fb3c..dad97c76d165 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -113,40 +113,40 @@ struct ImplBmpReplaceParam }; GDIMetaFile::GDIMetaFile() : - nCurrentActionElement( 0 ), - aPrefSize ( 1, 1 ), - pPrev ( nullptr ), - pNext ( nullptr ), - pOutDev ( nullptr ), - bPause ( false ), - bRecord ( false ), - bUseCanvas ( false ) + m_nCurrentActionElement( 0 ), + m_aPrefSize ( 1, 1 ), + m_pPrev ( nullptr ), + m_pNext ( nullptr ), + m_pOutDev ( nullptr ), + m_bPause ( false ), + m_bRecord ( false ), + m_bUseCanvas ( false ) { } GDIMetaFile::GDIMetaFile( const GDIMetaFile& rMtf ) : - nCurrentActionElement( rMtf.nCurrentActionElement ), - aPrefMapMode ( rMtf.aPrefMapMode ), - aPrefSize ( rMtf.aPrefSize ), - pPrev ( rMtf.pPrev ), - pNext ( rMtf.pNext ), - pOutDev ( nullptr ), - bPause ( false ), - bRecord ( false ), - bUseCanvas ( rMtf.bUseCanvas ) + m_nCurrentActionElement( rMtf.m_nCurrentActionElement ), + m_aPrefMapMode ( rMtf.m_aPrefMapMode ), + m_aPrefSize ( rMtf.m_aPrefSize ), + m_pPrev ( rMtf.m_pPrev ), + m_pNext ( rMtf.m_pNext ), + m_pOutDev ( nullptr ), + m_bPause ( false ), + m_bRecord ( false ), + m_bUseCanvas ( rMtf.m_bUseCanvas ) { // Increment RefCount of MetaActions for( size_t i = 0, n = rMtf.GetActionSize(); i < n; ++i ) { rMtf.GetAction( i )->Duplicate(); - aList.push_back( rMtf.GetAction( i ) ); + m_aList.push_back( rMtf.GetAction( i ) ); } - if( rMtf.bRecord ) + if( rMtf.m_bRecord ) { - Record( rMtf.pOutDev ); + Record( rMtf.m_pOutDev ); - if ( rMtf.bPause ) + if ( rMtf.m_bPause ) Pause( true ); } } @@ -158,28 +158,28 @@ GDIMetaFile::~GDIMetaFile() size_t GDIMetaFile::GetActionSize() const { - return aList.size(); + return m_aList.size(); } MetaAction* GDIMetaFile::GetAction( size_t nAction ) const { - return (nAction < aList.size()) ? aList[ nAction ] : nullptr; + return (nAction < m_aList.size()) ? m_aList[ nAction ] : nullptr; } MetaAction* GDIMetaFile::FirstAction() { - nCurrentActionElement = 0; - return aList.empty() ? nullptr : aList[ 0 ]; + m_nCurrentActionElement = 0; + return m_aList.empty() ? nullptr : m_aList[ 0 ]; } MetaAction* GDIMetaFile::NextAction() { - return ( nCurrentActionElement + 1 < aList.size() ) ? aList[ ++nCurrentActionElement ] : nullptr; + return ( m_nCurrentActionElement + 1 < m_aList.size() ) ? m_aList[ ++m_nCurrentActionElement ] : nullptr; } MetaAction* GDIMetaFile::ReplaceAction( MetaAction* pAction, size_t nAction ) { - if ( nAction >= aList.size() ) + if ( nAction >= m_aList.size() ) { // this method takes ownership of pAction and is // therefore responsible for deleting it @@ -188,7 +188,7 @@ MetaAction* GDIMetaFile::ReplaceAction( MetaAction* pAction, size_t nAction ) } //fdo#39995 This does't increment the incoming action ref-count nor does it //decrement the outgoing action ref-count - std::swap(pAction, aList[nAction]); + std::swap(pAction, m_aList[nAction]); return pAction; } @@ -202,23 +202,23 @@ GDIMetaFile& GDIMetaFile::operator=( const GDIMetaFile& rMtf ) for( size_t i = 0, n = rMtf.GetActionSize(); i < n; ++i ) { rMtf.GetAction( i )->Duplicate(); - aList.push_back( rMtf.GetAction( i ) ); + m_aList.push_back( rMtf.GetAction( i ) ); } - aPrefMapMode = rMtf.aPrefMapMode; - aPrefSize = rMtf.aPrefSize; - pPrev = rMtf.pPrev; - pNext = rMtf.pNext; - pOutDev = nullptr; - bPause = false; - bRecord = false; - bUseCanvas = rMtf.bUseCanvas; + m_aPrefMapMode = rMtf.m_aPrefMapMode; + m_aPrefSize = rMtf.m_aPrefSize; + m_pPrev = rMtf.m_pPrev; + m_pNext = rMtf.m_pNext; + m_pOutDev = nullptr; + m_bPause = false; + m_bRecord = false; + m_bUseCanvas = rMtf.m_bUseCanvas; - if( rMtf.bRecord ) + if( rMtf.m_bRecord ) { - Record( rMtf.pOutDev ); + Record( rMtf.m_pOutDev ); - if( rMtf.bPause ) + if( rMtf.m_bPause ) Pause( true ); } } @@ -228,20 +228,20 @@ GDIMetaFile& GDIMetaFile::operator=( const GDIMetaFile& rMtf ) bool GDIMetaFile::operator==( const GDIMetaFile& rMtf ) const { - const size_t nObjCount = aList.size(); + const size_t nObjCount = m_aList.size(); bool bRet = false; if( this == &rMtf ) bRet = true; else if( rMtf.GetActionSize() == nObjCount && - rMtf.GetPrefSize() == aPrefSize && - rMtf.GetPrefMapMode() == aPrefMapMode ) + rMtf.GetPrefSize() == m_aPrefSize && + rMtf.GetPrefMapMode() == m_aPrefMapMode ) { bRet = true; for( size_t n = 0; n < nObjCount; n++ ) { - if( aList[ n ] != rMtf.GetAction( n ) ) + if( m_aList[ n ] != rMtf.GetAction( n ) ) { bRet = false; break; @@ -254,68 +254,68 @@ bool GDIMetaFile::operator==( const GDIMetaFile& rMtf ) const void GDIMetaFile::Clear() { - if( bRecord ) + if( m_bRecord ) Stop(); - for( size_t i = 0, n = aList.size(); i < n; ++i ) - aList[ i ]->Delete(); - aList.clear(); + for( size_t i = 0, n = m_aList.size(); i < n; ++i ) + m_aList[ i ]->Delete(); + m_aList.clear(); } void GDIMetaFile::Linker( OutputDevice* pOut, bool bLink ) { if( bLink ) { - pNext = nullptr; - pPrev = pOut->GetConnectMetaFile(); + m_pNext = nullptr; + m_pPrev = pOut->GetConnectMetaFile(); pOut->SetConnectMetaFile( this ); - if( pPrev ) - pPrev->pNext = this; + if( m_pPrev ) + m_pPrev->m_pNext = this; } else { - if( pNext ) + if( m_pNext ) { - pNext->pPrev = pPrev; + m_pNext->m_pPrev = m_pPrev; - if( pPrev ) - pPrev->pNext = pNext; + if( m_pPrev ) + m_pPrev->m_pNext = m_pNext; } else { - if( pPrev ) - pPrev->pNext = nullptr; + if( m_pPrev ) + m_pPrev->m_pNext = nullptr; - pOut->SetConnectMetaFile( pPrev ); + pOut->SetConnectMetaFile( m_pPrev ); } - pPrev = nullptr; - pNext = nullptr; + m_pPrev = nullptr; + m_pNext = nullptr; } } void GDIMetaFile::Record( OutputDevice* pOut ) { - if( bRecord ) + if( m_bRecord ) Stop(); - nCurrentActionElement = aList.empty() ? 0 : (aList.size() - 1); - pOutDev = pOut; - bRecord = true; + m_nCurrentActionElement = m_aList.empty() ? 0 : (m_aList.size() - 1); + m_pOutDev = pOut; + m_bRecord = true; Linker( pOut, true ); } void GDIMetaFile::Play( GDIMetaFile& rMtf ) { - if ( !bRecord && !rMtf.bRecord ) + if ( !m_bRecord && !rMtf.m_bRecord ) { MetaAction* pAction = GetCurAction(); - const size_t nObjCount = aList.size(); + const size_t nObjCount = m_aList.size(); - rMtf.UseCanvas( rMtf.GetUseCanvas() || bUseCanvas ); + rMtf.UseCanvas( rMtf.GetUseCanvas() || m_bUseCanvas ); - for( size_t nCurPos = nCurrentActionElement; nCurPos < nObjCount; nCurPos++ ) + for( size_t nCurPos = m_nCurrentActionElement; nCurPos < nObjCount; nCurPos++ ) { if( pAction ) { @@ -330,10 +330,10 @@ void GDIMetaFile::Play( GDIMetaFile& rMtf ) void GDIMetaFile::Play( OutputDevice* pOut, size_t nPos ) { - if( !bRecord ) + if( !m_bRecord ) { MetaAction* pAction = GetCurAction(); - const size_t nObjCount = aList.size(); + const size_t nObjCount = m_aList.size(); size_t nSyncCount = ( pOut->GetOutDevType() == OUTDEV_WINDOW ) ? 0x000000ff : 0xffffffff; if( nPos > nObjCount ) @@ -351,7 +351,7 @@ void GDIMetaFile::Play( OutputDevice* pOut, size_t nPos ) if( !ImplPlayWithRenderer( pOut, Point(0,0), pOut->GetOutputSize() ) ) { size_t i = 0; - for( size_t nCurPos = nCurrentActionElement; nCurPos < nPos; nCurPos++ ) + for( size_t nCurPos = m_nCurrentActionElement; nCurPos < nPos; nCurPos++ ) { if( pAction ) { @@ -382,7 +382,7 @@ void GDIMetaFile::Play( OutputDevice* pOut, size_t nPos ) bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, Size rLogicDestSize ) { - if (!bUseCanvas) + if (!m_bUseCanvas) return false; Size rDestSize( pOut->LogicToPixel( rLogicDestSize ) ); @@ -587,98 +587,98 @@ void GDIMetaFile::Play( OutputDevice* pOut, const Point& rPos, void GDIMetaFile::Pause( bool _bPause ) { - if( bRecord ) + if( m_bRecord ) { if( _bPause ) { - if( !bPause ) - Linker( pOutDev, false ); + if( !m_bPause ) + Linker( m_pOutDev, false ); } else { - if( bPause ) - Linker( pOutDev, true ); + if( m_bPause ) + Linker( m_pOutDev, true ); } - bPause = _bPause; + m_bPause = _bPause; } } void GDIMetaFile::Stop() { - if( bRecord ) + if( m_bRecord ) { - bRecord = false; + m_bRecord = false; - if( !bPause ) - Linker( pOutDev, false ); + if( !m_bPause ) + Linker( m_pOutDev, false ); else - bPause = false; + m_bPause = false; } } void GDIMetaFile::WindStart() { - if( !bRecord ) - nCurrentActionElement = 0; + if( !m_bRecord ) + m_nCurrentActionElement = 0; } void GDIMetaFile::WindPrev() { - if( !bRecord ) - if ( nCurrentActionElement > 0 ) - --nCurrentActionElement; + if( !m_bRecord ) + if ( m_nCurrentActionElement > 0 ) + --m_nCurrentActionElement; } void GDIMetaFile::AddAction( MetaAction* pAction ) { - aList.push_back( pAction ); + m_aList.push_back( pAction ); - if( pPrev ) + if( m_pPrev ) { pAction->Duplicate(); - pPrev->AddAction( pAction ); + m_pPrev->AddAction( pAction ); } } void GDIMetaFile::AddAction( MetaAction* pAction, size_t nPos ) { - if ( nPos < aList.size() ) + if ( nPos < m_aList.size() ) { - ::std::vector< MetaAction* >::iterator it = aList.begin(); + ::std::vector< MetaAction* >::iterator it = m_aList.begin(); ::std::advance( it, nPos ); - aList.insert( it, pAction ); + m_aList.insert( it, pAction ); } else { - aList.push_back( pAction ); + m_aList.push_back( pAction ); } - if( pPrev ) + if( m_pPrev ) { pAction->Duplicate(); - pPrev->AddAction( pAction, nPos ); + m_pPrev->AddAction( pAction, nPos ); } } void GDIMetaFile::push_back( MetaAction* pAction ) { - aList.push_back( pAction ); + m_aList.push_back( pAction ); } void GDIMetaFile::RemoveAction( size_t nPos ) { - if ( nPos < aList.size() ) + if ( nPos < m_aList.size() ) { - ::std::vector< MetaAction* >::iterator it = aList.begin(); + ::std::vector< MetaAction* >::iterator it = m_aList.begin(); ::std::advance( it, nPos ); (*it)->Delete(); - aList.erase( it ); + m_aList.erase( it ); } - if( pPrev ) - pPrev->RemoveAction( nPos ); + if( m_pPrev ) + m_pPrev->RemoveAction( nPos ); } bool GDIMetaFile::Mirror( BmpMirrorFlags nMirrorFlags ) @@ -739,7 +739,7 @@ void GDIMetaFile::Move( long nX, long nY ) if( pAct->GetRefCount() > 1 ) { - aList[ nCurrentActionElement ] = pModAct = pAct->Clone(); + m_aList[ m_nCurrentActionElement ] = pModAct = pAct->Clone(); pAct->Delete(); } else @@ -774,7 +774,7 @@ void GDIMetaFile::Move( long nX, long nY, long nDPIX, long nDPIY ) if( pAct->GetRefCount() > 1 ) { - aList[ nCurrentActionElement ] = pModAct = pAct->Clone(); + m_aList[ m_nCurrentActionElement ] = pModAct = pAct->Clone(); pAct->Delete(); } else @@ -808,7 +808,7 @@ void GDIMetaFile::Scale( double fScaleX, double fScaleY ) if( pAct->GetRefCount() > 1 ) { - aList[ nCurrentActionElement ] = pModAct = pAct->Clone(); + m_aList[ m_nCurrentActionElement ] = pModAct = pAct->Clone(); pAct->Delete(); } else @@ -817,8 +817,8 @@ void GDIMetaFile::Scale( double fScaleX, double fScaleY ) pModAct->Scale( fScaleX, fScaleY ); } - aPrefSize.Width() = FRound( aPrefSize.Width() * fScaleX ); - aPrefSize.Height() = FRound( aPrefSize.Height() * fScaleY ); + m_aPrefSize.Width() = FRound( m_aPrefSize.Width() * fScaleX ); + m_aPrefSize.Height() = FRound( m_aPrefSize.Height() * fScaleY ); } void GDIMetaFile::Scale( const Fraction& rScaleX, const Fraction& rScaleY ) @@ -852,7 +852,7 @@ void GDIMetaFile::Clip( const Rectangle& i_rClipRect ) if( pOldAct->IsClipping() ) aNewReg.Intersect( pOldAct->GetRegion() ); MetaClipRegionAction* pNewAct = new MetaClipRegionAction( aNewReg, true ); - aList[ nCurrentActionElement ] = pNewAct; + m_aList[ m_nCurrentActionElement ] = pNewAct; pOldAct->Delete(); } } @@ -1361,16 +1361,16 @@ void GDIMetaFile::Rotate( long nAngle10 ) ( MetaActionType::PUSH == nActionType ) || ( MetaActionType::POP == nActionType ) ) { - aRotAnchor = OutputDevice::LogicToLogic( aOrigin, aPrefMapMode, aMapVDev->GetMapMode() ); - aRotOffset = OutputDevice::LogicToLogic( aOffset, aPrefMapMode, aMapVDev->GetMapMode() ); + aRotAnchor = OutputDevice::LogicToLogic( aOrigin, m_aPrefMapMode, aMapVDev->GetMapMode() ); + aRotOffset = OutputDevice::LogicToLogic( aOffset, m_aPrefMapMode, aMapVDev->GetMapMode() ); } } break; } } - aMtf.aPrefMapMode = aPrefMapMode; - aMtf.aPrefSize = aNewBound.GetSize(); + aMtf.m_aPrefMapMode = m_aPrefMapMode; + aMtf.m_aPrefSize = aNewBound.GetSize(); *this = aMtf; } @@ -1922,9 +1922,9 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol { GDIMetaFile aMtf; - aMtf.aPrefSize = aPrefSize; - aMtf.aPrefMapMode = aPrefMapMode; - aMtf.bUseCanvas = bUseCanvas; + aMtf.m_aPrefSize = m_aPrefSize; + aMtf.m_aPrefMapMode = m_aPrefMapMode; + aMtf.m_bUseCanvas = m_bUseCanvas; for( MetaAction* pAction = FirstAction(); pAction; pAction = NextAction() ) { @@ -2768,8 +2768,8 @@ SvStream& ReadGDIMetaFile( SvStream& rIStm, GDIMetaFile& rGDIMetaFile ) std::unique_ptr<VersionCompat> pCompat(new VersionCompat( rIStm, StreamMode::READ )); rIStm.ReadUInt32( nStmCompressMode ); - ReadMapMode( rIStm, rGDIMetaFile.aPrefMapMode ); - ReadPair( rIStm, rGDIMetaFile.aPrefSize ); + ReadMapMode( rIStm, rGDIMetaFile.m_aPrefMapMode ); + ReadPair( rIStm, rGDIMetaFile.m_aPrefSize ); rIStm.ReadUInt32( nCount ); pCompat.reset(); // destructor writes stuff into the header @@ -2866,8 +2866,8 @@ SvStream& GDIMetaFile::Write( SvStream& rOStm ) pCompat = new VersionCompat( rOStm, StreamMode::WRITE, 1 ); rOStm.WriteUInt32( static_cast<sal_uInt32>(nStmCompressMode) ); - WriteMapMode( rOStm, aPrefMapMode ); - WritePair( rOStm, aPrefSize ); + WriteMapMode( rOStm, m_aPrefMapMode ); + WritePair( rOStm, m_aPrefSize ); rOStm.WriteUInt32( GetActionSize() ); delete pCompat; @@ -2957,7 +2957,7 @@ bool GDIMetaFile::CreateThumbnail(BitmapEx& rBitmapEx, sal_uInt32 nMaximumExtent void GDIMetaFile::UseCanvas( bool _bUseCanvas ) { - bUseCanvas = _bUseCanvas; + m_bUseCanvas = _bUseCanvas; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |