dr78: #i88468# merge page margin display back into DoPrint

# HG changeset patch
# User Niklas Nebel <nn@openoffice.org>
# Date 1290192520 -3600
# Node ID 427eca1ec1adf81ed3016bde2ef2b010c9fd9ed1
# Parent  1ae0b7505c139ccfdb550df74c87e1da09a62eee

1 files changed, 1 insertions, 55 deletions

diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 170c61f9e73c..48d95153cfe1 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -311,60 +311,6 @@ ScPrintFunc::ScPrintFunc( OutputDevice* pOutDev, ScDocShell* pShell,
 
     Construct( pOptions );
 }
-ScPrintFunc::ScPrintFunc( ScDocShell* pShell, Window* pWindow, SCTAB nTab,
-                            long nPage, long nDocP, const ScRange* pArea,
-                            const ScPrintOptions* pOptions )
-    :   pDocShell           ( pShell ),
-        pPrinter            ( NULL ),
-        pDrawView           ( NULL ),
-        nPrintTab           ( nTab ),
-        nPageStart          ( nPage ),
-        nDocPages           ( nDocP ),
-        pUserArea           ( pArea ),
-        bState              ( false ),
-        bPrintCurrentTable  ( false ),
-        bMultiArea          ( false ),
-        nTabPages           ( 0 ),
-        nTotalPages         ( 0 ),
-        nPagesX(0),
-        nPagesY(0),
-        nTotalY(0),
-        pPageData           ( NULL )
-{
-    pDev = pWindow;
-    Construct( pOptions );
-}
-ScPrintFunc::ScPrintFunc( ScDocShell* pShell, Window* pWindow,
-                             const ScPrintState& rState, const ScPrintOptions* pOptions )
-    :   pDocShell           ( pShell ),
-        pPrinter            ( NULL ),
-        pDrawView           ( NULL ),
-        pUserArea           ( NULL ),
-        bPrintCurrentTable  ( false ),
-        bMultiArea          ( false ),
-        nPagesX(0),
-        nPagesY(0),
-        nTotalY(0),
-        pPageData           ( NULL )
-{
-    pDev = pWindow;
-
-    nPrintTab   = rState.nPrintTab;
-    nStartCol   = rState.nStartCol;
-    nStartRow   = rState.nStartRow;
-    nEndCol     = rState.nEndCol;
-    nEndRow     = rState.nEndRow;
-    nZoom       = rState.nZoom;
-    nPagesX     = rState.nPagesX;
-    nPagesY     = rState.nPagesY;
-    nTabPages   = rState.nTabPages;
-    nTotalPages = rState.nTotalPages;
-    nPageStart  = rState.nPageStart;
-    nDocPages   = rState.nDocPages;
-    bState      = sal_True;
-
-    Construct( pOptions );
-}
 
 void ScPrintFunc::GetPrintState( ScPrintState& rState )
 {
@@ -2662,7 +2608,7 @@ void ScPrintFunc::ApplyPrintSettings()
 //  nDisplayStart = continious number for displaying the page number
 
 long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges,
-                                long nStartPage, long nDisplayStart, sal_Bool bDoPrint,
+                                long nStartPage, long nDisplayStart, bool bDoPrint,
                                 SfxProgress* pProgress, ScPreviewLocationData* pLocationData )
 {
     OSL_ENSURE(pDev,"Device == NULL");