CWS-TOOLING: integrate CWS vcl117ooo/DEV300_m97

17 files changed, 33 insertions, 667 deletions

diff --git a/chart2/inc/pch/precompiled_chart2.hxx b/chart2/inc/pch/precompiled_chart2.hxx
index 06888d38d..608206e6a 100644..100755
--- a/chart2/inc/pch/precompiled_chart2.hxx
+++ b/chart2/inc/pch/precompiled_chart2.hxx
@@ -268,7 +268,7 @@
 #include "unotools/configitem.hxx"
 #include "unotools/eventlisteneradapter.hxx"
 
-#include "vcl/fldunit.hxx"
+#include "tools/fldunit.hxx"
 
 #include "vos/mutex.hxx"
 //---MARKER---
diff --git a/chart2/source/controller/inc/ConfigurationAccess.hxx b/chart2/source/controller/inc/ConfigurationAccess.hxx
index 01be5921a..513ee3c7f 100644
--- a/chart2/source/controller/inc/ConfigurationAccess.hxx
+++ b/chart2/source/controller/inc/ConfigurationAccess.hxx
@@ -29,7 +29,7 @@
 #define _CHART2_CONFIGURATIONACCESS_HXX
 
 // header for enum FieldUnit
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
 
 //.............................................................................
 namespace chart
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 0b69bf5f7..4edd8aa73 100644..100755
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -218,7 +218,7 @@
 #include <vcl/dndhelp.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/field.hxx>
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/inputctx.hxx>
 #include <vcl/jobset.hxx>
@@ -235,7 +235,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclevent.hxx>
 #include <vcl/window.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <vos/macros.hxx>
 #include <vos/object.hxx>
 #include <vos/types.hxx>
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 28b876104..d4bfa1f1d 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -928,7 +928,6 @@
 #define STR_REPLCELLSWARN           (STR_START + 91)
 
 #define SCSTR_DPFUNCLISTBOX         (STR_START + 92)
-#define STR_PRINT_NOTHING           (STR_START + 93)
 #define SCSTR_ALLFILTER             (STR_START + 94)
 #define SCSTR_MOREBTN_MOREOPTIONS   (STR_START + 95)
 #define SCSTR_MOREBTN_FEWEROPTIONS   (STR_START + 96)
diff --git a/sc/source/core/inc/core_pch.hxx b/sc/source/core/inc/core_pch.hxx
index 5461e8c46..4e045c530 100644
--- a/sc/source/core/inc/core_pch.hxx
+++ b/sc/source/core/inc/core_pch.hxx
@@ -125,7 +125,7 @@
 #include <vcl/outdev.hxx>
 #include <vcl/pointr.hxx>
 #include <vcl/ptrstyle.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <vcl/event.hxx>
 #include <tools/ownlist.hxx>
 #include <svl/itempool.hxx>
diff --git a/sc/source/filter/inc/filt_pch.hxx b/sc/source/filter/inc/filt_pch.hxx
index 0f1c7543e..b9521637f 100644
--- a/sc/source/filter/inc/filt_pch.hxx
+++ b/sc/source/filter/inc/filt_pch.hxx
@@ -126,7 +126,7 @@
 #include <tools/fract.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/mapmod.hxx>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/region.hxx>
 #include <svl/lstner.hxx>
 #include <patattr.hxx>
@@ -182,7 +182,7 @@
 #include <vcl/window.hxx>
 #include <vcl/pointr.hxx>
 #include <vcl/ptrstyle.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <vcl/inputctx.hxx>
 #include <vcl/event.hxx>
 #include <tools/ownlist.hxx>
@@ -253,7 +253,7 @@
 #include <vcl/menu.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/combobox.h>
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XFrame.hdl>
 #include <com/sun/star/awt/XWindow.hpp>
diff --git a/sc/source/filter/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxx
index ecc8ab9af..f7e351f81 100644
--- a/sc/source/filter/inc/xlescher.hxx
+++ b/sc/source/filter/inc/xlescher.hxx
@@ -29,7 +29,7 @@
 #define SC_XLESCHER_HXX
 
 #include <tools/gen.hxx>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 #include "fapihelper.hxx"
 #include "xladdress.hxx"
 #include "xlstyle.hxx"
diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx
index 5bc12d7b4..6dbfdc668 100644
--- a/sc/source/ui/cctrl/dpcontrol.cxx
+++ b/sc/source/ui/cctrl/dpcontrol.cxx
@@ -35,7 +35,7 @@
 
 #include <vcl/outdev.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <vcl/decoview.hxx>
 #include "strload.hxx"
 #include "global.hxx"
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 39277f06f..832be2a22 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -55,7 +55,6 @@ using namespace ::com::sun::star;
 #include <svtools/sfxecode.hxx>
 #include <svx/ofaitem.hxx>
 #include <sot/formats.hxx>
-#include <svtools/printdlg.hxx>
 #include <svl/whiter.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/waitobj.hxx>
@@ -1828,373 +1827,6 @@ void ScDocShell::GetStatePageStyle( SfxViewShell&   /* rCaller */,
     }
 }
 
