diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-20 23:08:41 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 13:06:13 +0100 |
| commit | c612c3b0aed9ad7f7f42b4313f821b71995ead15 (patch) | |
| tree | f6c673bccab1a0a6391315fde5966541eaf55d96 /svtools | |
| parent | a8dc965511f5f8e276eb4797ac0c37479907a079 (diff) | |
protect more printer code-paths.
Change-Id: Ic5bc5c3325b460cba0d95484454c9bb826684890
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/dialogs/prnsetup.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index d6f35ef39fdd..a841a5997754 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -53,8 +53,9 @@ void ImplFreePrnDlgListBox( ListBox* pBox, bool bClear ) Printer* ImplPrnDlgListBoxSelect( ListBox* pBox, PushButton* pPropBtn, - Printer* pPrinter, Printer* pTempPrinter ) + Printer* pPrinter, Printer* pTempPrinterIn ) { + VclPtr<Printer> pTempPrinter( pTempPrinterIn ); if ( pBox->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) { const QueueInfo* pInfo = Printer::GetQueueInfo( pBox->GetSelectEntry(), true ); @@ -73,7 +74,7 @@ Printer* ImplPrnDlgListBoxSelect( ListBox* pBox, PushButton* pPropBtn, if ( (pTempPrinter->GetName() != pInfo->GetPrinterName()) || (pTempPrinter->GetDriverName() != pInfo->GetDriver()) ) { - VclPtr<Printer>(pTempPrinter).disposeAndClear(); + pTempPrinter.disposeAndClear(); pTempPrinter = new Printer( *pInfo ); } } @@ -91,8 +92,9 @@ Printer* ImplPrnDlgListBoxSelect( ListBox* pBox, PushButton* pPropBtn, -Printer* ImplPrnDlgUpdatePrinter( Printer* pPrinter, Printer* pTempPrinter ) +Printer* ImplPrnDlgUpdatePrinter( Printer* pPrinter, Printer* pTempPrinterIn ) { + VclPtr<Printer> pTempPrinter( pTempPrinterIn ); OUString aPrnName; if ( pTempPrinter ) aPrnName = pTempPrinter->GetName(); @@ -101,7 +103,7 @@ Printer* ImplPrnDlgUpdatePrinter( Printer* pPrinter, Printer* pTempPrinter ) if ( ! Printer::GetQueueInfo( aPrnName, false ) ) { - VclPtr<Printer>(pTempPrinter).disposeAndClear(); + pTempPrinter.disposeAndClear(); pTempPrinter = new Printer; } |