diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/components/dtranscomp.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/gdi/bitmapex.cxx | 26 | ||||
| -rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 6 |
3 files changed, 18 insertions, 18 deletions
diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index 0ae1f7ff4467..610868196601 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -161,7 +161,7 @@ void GenericClipboard::setContents( m_aContents = xTrans; m_aOwner = xClipboardOwner; - std::list< Reference< datatransfer::clipboard::XClipboardListener > > xListeners( m_aListeners ); + std::list< Reference< datatransfer::clipboard::XClipboardListener > > aListeners( m_aListeners ); datatransfer::clipboard::ClipboardEvent aEv; aEv.Contents = m_aContents; @@ -170,7 +170,7 @@ void GenericClipboard::setContents( if( xOldOwner.is() && xOldOwner != xClipboardOwner ) xOldOwner->lostOwnership( this, xOldContents ); for( std::list< Reference< datatransfer::clipboard::XClipboardListener > >::iterator it = - xListeners.begin(); it != xListeners.end() ; ++it ) + aListeners.begin(); it != aListeners.end() ; ++it ) { (*it)->changedContents( aEv ); } diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index e12eabd97cc0..03ad08eba2b1 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -1214,16 +1214,16 @@ BitmapEx createBlendFrame( aContent.Erase(COL_BLACK); - BitmapWriteAccess* xContent = aContent.AcquireWriteAccess(); + BitmapWriteAccess* pContent = aContent.AcquireWriteAccess(); BitmapWriteAccess* pAlpha = aAlpha.AcquireWriteAccess(); - if(xContent && pAlpha) + if(pContent && pAlpha) { long x(0); long y(0); // x == 0, y == 0, top-left corner - xContent->SetPixel(0, 0, aColorTopLeft); + pContent->SetPixel(0, 0, aColorTopLeft); pAlpha->SetPixelIndex(0, 0, nAlpha); // y == 0, top line left to right @@ -1232,7 +1232,7 @@ BitmapEx createBlendFrame( Color aMix(aColorTopLeft); aMix.Merge(aColorTopRight, 255 - sal_uInt8((x * 255) / nW)); - xContent->SetPixel(0, x, aMix); + pContent->SetPixel(0, x, aMix); pAlpha->SetPixelIndex(0, x, nAlpha); } @@ -1240,7 +1240,7 @@ BitmapEx createBlendFrame( // #i123690# Caution! When nW is 1, x == nW is possible (!) if(x < nW) { - xContent->SetPixel(0, x, aColorTopRight); + pContent->SetPixel(0, x, aColorTopRight); pAlpha->SetPixelIndex(0, x, nAlpha); } @@ -1250,7 +1250,7 @@ BitmapEx createBlendFrame( Color aMixA(aColorTopLeft); aMixA.Merge(aColorBottomLeft, 255 - sal_uInt8((y * 255) / nH)); - xContent->SetPixel(y, 0, aMixA); + pContent->SetPixel(y, 0, aMixA); pAlpha->SetPixelIndex(y, 0, nAlpha); // #i123690# Caution! When nW is 1, x == nW is possible (!) @@ -1259,7 +1259,7 @@ BitmapEx createBlendFrame( Color aMixB(aColorTopRight); aMixB.Merge(aColorBottomRight, 255 - sal_uInt8((y * 255) / nH)); - xContent->SetPixel(y, x, aMixB); + pContent->SetPixel(y, x, aMixB); pAlpha->SetPixelIndex(y, x, nAlpha); } } @@ -1268,7 +1268,7 @@ BitmapEx createBlendFrame( if(y < nH) { // x == 0, y == nH - 1, bottom-left corner - xContent->SetPixel(y, 0, aColorBottomLeft); + pContent->SetPixel(y, 0, aColorBottomLeft); pAlpha->SetPixelIndex(y, 0, nAlpha); // y == nH - 1, bottom line left to right @@ -1277,7 +1277,7 @@ BitmapEx createBlendFrame( Color aMix(aColorBottomLeft); aMix.Merge(aColorBottomRight, 255 - sal_uInt8(((x - 0)* 255) / nW)); - xContent->SetPixel(y, x, aMix); + pContent->SetPixel(y, x, aMix); pAlpha->SetPixelIndex(y, x, nAlpha); } @@ -1285,21 +1285,21 @@ BitmapEx createBlendFrame( // #i123690# Caution! When nW is 1, x == nW is possible (!) if(x < nW) { - xContent->SetPixel(y, x, aColorBottomRight); + pContent->SetPixel(y, x, aColorBottomRight); pAlpha->SetPixelIndex(y, x, nAlpha); } } - Bitmap::ReleaseAccess(xContent); + Bitmap::ReleaseAccess(pContent); Bitmap::ReleaseAccess(pAlpha); pBlendFrameCache->m_aLastResult = BitmapEx(aContent, aAlpha); } else { - if(xContent) + if(pContent) { - Bitmap::ReleaseAccess(xContent); + Bitmap::ReleaseAccess(pContent); } if(pAlpha) diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 7595aeae07bb..86723116487c 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -7712,10 +7712,10 @@ sal_Int32 PDFWriterImpl::emitOutputIntent() cmsSaveProfileToMem(hProfile, nullptr, &nBytesNeeded); if (!nBytesNeeded) return 0; - std::vector<unsigned char> xBuffer(nBytesNeeded); - cmsSaveProfileToMem(hProfile, &xBuffer[0], &nBytesNeeded); + std::vector<unsigned char> aBuffer(nBytesNeeded); + cmsSaveProfileToMem(hProfile, &aBuffer[0], &nBytesNeeded); cmsCloseProfile(hProfile); - bool written = writeBuffer( &xBuffer[0], (sal_Int32) xBuffer.size() ); + bool written = writeBuffer( &aBuffer[0], (sal_Int32) aBuffer.size() ); disableStreamEncryption(); endCompression(); sal_uInt64 nEndStreamPos = 0; |