-void lcl_GetPrintData( ScDocShell* pDocShell /*in*/,
-    ScDocument* pDocument /*in*/, SfxPrinter* pPrinter /*in*/,
-    PrintDialog* pPrintDialog /*in*/, bool bForceSelected /*in*/,
-    ScMarkData* pMarkData /*inout*/, bool& rbHasOptions /*out*/,
-    ScPrintOptions& rOptions /*out*/, bool& rbAllTabs /*out*/,
-    long& rnTotalPages /*out*/, long aPageArr[] /*out*/,
-    MultiSelection& rPageRanges /*out*/, ScRange** ppMarkedRange /*out*/ )
-{
-    // get settings from print options sub-dialog
-    const SfxItemSet& rOptionSet = pPrinter->GetOptions();
-    const SfxPoolItem* pItem;
-    rbHasOptions = ( rOptionSet.GetItemState( SID_SCPRINTOPTIONS, FALSE, &pItem ) == SFX_ITEM_SET );
-    if ( rbHasOptions )
-    {
-        rOptions = ((const ScTpPrintItem*)pItem)->GetPrintOptions();
-    }
-    else
-    {
-        // use configuration
-        rOptions = SC_MOD()->GetPrintOptions();
-    }
-
-    // update all pending row heights with a single progress bar,
-    // instead of a separate progress for each sheet from ScPrintFunc
-    pDocShell->UpdatePendingRowHeights( MAXTAB, true );
-
-    // get number of total pages
-    rnTotalPages = 0;
-    SCTAB nTabCount = pDocument->GetTableCount();
-    for ( SCTAB nTab = 0; nTab < nTabCount; ++nTab )
-    {
-        ScPrintFunc aPrintFunc( pDocShell, pPrinter, nTab, 0, 0, NULL, &rOptions );
-        long nThisTab = aPrintFunc.GetTotalPages();
-        aPageArr[nTab] = nThisTab;
-        rnTotalPages += nThisTab;
-    }
-
-    rPageRanges.SetTotalRange( Range( 0, RANGE_MAX ) );
-    rPageRanges.Select( Range( 1, rnTotalPages ) );
-
-    rbAllTabs = ( pPrintDialog ? ( pPrintDialog->GetCheckedSheetRange() == PRINTSHEETS_ALL ) : SC_MOD()->GetPrintOptions().GetAllSheets() );
-    if ( bForceSelected )
-    {
-        rbAllTabs = false;
-    }
-
-    if ( ( pPrintDialog && pPrintDialog->GetCheckedSheetRange() == PRINTSHEETS_SELECTED_CELLS ) || bForceSelected )
-    {
-        if ( pMarkData && ( pMarkData->IsMarked() || pMarkData->IsMultiMarked() ) )
-        {
-            pMarkData->MarkToMulti();
-            *ppMarkedRange = new ScRange;
-            pMarkData->GetMultiMarkArea( **ppMarkedRange );
-            pMarkData->MarkToSimple();
-        }
-    }
-
-    PrintDialogRange eDlgOption = pPrintDialog ? pPrintDialog->GetCheckedRange() : PRINTDIALOG_ALL;
-    if ( eDlgOption == PRINTDIALOG_RANGE )
-    {
-        rPageRanges = MultiSelection( pPrintDialog->GetRangeText() );
-    }
-
-    // get number of total pages if selection
-    if ( !rbAllTabs )
-    {
-        rnTotalPages = 0;
-        for ( SCTAB nTab = 0; nTab < nTabCount; ++nTab )
-        {
-            if ( *ppMarkedRange )    // selected range is used instead of print ranges -> page count is different
-            {
-                ScPrintFunc aPrintFunc( pDocShell, pPrinter, nTab, 0, 0, *ppMarkedRange, &rOptions );
-                aPageArr[nTab] = aPrintFunc.GetTotalPages();
-            }
-            if ( !pMarkData || pMarkData->GetTableSelect( nTab ) )
-            {
-                rnTotalPages += aPageArr[nTab];
-            }
-        }
-        if ( eDlgOption == PRINTDIALOG_ALL || bForceSelected )
-        {
-            rPageRanges.Select( Range( 1, rnTotalPages ) );
-        }
-    }
-}
-
-bool ScDocShell::CheckPrint( PrintDialog* pPrintDialog, ScMarkData* pMarkData, bool bForceSelected, bool bIsAPI )
-{
-    SfxPrinter* pPrinter = GetPrinter();
-    if ( !pPrinter )
-    {
-        return false;
-    }
-
-    bool bHasOptions = false;
-    ScPrintOptions aOptions;
-    bool bAllTabs = true;
-    long nTotalPages = 0;
-    long aPageArr[MAXTABCOUNT];    // pages per sheet
-    MultiSelection aPageRanges;    // pages to print
-    ScRange* pMarkedRange = NULL;
-
-    lcl_GetPrintData( this, &aDocument, pPrinter, pPrintDialog, bForceSelected,
-                      pMarkData, bHasOptions, aOptions, bAllTabs, nTotalPages,
-                      aPageArr, aPageRanges, &pMarkedRange );
-
-    delete pMarkedRange;
-
-    if ( nTotalPages == 0 )
-    {
-        if ( !bIsAPI )
-        {
-            WarningBox aWarningBox( GetActiveDialogParent(), WinBits( WB_OK ),
-                String( ScResId( STR_PRINT_NOTHING ) ) );
-            aWarningBox.Execute();
-        }
-        return false;
-    }
-
-    return true;
-}
-
-void ScDocShell::PreparePrint( PrintDialog* pPrintDialog, ScMarkData* pMarkData )
-{
-    SfxPrinter* pPrinter = GetPrinter();
-    if ( !pPrinter )
-    {
-        return;
-    }
-
-    delete pOldJobSetup;						// gesetzt nur bei Fehler in StartJob()
-    pOldJobSetup = new ScJobSetup( pPrinter );	// Einstellungen merken
-
-    //	Einstellungen fuer die erste gedruckte Seite muessen hier (vor StartJob) gesetzt werden
-    //!	Selection etc. mit Print() zusammenfassen !!!
-    //!	Seiten nur einmal zaehlen
-
-    bool bHasOptions = false;
-    ScPrintOptions aOptions;
-    bool bAllTabs = true;
-    long nTotalPages = 0;
-    long aPageArr[MAXTABCOUNT];    // pages per sheet
-    MultiSelection aPageRanges;    // pages to print
-    ScRange* pMarkedRange = NULL;
-
-    lcl_GetPrintData( this, &aDocument, pPrinter, pPrintDialog, false,
-                      pMarkData, bHasOptions, aOptions, bAllTabs, nTotalPages,
-                      aPageArr, aPageRanges, &pMarkedRange );
-
-    BOOL bFound = FALSE;		// erste Seite gefunden
-    long nTabStart = 0;
-    SCTAB nTabCount = aDocument.GetTableCount();
-    for ( SCTAB nTab=0; nTab<nTabCount && !bFound; nTab++ )
-    {
-        if ( bAllTabs || !pMarkData || pMarkData->GetTableSelect( nTab ) )
-        {
-            long nNext = nTabStart + aPageArr[nTab];
-            BOOL bSelected = FALSE;
-            for (long nP=nTabStart+1; nP<=nNext; nP++)	// 1-basiert
-                if (aPageRanges.IsSelected( nP ))		// eine Seite von dieser Tabelle selektiert?
-                    bSelected = TRUE;
-
-            if (bSelected)
-            {
-                ScPrintFunc aPrintFunc( this, pPrinter, nTab );
-
-                aPrintFunc.ApplyPrintSettings();		// dann Settings fuer diese Tabelle
-                bFound = TRUE;
-            }
-            nTabStart = nNext;
-        }
-    }
-
-    delete pMarkedRange;
-}
-
-BOOL lcl_HasTransparent( ScDocument* pDoc, SCTAB nTab, const ScRange* pRange )
-{
-    BOOL bFound = FALSE;
-    ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
-    if (pDrawLayer)
-    {
-        SdrPage* pPage = pDrawLayer->GetPage(static_cast<sal_uInt16>(nTab));
-        DBG_ASSERT(pPage,"Page ?");
-        if (pPage)
-        {
-            Rectangle aMMRect;
-            if ( pRange )
-                aMMRect = pDoc->GetMMRect( pRange->aStart.Col(), pRange->aStart.Row(),
-                                             pRange->aEnd.Col(), pRange->aEnd.Row(), nTab );
-
-            SdrObjListIter aIter( *pPage, IM_DEEPNOGROUPS );
-            SdrObject* pObject = aIter.Next();
-            while (pObject && !bFound)
-            {
-                if (pObject->IsTransparent())
-                {
-                    if ( pRange )
-                    {
-                        Rectangle aObjRect = pObject->GetLogicRect();
-                        if ( aObjRect.IsOver( aMMRect ) )
-                            bFound = TRUE;
-                    }
-                    else
-                        bFound = TRUE;
-                }
-
-                pObject = aIter.Next();
-            }
-        }
-    }
-
-    return bFound;
-}
-
-void ScDocShell::Print( SfxProgress& rProgress, PrintDialog* pPrintDialog,
-                        ScMarkData* pMarkData, Window* pDialogParent, BOOL bForceSelected, BOOL bIsAPI )
-{
-    SfxPrinter* pPrinter = GetPrinter();
-    if ( !pPrinter )
-    {
-        return;
-    }
-
-    bool bHasOptions = false;
-    ScPrintOptions aOptions;
-    bool bAllTabs = true;
-    long nTotalPages = 0;
-    long aPageArr[MAXTABCOUNT];    // pages per sheet
-    MultiSelection aPageRanges;    // pages to print
-    ScRange* pMarkedRange = NULL;
-
-    lcl_GetPrintData( this, &aDocument, pPrinter, pPrintDialog, bForceSelected,
-                      pMarkData, bHasOptions, aOptions, bAllTabs, nTotalPages,
-                      aPageArr, aPageRanges, &pMarkedRange );
-
-    USHORT nCollateCopies = 1;
-    if ( pPrintDialog && pPrintDialog->IsCollateEnabled() && pPrintDialog->IsCollateChecked() )
-        nCollateCopies = pPrintDialog->GetCopyCount();
-
-    //	test if printed range contains transparent objects
-
-    BOOL bHasTransp = FALSE;
-    BOOL bAnyPrintRanges = aDocument.HasPrintRange();
-    ScStyleSheetPool* pStylePool = aDocument.GetStyleSheetPool();
-    SCTAB nTabCount = aDocument.GetTableCount();
-    for ( SCTAB nTab=0; nTab<nTabCount && !bHasTransp; nTab++ )
-    {
-        if ( bAllTabs || !pMarkData || pMarkData->GetTableSelect( nTab ) )
-        {
-            SfxStyleSheetBase* pStyleSheet = pStylePool->Find(
-                            aDocument.GetPageStyle( nTab ), SFX_STYLE_FAMILY_PAGE );
-            if ( pStyleSheet )
-            {
-                const SfxItemSet& rSet = pStyleSheet->GetItemSet();
-                if ( ((const ScViewObjectModeItem&)rSet.Get(ATTR_PAGE_CHARTS)).GetValue() == VOBJ_MODE_SHOW ||
-                     ((const ScViewObjectModeItem&)rSet.Get(ATTR_PAGE_OBJECTS)).GetValue() == VOBJ_MODE_SHOW ||
-                     ((const ScViewObjectModeItem&)rSet.Get(ATTR_PAGE_DRAWINGS)).GetValue() == VOBJ_MODE_SHOW )
-                {
-                    if ( pMarkedRange )
-                        bHasTransp = bHasTransp || lcl_HasTransparent( &aDocument, nTab, pMarkedRange );
-                    else if ( aDocument.GetPrintRangeCount(nTab) )
-                    {
-                        USHORT nRangeCount = aDocument.GetPrintRangeCount(nTab);
-                        for (USHORT i=0; i<nRangeCount; i++)
-                            bHasTransp = bHasTransp ||
-                                lcl_HasTransparent( &aDocument, nTab, aDocument.GetPrintRange( nTab, i ) );
-                    }
-                    else if (!bAnyPrintRanges || aDocument.IsPrintEntireSheet(nTab))
-                        bHasTransp = bHasTransp || lcl_HasTransparent( &aDocument, nTab, NULL );
-                }
-            }
-        }
-    }
-
-    BOOL bContinue = pPrinter->InitJob( pDialogParent, !bIsAPI && bHasTransp );
-
-    if ( bContinue )
-    {
-        for ( USHORT n=0; n<nCollateCopies; n++ )
-        {
-            long nTabStart = 0;
-            long nDisplayStart = 0;
-            long nAttrPage = 1;
-            long nPrinted = 0;
-
-            for ( SCTAB nTab=0; nTab<nTabCount; nTab++ )
-            {
-                if ( bAllTabs || !pMarkData || pMarkData->GetTableSelect( nTab ) )
-                {
-                    FmFormView* pDrawView = NULL;
-                    Rectangle aFull( 0, 0, LONG_MAX, LONG_MAX );
-
-                    // #114135#
-                    ScDrawLayer* pModel = aDocument.GetDrawLayer();		// ist nicht NULL
-
-                    if(pModel)
-                    {
-                        pDrawView = new FmFormView( pModel, pPrinter );
-                        pDrawView->ShowSdrPage(pDrawView->GetModel()->GetPage(nTab));
-                        pDrawView->SetPrintPreview( TRUE );
-                    }
-
-                    ScPrintFunc aPrintFunc( this, pPrinter, nTab, nAttrPage, nTotalPages, pMarkedRange, &aOptions );
-                    aPrintFunc.SetDrawView( pDrawView );
-                    nPrinted += aPrintFunc.DoPrint( aPageRanges, nTabStart, nDisplayStart, TRUE, &rProgress, NULL );
-
-                    nTabStart += aPageArr[nTab];
-                    if ( aDocument.NeedPageResetAfterTab(nTab) )
-                        nDisplayStart = 0;
-                    else
-                        nDisplayStart += aPageArr[nTab];
-                    nAttrPage = aPrintFunc.GetFirstPageNo();	// behalten oder aus Vorlage
-
-                    delete pDrawView;
-                }
-            }
-
-            if ( n+1 < nCollateCopies &&
-                 (pPrinter->GetDuplexMode() == DUPLEX_SHORTEDGE || pPrinter->GetDuplexMode() == DUPLEX_LONGEDGE) &&
-                 ( nPrinted % 2 ) == 1 )
-            {
-                // #105584# when several collated copies are printed in duplex mode, and there is
-                // an odd number of pages, print an empty page between copies, so the first page of
-                // the second copy isn't printed on the back of the last page of the first copy.
-                // (same as in Writer ViewShell::Prt)
-                
-                // FIXME: needs to be adapted to XRenderable interface
-                #if 0
-                pPrinter->StartPage();
-                pPrinter->EndPage();
-                #endif
-            }
-        }
-    }
-
-    delete pMarkedRange;
-
-    if (pOldJobSetup)
-    {
-        pPrinter->SetOrientation( pOldJobSetup->eOrientation );
-        pPrinter->SetPaperBin	( pOldJobSetup->nPaperBin );
-        pPrinter->SetPaper		( pOldJobSetup->ePaper );
-
-        if ( PAPER_USER == pOldJobSetup->ePaper )
-        {
-            pPrinter->SetMapMode( pOldJobSetup->aUserMapMode );
-            pPrinter->SetPaperSizeUser( pOldJobSetup->aUserSize );
-        }
-
-        delete pOldJobSetup;
-        pOldJobSetup = NULL;
-    }
-
-    if ( bHasOptions )
-    {
-        //	remove PrintOptions from printer ItemSet,
-        //	so next time the options from the configuration are used
-
-        SfxItemSet aSet( pPrinter->GetOptions() );
-        aSet.ClearItem( SID_SCPRINTOPTIONS );
-        pPrinter->SetOptions( aSet );
-    }
-
-    PostPaintGridAll();					//! nur wenn geaendert
-}
-
 void ScDocShell::GetState( SfxItemSet &rSet )
 {
     SfxWhichIter aIter(rSet);
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index b1b1b0b8b..44e11718e 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -45,7 +45,6 @@
 
 class ScEditEngineDefaulter;
 class FontList;
-class PrintDialog;
 class SfxStyleSheetBasePool;
 class SfxStyleSheetHint;
 struct ChartSelectionInfo;
@@ -303,13 +302,6 @@ public:
     void			DoRecalc( BOOL bApi );
     void			DoHardRecalc( BOOL bApi );
 
-    bool            CheckPrint( PrintDialog* pPrintDialog, ScMarkData* pMarkData,
-                                bool bForceSelected, bool bIsAPI );
-    void			PreparePrint( PrintDialog* pPrintDialog, ScMarkData* pMarkData );
-    void			Print( SfxProgress& rProgress, PrintDialog* pPrintDialog,
-                            ScMarkData* pMarkData, Window* pDialogParent,
-                            BOOL bForceSelected, BOOL bIsAPI );
-
     void			UpdateOle( const ScViewData* pViewData, BOOL bSnapSize = FALSE );
     BOOL			IsOle();
 
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index eb533079a..9fe815b02 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -116,11 +116,7 @@ public:
 
     virtual SfxPrinter*		GetPrinter( BOOL bCreate = FALSE );
     virtual USHORT          SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
-    virtual PrintDialog*	CreatePrintDialog( Window* pParent );
     virtual SfxTabPage*     CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions );
