View | Details | Raw Unified | Return to issue 45497
Collapse All | Expand All

(-)sc/source/ui/view/preview.cxx (+9 lines)
Lines 231-238 void ScPreview::CalcPages( SCTAB nToWhic Link Here
231
	//	but always all sheets are used (there is no selected sheet)
231
	//	but always all sheets are used (there is no selected sheet)
232
	ScPrintOptions aOptions = SC_MOD()->GetPrintOptions();
232
	ScPrintOptions aOptions = SC_MOD()->GetPrintOptions();
233
233
234
	ScMarkData aMarkData;
235
	aMarkData.SelectTable( ScDocShell::GetCurTab(), TRUE );
236
234
	for (SCTAB i=nStart; i<nAnz; i++)
237
	for (SCTAB i=nStart; i<nAnz; i++)
235
	{
238
	{
239
		if (!aOptions.GetAllSheets() && !aMarkData.GetTableSelect( i )) {
240
			nPages[i] = 0;
241
			nFirstAttr[i] = 0;
242
			continue;
243
		}
244
236
		long nAttrPage = i > 0 ? nFirstAttr[i-1] : 1;
245
		long nAttrPage = i > 0 ? nFirstAttr[i-1] : 1;
237
246
238
		long nThisStart = nTotalPages;
247
		long nThisStart = nTotalPages;
(-)sc/source/ui/view/tabvwsh4.cxx (+5 lines)
Lines 1207-1214 PrintDialog* __EXPORT ScTabViewShell::Cr Link Here
1207
    bool bAllTabs = SC_MOD()->GetPrintOptions().GetAllSheets();
1215
    bool bAllTabs = SC_MOD()->GetPrintOptions().GetAllSheets();
1208
    pDlg->CheckSheetRange( bAllTabs ? PRINTSHEETS_ALL : PRINTSHEETS_SELECTED_SHEETS );
1216
    pDlg->CheckSheetRange( bAllTabs ? PRINTSHEETS_ALL : PRINTSHEETS_SELECTED_SHEETS );
1209
1217
1218
	ScMarkData aMarkData;
1219
	aMarkData.SelectTable( GetViewData()->GetTabNo(), TRUE );
1220
1210
	for ( SCTAB i=0; i<nTabCount; i++ )
1221
	for ( SCTAB i=0; i<nTabCount; i++ )
1211
	{
1222
	{
1223
		if ( !bAllTabs && !aMarkData.GetTableSelect( i ) )
1224
			continue;
1212
		ScPrintFunc aPrintFunc( pDocShell, pPrinter, i );
1225
		ScPrintFunc aPrintFunc( pDocShell, pPrinter, i );
1213
		nDocPageMax += aPrintFunc.GetTotalPages();
1226
		nDocPageMax += aPrintFunc.GetTotalPages();
1214
	}
1227
	}

Return to issue 45497