summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2014-04-23 07:22:08 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2014-04-23 07:23:43 +1000
commit8708d30369685ba84a0b9c335fcaccd4814fa842 (patch)
tree4443cc88e8f2bbae2b20b351470856508311fa4e
parent665bc42d7504c3896a485c8bab17b8eff7d119df (diff)
Rename OutputDevice::ImplGetGraphics to GetGraphics
Change-Id: I4086978f2292538c458802a7fb56c0d3826f2def
-rw-r--r--include/vcl/outdev.hxx6
-rw-r--r--vcl/source/gdi/bitmap.cxx2
-rw-r--r--vcl/source/gdi/embeddedfontshelper.cxx2
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx6
-rw-r--r--vcl/source/gdi/print.cxx4
-rw-r--r--vcl/source/gdi/virdev.cxx8
-rw-r--r--vcl/source/outdev/bitmap.cxx4
-rw-r--r--vcl/source/outdev/curvedshapes.cxx8
-rw-r--r--vcl/source/outdev/font.cxx20
-rw-r--r--vcl/source/outdev/gradient.cxx2
-rw-r--r--vcl/source/outdev/hatch.cxx2
-rw-r--r--vcl/source/outdev/line.cxx4
-rw-r--r--vcl/source/outdev/nativecontrols.cxx8
-rw-r--r--vcl/source/outdev/outdev.cxx26
-rw-r--r--vcl/source/outdev/pixel.cxx10
-rw-r--r--vcl/source/outdev/polygon.cxx8
-rw-r--r--vcl/source/outdev/polyline.cxx8
-rw-r--r--vcl/source/outdev/rect.cxx4
-rw-r--r--vcl/source/outdev/text.cxx10
-rw-r--r--vcl/source/outdev/textline.cxx4
-rw-r--r--vcl/source/outdev/transparent.cxx4
-rw-r--r--vcl/source/window/window.cxx4
-rw-r--r--vcl/source/window/window2.cxx8
23 files changed, 81 insertions, 81 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index defa3dd367d3..901cfbe1a4d9 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -56,7 +56,7 @@
return; \
\
if ( !mpGraphics ) \
- if ( !ImplGetGraphics() ) \
+ if ( !AcquireGraphics() ) \
return; \
\
if ( mbInitClipRegion ) \
@@ -401,8 +401,8 @@ public:
@returns SalGraphics instance.
*/
- SAL_DLLPRIVATE SalGraphics const *ImplGetGraphics() const;
- SAL_DLLPRIVATE SalGraphics* ImplGetGraphics();
+ SAL_DLLPRIVATE SalGraphics const *GetGraphics() const;
+ SAL_DLLPRIVATE SalGraphics* GetGraphics();
/** Acquire a graphics device that the output device uses to draw on.
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 2bd739e2bf30..dee0722356ba 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -1642,7 +1642,7 @@ Bitmap Bitmap::CreateDisplayBitmap( OutputDevice* pDisplay )
{
Bitmap aDispBmp( *this );
- if( mpImpBmp && ( pDisplay->mpGraphics || pDisplay->ImplGetGraphics() ) )
+ if( mpImpBmp && ( pDisplay->mpGraphics || pDisplay->AcquireGraphics() ) )
{
ImpBitmap* pImpDispBmp = new ImpBitmap;
diff --git a/vcl/source/gdi/embeddedfontshelper.cxx b/vcl/source/gdi/embeddedfontshelper.cxx
index 05730b7cc959..1eca07e2833e 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -230,7 +230,7 @@ OUString EmbeddedFontsHelper::fontFileUrl( const OUString& familyName, FontFamil
return url;
}
bool ok = false;
- SalGraphics* graphics = Application::GetDefaultDevice()->ImplGetGraphics();
+ SalGraphics* graphics = Application::GetDefaultDevice()->GetGraphics();
PhysicalFontCollection fonts;
graphics->GetDevFontList( &fonts );
boost::scoped_ptr< ImplGetDevFontList > fontInfo( fonts.GetDevFontList());
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 9d007164c3c2..6dcaf0a5544b 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -3835,7 +3835,7 @@ void PDFWriterImpl::appendBuiltinFontsToDict( OStringBuffer& rDict ) const
bool PDFWriterImpl::emitFonts()
{
- if( ! m_pReferenceDevice->ImplGetGraphics() )
+ if( ! m_pReferenceDevice->AcquireGraphics() )
return false;
OStringBuffer aLine( 1024 );
@@ -7041,7 +7041,7 @@ void PDFWriterImpl::registerGlyphs( int nGlyphs,
rNewGlyph.m_nFontID = pMappedFontObjects[i];
rNewGlyph.m_nSubsetGlyphID = nNewId;
}
- getReferenceDevice()->ImplGetGraphics();
+ getReferenceDevice()->AcquireGraphics();
const bool bVertical = ((pGlyphs[i] & GF_ROTMASK) != 0);
pGlyphWidths[i] = m_aFontCache.getGlyphWidth( pCurrentFont,
nFontGlyphId,
@@ -7064,7 +7064,7 @@ void PDFWriterImpl::registerGlyphs( int nGlyphs,
const Ucs2SIntMap* pEncoding = NULL;
const Ucs2OStrMap* pNonEncoded = NULL;
- getReferenceDevice()->ImplGetGraphics();
+ getReferenceDevice()->AcquireGraphics();
pEncoding = m_pReferenceDevice->mpGraphics->GetFontEncodingVector( pCurrentFont, &pNonEncoded );
Ucs2SIntMap::const_iterator enc_it;
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index f017ee602d65..47190ff930f5 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -770,7 +770,7 @@ void Printer::ImplInit( SalPrinterQueueInfo* pInfo )
}
// we need a graphics
- if ( !ImplGetGraphics() )
+ if ( !AcquireGraphics() )
{
ImplInitDisplay( NULL );
return;
@@ -937,7 +937,7 @@ SalPrinterQueueInfo* Printer::ImplGetQueueInfo( const OUString& rPrinterName,
void Printer::ImplUpdatePageData()
{
// we need a graphics
- if ( !ImplGetGraphics() )
+ if ( !AcquireGraphics() )
return;
mpGraphics->GetResolution( mnDPIX, mnDPIY );
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 17926b8e449c..616c68b3e003 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -133,7 +133,7 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev,
SalGraphics* pGraphics;
if ( !pOutDev->mpGraphics )
- ((OutputDevice*)pOutDev)->ImplGetGraphics();
+ pOutDev->AcquireGraphics();
pGraphics = pOutDev->mpGraphics;
if ( pGraphics )
mpVirDev = pSVData->mpDefInst->CreateVirtualDevice( pGraphics, nDX, nDY, nBitCount, pData );
@@ -315,7 +315,7 @@ bool VirtualDevice::InnerImplSetOutputSizePixel( const Size& rNewSize, bool bEra
// we need a graphics
if ( !mpGraphics )
{
- if ( !ImplGetGraphics() )
+ if ( !AcquireGraphics() )
return false;
}
@@ -422,7 +422,7 @@ void VirtualDevice::EnableRTL( bool bEnable )
// under rare circumstances in the UI, eg the valueset control
// because each virdev has its own SalGraphics we can safely switch the SalGraphics here
// ...hopefully
- if( ImplGetGraphics() )
+ if( AcquireGraphics() )
mpGraphics->SetLayout( bEnable ? SAL_LAYOUT_BIDI_RTL : 0 );
OutputDevice::EnableRTL(bEnable);
@@ -518,7 +518,7 @@ void VirtualDevice::ImplSetReferenceDevice( RefDevMode i_eRefDevMode, sal_Int32
delete mpFontCache;
// get font list with scalable fonts only
- ImplGetGraphics();
+ AcquireGraphics();
mpFontCollection = pSVData->maGDIData.mpScreenFontList->Clone( true, false );
// prepare to use new font lists
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 68e13c742535..056af7ec2ef2 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -886,7 +886,7 @@ Bitmap OutputDevice::GetBitmap( const Point& rSrcPt, const Size& rSize ) const
long nWidth = ImplLogicWidthToDevicePixel( rSize.Width() );
long nHeight = ImplLogicHeightToDevicePixel( rSize.Height() );
- if ( mpGraphics || ( (OutputDevice*) this )->ImplGetGraphics() )
+ if ( mpGraphics || AcquireGraphics() )
{
if ( nWidth > 0 && nHeight > 0 && nX <= (mnOutWidth + mnOutOffX) && nY <= (mnOutHeight + mnOutOffY))
{
@@ -932,7 +932,7 @@ Bitmap OutputDevice::GetBitmap( const Point& rSrcPt, const Size& rSize ) const
if ( aVDev.SetOutputSizePixel( aRect.GetSize() ) )
{
- if ( ((OutputDevice*)&aVDev)->mpGraphics || ((OutputDevice*)&aVDev)->ImplGetGraphics() )
+ if ( ((OutputDevice*)&aVDev)->mpGraphics || ((OutputDevice*)&aVDev)->AcquireGraphics() )
{
SalTwoRect aPosAry;
diff --git a/vcl/source/outdev/curvedshapes.cxx b/vcl/source/outdev/curvedshapes.cxx
index 160d06b3bc12..c07c19f96268 100644
--- a/vcl/source/outdev/curvedshapes.cxx
+++ b/vcl/source/outdev/curvedshapes.cxx
@@ -46,7 +46,7 @@ void OutputDevice::DrawEllipse( const Rectangle& rRect )
// we need a graphics
if ( !mpGraphics )
{
- if ( !ImplGetGraphics() )
+ if ( !AcquireGraphics() )
return;
}
@@ -93,7 +93,7 @@ void OutputDevice::DrawArc( const Rectangle& rRect,
// we need a graphics
if ( !mpGraphics )
{
- if ( !ImplGetGraphics() )
+ if ( !AcquireGraphics() )
return;
}
@@ -136,7 +136,7 @@ void OutputDevice::DrawPie( const Rectangle& rRect,
// we need a graphics
if ( !mpGraphics )
{
- if ( !ImplGetGraphics() )
+ if ( !AcquireGraphics() )
return;
}
@@ -186,7 +186,7 @@ void OutputDevice::DrawChord( const Rectangle& rRect,
// we need a graphics
if ( !mpGraphics )
{
- if ( !ImplGetGraphics() )
+ if ( !AcquireGraphics() )
return;
}
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index ceea7a9d58c4..b83f7dfb74d7 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -172,7 +172,7 @@ void OutputDevice::ImplClearFontData( const bool bNewFontLists )
}
// release all physically selected fonts on this device
- if( ImplGetGraphics() )
+ if( AcquireGraphics() )
mpGraphics->ReleaseFonts();
}
@@ -186,7 +186,7 @@ void OutputDevice::ImplClearFontData( const bool bNewFontLists )
if ( bNewFontLists )
{
// we need a graphics
- if ( ImplGetGraphics() )
+ if ( AcquireGraphics() )
{
if( mpFontCollection && mpFontCollection != pSVData->maGDIData.mpScreenFontList )
mpFontCollection->Clear();
@@ -225,7 +225,7 @@ void OutputDevice::ImplRefreshFontData( const bool bNewFontLists )
if ( bNewFontLists )
{
// we need a graphics
- if ( ImplGetGraphics() )
+ if ( AcquireGraphics() )
{
if( mpPDFWriter )
{
@@ -272,7 +272,7 @@ void OutputDevice::ImplUpdateAllFontData( bool bNewFontLists )
Window * pFrame = pSVData->maWinData.mpFirstFrame;
if ( pFrame )
{
- if ( pFrame->ImplGetGraphics() )
+ if ( pFrame->AcquireGraphics() )
{
// Stupid typecast here and somewhere ((OutputDevice*)&aVDev)->, because bug in .NET2002 compiler
OutputDevice *pDevice = (OutputDevice*)pFrame;
@@ -1131,7 +1131,7 @@ void OutputDevice::ImplInitFontList() const
{
if( !mpFontCollection->Count() )
{
- if( mpGraphics || ImplGetGraphics() )
+ if( mpGraphics || AcquireGraphics() )
{
SAL_INFO( "vcl.gdi", "OutputDevice::ImplInitFontList()" );
mpGraphics->GetDevFontList( mpFontCollection );
@@ -1192,7 +1192,7 @@ bool OutputDevice::ImplNewFont() const
return true;
// we need a graphics
- if ( !mpGraphics && !ImplGetGraphics() )
+ if ( !mpGraphics && !AcquireGraphics() )
return false;
SalGraphics* pGraphics = mpGraphics;
ImplInitFontList();
@@ -2087,7 +2087,7 @@ bool OutputDevice::AddTempDevFont( const OUString& rFileURL, const OUString& rFo
ImplInitFontList();
- if( !mpGraphics && !ImplGetGraphics() )
+ if( !mpGraphics && !AcquireGraphics() )
return false;
bool bRC = mpGraphics->AddTempDevFont( mpFontCollection, rFileURL, rFontName );
@@ -2225,7 +2225,7 @@ SystemFontData OutputDevice::GetSysFontData(int nFallbacklevel) const
SystemFontData aSysFontData;
aSysFontData.nSize = sizeof(aSysFontData);
- if (!mpGraphics) ImplGetGraphics();
+ if (!mpGraphics) AcquireGraphics();
if (mpGraphics) aSysFontData = mpGraphics->GetSysFontData(nFallbacklevel);
return aSysFontData;
@@ -2299,7 +2299,7 @@ bool OutputDevice::GetGlyphBoundRects( const Point& rOrigin, const OUString& rSt
bool OutputDevice::GetFontCapabilities( FontCapabilities& rFontCapabilities ) const
{
// we need a graphics
- if( !mpGraphics && !ImplGetGraphics() )
+ if( !mpGraphics && !AcquireGraphics() )
return false;
if( mbNewFont )
@@ -2317,7 +2317,7 @@ bool OutputDevice::GetFontCharMap( FontCharMap& rFontCharMap ) const
rFontCharMap.Reset();
// we need a graphics
- if( !mpGraphics && !ImplGetGraphics() )
+ if( !mpGraphics && !AcquireGraphics() )
return false;
if( mbNewFont )
diff --git a/vcl/source/outdev/gradient.cxx b/vcl/source/outdev/gradient.cxx
index 9df5917ee5e1..2357f5e08ea9 100644
--- a/vcl/source/outdev/gradient.cxx
+++ b/vcl/source/outdev/gradient.cxx
@@ -108,7 +108,7 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly,
// do nothing if the rectangle is empty
if ( !aRect.IsEmpty() )
{
- if( !mpGraphics && !ImplGetGraphics() )
+ if( !mpGraphics && !AcquireGraphics() )
return;
// secure clip region
diff --git a/vcl/source/outdev/hatch.cxx b/vcl/source/outdev/hatch.cxx
index f89a00406d5a..5d313b526299 100644
--- a/vcl/source/outdev/hatch.cxx
+++ b/vcl/source/outdev/hatch.cxx
@@ -82,7 +82,7 @@ void OutputDevice::DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch
if( !IsDeviceOutputNecessary() || ImplIsRecordLayout() )
return;
- if( !mpGraphics && !ImplGetGraphics() )
+ if( !mpGraphics && !AcquireGraphics() )
return;
if( mbInitClipRegion )
diff --git a/vcl/source/outdev/line.cxx b/vcl/source/outdev/line.cxx
index c6e9a865a635..13f1d65cac1b 100644
--- a/vcl/source/outdev/line.cxx
+++ b/vcl/source/outdev/line.cxx
@@ -49,7 +49,7 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt,
if( !mpGraphics )
{
- if ( !ImplGetGraphics() )
+ if ( !AcquireGraphics() )
return;
}
@@ -96,7 +96,7 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt )
if ( !mpGraphics )
{
- if ( !ImplGetGraphics() )
+ if ( !AcquireGraphics() )
return;
}
diff --git a/vcl/source/outdev/nativecontrols.cxx b/vcl/source/outdev/nativecontrols.cxx
index 2a78cce09f9e..b4f35a2cb0d9 100644
--- a/vcl/source/outdev/nativecontrols.cxx
+++ b/vcl/source/outdev/nativecontrols.cxx
@@ -146,7 +146,7 @@ bool OutputDevice::IsNativeControlSupported( ControlType nType, ControlPart nPar
return false;
if ( !mpGraphics )
- if ( !ImplGetGraphics() )
+ if ( !AcquireGraphics() )
return false;
return( mpGraphics->IsNativeControlSupported(nType, nPart) );
@@ -162,7 +162,7 @@ bool OutputDevice::HitTestNativeControl( ControlType nType,
return false;
if ( !mpGraphics )
- if ( !ImplGetGraphics() )
+ if ( !AcquireGraphics() )
return false;
Point aWinOffs( mnOutOffX, mnOutOffY );
@@ -263,7 +263,7 @@ bool OutputDevice::DrawNativeControl( ControlType nType,
// make sure the current clip region is initialized correctly
if ( !mpGraphics )
- if ( !ImplGetGraphics() )
+ if ( !AcquireGraphics() )
return false;
if ( mbInitClipRegion )
@@ -304,7 +304,7 @@ bool OutputDevice::GetNativeControlRegion( ControlType nType,
return false;
if ( !mpGraphics )
- if ( !ImplGetGraphics() )
+ if ( !AcquireGraphics() )
return false;
// Convert the coordinates from relative to Window-absolute, so we draw
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index 56c27ca892d7..7b8142024f32 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -164,7 +164,7 @@ static void ImplDeleteObjStack( ImplObjStack* pObjStack )
bool OutputDevice::ImplIsAntiparallel() const
{
bool bRet = false;
- if( ImplGetGraphics() )
+ if( AcquireGraphics() )
{
if( ( (mpGraphics->GetLayout() & SAL_LAYOUT_BIDI_RTL) && ! IsRTLEnabled() ) ||
( ! (mpGraphics->GetLayout() & SAL_LAYOUT_BIDI_RTL) && IsRTLEnabled() ) )
@@ -324,7 +324,7 @@ OutputDevice::~OutputDevice()
bool OutputDevice::supportsOperation( OutDevSupportType eType ) const
{
if( !mpGraphics )
- if( !ImplGetGraphics() )
+ if( !AcquireGraphics() )
return false;
const bool bHasSupport = mpGraphics->supportsOperation( eType );
return bHasSupport;
@@ -340,7 +340,7 @@ void OutputDevice::EnableRTL( bool bEnable )
bool OutputDevice::HasMirroredGraphics() const
{
- return ( ImplGetGraphics() && (mpGraphics->GetLayout() & SAL_LAYOUT_BIDI_RTL) );
+ return ( AcquireGraphics() && (mpGraphics->GetLayout() & SAL_LAYOUT_BIDI_RTL) );
}
// note: the coordiantes to be remirrored are in frame coordiantes !
@@ -376,7 +376,7 @@ void OutputDevice::ReMirror( Region &rRegion ) const
}
-SalGraphics* OutputDevice::ImplGetGraphics()
+SalGraphics* OutputDevice::GetGraphics()
{
DBG_TESTSOLARMUTEX();
@@ -391,7 +391,7 @@ SalGraphics* OutputDevice::ImplGetGraphics()
return mpGraphics;
}
-SalGraphics const *OutputDevice::ImplGetGraphics() const
+SalGraphics const *OutputDevice::GetGraphics() const
{
DBG_TESTSOLARMUTEX();
@@ -496,7 +496,7 @@ void OutputDevice::ImplDrawOutDevDirect( const OutputDevice* pSrcDev, SalTwoRect
{
if ( !pSrcDev->mpGraphics )
{
- if ( !((OutputDevice*)pSrcDev)->ImplGetGraphics() )
+ if ( !((OutputDevice*)pSrcDev)->AcquireGraphics() )
return;
}
pGraphics2 = pSrcDev->mpGraphics;
@@ -509,14 +509,14 @@ void OutputDevice::ImplDrawOutDevDirect( const OutputDevice* pSrcDev, SalTwoRect
{
if ( !pSrcDev->mpGraphics )
{
- if ( !((OutputDevice*)pSrcDev)->ImplGetGraphics() )
+ if ( !((OutputDevice*)pSrcDev)->AcquireGraphics() )
return;
}
pGraphics2 = pSrcDev->mpGraphics;
if ( !mpGraphics )
{
- if ( !ImplGetGraphics() )
+ if ( !AcquireGraphics() )
return;
}
DBG_ASSERT( mpGraphics && pSrcDev->mpGraphics,
@@ -720,7 +720,7 @@ void OutputDevice::ImplDrawFrameDev( const Point& rPt, const Point& rDevPt, cons
if ( !mpGraphics )
{
- if ( !ImplGetGraphics() )
+ if ( !AcquireGraphics() )
return;
}
@@ -801,7 +801,7 @@ void OutputDevice::SetRasterOp( RasterOp eRasterOp )
meRasterOp = eRasterOp;
mbInitLineColor = mbInitFillColor = true;
- if( mpGraphics || ImplGetGraphics() )
+ if( mpGraphics || AcquireGraphics() )
mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp), ROP_INVERT == meRasterOp );
}
@@ -1196,7 +1196,7 @@ sal_uInt16 OutputDevice::GetBitCount() const
// we need a graphics instance
if ( !mpGraphics )
{
- if ( !((OutputDevice*)this)->ImplGetGraphics() )
+ if ( !((OutputDevice*)this)->AcquireGraphics() )
return 0;
}
@@ -1230,7 +1230,7 @@ SystemGraphicsData OutputDevice::GetSystemGfxData() const
{
if ( !mpGraphics )
{
- if ( !ImplGetGraphics() )
+ if ( !AcquireGraphics() )
return SystemGraphicsData();
}
@@ -1316,7 +1316,7 @@ bool OutputDevice::DrawEPS( const Point& rPoint, const Size& rSize,
// draw the real EPS graphics
if( rGfxLink.GetData() && rGfxLink.GetDataSize() )
{
- if( !mpGraphics && !ImplGetGraphics() )
+ if( !mpGraphics && !AcquireGraphics() )
return bDrawn;
if( mbInitClipRegion )
diff --git a/vcl/source/outdev/pixel.cxx b/vcl/source/outdev/pixel.cxx
index 5da1ca38d1b3..3375eb20a3f7 100644
--- a/vcl/source/outdev/pixel.cxx
+++ b/vcl/source/outdev/pixel.cxx
@@ -51,10 +51,10 @@ Color OutputDevice::GetPixel( const Point& rPt ) const
Color aColor;
- if ( mpGraphics || ((OutputDevice*)this)->ImplGetGraphics() )
+ if ( mpGraphics || AcquireGraphics() )
{
if ( mbInitClipRegion )
- ((OutputDevice*)this)->ImplInitClipRegion();
+ const_cast<OutputDevice*>(this)->ImplInitClipRegion();
if ( !mbOutputClipped )
{
@@ -82,7 +82,7 @@ void OutputDevice::DrawPixel( const Point& rPt )
if ( !mpGraphics )
{
- if ( !ImplGetGraphics() )
+ if ( !AcquireGraphics() )
return;
}
@@ -115,7 +115,7 @@ void OutputDevice::DrawPixel( const Point& rPt, const Color& rColor )
if ( !mpGraphics )
{
- if ( !ImplGetGraphics() )
+ if ( !AcquireGraphics() )
return;
}
@@ -149,7 +149,7 @@ void OutputDevice::DrawPixel( const Polygon& rPts, const Color* pColors )
if ( !IsDeviceOutputNecessary() || ImplIsRecordLayout() )
return;
- if ( mpGraphics || ImplGetGraphics() )
+ if ( mpGraphics || AcquireGraphics() )
{
if ( mbInitClipRegion )
ImplInitClipRegion();
diff --git a/vcl/source/outdev/polygon.cxx b/vcl/source/outdev/polygon.cxx
index 359818610bea..722386aa9ce8 100644
--- a/vcl/source/outdev/polygon.cxx
+++ b/vcl/source/outdev/polygon.cxx
@@ -47,7 +47,7 @@ void OutputDevice::DrawPolyPolygon( const PolyPolygon& rPolyPoly )
// we need a graphics
if ( !mpGraphics )
- if ( !ImplGetGraphics() )
+ if ( !AcquireGraphics() )
return;
if ( mbInitClipRegion )
@@ -154,7 +154,7 @@ void OutputDevice::DrawPolygon( const Polygon& rPoly )
// we need a graphics
if ( !mpGraphics )
- if ( !ImplGetGraphics() )
+ if ( !AcquireGraphics() )
return;
if ( mbInitClipRegion )
@@ -254,7 +254,7 @@ void OutputDevice::ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyP
// we need a graphics
if( !mpGraphics )
- if( !ImplGetGraphics() )
+ if( !AcquireGraphics() )
return;
if( mbInitClipRegion )
@@ -486,7 +486,7 @@ void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLon
if( aDstRect.IsEmpty() || ImplIsRecordLayout() )
return;
- if( !mpGraphics && !ImplGetGraphics() )
+ if( !mpGraphics && !AcquireGraphics() )
return;
if( mbInitClipRegion )
diff --git a/vcl/source/outdev/polyline.cxx b/vcl/source/outdev/polyline.cxx
index 3d06e27d0472..fe3e9cd89e30 100644
--- a/vcl/source/outdev/polyline.cxx
+++ b/vcl/source/outdev/polyline.cxx
@@ -41,7 +41,7 @@ void OutputDevice::DrawPolyLine( const Polygon& rPoly )
// we need a graphics
if ( !mpGraphics )
- if ( !ImplGetGraphics() )
+ if ( !AcquireGraphics() )
return;
if ( mbInitClipRegion )
@@ -150,7 +150,7 @@ void OutputDevice::DrawPolyLine(
// we need a graphics
if( !mpGraphics )
- if( !ImplGetGraphics() )
+ if( !AcquireGraphics() )
return;
if( mbInitClipRegion )
@@ -239,7 +239,7 @@ void OutputDevice::DrawPolyLineWithLineInfo(const Polygon& rPoly, const LineInfo
Polygon aPoly = ImplLogicToDevicePixel( rPoly );
// we need a graphics
- if ( !mpGraphics && !ImplGetGraphics() )
+ if ( !mpGraphics && !AcquireGraphics() )
return;
if ( mbInitClipRegion )
@@ -330,7 +330,7 @@ bool OutputDevice::TryDrawPolyLineDirect(
// we need a graphics
if( !mpGraphics )
- if( !ImplGetGraphics() )
+ if( !AcquireGraphics() )
return false;
if( mbInitClipRegion )
diff --git a/vcl/source/outdev/rect.cxx b/vcl/source/outdev/rect.cxx
index 34abf0a2e2ca..d47119b52850 100644
--- a/vcl/source/outdev/rect.cxx
+++ b/vcl/source/outdev/rect.cxx
@@ -42,7 +42,7 @@ void OutputDevice::DrawRect( const Rectangle& rRect )
if ( !mpGraphics )
{
- if ( !ImplGetGraphics() )
+ if ( !AcquireGraphics() )
return;
}
@@ -83,7 +83,7 @@ void OutputDevice::DrawRect( const Rectangle& rRect,
// we need a graphics
if ( !mpGraphics )
{
- if ( !ImplGetGraphics() )
+ if ( !AcquireGraphics() )
return;
}
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 246d9d4cf315..f54c9895d66a 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -1023,7 +1023,7 @@ void OutputDevice::DrawTextArray( const Point& rStartPt, const OUString& rStr,
if ( !IsDeviceOutputNecessary() )
return;
- if( !mpGraphics && !ImplGetGraphics() )
+ if( !mpGraphics && !AcquireGraphics() )
return;
if( mbInitClipRegion )
ImplInitClipRegion();
@@ -1307,7 +1307,7 @@ SalLayout* OutputDevice::ImplLayout(const OUString& rOrigStr,
{
// we need a graphics
if( !mpGraphics )
- if( !ImplGetGraphics() )
+ if( !AcquireGraphics() )
return NULL;
// initialize font if needed
@@ -1767,7 +1767,7 @@ void OutputDevice::AddTextRectActions( const Rectangle& rRect,
return;
// we need a graphics
- if( !mpGraphics && !ImplGetGraphics() )
+ if( !mpGraphics && !AcquireGraphics() )
return;
if( mbInitClipRegion )
ImplInitClipRegion();
@@ -1808,7 +1808,7 @@ void OutputDevice::DrawText( const Rectangle& rRect, const OUString& rOrigStr, s
return;
// we need a graphics
- if( !mpGraphics && !ImplGetGraphics() )
+ if( !mpGraphics && !AcquireGraphics() )
return;
if( mbInitClipRegion )
ImplInitClipRegion();
@@ -2115,7 +2115,7 @@ void OutputDevice::DrawCtrlText( const Point& rPos, const OUString& rStr,
// better get graphics here because ImplDrawMnemonicLine() will not
// we need a graphics
- if( !mpGraphics && !ImplGetGraphics() )
+ if( !mpGraphics && !AcquireGraphics() )
return;
if( mbInitClipRegion )
ImplInitClipRegion();
diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx
index 7257eb087de0..ad173ad29602 100644
--- a/vcl/source/outdev/textline.cxx
+++ b/vcl/source/outdev/textline.cxx
@@ -971,7 +971,7 @@ void OutputDevice::DrawTextLine( const Point& rPos, long nWidth,
return;
// we need a graphics
- if( !mpGraphics && !ImplGetGraphics() )
+ if( !mpGraphics && !AcquireGraphics() )
return;
if( mbInitClipRegion )
ImplInitClipRegion();
@@ -1003,7 +1003,7 @@ void OutputDevice::DrawWaveLine( const Point& rStartPos, const Point& rEndPos )
// we need a graphics
if( !mpGraphics )
- if( !ImplGetGraphics() )
+ if( !AcquireGraphics() )
return;
if ( mbInitClipRegion )
diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx
index acf9464091ff..e035fa90e08e 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -187,7 +187,7 @@ void OutputDevice::DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly,
// we need a graphics
if( !mpGraphics )
- if( !ImplGetGraphics() )
+ if( !AcquireGraphics() )
return;
if( mbInitClipRegion )
@@ -561,7 +561,7 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
// get the device graphics as drawing target
if( !mpGraphics )
- if( !ImplGetGraphics() )
+ if( !AcquireGraphics() )
return;
// try hard to draw it directly, because the emulation layers are slower
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index d44b2fd3c868..0de07b030f51 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1081,7 +1081,7 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste
else
{
OutputDevice *pOutDev = GetOutDev();
- if ( pOutDev->ImplGetGraphics() )
+ if ( pOutDev->AcquireGraphics() )
{
mpGraphics->GetResolution( mpWindowImpl->mpFrameData->mnDPIX, mpWindowImpl->mpFrameData->mnDPIY );
}
@@ -1526,7 +1526,7 @@ SalGraphics* Window::ImplGetFrameGraphics() const
else
{
OutputDevice *pFrameWinOutDev = mpWindowImpl->mpFrameWindow;
- pFrameWinOutDev->ImplGetGraphics();
+ pFrameWinOutDev->AcquireGraphics();
}
mpWindowImpl->mpFrameWindow->mpGraphics->ResetClipRegion();
return mpWindowImpl->mpFrameWindow->mpGraphics;
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index e2330a90eee2..1567aed10144 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -372,7 +372,7 @@ void Window::Invert( const Rectangle& rRect, sal_uInt16 nFlags )
// we need a graphics
if ( !mpGraphics )
{
- if ( !pOutDev->ImplGetGraphics() )
+ if ( !pOutDev->AcquireGraphics() )
return;
}
@@ -406,7 +406,7 @@ void Window::Invert( const Polygon& rPoly, sal_uInt16 nFlags )
// we need a graphics
if ( !mpGraphics )
{
- if ( !pOutDev->ImplGetGraphics() )
+ if ( !pOutDev->AcquireGraphics() )
return;
}
@@ -481,7 +481,7 @@ void Window::InvertTracking( const Rectangle& rRect, sal_uInt16 nFlags )
// we need a graphics
if ( !mpGraphics )
{
- if ( !pOutDev->ImplGetGraphics() )
+ if ( !pOutDev->AcquireGraphics() )
return;
}
@@ -545,7 +545,7 @@ void Window::InvertTracking( const Polygon& rPoly, sal_uInt16 nFlags )
// we need a graphics
if ( !mpGraphics )
{
- if ( !pOutDev->ImplGetGraphics() )
+ if ( !pOutDev->AcquireGraphics() )
return;
}