CWS-TOOLING: integrate CWS mba31issues01

2009-01-28 12:14:00 +0100 mba  r267052 : #i97267#: wrong license file
2009-01-28 11:52:05 +0100 mba  r267048 : #i97267#: add dependency to readlicense_oo as some dicts use the OOo license files
2009-01-26 15:47:05 +0100 mba  r266934 : correct mistake
2009-01-26 15:42:20 +0100 mba  r266933 : #i97403#: new english dictionaries
2009-01-26 15:40:20 +0100 mba  r266931 : #i97403#: new english dictionaries
2009-01-26 15:37:32 +0100 mba  r266930 : #i92532#: new dictionaries and hyphenation
2009-01-26 15:36:10 +0100 mba  r266929 : #i97403#: new canadian dictionaries; remove bogus dependencies
2009-01-26 15:34:38 +0100 mba  r266928 : #i97403#: new canadian dictionaries
2009-01-26 09:58:18 +0100 mba  r266907 : fixed warning
2009-01-26 09:53:09 +0100 mba  r266906 : fixed warning
2009-01-25 20:22:32 +0100 mba  r266892 : #i87495#: new property
2009-01-25 18:29:54 +0100 mba  r266891 : #i96422#: new serbian dictionary
2009-01-25 00:37:28 +0100 mba  r266886 : added include
2009-01-24 18:13:17 +0100 mba  r266884 : CWS-TOOLING: rebase CWS mba31issues01 to trunk@266428 (milestone: DEV300:m39)
2009-01-24 11:34:07 +0100 mba  r266869 : #i69705#: make nPageCnt a member
2009-01-24 11:30:44 +0100 mba  r266868 : #i97490#: harmonize treatment of different protocols in hyperlinks
2009-01-24 11:16:07 +0100 mba  r266867 : #i96422#: serbian dictionary
2009-01-21 17:29:33 +0100 mba  r266693 : #i94743#: wrong return value after importing meta data
2009-01-16 18:49:21 +0100 mba  r266451 : #i87495#: remove last change
2009-01-16 18:49:04 +0100 mba  r266450 : #i87495#: remove last change
2009-01-16 18:47:43 +0100 mba  r266448 : #i87495#: support for setting PaperBin via API
2009-01-16 18:36:10 +0100 mba  r266446 : #i87495#: support for setting PaperBin via API
2009-01-16 18:35:53 +0100 mba  r266445 : #i87495#: support for setting PaperBin via API
2009-01-16 18:34:56 +0100 mba  r266444 : #159083#: set additional printoptions before printing
2009-01-16 17:00:48 +0100 mba  r266437 : #159083#: always create printhelper
2009-01-16 15:39:41 +0100 mba  r266427 : prevent adding of OOo licence file
2009-01-15 14:47:08 +0100 mba  r266374 : #i84010#: check for missing clipboarddoc
2008-12-05 18:11:04 +0100 mba  r264913 : #i92871#: update of swedish dictionary
2008-12-05 18:08:41 +0100 mba  r264912 : #i92871#: update of swedish dictionary
2008-12-03 14:56:16 +0100 mba  r264788 : #i69705#: nPageCnt must be a member variable
2008-12-03 14:55:40 +0100 mba  r264787 : #i69705#: nPageCnt must be a member variable
2008-12-03 12:13:52 +0100 mba  r264765 : #i96422#: serbian dictionaries
2008-12-03 12:13:36 +0100 mba  r264764 : #i96422#: serbian dictionaries
2008-12-03 11:59:10 +0100 mba  r264763 : #i96422#: serbian dictionaries
2008-12-03 11:26:19 +0100 mba  r264757 : #i94562#: australian dictionary
2008-12-03 11:22:39 +0100 mba  r264756 : #i94562#: australian dictionary; #i88025#: canadian spell checking
2008-12-03 11:21:03 +0100 mba  r264755 : #i94562#: australian dictionary
2008-12-03 11:20:00 +0100 mba  r264754 : #i94562#: australian dictionary
2008-12-03 10:56:29 +0100 mba  r264751 : #i75458#: added optional service
2008-12-03 10:39:54 +0100 mba  r264750 : #i96058#: missing parenthesis

1 files changed, 20 insertions, 24 deletions

diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 680c1ce0f40a..48c79f09dcb4 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1261,7 +1261,26 @@ ErrCode ScTabViewShell::DoPrint( SfxPrinter *pPrinter,
     ScDocShell* pDocShell = GetViewData()->GetDocShell();
     if ( pDocShell->CheckPrint( pPrintDialog, &GetViewData()->GetMarkData(), bPrintSelected, bIsAPI ) )
     {
-        // SfxViewShell::DoPrint calls Print (after StartJob etc.)
+        // 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 );
     }
 
@@ -1276,32 +1295,9 @@ USHORT __EXPORT ScTabViewShell::Print( SfxProgress& rProgress, BOOL bIsAPI,
     ScDocShell* pDocShell = GetViewData()->GetDocShell();
     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() );
-
-    uno::Sequence<sal_Int32> aSheets;
-    SCTAB nTabCount = pDocShell->GetDocument()->GetTableCount();
-    USHORT nPrinted = 0;
-    const ScMarkData& rMarkData = GetViewData()->GetMarkData();
-    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 );
-
-    //  ... use aSheets here ...
-
     SfxViewShell::Print( rProgress, bIsAPI, pPrintDialog );
     pDocShell->Print( rProgress, pPrintDialog, &GetViewData()->GetMarkData(),
                         GetDialogParent(), bPrintSelected, bIsAPI );
-
     return 0;
 }