diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-08 13:40:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-09 20:31:38 +0200 |
| commit | 7e45b80b7a0c83b7d6e8dab39dfbfe05012e145d (patch) | |
| tree | da177e5e8852698268e4bf229540f7c608e605cc /vcl/win | |
| parent | 751308c234f78cc3ff3a282cef4be9747def59ec (diff) | |
rename SalPrinterQueueInfo::mpSysData to mpPortName
and simplify, most places can just leave it alone
Change-Id: Id938ec12d21ef244a15b5e5a72626c5ad0d0e124
Reviewed-on: https://gerrit.libreoffice.org/55499
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/gdi/salprn.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx index 0027263b5af9..0f16b32ab530 100644 --- a/vcl/win/gdi/salprn.cxx +++ b/vcl/win/gdi/salprn.cxx @@ -166,7 +166,6 @@ void WinSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList ) pInfo->maPrinterName = o3tl::toU(pWinInfo4[i].pPrinterName); pInfo->mnStatus = PrintQueueFlags::NONE; pInfo->mnJobs = 0; - pInfo->mpSysData = nullptr; pList->Add( pInfo ); } } @@ -202,8 +201,8 @@ void WinSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) pInfo->maComment = o3tl::toU(pWinInfo2->pComment); pInfo->mnStatus = ImplWinQueueStatusToSal( pWinInfo2->Status ); pInfo->mnJobs = pWinInfo2->cJobs; - if( ! pInfo->mpSysData ) - pInfo->mpSysData = new OUString(aPortName); + if( ! pInfo->mpPortName ) + pInfo->mpPortName.reset(new OUString(aPortName)); } rtl_freeMemory(pWinInfo2); } @@ -213,7 +212,6 @@ void WinSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) void WinSalInstance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) { - delete pInfo->mpSysData; delete pInfo; } @@ -1060,13 +1058,11 @@ SalInfoPrinter* WinSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueIn ImplJobSetup* pSetupData ) { WinSalInfoPrinter* pPrinter = new WinSalInfoPrinter; - if( ! pQueueInfo->mpSysData ) + if( ! pQueueInfo->mpPortName ) GetPrinterQueueState( pQueueInfo ); pPrinter->maDriverName = pQueueInfo->maDriver; pPrinter->maDeviceName = pQueueInfo->maPrinterName; - pPrinter->maPortName = pQueueInfo->mpSysData ? - *pQueueInfo->mpSysData - : OUString(); + pPrinter->maPortName = pQueueInfo->mpPortName ? *pQueueInfo->mpPortName : OUString(); // check if the provided setup data match the actual printer ImplTestSalJobSetup( pPrinter, pSetupData, true ); |