-    virtual void			PreparePrint( PrintDialog* pPrintDialog = NULL );
-    virtual ErrCode         DoPrint( SfxPrinter *pPrinter, PrintDialog *pPrintDialog, BOOL bSilent, BOOL bIsAPI );
-    virtual USHORT          Print( SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* pPrintDialog = NULL );
 
     void	AddAccessibilityObject( SfxListener& rObject );
     void	RemoveAccessibilityObject( SfxListener& rObject );
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 68cbfe5d5..621e9a167 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -369,13 +369,7 @@ public:
     virtual USHORT			SetPrinter( SfxPrinter* pNewPrinter,
                                           USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false );
 
-    virtual PrintDialog*	CreatePrintDialog( Window* pParent );
     virtual SfxTabPage*     CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions );
-    virtual void			PreparePrint( PrintDialog* pPrintDialog = NULL );
-    virtual ErrCode			DoPrint( SfxPrinter *pPrinter,
-                                         PrintDialog *pPrintDialog,
-                                         BOOL bSilent, BOOL bIsAPI );
-    virtual USHORT          Print( SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* pPrintDialog = NULL );
 
     void			ConnectObject( SdrOle2Obj* pObj );
     BOOL			ActivateObject( SdrOle2Obj* pObj, long nVerb );
