Commits

Anonymous committed 03bac0b

sw33bf06: #i112566#: SfxViewShell_Impl::pPrinterController -> boost::shared_ptr

Comments (0)

Files changed (2)

sfx2/source/view/viewimp.hxx

     ::svt::AcceleratorExecute*  pAccExec;
 	com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aPrintOpts;
     ::rtl::Reference< SfxClipboardChangeListener > xClipboardListener;
-    vcl::PrinterController*     pPrinterController;
-    
+    ::boost::shared_ptr< vcl::PrinterController > m_pPrinterController;
+
     SfxViewShell_Impl();
 };
 

sfx2/source/view/viewprn.cxx

 			mpObjectShell->EnableSetModified( m_bOrigStatus );
 			
 		if ( mpViewShell )
-    		mpViewShell->pImp->pPrinterController = 0;
+        {
+            mpViewShell->pImp->m_pPrinterController.reset();
+        }
 	}
 }
 
 																			   this,
                                                                                rProps
                                                                                ) );
-    pImp->pPrinterController = pController.get();
-                                                                                   
+    pImp->m_pPrinterController = pController;
+
     SfxObjectShell *pObjShell = GetObjectShell();
     pController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "JobName" ) ),
                         makeAny( rtl::OUString( pObjShell->GetTitle(0) ) ) );
 
 Printer* SfxViewShell::GetActivePrinter() const
 {
-    return pImp->pPrinterController ? pImp->pPrinterController->getPrinter().get() : 0;
+    return (pImp->m_pPrinterController)
+        ?  pImp->m_pPrinterController->getPrinter().get() : 0;
 }
 
 void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.