summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vcl/generic/print/genprnpsp.cxx2
-rw-r--r--vcl/headless/svpframe.cxx2
-rw-r--r--vcl/headless/svpvd.cxx2
-rw-r--r--vcl/inc/generic/genprn.h2
-rw-r--r--vcl/inc/headless/svpframe.hxx2
-rw-r--r--vcl/inc/headless/svpvd.hxx2
-rw-r--r--vcl/inc/osx/salframe.h2
-rw-r--r--vcl/inc/osx/salprn.h2
-rw-r--r--vcl/inc/quartz/salvd.h2
-rw-r--r--vcl/inc/salframe.hxx2
-rw-r--r--vcl/inc/salprn.hxx2
-rw-r--r--vcl/inc/salvd.hxx2
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx2
-rw-r--r--vcl/inc/unx/kde/kdedata.hxx2
-rw-r--r--vcl/inc/unx/salframe.h2
-rw-r--r--vcl/inc/unx/salvd.h2
-rw-r--r--vcl/inc/unx/tde/tdedata.hxx2
-rw-r--r--vcl/inc/win/salframe.h2
-rw-r--r--vcl/inc/win/salprn.h2
-rw-r--r--vcl/inc/win/salvd.h2
-rw-r--r--vcl/osx/salframe.cxx4
-rw-r--r--vcl/osx/salprn.cxx2
-rw-r--r--vcl/quartz/salvd.cxx2
-rw-r--r--vcl/source/gdi/outdev.cxx16
-rw-r--r--vcl/source/gdi/virdev.cxx2
-rw-r--r--vcl/unx/generic/gdi/salvd.cxx2
-rw-r--r--vcl/unx/generic/window/salframe.cxx2
-rw-r--r--vcl/unx/gtk/window/gtksalframe.cxx4
-rw-r--r--vcl/unx/kde/salnativewidgets-kde.cxx2
-rw-r--r--vcl/unx/kde4/KDESalFrame.cxx2
-rw-r--r--vcl/unx/kde4/KDESalFrame.hxx2
-rw-r--r--vcl/win/source/gdi/salprn.cxx2
-rw-r--r--vcl/win/source/gdi/salvd.cxx2
-rw-r--r--vcl/win/source/window/salframe.cxx4
34 files changed, 44 insertions, 44 deletions
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index f49af9aa7ce7..de72bb9a1b98 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -534,7 +534,7 @@ int PspSalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* )
return 900;
}
-SalGraphics* PspSalInfoPrinter::GetGraphics()
+SalGraphics* PspSalInfoPrinter::AcquireGraphics()
{
// return a valid pointer only once
// the reasoning behind this is that we could have different
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index e4ab5a1f19c0..68aa4d0f603e 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -167,7 +167,7 @@ void SvpSalFrame::LoseFocus()
}
}
-SalGraphics* SvpSalFrame::GetGraphics()
+SalGraphics* SvpSalFrame::AcquireGraphics()
{
SvpSalGraphics* pGraphics = new SvpSalGraphics();
pGraphics->setDevice( m_aFrame );
diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx
index 6d5cfbc25fcf..0f3c197ed0f5 100644
--- a/vcl/headless/svpvd.cxx
+++ b/vcl/headless/svpvd.cxx
@@ -33,7 +33,7 @@ SvpSalVirtualDevice::~SvpSalVirtualDevice()
{
}
-SalGraphics* SvpSalVirtualDevice::GetGraphics()
+SalGraphics* SvpSalVirtualDevice::AcquireGraphics()
{
SvpSalGraphics* pGraphics = new SvpSalGraphics();
pGraphics->setDevice( m_aDevice );
diff --git a/vcl/inc/generic/genprn.h b/vcl/inc/generic/genprn.h
index a14a46a501cd..d21b97e19c5a 100644
--- a/vcl/inc/generic/genprn.h
+++ b/vcl/inc/generic/genprn.h
@@ -38,7 +38,7 @@ public:
virtual ~PspSalInfoPrinter();
// overload all pure virtual methods
- virtual SalGraphics* GetGraphics();
+ virtual SalGraphics* AcquireGraphics();
virtual void ReleaseGraphics( SalGraphics* pGraphics );
virtual bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData );
virtual bool SetPrinterData( ImplJobSetup* pSetupData );
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 8e72709b979f..b05f71e71078 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -76,7 +76,7 @@ public:
#endif
// SalFrame
- virtual SalGraphics* GetGraphics();
+ virtual SalGraphics* AcquireGraphics();
virtual void ReleaseGraphics( SalGraphics* pGraphics );
virtual bool PostEvent( void* pData );
diff --git a/vcl/inc/headless/svpvd.hxx b/vcl/inc/headless/svpvd.hxx
index a896db8300d4..1f0376ecc196 100644
--- a/vcl/inc/headless/svpvd.hxx
+++ b/vcl/inc/headless/svpvd.hxx
@@ -41,7 +41,7 @@ public:
virtual ~SvpSalVirtualDevice();
// SalVirtualDevice
- virtual SalGraphics* GetGraphics();
+ virtual SalGraphics* AcquireGraphics();
virtual void ReleaseGraphics( SalGraphics* pGraphics );
virtual bool SetSize( long nNewDX, long nNewDY );
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index ff7c97295c71..7feac6e404e6 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -112,7 +112,7 @@ public:
virtual ~AquaSalFrame();
- virtual SalGraphics* GetGraphics() SAL_OVERRIDE;
+ virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE;
virtual void ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
virtual bool PostEvent( void* pData ) SAL_OVERRIDE;
virtual void SetTitle( const OUString& rTitle ) SAL_OVERRIDE;
diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h
index 4a1cdb325ed9..3aa17becf245 100644
--- a/vcl/inc/osx/salprn.h
+++ b/vcl/inc/osx/salprn.h
@@ -71,7 +71,7 @@ class AquaSalInfoPrinter : public SalInfoPrinter
void SetupPrinterGraphics( CGContextRef i_xContext ) const;
- virtual SalGraphics* GetGraphics() SAL_OVERRIDE;
+ virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE;
virtual void ReleaseGraphics( SalGraphics* i_pGraphics ) SAL_OVERRIDE;
virtual bool Setup( SalFrame* i_pFrame, ImplJobSetup* i_pSetupData ) SAL_OVERRIDE;
virtual bool SetPrinterData( ImplJobSetup* pSetupData ) SAL_OVERRIDE;
diff --git a/vcl/inc/quartz/salvd.h b/vcl/inc/quartz/salvd.h
index dc17534bf197..beec9891bde5 100644
--- a/vcl/inc/quartz/salvd.h
+++ b/vcl/inc/quartz/salvd.h
@@ -58,7 +58,7 @@ public:
AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData );
virtual ~AquaSalVirtualDevice();
- virtual SalGraphics* GetGraphics();
+ virtual SalGraphics* AcquireGraphics();
virtual void ReleaseGraphics( SalGraphics* pGraphics );
virtual bool SetSize( long nNewDX, long nNewDY );
virtual void GetSize( long& rWidth, long& rHeight );
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index 9142e7aee7f3..87ee9419f6eb 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -110,7 +110,7 @@ public:
// SalGraphics or NULL, but two Graphics for all SalFrames
// must be returned
- virtual SalGraphics* GetGraphics() = 0;
+ virtual SalGraphics* AcquireGraphics() = 0;
virtual void ReleaseGraphics( SalGraphics* pGraphics ) = 0;
// Event must be destroyed, when Frame is destroyed
diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx
index 368ec3d0c71e..a9a80701c032 100644
--- a/vcl/inc/salprn.hxx
+++ b/vcl/inc/salprn.hxx
@@ -58,7 +58,7 @@ public:
// SalGraphics or NULL, but two Graphics for all SalFrames
// must be returned
- virtual SalGraphics* GetGraphics() = 0;
+ virtual SalGraphics* AcquireGraphics() = 0;
virtual void ReleaseGraphics( SalGraphics* pGraphics ) = 0;
virtual bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) = 0;
diff --git a/vcl/inc/salvd.hxx b/vcl/inc/salvd.hxx
index 736ee06822a5..842429f4d8c3 100644
--- a/vcl/inc/salvd.hxx
+++ b/vcl/inc/salvd.hxx
@@ -33,7 +33,7 @@ public:
// SalGraphics or NULL, but two Graphics for all SalVirtualDevices
// must be returned
- virtual SalGraphics* GetGraphics() = 0;
+ virtual SalGraphics* AcquireGraphics() = 0;
virtual void ReleaseGraphics( SalGraphics* pGraphics ) = 0;
// Set new size, without saving the old contents
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 82cee5d47804..76a8ec5f83b4 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -351,7 +351,7 @@ public:
// SalGraphics or NULL, but two Graphics for all SalFrames
// must be returned
- virtual SalGraphics* GetGraphics();
+ virtual SalGraphics* AcquireGraphics();
virtual void ReleaseGraphics( SalGraphics* pGraphics );
// Event must be destroyed, when Frame is destroyed
diff --git a/vcl/inc/unx/kde/kdedata.hxx b/vcl/inc/unx/kde/kdedata.hxx
index 0b8afea6d926..53537afd66db 100644
--- a/vcl/inc/unx/kde/kdedata.hxx
+++ b/vcl/inc/unx/kde/kdedata.hxx
@@ -62,7 +62,7 @@ public:
KDESalFrame( SalFrame* pParent, sal_uLong );
virtual ~KDESalFrame();
- virtual SalGraphics* GetGraphics();
+ virtual SalGraphics* AcquireGraphics();
virtual void ReleaseGraphics( SalGraphics *pGraphics );
virtual void updateGraphics( bool bClear );
virtual void UpdateSettings( AllSettings& rSettings );
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index e5f41264158d..931764170861 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -210,7 +210,7 @@ public:
bool appendUnicodeSequence( sal_Unicode );
bool endUnicodeSequence();
- virtual SalGraphics* GetGraphics();
+ virtual SalGraphics* AcquireGraphics();
virtual void ReleaseGraphics( SalGraphics* pGraphics );
// call with true to clear graphics (setting None as drawable)
diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h
index b1210b3a5243..b50dd087dd39 100644
--- a/vcl/inc/unx/salvd.h
+++ b/vcl/inc/unx/salvd.h
@@ -76,7 +76,7 @@ public:
int GetHeight() const { return nDY_; }
SalX11Screen GetXScreenNumber() const { return m_nXScreen; }
- virtual SalGraphics* GetGraphics();
+ virtual SalGraphics* AcquireGraphics();
virtual void ReleaseGraphics( SalGraphics* pGraphics );
// Set new size, without saving the old contents
diff --git a/vcl/inc/unx/tde/tdedata.hxx b/vcl/inc/unx/tde/tdedata.hxx
index 940947b40c90..bc937765cb5f 100644
--- a/vcl/inc/unx/tde/tdedata.hxx
+++ b/vcl/inc/unx/tde/tdedata.hxx
@@ -72,7 +72,7 @@ public:
TDESalFrame( SalFrame* pParent, sal_uLong );
virtual ~TDESalFrame();
- virtual SalGraphics* GetGraphics();
+ virtual SalGraphics* AcquireGraphics();
virtual void ReleaseGraphics( SalGraphics *pGraphics );
virtual void updateGraphics( bool bClear );
virtual void UpdateSettings( AllSettings& rSettings );
diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index 990d5bf290c0..526b87ab0b57 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -88,7 +88,7 @@ public:
WinSalFrame();
virtual ~WinSalFrame();
- virtual SalGraphics* GetGraphics();
+ virtual SalGraphics* AcquireGraphics();
virtual void ReleaseGraphics( SalGraphics* pGraphics );
virtual bool PostEvent( void* pData );
virtual void SetTitle( const OUString& rTitle );
diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h
index 2c71f7a28484..7c15d019de38 100644
--- a/vcl/inc/win/salprn.h
+++ b/vcl/inc/win/salprn.h
@@ -59,7 +59,7 @@ public:
WinSalInfoPrinter();
virtual ~WinSalInfoPrinter();
- virtual SalGraphics* GetGraphics();
+ virtual SalGraphics* AcquireGraphics();
virtual void ReleaseGraphics( SalGraphics* pGraphics );
virtual bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData );
virtual bool SetPrinterData( ImplJobSetup* pSetupData );
diff --git a/vcl/inc/win/salvd.h b/vcl/inc/win/salvd.h
index b8c6f555fc29..3c7d3e998e52 100644
--- a/vcl/inc/win/salvd.h
+++ b/vcl/inc/win/salvd.h
@@ -49,7 +49,7 @@ public:
WinSalVirtualDevice();
virtual ~WinSalVirtualDevice();
- virtual SalGraphics* GetGraphics();
+ virtual SalGraphics* AcquireGraphics();
virtual void ReleaseGraphics( SalGraphics* pGraphics );
virtual bool SetSize( long nNewDX, long nNewDY );
virtual void GetSize( long& rWidth, long& rHeight );
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 80d2aa754325..fa4fe5464261 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -274,7 +274,7 @@ void AquaSalFrame::screenParametersChanged()
-SalGraphics* AquaSalFrame::GetGraphics()
+SalGraphics* AquaSalFrame::AcquireGraphics()
{
if ( mbGraphics )
return NULL;
@@ -1216,7 +1216,7 @@ void AquaSalFrame::getResolution( sal_Int32& o_rDPIX, sal_Int32& o_rDPIY )
{
if( ! mpGraphics )
{
- GetGraphics();
+ AcquireGraphics();
ReleaseGraphics( mpGraphics );
}
mpGraphics->GetResolution( o_rDPIX, o_rDPIY );
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index 3171b00e3831..751570a6987f 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -148,7 +148,7 @@ void AquaSalInfoPrinter::SetupPrinterGraphics( CGContextRef i_rContext ) const
-SalGraphics* AquaSalInfoPrinter::GetGraphics()
+SalGraphics* AquaSalInfoPrinter::AcquireGraphics()
{
SalGraphics* pGraphics = mbGraphics ? NULL : mpGraphics;
mbGraphics = true;
diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx
index 0320070d045b..78a5352ad9ea 100644
--- a/vcl/quartz/salvd.cxx
+++ b/vcl/quartz/salvd.cxx
@@ -155,7 +155,7 @@ void AquaSalVirtualDevice::Destroy()
-SalGraphics* AquaSalVirtualDevice::GetGraphics()
+SalGraphics* AquaSalVirtualDevice::AcquireGraphics()
{
if( mbGraphicsUsed || !mpGraphics )
return 0;
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index ec309f9c90fd..3d412a295338 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -538,7 +538,7 @@ SalGraphics* OutputDevice::ImplGetGraphics() const
{
Window* pWindow = (Window*)this;
- mpGraphics = pWindow->mpWindowImpl->mpFrame->GetGraphics();
+ mpGraphics = pWindow->mpWindowImpl->mpFrame->AcquireGraphics();
// try harder if no wingraphics was available directly
if ( !mpGraphics )
{
@@ -565,7 +565,7 @@ SalGraphics* OutputDevice::ImplGetGraphics() const
if ( !pSVData->maGDIData.mpLastWinGraphics )
break;
pSVData->maGDIData.mpLastWinGraphics->ImplReleaseGraphics();
- mpGraphics = pWindow->mpWindowImpl->mpFrame->GetGraphics();
+ mpGraphics = pWindow->mpWindowImpl->mpFrame->AcquireGraphics();
}
}
}
@@ -587,14 +587,14 @@ SalGraphics* OutputDevice::ImplGetGraphics() const
if ( pVirDev->mpVirDev )
{
- mpGraphics = pVirDev->mpVirDev->GetGraphics();
+ mpGraphics = pVirDev->mpVirDev->AcquireGraphics();
// if needed retry after releasing least recently used virtual device graphics
while ( !mpGraphics )
{
if ( !pSVData->maGDIData.mpLastVirGraphics )
break;
pSVData->maGDIData.mpLastVirGraphics->ImplReleaseGraphics();
- mpGraphics = pVirDev->mpVirDev->GetGraphics();
+ mpGraphics = pVirDev->mpVirDev->AcquireGraphics();
}
// update global LRU list of virtual device graphics
if ( mpGraphics )
@@ -617,14 +617,14 @@ SalGraphics* OutputDevice::ImplGetGraphics() const
else if ( pPrinter->mpDisplayDev )
{
const VirtualDevice* pVirDev = pPrinter->mpDisplayDev;
- mpGraphics = pVirDev->mpVirDev->GetGraphics();
+ mpGraphics = pVirDev->mpVirDev->AcquireGraphics();
// if needed retry after releasing least recently used virtual device graphics
while ( !mpGraphics )
{
if ( !pSVData->maGDIData.mpLastVirGraphics )
break;
pSVData->maGDIData.mpLastVirGraphics->ImplReleaseGraphics();
- mpGraphics = pVirDev->mpVirDev->GetGraphics();
+ mpGraphics = pVirDev->mpVirDev->AcquireGraphics();
}
// update global LRU list of virtual device graphics
if ( mpGraphics )
@@ -639,14 +639,14 @@ SalGraphics* OutputDevice::ImplGetGraphics() const
}
else
{
- mpGraphics = pPrinter->mpInfoPrinter->GetGraphics();
+ mpGraphics = pPrinter->mpInfoPrinter->AcquireGraphics();
// if needed retry after releasing least recently used printer graphics
while ( !mpGraphics )
{
if ( !pSVData->maGDIData.mpLastPrnGraphics )
break;
pSVData->maGDIData.mpLastPrnGraphics->ImplReleaseGraphics();
- mpGraphics = pPrinter->mpInfoPrinter->GetGraphics();
+ mpGraphics = pPrinter->mpInfoPrinter->AcquireGraphics();
}
// update global LRU list of printer graphics
if ( mpGraphics )
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index e0b497311f21..eda91c0060dc 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -258,7 +258,7 @@ bool VirtualDevice::InnerImplSetOutputSizePixel( const Size& rNewSize, bool bEra
pNewVirDev = pSVData->mpDefInst->CreateVirtualDevice( mpGraphics, nNewWidth, nNewHeight, mnBitCount );
if ( pNewVirDev )
{
- SalGraphics* pGraphics = pNewVirDev->GetGraphics();
+ SalGraphics* pGraphics = pNewVirDev->AcquireGraphics();
if ( pGraphics )
{
SalTwoRect aPosAry;
diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx
index 250ad488ba8c..e5044545ef1f 100644
--- a/vcl/unx/generic/gdi/salvd.cxx
+++ b/vcl/unx/generic/gdi/salvd.cxx
@@ -188,7 +188,7 @@ X11SalVirtualDevice::~X11SalVirtualDevice()
XFreePixmap( GetXDisplay(), GetDrawable() );
}
-SalGraphics* X11SalVirtualDevice::GetGraphics()
+SalGraphics* X11SalVirtualDevice::AcquireGraphics()
{
if( bGraphics_ )
return NULL;
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index c24e960c0835..ad2dcd5e0d59 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -875,7 +875,7 @@ const SystemEnvData* X11SalFrame::GetSystemData() const
return &maSystemChildData;
}
-SalGraphics *X11SalFrame::GetGraphics()
+SalGraphics *X11SalFrame::AcquireGraphics()
{
if( pGraphics_ )
return NULL;
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 55c592ab4c36..6a0056074d96 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -1493,7 +1493,7 @@ void GtkSalFrame::SetExtendedFrameStyle( SalExtStyle nStyle )
}
}
-SalGraphics* GtkSalFrame::GetGraphics()
+SalGraphics* GtkSalFrame::AcquireGraphics()
{
if( m_pWindow )
{
@@ -2889,7 +2889,7 @@ void GtkSalFrame::UpdateSettings( AllSettings& rSettings )
bool bFreeGraphics = false;
if( ! pGraphics )
{
- pGraphics = static_cast<GtkSalGraphics*>(GetGraphics());
+ pGraphics = static_cast<GtkSalGraphics*>(AcquireGraphics());
if ( !pGraphics )
{
SAL_WARN("vcl", "Could not get graphics - unable to update settings");
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 7f11b2ef0c2d..0ca0cd8f916e 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -2036,7 +2036,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
rSettings.SetStyleSettings( aStyleSettings );
}
-SalGraphics* KDESalFrame::GetGraphics()
+SalGraphics* KDESalFrame::AcquireGraphics()
{
if( GetWindow() )
{
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index a27fbb0989ea..9e3fb85d00a2 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -369,7 +369,7 @@ KDESalFrame::GraphicsHolder::~GraphicsHolder()
delete pGraphics;
}
-SalGraphics* KDESalFrame::GetGraphics()
+SalGraphics* KDESalFrame::AcquireGraphics()
{
if( GetWindow() )
{
diff --git a/vcl/unx/kde4/KDESalFrame.hxx b/vcl/unx/kde4/KDESalFrame.hxx
index 1748415af9c3..39ddc5ee655a 100644
--- a/vcl/unx/kde4/KDESalFrame.hxx
+++ b/vcl/unx/kde4/KDESalFrame.hxx
@@ -42,7 +42,7 @@ class KDESalFrame : public X11SalFrame
KDESalFrame( SalFrame* pParent, sal_uLong nStyle );
virtual ~KDESalFrame();
- virtual SalGraphics* GetGraphics();
+ virtual SalGraphics* AcquireGraphics();
virtual void ReleaseGraphics( SalGraphics *pGraphics );
virtual void updateGraphics( bool bClear );
virtual void UpdateSettings( AllSettings& rSettings );
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index 7c36d1b6f259..03af06c6a090 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -1172,7 +1172,7 @@ int WinSalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* pSetupData )
return 900; // guess
}
-SalGraphics* WinSalInfoPrinter::GetGraphics()
+SalGraphics* WinSalInfoPrinter::AcquireGraphics()
{
if ( mbGraphics )
return NULL;
diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx
index 30a733665c49..2daa846f973d 100644
--- a/vcl/win/source/gdi/salvd.cxx
+++ b/vcl/win/source/gdi/salvd.cxx
@@ -199,7 +199,7 @@ WinSalVirtualDevice::~WinSalVirtualDevice()
-SalGraphics* WinSalVirtualDevice::GetGraphics()
+SalGraphics* WinSalVirtualDevice::AcquireGraphics()
{
if ( mbGraphics )
return NULL;
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 9154fa05a27d..fa664cb948f1 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -994,7 +994,7 @@ WinSalFrame::~WinSalFrame()
-SalGraphics* WinSalFrame::GetGraphics()
+SalGraphics* WinSalFrame::AcquireGraphics()
{
if ( mbGraphics )
return NULL;
@@ -3899,7 +3899,7 @@ static bool ImplHandlePaintMsg( HWND hWnd )
// if we don't get the mutex, we can also change the clip region,
// because other threads doesn't use the mutex from the main
- // thread --> see GetGraphics()
+ // thread --> see AcquireGraphics()
WinSalFrame* pFrame = GetWindowPtr( hWnd );
if ( pFrame )