diff --git a/sc/source/ui/inc/ui_pch.hxx b/sc/source/ui/inc/ui_pch.hxx
index 9ae6c8b86..4a6dfaf79 100644
--- a/sc/source/ui/inc/ui_pch.hxx
+++ b/sc/source/ui/inc/ui_pch.hxx
@@ -81,7 +81,7 @@
 #include <vcl/outdev.hxx>
 #include <vcl/pointr.hxx>
 #include <vcl/ptrstyle.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <vcl/event.hxx>
 #include <limits.h>
 #include <tools/errinf.hxx>
@@ -185,7 +185,6 @@
 #include <sfx2/ipfrm.hxx>
 #include <docsh.hxx>
 //REMOVE	#include <sfx2/interno.hxx>
-#include <vcl/wintypes.hxx>
 #include <sfx2/docfac.hxx>
 #include <scitems.hxx>
 #include <vcl/virdev.hxx>
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
index f7c44c1fc..ef43dd3fa 100644
--- a/sc/source/ui/src/scstring.src
+++ b/sc/source/ui/src/scstring.src
@@ -553,11 +553,6 @@ String STR_REPLCELLSWARN
     Text [ en-US ] = "You are pasting data into cells that already contain data.\nDo you really want to overwrite the existing data?";
 };
 
