diff options
| author | Philipp Lohmann <pl@openoffice.org> | 2009-08-05 15:46:46 +0000 |
|---|---|---|
| committer | Philipp Lohmann <pl@openoffice.org> | 2009-08-05 15:46:46 +0000 |
| commit | 712176f85a73d77d7cfef92350ebfaa3d30ef79f (patch) | |
| tree | 8c689fa68a5909434f1965b30dd45aa70ec1c865 /vcl/aqua | |
| parent | 4bcda09aeec59e01797f96a163f408b642491a46 (diff) | |
get rid of old cruft
Diffstat (limited to 'vcl/aqua')
| -rw-r--r-- | vcl/aqua/inc/salprn.h | 7 | ||||
| -rw-r--r-- | vcl/aqua/source/gdi/salprn.cxx | 22 |
2 files changed, 11 insertions, 18 deletions
diff --git a/vcl/aqua/inc/salprn.h b/vcl/aqua/inc/salprn.h index a572641dd59e..bf9c3c25bc87 100644 --- a/vcl/aqua/inc/salprn.h +++ b/vcl/aqua/inc/salprn.h @@ -106,8 +106,7 @@ class AquaSalInfoPrinter : public SalInfoPrinter const String& rJobName, const String& i_rAppName, ImplJobSetup* i_pSetupData, - vcl::PrinterController& i_rController, - bool bIsQuickJob ); + vcl::PrinterController& i_rController ); BOOL EndJob(); BOOL AbortJob(); SalGraphics* StartPage( ImplJobSetup* i_pSetupData, BOOL i_bNewJobData ); @@ -142,7 +141,9 @@ class AquaSalPrinter : public SalPrinter virtual BOOL StartJob( const XubString* i_pFileName, const XubString& i_rJobName, const XubString& i_rAppName, - ULONG i_nCopies, BOOL i_bCollate, + ULONG i_nCopies, + bool i_bCollate, + bool i_bDirect, ImplJobSetup* i_pSetupData ); // implement pull model print system virtual BOOL StartJob( const String* i_pFileName, diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx index d68c026d5ebe..6575f89d3fa0 100644 --- a/vcl/aqua/source/gdi/salprn.cxx +++ b/vcl/aqua/source/gdi/salprn.cxx @@ -519,8 +519,8 @@ BOOL AquaSalInfoPrinter::StartJob( const String* i_pFileName, const String& i_rJobName, const String& i_rAppName, ImplJobSetup* i_pSetupData, - vcl::PrinterController& i_rController, - bool bIsQuickJob ) + vcl::PrinterController& i_rController + ) { if( mbJob ) return FALSE; @@ -621,7 +621,7 @@ BOOL AquaSalInfoPrinter::StartJob( const String* i_pFileName, if( pPrintOperation ) { NSObject* pReleaseAfterUse = nil; - bool bShowPanel = (! bIsQuickJob && getUseNativeDialog() && i_rController.isShowDialogs() ); + bool bShowPanel = (! i_rController.isDirectPrint() && getUseNativeDialog() && i_rController.isShowDialogs() ); [pPrintOperation setShowsPrintPanel: bShowPanel ? YES : NO ]; [pPrintOperation setShowsProgressPanel: bShowProgressPanel ? YES : NO]; @@ -736,17 +736,7 @@ BOOL AquaSalPrinter::StartJob( const String* i_pFileName, ImplJobSetup* i_pSetupData, vcl::PrinterController& i_rController ) { - bool bIsQuickJob = false; - std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator quick_it = - i_pSetupData->maValueMap.find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsQuickJob" ) ) ); - - if( quick_it != i_pSetupData->maValueMap.end() ) - { - if( quick_it->second.equalsIgnoreAsciiCaseAscii( "true" ) ) - bIsQuickJob = true; - } - - return mpInfoPrinter->StartJob( i_pFileName, i_rJobName, i_rAppName, i_pSetupData, i_rController, bIsQuickJob ); + return mpInfoPrinter->StartJob( i_pFileName, i_rJobName, i_rAppName, i_pSetupData, i_rController ); } // ----------------------------------------------------------------------- @@ -754,7 +744,9 @@ BOOL AquaSalPrinter::StartJob( const String* i_pFileName, BOOL AquaSalPrinter::StartJob( const XubString* i_pFileName, const XubString& i_rJobName, const XubString& i_rAppName, - ULONG i_nCopies, BOOL i_bCollate, + ULONG i_nCopies, + bool i_bCollate, + bool i_bDirect, ImplJobSetup* i_pSetupData ) { DBG_ERROR( "should never be called" ); |