From 5322b2a0c94772961310dc646a237df18cd20e6e Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Thu, 4 Jun 2009 08:23:53 +0000 Subject: #i101242# new print dialog UI --- sw/source/ui/uiview/pview.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sw/source/ui/uiview/pview.cxx') diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index 7c12f537761e..a9b36d255a23 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -2470,7 +2470,7 @@ USHORT SwPagePreView::Print( SfxProgress &rProgress, BOOL bIsAPI, PrintDialog * if( bPrtPros ) pSh->PrintProspect( aOpts, rProgress, bPrtPros_RTL ); else - pSh->Prt( aOpts, &rProgress ); + pSh->Prt( pPrinter, aOpts, &rProgress ); /*TLPDF*/ } else { -- cgit From 3c7537520ff5fb728e357a6f6cb7b1a343cd54fe Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Thu, 16 Jul 2009 14:39:49 +0000 Subject: #i101242# new print UI dialog; PageRange now basically functional --- sw/source/ui/uiview/pview.cxx | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'sw/source/ui/uiview/pview.cxx') diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index a9b36d255a23..263068d03a42 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -2470,7 +2470,11 @@ USHORT SwPagePreView::Print( SfxProgress &rProgress, BOOL bIsAPI, PrintDialog * if( bPrtPros ) pSh->PrintProspect( aOpts, rProgress, bPrtPros_RTL ); else + { +#ifdef TL_NOT_NOW /*TLPDF*/ //!! Currently broken beyond repair since we will not have a printer pSh->Prt( pPrinter, aOpts, &rProgress ); /*TLPDF*/ +#endif // TL_NOT_NOW /*TLPDF*/ //!! Currently broken beyond repair since we will not have a printer + } } else { -- cgit From e7200b2b026e535228b1fa27d4ab450b8125f2fd Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Tue, 28 Jul 2009 09:43:30 +0000 Subject: #i101242# fixed crashwhen printing the page preview with new print UI --- sw/source/ui/uiview/pview.cxx | 63 +++---------------------------------------- 1 file changed, 4 insertions(+), 59 deletions(-) (limited to 'sw/source/ui/uiview/pview.cxx') diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index c2512a3e5d2a..e9b8094d0e7f 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -2415,65 +2416,9 @@ void SwPagePreView::ScrollDocSzChg() USHORT SwPagePreView::Print( SfxProgress &rProgress, BOOL bIsAPI, PrintDialog *pDlg ) { - ViewShell* pSh = aViewWin.GetViewShell(); - SfxPrinter* pPrinter = GetPrinter(); - if( !pPrinter || !pPrinter->InitJob( &aViewWin, - pSh->HasDrawView() && !bIsAPI && pSh->GetDrawView()->GetModel()->HasTransparentObjects() )) - return ERRCODE_IO_ABORT; - - SwWait aWait( *GetDocShell(), TRUE ); - - USHORT nRowCol = ( aViewWin.GetRow() << 8 ) + - aViewWin.GetCol(); // Zeilen / DoppelSeiten - - { - // die Felder aktualisieren - // ACHTUNG: hochcasten auf die EditShell, um die SS zu nutzen. - // In den Methoden wird auf die akt. Shell abgefragt! - SwEditShell* pESh = (SwEditShell*)pSh; - SwDocStat aDocStat; - BOOL bIsModified = pESh->IsModified(); - - pESh->StartAllAction(); - pESh->UpdateDocStat( aDocStat ); - pSh->UpdateFlds(); - pESh->EndAllAction(); - - if( !bIsModified ) - pESh->ResetModified(); - } - - // Druckauftrag starten - SfxObjectShell *pObjShell = GetViewFrame()->GetObjectShell(); - SwPrtOptions aOpts( pObjShell->GetTitle(0) ); - - BOOL bPrtPros; - BOOL bPrtPros_RTL; - SwView::MakeOptions( pDlg, aOpts, &bPrtPros, &bPrtPros_RTL, FALSE, GetPrinter(), GetDocShell()->GetDoc()->getPrintData() ); - - if( bNormalPrint ) - { - if( bPrtPros ) - pSh->PrintProspect( aOpts, rProgress, bPrtPros_RTL ); - else - { -#ifdef TL_NOT_NOW /*TLPDF*/ //!! Currently broken beyond repair since we will not have a printer - pSh->Prt( pPrinter, aOpts, &rProgress ); /*TLPDF*/ -#endif // TL_NOT_NOW /*TLPDF*/ //!! Currently broken beyond repair since we will not have a printer - } - } - else - { - const SwPagePreViewPrtData* pPPVPD = pSh->GetDoc()->GetPreViewPrtData(); - if( pPPVPD && pPPVPD->GetCol() && pPPVPD->GetRow() ) - { - // Zeilen / Seiten - nRowCol = ( pPPVPD->GetRow() << 8 ) + pPPVPD->GetCol(); - } - else - pPPVPD = 0; - pSh->PrintPreViewPage( aOpts, nRowCol, rProgress, pPPVPD ); - } + (void) rProgress; (void) bIsAPI; (void) pDlg; + // TLPDF no longer needed in new print UI + // TLPDF TODO: clean-up return 0; // OK } -- cgit From 3c93e8d423b0f7c3f448fd1e7ccf06fce0b307cd Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Wed, 29 Jul 2009 09:01:57 +0000 Subject: #i101242# print-preview toolbar changes --- sw/source/ui/uiview/pview.cxx | 6 ------ 1 file changed, 6 deletions(-) (limited to 'sw/source/ui/uiview/pview.cxx') diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index e9b8094d0e7f..1dc6c393dfcf 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -1521,12 +1521,6 @@ MOVEPAGE: rReq.SetSlot( FN_PRINT_PAGEPREVIEW ); return; } - case FN_PREVIEW_PRINT_OPTIONS : - { - SwPreviewPrintOptionsDialog aDlg(aViewWin, *this); - aDlg.Execute(); - } - break; case SID_PRINTDOCDIRECT: case SID_PRINTDOC: ::SetAppPrintOptions( aViewWin.GetViewShell(), FALSE ); -- cgit From 8b9588e75bd53b64fa3d1cd0a006a14e74578f96 Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Tue, 1 Sep 2009 15:16:12 +0000 Subject: #i101242# applying view options and formatting doc now only done in getRendererCount --- sw/source/ui/uiview/pview.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sw/source/ui/uiview/pview.cxx') diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index 1dc6c393dfcf..81958e19be19 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -1779,7 +1779,7 @@ void SwPagePreView::Init(const SwViewOption * pPrefs) // OD 09.01.2003 #i6467# - adjust view shell option to the same as for print SwPrtOptions aPrintOptions( GetViewFrame()->GetObjectShell()->GetTitle(0) ); - SwView::MakeOptions( 0, aPrintOptions, 0, 0, false, 0, 0 ); + aPrintOptions.MakeOptions( 0, 0, 0, false, 0, 0 ); GetViewShell()->AdjustOptionsForPagePreview( aPrintOptions ); IDocumentSettingAccess* pIDSA = pESh->getIDocumentSettingAccess(); -- cgit From 4f2690960ace7b79ef45b07f3fb81a208d97636a Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Fri, 4 Sep 2009 14:41:56 +0000 Subject: #i101242# clean-up --- sw/source/ui/uiview/pview.cxx | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'sw/source/ui/uiview/pview.cxx') diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index 81958e19be19..ac10369d241c 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -1779,7 +1779,7 @@ void SwPagePreView::Init(const SwViewOption * pPrefs) // OD 09.01.2003 #i6467# - adjust view shell option to the same as for print SwPrtOptions aPrintOptions( GetViewFrame()->GetObjectShell()->GetTitle(0) ); - aPrintOptions.MakeOptions( 0, 0, 0, false, 0, 0 ); + aPrintOptions.MakeOptions( false ); GetViewShell()->AdjustOptionsForPagePreview( aPrintOptions ); IDocumentSettingAccess* pIDSA = pESh->getIDocumentSettingAccess(); @@ -2408,20 +2408,6 @@ void SwPagePreView::ScrollDocSzChg() // alles zum Thema Drucken -USHORT SwPagePreView::Print( SfxProgress &rProgress, BOOL bIsAPI, PrintDialog *pDlg ) -{ - (void) rProgress; (void) bIsAPI; (void) pDlg; - // TLPDF no longer needed in new print UI - // TLPDF TODO: clean-up - - return 0; // OK -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - - SfxPrinter* SwPagePreView::GetPrinter( BOOL bCreate ) { return aViewWin.GetViewShell()->getIDocumentDeviceAccess()->getPrinter( bCreate ); -- cgit