-String STR_PRINT_NOTHING
-{
-    Text [ en-US ] = "There is nothing to print. The selected print range or sheet is empty.";
-};
-
 String SCSTR_ALLFILTER
 {
     Text [ en-US ] = "All";
@@ -749,22 +744,13 @@ StringArray SCSTR_PRINT_OPTIONS
     {
         < "Pages"; >;
         < "~Include output of empty pages"; >;
-        < "If checked empty pages that have no cell contents or draw objects are not printed."; >;
-        < "Sheets"; >;
-        < "Print ~only selected sheets"; >;
-        < "If checked only contents from selected sheets are printed, even if you specify a wider range in the Format - Print Ranges dialog. Content from sheets that are not selected will not be printed."; >;
         < "Print content"; >;
         < "~All sheets"; >;
-        < "The printout will be created from all sheets in the document."; >;
         < "~Selected sheets"; >;
-        < "The printout will be created only from the currently selected sheets."; >;
         < "Selected cells"; >;
-        < "The printout will be created only from the currently selected cells."; >;
         < "Thereof print"; >;
         < "All ~pages"; >;
-        < "Print all pages of the printable content."; >;
         < "Pa~ges"; >;
-        < "Print only some pages of the printable content."; >;
         < "%PRODUCTNAME %s"; >;
     };
 };
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 6d539327f..eb0306ab7 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -225,53 +225,53 @@ ScPrintUIOptions::ScPrintUIOptions()
     sal_Bool bSuppress = rPrintOpt.GetSkipEmpty();
 
     ResStringArray aStrings( ScResId( SCSTR_PRINT_OPTIONS ) );
-    DBG_ASSERT( aStrings.Count() >= 19, "resource incomplete" );
-    if( aStrings.Count() < 19 ) // bad resource ?
+    DBG_ASSERT( aStrings.Count() >= 10, "resource incomplete" );
+    if( aStrings.Count() < 10 ) // bad resource ?
         return;
 
     m_aUIProperties.realloc( 8 );
 
     // create Section for spreadsheet (results in an extra tab page in dialog)
     SvtModuleOptions aOpt;
-    String aAppGroupname( aStrings.GetString( 18 ) );
+    String aAppGroupname( aStrings.GetString( 9 ) );
     aAppGroupname.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%s" ) ),
                                     aOpt.GetModuleName( SvtModuleOptions::E_SCALC ) ); 
