summaryrefslogtreecommitdiff
path: root/vcl/source/outdev
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2014-11-12 20:27:09 +1100
committerChris Sherlock <chris.sherlock79@gmail.com>2014-11-13 18:31:11 +1100
commitd1ec0bf64ce7c099f199e62f148187509c998d3a (patch)
tree8804e3c0a1499ccb506881fa90b056b88f4f75fc /vcl/source/outdev
parente6c7c618d1c4f78d4e11fcc9ee40f70aff583c90 (diff)
vcl: rename variable in OutputDevice:drawOutDevDirect()
pGraphics2 is quite non-descriptive in OutputDevice::drawOutDevDirect(). It's actually the source SalGraphics instance of the source OutputDevice, so rename it to pSrcGraphics which is rather more clear. Change-Id: Iea8aa7410a294e012fccd9d4c8d7ff9c1270aa74
Diffstat (limited to 'vcl/source/outdev')
-rw-r--r--vcl/source/outdev/outdev.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index af7d6431e57e..78eaddc114f7 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -593,10 +593,10 @@ void OutputDevice::CopyDeviceArea( SalTwoRect& aPosAry, sal_uInt32 /*nFlags*/)
void OutputDevice::drawOutDevDirect( const OutputDevice* pSrcDev, SalTwoRect& rPosAry )
{
- SalGraphics* pGraphics2;
+ SalGraphics* pSrcGraphics;
if ( this == pSrcDev )
- pGraphics2 = NULL;
+ pSrcGraphics = NULL;
else
{
if ( (GetOutDevType() != pSrcDev->GetOutDevType()) ||
@@ -607,12 +607,12 @@ void OutputDevice::drawOutDevDirect( const OutputDevice* pSrcDev, SalTwoRect& rP
if ( !((OutputDevice*)pSrcDev)->AcquireGraphics() )
return;
}
- pGraphics2 = pSrcDev->mpGraphics;
+ pSrcGraphics = pSrcDev->mpGraphics;
}
else
{
if ( static_cast<vcl::Window*>(this)->mpWindowImpl->mpFrameWindow == static_cast<const vcl::Window*>(pSrcDev)->mpWindowImpl->mpFrameWindow )
- pGraphics2 = NULL;
+ pSrcGraphics = NULL;
else
{
if ( !pSrcDev->mpGraphics )
@@ -620,7 +620,7 @@ void OutputDevice::drawOutDevDirect( const OutputDevice* pSrcDev, SalTwoRect& rP
if ( !((OutputDevice*)pSrcDev)->AcquireGraphics() )
return;
}
- pGraphics2 = pSrcDev->mpGraphics;
+ pSrcGraphics = pSrcDev->mpGraphics;
if ( !mpGraphics )
{
@@ -645,14 +645,14 @@ void OutputDevice::drawOutDevDirect( const OutputDevice* pSrcDev, SalTwoRect& rP
// mirroring may be required
// because only windows have a SalGraphicsLayout
// mirroring is performed here
- if( (GetOutDevType() != OUTDEV_WINDOW) && pGraphics2 && (pGraphics2->GetLayout() & SAL_LAYOUT_BIDI_RTL) )
+ if( (GetOutDevType() != OUTDEV_WINDOW) && pSrcGraphics && (pSrcGraphics->GetLayout() & SAL_LAYOUT_BIDI_RTL) )
{
SalTwoRect aPosAry2 = rPosAry;
- pGraphics2->mirror( aPosAry2.mnSrcX, aPosAry2.mnSrcWidth, pSrcDev );
- mpGraphics->CopyBits( aPosAry2, pGraphics2, this, pSrcDev );
+ pSrcGraphics->mirror( aPosAry2.mnSrcX, aPosAry2.mnSrcWidth, pSrcDev );
+ mpGraphics->CopyBits( aPosAry2, pSrcGraphics, this, pSrcDev );
}
else
- mpGraphics->CopyBits( rPosAry, pGraphics2, this, pSrcDev );
+ mpGraphics->CopyBits( rPosAry, pSrcGraphics, this, pSrcDev );
}
}