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

(-)sc/source/ui/view/tabvwsh4.cxx (+16 lines)
Lines 1196-1201 PrintDialog* __EXPORT ScTabViewShell::Cr Link Here
1196
	pDoc->SetPrintOptions();				// Optionen aus OFA am Printer setzen
1204
	pDoc->SetPrintOptions();				// Optionen aus OFA am Printer setzen
1197
	SfxPrinter* pPrinter = GetPrinter();
1205
	SfxPrinter* pPrinter = GetPrinter();
1198
1206
1207
	const SfxPoolItem* pItem;
1208
	const SfxItemSet& rOptionSet = pPrinter->GetOptions();
1209
	BOOL bHasOptions = ( rOptionSet.GetItemState(SID_SCPRINTOPTIONS, FALSE, &pItem) == SFX_ITEM_SET );
1210
	ScPrintOptions aOptions;
1211
	if (bHasOptions)
1212
		aOptions = ((const ScTpPrintItem*)pItem)->GetPrintOptions();
1213
	else
1214
		aOptions = SC_MOD()->GetPrintOptions();		// use configuration
1215
1216
	bool bAllTabs = aOptions.GetAllSheets();
1217
1218
	ScMarkData aMarkData;
1219
	aMarkData.SelectTable( GetViewData()->GetTabNo(), TRUE );
1220
1199
	String			aStrRange;
1221
	String			aStrRange;
1200
	PrintDialog*	pDlg 		= new PrintDialog( pParent);
1222
	PrintDialog*	pDlg 		= new PrintDialog( pParent);
1201
	SCTAB			nTabCount	= pDoc->GetTableCount();
1223
	SCTAB			nTabCount	= pDoc->GetTableCount();
Lines 1203-1208 PrintDialog* __EXPORT ScTabViewShell::Cr Link Here
1203
1225
1204
	for ( SCTAB i=0; i<nTabCount; i++ )
1226
	for ( SCTAB i=0; i<nTabCount; i++ )
1205
	{
1227
	{
1228
		if ( !bAllTabs && !aMarkData.GetTableSelect( i ) )
1229
			continue;
1206
		ScPrintFunc aPrintFunc( pDocShell, pPrinter, i );
1230
		ScPrintFunc aPrintFunc( pDocShell, pPrinter, i );
1207
		nDocPageMax += aPrintFunc.GetTotalPages();
1231
		nDocPageMax += aPrintFunc.GetTotalPages();
1208
	}
1232
	}
(-)sc/source/ui/view/preview.cxx (+7 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
	bool bAllTabs = aOptions.GetAllSheets();
235
236
	ScMarkData aMarkData;
237
	aMarkData.SelectTable( static_cast< SCTAB >( nTab ), TRUE );
238
234
	for (SCTAB i=nStart; i<nAnz; i++)
239
	for (SCTAB i=nStart; i<nAnz; i++)
235
	{
240
	{
241
		if (!bAllTabs && !aMarkData.GetTableSelect( i ))
242
			continue;
236
		long nAttrPage = i > 0 ? nFirstAttr[i-1] : 1;
243
		long nAttrPage = i > 0 ? nFirstAttr[i-1] : 1;
237
244
238
		long nThisStart = nTotalPages;
245
		long nThisStart = nTotalPages;

Return to issue 45497