From 872de529584cd001431a2090eca0f52eb0b16539 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 20 Mar 2014 09:04:47 +0000 Subject: IsQuickJob is never read and FAX# is never written Change-Id: Id8f852df49b951fa6f5558e7e45018f07a9b104f --- include/vcl/jobset.hxx | 7 ------- include/vcl/print.hxx | 1 - padmin/source/padialog.cxx | 1 - sfx2/source/view/viewprn.cxx | 4 ---- vcl/generic/print/genprnpsp.cxx | 5 ----- vcl/source/gdi/jobset.cxx | 8 -------- 6 files changed, 26 deletions(-) diff --git a/include/vcl/jobset.hxx b/include/vcl/jobset.hxx index 75f48ca36d55..3c2c837919a2 100644 --- a/include/vcl/jobset.hxx +++ b/include/vcl/jobset.hxx @@ -46,13 +46,6 @@ public: OUString GetPrinterName() const; OUString GetDriverName() const; - /* Get/SetValue are used to read/store additional - * Parameters in the job setup that may be used - * by the printer driver. One possible use are phone - * numbers for faxes (which disguise as printers) - */ - void SetValue( const OUString& rKey, const OUString& rValue ); - JobSetup& operator=( const JobSetup& rJob ); bool operator==( const JobSetup& rJobSetup ) const; diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index f72781c908f8..2e8098d38376 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -305,7 +305,6 @@ public: bool SetJobSetup( const JobSetup& rSetup ); const JobSetup& GetJobSetup() const { return maJobSetup; } - void SetJobValue( const OUString& rKey, const OUString& rValue ) { maJobSetup.SetValue( rKey, rValue ); } bool Setup( Window* pWindow = NULL ); bool SetPrinterProps( const Printer* pPrinter ); diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx index 93788e49c382..286adda6e18b 100644 --- a/padmin/source/padialog.cxx +++ b/padmin/source/padialog.cxx @@ -579,7 +579,6 @@ void PADialog::PrintTestPage() boost::shared_ptr pController( new SpaPrinterController( pPrinter ) ); JobSetup aJobSetup( pPrinter->GetJobSetup() ); - aJobSetup.SetValue( "IsQuickJob", "true" ); Printer::PrintJob( pController, aJobSetup ); } diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 6a17d5b19c17..6081a9b50a24 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -618,10 +618,6 @@ void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rPro // FIXME: job setup SfxPrinter* pDocPrt = GetPrinter(false); JobSetup aJobSetup = pDocPrt ? pDocPrt->GetJobSetup() : GetJobSetup(); - if( bIsDirect ) - aJobSetup.SetValue( OUString( "IsQuickJob" ), - OUString( "true" ) ); - Printer::PrintJob( pController, aJobSetup ); } diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index de72bb9a1b98..022e26c8a7eb 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -921,11 +921,6 @@ bool PspSalPrinter::StartJob( m_aTmpFile = getTmpName(); nMode = S_IRUSR | S_IWUSR; - ::boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator it; - it = pJobSetup->maValueMap.find( OUString("FAX#") ); - if( it != pJobSetup->maValueMap.end() ) - m_aFaxNr = it->second; - sal_Int32 nPos = 0; m_bSwallowFaxNo = aToken.getToken( 1, '=', nPos ).startsWith( "swallow" ) ? true : false; diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index 15e49dfaf793..82354f1f14a7 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -162,14 +162,6 @@ OUString JobSetup::GetDriverName() const return OUString(); } -void JobSetup::SetValue( const OUString& rKey, const OUString& rValue ) -{ - if( ! mpData ) - mpData = new ImplJobSetup(); - - mpData->maValueMap[ rKey ] = rValue; -} - JobSetup& JobSetup::operator=( const JobSetup& rJobSetup ) { DBG_ASSERT( !rJobSetup.mpData || (rJobSetup.mpData->mnRefCount) < 0xFFFE, "JobSetup: RefCount overflow" ); -- cgit