diff options
| -rw-r--r-- | basic/source/app/printer.cxx | 20 | ||||
| -rw-r--r-- | sfx2/inc/sfx2/objsh.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/prnmon.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/view/viewprn.cxx | 6 |
4 files changed, 22 insertions, 12 deletions
diff --git a/basic/source/app/printer.cxx b/basic/source/app/printer.cxx index 6f173fd53ffa..94097f5b1f7a 100644 --- a/basic/source/app/printer.cxx +++ b/basic/source/app/printer.cxx @@ -76,16 +76,21 @@ BasicPrinter::BasicPrinter() : Printer() // Output: 6 Lines/Inch = 12 Point nLines = (short) s.Height() / 12; nYoff = 12; + // FIXME: new API + #if 0 SetStartPrintHdl( LINK( this, BasicPrinter, StartPrintHdl ) ); SetEndPrintHdl( LINK( this, BasicPrinter, EndPrintHdl ) ); SetPrintPageHdl( LINK( this, BasicPrinter, PrintPageHdl ) ); + #endif } void BasicPrinter::Header() { - if( nPage ) EndPage(); + // FIXME: new API + // if( nPage ) EndPage(); nPage++; - StartPage(); + // FIXME: new API + // StartPage(); String aHdr; String aPage( SttResId( IDS_PAGE ) ); aPage.Append( String::CreateFromInt32(nPage) ); @@ -116,8 +121,10 @@ void BasicPrinter::Print( const String& rFile, const String& rText, BasicFrame * pDlg->ChangeMessage( 1 ); pDlg->Show(); - StartJob( rFile ); - StartPage(); + + // FIXME: new API + // StartJob( rFile ); + // StartPage(); xub_StrLen nDone=0; while( nDone < rText.Len() ) { @@ -130,8 +137,9 @@ void BasicPrinter::Print( const String& rFile, const String& rText, BasicFrame * nLine++; Application::Reschedule(); } - EndPage(); - EndJob(); + // FIXME: new API + // EndPage(); + // EndJob(); nPage = 1; while( IsPrinting() ) Application::Reschedule(); delete pDlg; pDlg = NULL; diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx index 3f2d710cfe51..bfb434cdbb54 100644 --- a/sfx2/inc/sfx2/objsh.hxx +++ b/sfx2/inc/sfx2/objsh.hxx @@ -585,7 +585,7 @@ public: sal_uInt16 nIdx2 = INDEX_IGNORE, sal_uInt16 nIdx3 = INDEX_IGNORE); - virtual sal_Bool Print( Printer &rPrt, + sal_Bool Print( Printer &rPrt, sal_uInt16 nIdx1, sal_uInt16 nIdx2 = INDEX_IGNORE, sal_uInt16 nIdx3 = INDEX_IGNORE, diff --git a/sfx2/source/view/prnmon.cxx b/sfx2/source/view/prnmon.cxx index 9fdd29db2805..c4ca47439ee1 100644 --- a/sfx2/source/view/prnmon.cxx +++ b/sfx2/source/view/prnmon.cxx @@ -274,10 +274,12 @@ SfxPrintProgress::SfxPrintProgress( SfxViewShell* pViewSh, FASTBOOL bShow ) String(SfxResId(STR_PRINTING)), 1, FALSE ), pImp( new SfxPrintProgress_Impl( pViewSh, pViewSh->GetPrinter() ) ) { + #if 0 pImp->pPrinter->SetEndPrintHdl( LINK( this, SfxPrintProgress, EndPrintNotify ) ); pImp->pPrinter->SetErrorHdl( LINK( this, SfxPrintProgress, PrintErrorNotify ) ); pImp->pPrinter->SetStartPrintHdl( LINK( this, SfxPrintProgress, StartPrintNotify ) ); pImp->bCallbacks = TRUE; + #endif SfxObjectShell* pDoc = pViewSh->GetObjectShell(); SFX_ITEMSET_ARG( pDoc->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_HIDDEN, FALSE ); @@ -307,7 +309,7 @@ SfxPrintProgress::~SfxPrintProgress() // ggf. Callbacks entfermen if ( pImp->bCallbacks ) { - pImp->pPrinter->SetEndPrintHdl( Link() ); + // pImp->pPrinter->SetEndPrintHdl( Link() ); pImp->pPrinter->SetErrorHdl( Link() ); pImp->bCallbacks = FALSE; } @@ -410,7 +412,7 @@ IMPL_LINK( SfxPrintProgress, EndPrintNotify, void *, EMPTYARG ) //! if( pMDI->IsPrinterChanged() ) pMDI->Changed( 0L ); // Callbacks rausnehmen - pImp->pPrinter->SetEndPrintHdl( Link() ); + // pImp->pPrinter->SetEndPrintHdl( Link() ); pImp->pPrinter->SetErrorHdl( Link() ); pImp->bCallbacks = FALSE; diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 94aba105ac1f..80393c7498a3 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -891,7 +891,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) return; } - pPrinter->SetNextJobIsQuick(); + // pPrinter->SetNextJobIsQuick(); } // if "Collate" was checked, the SfxPrinter must handle the CopyCount itself, @@ -903,7 +903,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) pPrinter->SetCopyCount( nCopies ); // enable background printing - pPrinter->SetPageQueueSize( 1 ); + // pPrinter->SetPageQueueSize( 1 ); // refresh document info using namespace ::com::sun::star; @@ -961,7 +961,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) rReq.Ignore(); } - pPrinter->SetNextJobIsQuick( false ); + // pPrinter->SetNextJobIsQuick( false ); delete pPrintDlg; } |