-    m_aUIProperties[0].Value = getGroupControlOpt( aAppGroupname, rtl::OUString() );
+    m_aUIProperties[0].Value = getGroupControlOpt( aAppGroupname, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:TabPage:AppPage" ) ) );
 
     // create subgroup for pages
     m_aUIProperties[1].Value = getSubgroupControlOpt( rtl::OUString( aStrings.GetString( 0 ) ), rtl::OUString() );
 
     // create a bool option for empty pages
     m_aUIProperties[2].Value = getBoolControlOpt( rtl::OUString( aStrings.GetString( 1 ) ),
-                                                  rtl::OUString( aStrings.GetString( 2 ) ),
+                                                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:IsIncludeEmptyPages:CheckBox" ) ),
                                                   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsIncludeEmptyPages" ) ),
                                                   ! bSuppress
                                                   );
     // create Subgroup for print content
     vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt;
     aPrintRangeOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintRange" ) );
-    m_aUIProperties[3].Value = getSubgroupControlOpt( rtl::OUString( aStrings.GetString( 6 ) ),
+    m_aUIProperties[3].Value = getSubgroupControlOpt( rtl::OUString( aStrings.GetString( 2 ) ),
                                                       rtl::OUString(),
                                                       aPrintRangeOpt
                                                       );
     
     // create a choice for the content to create
-    uno::Sequence< rtl::OUString > aChoices( 3 ), aHelpTexts( 3 );
-    aChoices[0] = aStrings.GetString( 7 );
-    aHelpTexts[0] = aStrings.GetString( 8 );
-    aChoices[1] = aStrings.GetString( 9 );
-    aHelpTexts[1] = aStrings.GetString( 10 );
-    aChoices[2] = aStrings.GetString( 11 );
-    aHelpTexts[2] = aStrings.GetString( 12 );
+    uno::Sequence< rtl::OUString > aChoices( 3 ), aHelpIds( 3 );
+    aChoices[0] = aStrings.GetString( 3 );
+    aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ) );
+    aChoices[1] = aStrings.GetString( 4 );
+    aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ) );
+    aChoices[2] = aStrings.GetString( 5 );
+    aHelpIds[2] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" ) );
     m_aUIProperties[4].Value = getChoiceControlOpt( rtl::OUString(),
-                                                    aHelpTexts,
+                                                    aHelpIds,
                                                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintContent" ) ),
                                                     aChoices,
                                                     nContent );
                                                     
     // create Subgroup for print range
     aPrintRangeOpt.mbInternalOnly = sal_True;
-    m_aUIProperties[5].Value = getSubgroupControlOpt( rtl::OUString( aStrings.GetString( 13 ) ),
+    m_aUIProperties[5].Value = getSubgroupControlOpt( rtl::OUString( aStrings.GetString( 6 ) ),
                                                       rtl::OUString(),
                                                       aPrintRangeOpt
                                                       );
@@ -279,13 +279,13 @@ ScPrintUIOptions::ScPrintUIOptions()
     // create a choice for the range to print
     rtl::OUString aPrintRangeName( RTL_CONSTASCII_USTRINGPARAM( "PrintRange" ) );
     aChoices.realloc( 2 );
-    aHelpTexts.realloc( 2 );
-    aChoices[0] = aStrings.GetString( 14 );
-    aHelpTexts[0] = aStrings.GetString( 15 );
-    aChoices[1] = aStrings.GetString( 16 );
-    aHelpTexts[1] = aStrings.GetString( 17 );
+    aHelpIds.realloc( 2 );
+    aChoices[0] = aStrings.GetString( 7 );
+    aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:0" ) );
+    aChoices[1] = aStrings.GetString( 8 );
+    aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:1" ) );
     m_aUIProperties[6].Value = getChoiceControlOpt( rtl::OUString(),
-                                                    aHelpTexts,
+                                                    aHelpIds,
                                                     aPrintRangeName,
                                                     aChoices,
                                                     0 );
@@ -293,24 +293,11 @@ ScPrintUIOptions::ScPrintUIOptions()
     // create a an Edit dependent on "Pages" selected
     vcl::PrinterOptionsHelper::UIControlOptions aPageRangeOpt( aPrintRangeName, 1, sal_True );
     m_aUIProperties[7].Value = getEditControlOpt( rtl::OUString(),
-                                                  rtl::OUString(),
+                                                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PageRange:Edit" ) ),
                                                   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) ),
                                                   rtl::OUString(),
                                                   aPageRangeOpt
                                                   ); 
-
-    // "Print only selected sheets" isn't needed because of the "Selected Sheets" choice in "Print content"
-#if 0
-    // create subgroup for sheets
-    m_aUIProperties[8].Value = getSubgroupControlOpt( rtl::OUString( aStrings.GetString( 3 ) ), rtl::OUString() );
-
-    // create a bool option for selected pages only
-    m_aUIProperties[9].Value = getBoolControlOpt( rtl::OUString( aStrings.GetString( 4 ) ),
-                                                  rtl::OUString( aStrings.GetString( 5 ) ),
-                                                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsOnlySelectedSheets" ) ),
-                                                  i_bSelectedOnly
-                                                  );
-#endif
 }
 
 void ScPrintUIOptions::SetDefaults()
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 699acbcac..a04456601 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -44,7 +44,6 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/printdlg.hxx>
 #include <svl/stritem.hxx>
 #include <svl/whiter.hxx>
 #include <vcl/msgbox.hxx>
@@ -484,40 +483,6 @@ USHORT __EXPORT ScPreviewShell::SetPrinter( SfxPrinter *pNewPrinter, USHORT nDif
     return pDocShell->SetPrinter( pNewPrinter, nDiffFlags );
 }
 
