diff options
| author | Eike Rathke <erack@redhat.com> | 2011-11-28 03:01:52 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2011-11-28 15:25:33 +0100 |
| commit | d8a85d728f45826c485eb3d250a394e3462e37a1 (patch) | |
| tree | 7c5a886ab0e341d2b976af1d8c95b3075fdd6c4d /sc/source/ui/view/printfun.cxx | |
| parent | b66fb4c3c5c7d1bb6543d84d425b6c4bd654fae3 (diff) | |
dr78: #i116881# correct handling of cached page breaks for user-defined cell range, remove unused parameter in DoPrint
# HG changeset patch
# User Niklas Nebel <nn@openoffice.org>
# Date 1297188469 -3600
# Node ID be5ffcd423c49c0045ddeaf11702d44fbde8a8f1
# Parent 3157cd9d60c35f1bcb4c8f56e86cf76ab364e7ee
Diffstat (limited to 'sc/source/ui/view/printfun.cxx')
| -rw-r--r-- | sc/source/ui/view/printfun.cxx | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index c844fd951951..b6af96afcb27 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -51,7 +51,6 @@ #include <editeng/ulspitem.hxx> #include <sfx2/app.hxx> #include <sfx2/printer.hxx> -#include <sfx2/progress.hxx> #include <tools/multisel.hxx> #include <sfx2/docfile.hxx> #include <tools/urlobj.hxx> @@ -2609,7 +2608,7 @@ void ScPrintFunc::ApplyPrintSettings() long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges, long nStartPage, long nDisplayStart, bool bDoPrint, - SfxProgress* pProgress, ScPreviewLocationData* pLocationData ) + ScPreviewLocationData* pLocationData ) { OSL_ENSURE(pDev,"Device == NULL"); if (!pParamSet) @@ -2629,9 +2628,6 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges, MakeTableString(); - if ( pProgress ) - pProgress->SetText( String( ScResId( SCSTR_STAT_PRINT ) ) ); - //-------------------------------------------------------------------- long nPageNo = 0; @@ -2672,12 +2668,6 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges, { PrintPage( nPageNo+nDisplayStart, nX1, nY1, nX2, nY2, bDoPrint, pLocationData ); - - if ( pProgress ) - { - pProgress->SetState( nPageNo+nStartPage+1, nEndPage ); - pProgress->Reschedule(); //does the user want to continue - } ++nPrinted; } ++nPageNo; @@ -2702,13 +2692,6 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges, { PrintPage( nPageNo+nDisplayStart, nX1, nY1, nX2, nY2, bDoPrint, pLocationData ); - - if ( pProgress ) - { - pProgress->SetState( nPageNo+nStartPage+1, nEndPage ); - pProgress->Reschedule(); //does the user want to continue - - } ++nPrinted; } ++nPageNo; @@ -2733,11 +2716,6 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges, if ( nNoteAdd ) { nNoteNr += nNoteAdd; - if ( pProgress && bPageSelected ) - { - pProgress->SetState( nPageNo+nStartPage+1, nEndPage ); - pProgress->Reschedule(); //does the user want to continue - } if (bPageSelected) { ++nPrinted; |