applied_patches/0138-sc-print-selected-sheets.diff

   1 Index: sc/source/ui/inc/preview.hxx
   2 ===================================================================
   3 RCS file: /cvs/sc/sc/source/ui/inc/preview.hxx,v
   4 retrieving revision 1.11
   5 diff -u -p -r1.11 preview.hxx
   6 --- sc/source/ui/inc/preview.hxx        10 Apr 2008 23:16:01 -0000      1.11
   7 +++ sc/source/ui/inc/preview.hxx        19 May 2008 14:06:41 -0000
   8 @@ -66,6 +66,8 @@ private:
   9         ScPreviewLocationData* pLocationData;   // stores table layout for accessibility API
  10         FmFormView*             pDrawView;
  11
  12 +    SCTAB           nCurTab;
  13 +
  14                                                                                 // intern:
  15         BOOL                    bInPaint;
  16         BOOL                    bInGetState;
  17 Index: sc/source/ui/view/preview.cxx
  18 ===================================================================
  19 RCS file: /cvs/sc/sc/source/ui/view/preview.cxx,v
  20 retrieving revision 1.34
  21 diff -u -p -r1.34 preview.cxx
  22 --- sc/source/ui/view/preview.cxx       11 Apr 2008 01:35:53 -0000      1.34
  23 +++ sc/source/ui/view/preview.cxx       19 May 2008 14:06:41 -0000
  24 @@ -109,6 +109,7 @@ ScPreview::ScPreview( Window* pParent, S
  25         bLocationValid( FALSE ),
  26         pLocationData( NULL ),
  27         pDrawView( NULL ),
  28 +    nCurTab ( ScDocShell::GetCurTab() ),
  29         bInPaint( FALSE ),
  30         bInGetState( FALSE ),
  31         pDocShell( pDocSh ),
  32 @@ -244,8 +245,17 @@ void ScPreview::CalcPages( SCTAB nToWhic
  33         //      but always all sheets are used (there is no selected sheet)
  34         ScPrintOptions aOptions = SC_MOD()->GetPrintOptions();
  35
  36 +       ScMarkData aMarkData;
  37 +       aMarkData.SelectTable( nCurTab, TRUE );
  38 +
  39         for (SCTAB i=nStart; i<nAnz; i++)
  40         {
  41 +               if (!aOptions.GetAllSheets() && !aMarkData.GetTableSelect( i )) {
  42 +                       nPages[i] = 0;
  43 +                       nFirstAttr[i] = 0;
  44 +                       continue;
  45 +               }
  46 +
  47                 long nAttrPage = i > 0 ? nFirstAttr[i-1] : 1;
  48
  49                 long nThisStart = nTotalPages;
  50 Index: sc/source/ui/view/tabvwsh4.cxx
  51 ===================================================================
  52 RCS file: /cvs/sc/sc/source/ui/view/tabvwsh4.cxx,v
  53 retrieving revision 1.70
  54 diff -u -p -r1.70 tabvwsh4.cxx
  55 --- sc/source/ui/view/tabvwsh4.cxx      26 Nov 2007 18:43:29 -0000      1.70
  56 +++ sc/source/ui/view/tabvwsh4.cxx      15 Dec 2007 03:19:14 -0000
  57 @@ -1207,8 +1215,13 @@ PrintDialog* __EXPORT ScTabViewShell::Cr
  58      bool bAllTabs = SC_MOD()->GetPrintOptions().GetAllSheets();
  59      pDlg->CheckSheetRange( bAllTabs ? PRINTSHEETS_ALL : PRINTSHEETS_SELECTED_SHEETS );
  60
  61 +       ScMarkData aMarkData;
  62 +       aMarkData.SelectTable( GetViewData()->GetTabNo(), TRUE );
  63 +
  64         for ( SCTAB i=0; i<nTabCount; i++ )
  65         {
  66 +               if ( !bAllTabs && !aMarkData.GetTableSelect( i ) )
  67 +                       continue;
  68                 ScPrintFunc aPrintFunc( pDocShell, pPrinter, i );
  69                 nDocPageMax += aPrintFunc.GetTotalPages();
  70         }