mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bin DestroyVirtualDevice(): Just use delete directly at call sites

Browse Source 
Change-Id: I47c67d3d89ab22b07b3ec6fe7ea6e035d21e85b6
This commit is contained in:
Tor Lillqvist
2014-03-26 09:08:27 +02:00
parent 975bbf29df
commit d852df0d6d
10 changed files with 3 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vcl/headless/svpinst.cxx
View File

@@ -228,11 +228,6 @@ SalVirtualDevice* SvpSalInstance::CreateVirtualDevice( SalGraphics* /* pGraphics
return pNew; return pNew;
} }
void SvpSalInstance::DestroyVirtualDevice( SalVirtualDevice* pDevice )
{
delete pDevice;
}
#endif #endif
SalTimer* SvpSalInstance::CreateSalTimer() SalTimer* SvpSalInstance::CreateSalTimer()

1
vcl/inc/headless/svpinst.hxx
View File

@@ -122,7 +122,6 @@ public:
virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics, virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics,
long nDX, long nDY, long nDX, long nDY,
sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL ); sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL );
virtual void DestroyVirtualDevice( SalVirtualDevice* pDevice );
// Printer // Printer
// pSetupData->mpDriverData can be 0 // pSetupData->mpDriverData can be 0

2
vcl/inc/osx/salinst.h
View File

@@ -91,8 +91,6 @@ public:
virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics, virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics,
long nDX, long nDY, long nDX, long nDY,
sal_uInt16 nBitCount, const SystemGraphicsData *pData ) SAL_OVERRIDE; sal_uInt16 nBitCount, const SystemGraphicsData *pData ) SAL_OVERRIDE;
virtual void DestroyVirtualDevice( SalVirtualDevice* pDevice ) SAL_OVERRIDE;
virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo, virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
ImplJobSetup* pSetupData ) SAL_OVERRIDE; ImplJobSetup* pSetupData ) SAL_OVERRIDE;
virtual void DestroyInfoPrinter( SalInfoPrinter* pPrinter ) SAL_OVERRIDE; virtual void DestroyInfoPrinter( SalInfoPrinter* pPrinter ) SAL_OVERRIDE;

1
vcl/inc/salinst.hxx
View File

@@ -86,7 +86,6 @@ public:
CreateVirtualDevice( SalGraphics* pGraphics, CreateVirtualDevice( SalGraphics* pGraphics,
long nDX, long nDY, long nDX, long nDY,
sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL ) = 0; sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL ) = 0;
virtual void DestroyVirtualDevice( SalVirtualDevice* pDevice ) = 0;
// Printer // Printer
// pSetupData->mpDriverData can be 0 // pSetupData->mpDriverData can be 0

1
vcl/inc/unx/salinst.h
View File

@@ -55,7 +55,6 @@ public:
virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics, virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics,
long nDX, long nDY, long nDX, long nDY,
sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL ); sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL );
virtual void DestroyVirtualDevice( SalVirtualDevice* pDevice );
virtual void PostPrintersChanged(); virtual void PostPrintersChanged();
virtual GenPspGraphics *CreatePrintGraphics(); virtual GenPspGraphics *CreatePrintGraphics();

2
vcl/inc/win/salinst.h
View File

@@ -44,8 +44,6 @@ public:
virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics, virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics,
long nDX, long nDY, long nDX, long nDY,
sal_uInt16 nBitCount, const SystemGraphicsData *pData ); sal_uInt16 nBitCount, const SystemGraphicsData *pData );
virtual void DestroyVirtualDevice( SalVirtualDevice* pDevice );
virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo, virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
ImplJobSetup* pSetupData ); ImplJobSetup* pSetupData );
virtual void DestroyInfoPrinter( SalInfoPrinter* pPrinter ); virtual void DestroyInfoPrinter( SalInfoPrinter* pPrinter );

9
vcl/quartz/salvd.cxx
View File

@@ -55,15 +55,6 @@ SalVirtualDevice* AquaSalInstance::CreateVirtualDevice( SalGraphics* pGraphics,
#endif #endif
} }
void AquaSalInstance::DestroyVirtualDevice( SalVirtualDevice* pDevice )
{
delete pDevice;
}
AquaSalVirtualDevice::AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData ) AquaSalVirtualDevice::AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData )
: mbGraphicsUsed( false ) : mbGraphicsUsed( false )
, mxBitmapContext( NULL ) , mxBitmapContext( NULL )

7
vcl/source/gdi/virdev.cxx
View File

@@ -254,8 +254,7 @@ VirtualDevice::~VirtualDevice()
ImplReleaseGraphics(); ImplReleaseGraphics();
if ( mpVirDev ) delete mpVirDev;
pSVData->mpDefInst->DestroyVirtualDevice( mpVirDev );
// remove this VirtualDevice from the double-linked global list // remove this VirtualDevice from the double-linked global list
if( mpPrev ) if( mpPrev )
@@ -350,7 +349,7 @@ bool VirtualDevice::InnerImplSetOutputSizePixel( const Size& rNewSize, bool bEra
pGraphics->CopyBits( aPosAry, mpGraphics, this, this ); pGraphics->CopyBits( aPosAry, mpGraphics, this, this );
pNewVirDev->ReleaseGraphics( pGraphics ); pNewVirDev->ReleaseGraphics( pGraphics );
ImplReleaseGraphics(); ImplReleaseGraphics();
pSVData->mpDefInst->DestroyVirtualDevice( mpVirDev ); delete mpVirDev;
mpVirDev = pNewVirDev; mpVirDev = pNewVirDev;
mnOutWidth = rNewSize.Width(); mnOutWidth = rNewSize.Width();
mnOutHeight = rNewSize.Height(); mnOutHeight = rNewSize.Height();
@@ -359,7 +358,7 @@ bool VirtualDevice::InnerImplSetOutputSizePixel( const Size& rNewSize, bool bEra
else else
{ {
bRet = false; bRet = false;
pSVData->mpDefInst->DestroyVirtualDevice( pNewVirDev ); delete pNewVirDev;
} }
} }
else else

5
vcl/unx/generic/gdi/salvd.cxx
View File

@@ -78,11 +78,6 @@ SalVirtualDevice* X11SalInstance::CreateVirtualDevice( SalGraphics* pGraphics,
return pVDev; return pVDev;
} }
void X11SalInstance::DestroyVirtualDevice( SalVirtualDevice* pDevice )
{
delete pDevice;
}
void X11SalGraphics::Init( X11SalVirtualDevice *pDevice, SalColormap* pColormap, void X11SalGraphics::Init( X11SalVirtualDevice *pDevice, SalColormap* pColormap,
bool bDeleteColormap ) bool bDeleteColormap )
{ {

9
vcl/win/source/gdi/salvd.cxx
View File

@@ -151,15 +151,6 @@ SalVirtualDevice* WinSalInstance::CreateVirtualDevice( SalGraphics* pSGraphics,
} }
} }
void WinSalInstance::DestroyVirtualDevice( SalVirtualDevice* pDevice )
{
delete pDevice;
}
WinSalVirtualDevice::WinSalVirtualDevice() WinSalVirtualDevice::WinSalVirtualDevice()
{ {
setHDC((HDC)NULL); // HDC or 0 for Cache Device setHDC((HDC)NULL); // HDC or 0 for Cache Device