-PrintDialog* __EXPORT ScPreviewShell::CreatePrintDialog( Window* pParent )
-{
-    pDocShell->GetDocument()->SetPrintOptions();	// Optionen aus OFA am Printer setzen
-    (void)GetPrinter();
-
-    const long	 nCurPage	 = pPreview->GetPageNo()+1;
-    const long	 nDocPageMax = pPreview->GetTotalPages();
-    PrintDialog* pDlg        = new PrintDialog( pParent, true );
-// wenn zu langsam wieder einbauen
-//	if ( pPreview->AllTested() )
-//		nPageMax = pPreview->GetTotalPages();
-
-    pDlg->EnableSheetRange( true, PRINTSHEETS_ALL );
-    pDlg->EnableSheetRange( true, PRINTSHEETS_SELECTED_SHEETS );
-    pDlg->EnableSheetRange( false, PRINTSHEETS_SELECTED_CELLS );
-    bool bAllTabs = SC_MOD()->GetPrintOptions().GetAllSheets();
-    pDlg->CheckSheetRange( bAllTabs ? PRINTSHEETS_ALL : PRINTSHEETS_SELECTED_SHEETS );
-
-    if ( nDocPageMax > 0 )
-        pDlg->SetRangeText( String::CreateFromInt32( nCurPage ) );
-
-    pDlg->EnableRange	( PRINTDIALOG_ALL );
-    pDlg->EnableRange	( PRINTDIALOG_RANGE );
-    pDlg->SetFirstPage	( 1 );
-    pDlg->SetMinPage	( 1 );
-    pDlg->SetLastPage	( (USHORT)nDocPageMax );
-    pDlg->SetMaxPage	( (USHORT)nDocPageMax );
-    pDlg->EnableCollate	();
-
-    // Selektion hier nicht
-
-    return pDlg;
-}
-
 SfxTabPage* ScPreviewShell::CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions )
 {
     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
@@ -529,66 +494,6 @@ SfxTabPage* ScPreviewShell::CreatePrintOptionsPage( Window *pParent, const SfxIt
     return 0;
 }
 
-void __EXPORT ScPreviewShell::PreparePrint( PrintDialog* pPrintDialog )
-{
-    SfxViewShell::PreparePrint( pPrintDialog );
-
-    ScMarkData aMarkData;
-    aMarkData.SelectTable( static_cast< SCTAB >( pPreview->GetTab() ), TRUE );
-    pDocShell->PreparePrint( pPrintDialog, &aMarkData );
-}
-
-ErrCode ScPreviewShell::DoPrint( SfxPrinter *pPrinter,
-                                 PrintDialog *pPrintDialog, BOOL bSilent, BOOL bIsAPI )
-{
-    ErrCode nRet = ERRCODE_IO_ABORT;
-
-    ScMarkData aMarkData;
-    aMarkData.SelectTable( static_cast< SCTAB >( pPreview->GetTab() ), TRUE );
-
-    if ( pDocShell->CheckPrint( pPrintDialog, &aMarkData, false, bIsAPI ) )
-    {
-        // SfxViewShell::DoPrint calls Print (after StartJob etc.)
-        nRet = SfxViewShell::DoPrint( pPrinter, pPrintDialog, bSilent, bIsAPI );
-    }
-
-    return nRet;
-}
-
-USHORT __EXPORT ScPreviewShell::Print( SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* pPrintDialog )
-{
-    pDocShell->GetDocument()->SetPrintOptions();	// Optionen aus OFA am Printer setzen
-
-    // get the list of affected sheets before SfxViewShell::Print
-    bool bAllTabs = ( pPrintDialog ? ( pPrintDialog->GetCheckedSheetRange() == PRINTSHEETS_ALL ) : SC_MOD()->GetPrintOptions().GetAllSheets() );
-
-    ScMarkData aMarkData;
-    aMarkData.SelectTable( static_cast< SCTAB >( pPreview->GetTab() ), TRUE );
-
-    uno::Sequence< sal_Int32 > aSheets;
-    SCTAB nTabCount = pDocShell->GetDocument()->GetTableCount();
-    sal_Int32 nPrinted = 0;
-    for ( SCTAB nTab = 0; nTab < nTabCount; ++nTab )
-    {
-        if ( bAllTabs || aMarkData.GetTableSelect( nTab ) )
-        {
-            aSheets.realloc( nPrinted + 1 );
-            aSheets[nPrinted] = nTab;
-            ++nPrinted;
-        }
-    }
-
-    uno::Sequence < beans::PropertyValue > aProps(1);
-    aProps[0].Name = ::rtl::OUString::createFromAscii( "PrintSheets" );
-    aProps[0].Value <<= aSheets;
-    SetAdditionalPrintOptions( aProps );
-
-    SfxViewShell::Print( rProgress, bIsAPI, pPrintDialog );
-    pDocShell->Print( rProgress, pPrintDialog, &aMarkData, pPreview, FALSE, bIsAPI );
-
-    return 0;
-}
-
 //------------------------------------------------------------------------
 
 void __EXPORT ScPreviewShell::Activate(BOOL bMDI)
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 1e494c1ee..367ea1449 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -46,7 +46,6 @@
 #include <sfx2/request.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/printdlg.hxx>
 #include <svl/whiter.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <rtl/logfile.hxx>
@@ -1159,57 +1158,6 @@ USHORT __EXPORT ScTabViewShell::SetPrinter( SfxPrinter *pNewPrinter, USHORT nDif
     return GetViewData()->GetDocShell()->SetPrinter( pNewPrinter, nDiffFlags );
 }
 
-PrintDialog* __EXPORT ScTabViewShell::CreatePrintDialog( Window *pParent )
-{
-    ScDocShell*	pDocShell	= GetViewData()->GetDocShell();
-    ScDocument*	pDoc		= pDocShell->GetDocument();
-
-    pDoc->SetPrintOptions();				// Optionen aus OFA am Printer setzen
-    SfxPrinter* pPrinter = GetPrinter();
-
-    String			aStrRange;
-    PrintDialog*    pDlg        = new PrintDialog( pParent, true );
-    SCTAB			nTabCount	= pDoc->GetTableCount();
-    long			nDocPageMax = 0;
-
-    pDlg->EnableSheetRange( true, PRINTSHEETS_ALL );
-    pDlg->EnableSheetRange( true, PRINTSHEETS_SELECTED_SHEETS );
-    pDlg->EnableSheetRange( true, PRINTSHEETS_SELECTED_CELLS );
-    bool bAllTabs = SC_MOD()->GetPrintOptions().GetAllSheets();
-    pDlg->CheckSheetRange( bAllTabs ? PRINTSHEETS_ALL : PRINTSHEETS_SELECTED_SHEETS );
-
-    // update all pending row heights with a single progress bar,
-    // instead of a separate progress for each sheet from ScPrintFunc
-    pDocShell->UpdatePendingRowHeights( MAXTAB, true );
-
-    for ( SCTAB i=0; i<nTabCount; i++ )
-    {
-        ScPrintFunc aPrintFunc( pDocShell, pPrinter, i );
-        nDocPageMax += aPrintFunc.GetTotalPages();
-    }
-
-    if ( nDocPageMax > 0 )
-    {
-        aStrRange = '1';
-        if ( nDocPageMax > 1 )
-        {
-            aStrRange += '-';
-            aStrRange += String::CreateFromInt32( nDocPageMax );
-        }
-    }
-
-    pDlg->SetRangeText	( aStrRange );
-    pDlg->EnableRange	( PRINTDIALOG_ALL );
-    pDlg->EnableRange	( PRINTDIALOG_RANGE );
-    pDlg->SetFirstPage	( 1 );
-    pDlg->SetMinPage	( 1 );
-    pDlg->SetLastPage	( (USHORT)nDocPageMax );
-    pDlg->SetMaxPage	( (USHORT)nDocPageMax );
-    pDlg->EnableCollate	();
-
-    return pDlg;
-}
-
 SfxTabPage* ScTabViewShell::CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions )
 {
     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
@@ -1221,78 +1169,6 @@ SfxTabPage* ScTabViewShell::CreatePrintOptionsPage( Window *pParent, const SfxIt
     return 0;
 }
 
-void __EXPORT ScTabViewShell::PreparePrint( PrintDialog* pPrintDialog )
-{
-    ScDocShell* pDocShell = GetViewData()->GetDocShell();
-
-    SfxViewShell::PreparePrint( pPrintDialog );
-    pDocShell->PreparePrint( pPrintDialog, &GetViewData()->GetMarkData() );
-}
-
-ErrCode ScTabViewShell::DoPrint( SfxPrinter *pPrinter,
-                                 PrintDialog *pPrintDialog, BOOL bSilent, BOOL bIsAPI )
-{
-    //	#72527# if SID_PRINTDOCDIRECT is executed and there's a selection,
-    //	ask if only the selection should be printed
-
-    const ScMarkData& rMarkData = GetViewData()->GetMarkData();
-    if ( !pPrintDialog && !bSilent && !bIsAPI && ( rMarkData.IsMarked() || rMarkData.IsMultiMarked() ) )
-    {
-        SvxPrtQryBox aQuery( GetDialogParent() );
-        short nBtn = aQuery.Execute();
-
-        if ( nBtn == RET_CANCEL )
-            return ERRCODE_IO_ABORT;
-
-        if ( nBtn == RET_OK )
-            bPrintSelected = TRUE;
-    }
-
-    ErrCode nRet = ERRCODE_IO_ABORT;
-
-    ScDocShell* pDocShell = GetViewData()->GetDocShell();
-    if ( pDocShell->CheckPrint( pPrintDialog, &GetViewData()->GetMarkData(), bPrintSelected, bIsAPI ) )
-    {
-        // get the list of affected sheets before SfxViewShell::Print
-        bool bAllTabs = ( pPrintDialog ? ( pPrintDialog->GetCheckedSheetRange() == PRINTSHEETS_ALL ) : SC_MOD()->GetPrintOptions().GetAllSheets() );
-
-        uno::Sequence<sal_Int32> aSheets;
-        SCTAB nTabCount = pDocShell->GetDocument()->GetTableCount();
-        USHORT nPrinted = 0;
-        for ( SCTAB nTab=0; nTab<nTabCount; nTab++ )
-            if ( bAllTabs || rMarkData.GetTableSelect(nTab) )
-            {
-                aSheets.realloc( nPrinted + 1 );
-                aSheets[nPrinted] = nTab;
-                ++nPrinted;
-            }
-
-        uno::Sequence < beans::PropertyValue > aProps(1);
-        aProps[0].Name=::rtl::OUString::createFromAscii("PrintSheets");
-        aProps[0].Value <<= aSheets;
-        SetAdditionalPrintOptions( aProps );
-
-        // SfxViewShell::DoPrint calls Print (after StartJob etc.)
-        nRet = SfxViewShell::DoPrint( pPrinter, pPrintDialog, bSilent, bIsAPI );
-    }
-
-    bPrintSelected = FALSE;
-
-    return nRet;
-}
-
-USHORT __EXPORT ScTabViewShell::Print( SfxProgress& rProgress, BOOL bIsAPI,
-                                       PrintDialog* pPrintDialog )
-{
-    ScDocShell* pDocShell = GetViewData()->GetDocShell();
-    pDocShell->GetDocument()->SetPrintOptions();	// Optionen aus OFA am Printer setzen
-
-    SfxViewShell::Print( rProgress, bIsAPI, pPrintDialog );
-    pDocShell->Print( rProgress, pPrintDialog, &GetViewData()->GetMarkData(),
-                        GetDialogParent(), bPrintSelected, bIsAPI );
-    return 0;
-}
-
 void ScTabViewShell::StopEditShell()
 {
     if ( pEditShell != NULL && !bDontSwitch )