diff options
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwsh4.cxx | 40 |
2 files changed, 21 insertions, 21 deletions
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index bcac0593e..154a26eef 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -32,7 +32,7 @@ #include "precompiled_sc.hxx" #if ! ENABLE_LAYOUT_EXPERIMENTAL -#undef ENABLE_LAYOUT
+#undef ENABLE_LAYOUT #endif #undef SC_DLLIMPLEMENTATION diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 28263f064..4d3dfc107 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1261,26 +1261,26 @@ ErrCode ScTabViewShell::DoPrint( SfxPrinter *pPrinter, 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.)
+ // 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 ); } |