diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-03-21 11:28:59 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-03-21 11:32:18 -0400 |
| commit | f2d009a675755136e2e06b2866bc055b06cea6c8 (patch) | |
| tree | 0f1e88b170dd23cfb655f4f8a721d774dc3cd762 /sc/source | |
| parent | f5179bcbac9a0b33546e442a9e176b1791dff170 (diff) | |
Make it harder to accidentally set print range to '- none -'.
And make the current print range behavior a bit more intuitive. People
often "remove" ranges to quickly clear any custom ranges if set. They
wouldn't expect this to actually set the print range to "none".
Also, change the wording of the menu item from "Remove" to "Clear", to
refect this behavior change.
Change-Id: I0369020fedf1c7463d718809875022adef697bf4
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/ui/view/tabvwsh3.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwsha.cxx | 13 |
2 files changed, 5 insertions, 12 deletions
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index c74de5aed9b2..d8d482738f3b 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -190,8 +190,10 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) case SID_DELETE_PRINTAREA: { + // Clear currently defined print range if any, and reset it to + // print entire sheet which is the default. OUString aEmpty; - SetPrintRanges( false, &aEmpty, NULL, NULL, false ); // Druckbereich loeschen + SetPrintRanges(true, &aEmpty, NULL, NULL, false); rReq.Done(); } break; diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index af5cd662785c..5e8ae2a28b97 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -191,21 +191,12 @@ void ScTabViewShell::GetState( SfxItemSet& rSet ) break; case SID_DELETE_PRINTAREA: - if ( nTabSelCount > 1 ) - { - // #i22589# also take "Print Entire Sheet" into account here - bool bHas = false; - for (SCTAB i=0; !bHas && i<nTabCount; i++) - bHas = rMark.GetTableSelect(i) && (pDoc->GetPrintRangeCount(i) || pDoc->IsPrintEntireSheet(i)); - if (!bHas) - rSet.DisableItem( nWhich ); - } - else if ( !pDoc->GetPrintRangeCount( nTab ) && !pDoc->IsPrintEntireSheet( nTab ) ) - rSet.DisableItem( nWhich ); if ( pDocShell && pDocShell->IsDocShared() ) { rSet.DisableItem( nWhich ); } + else if (pDoc->IsPrintEntireSheet(nTab)) + rSet.DisableItem(nWhich); break; case SID_STATUS_PAGESTYLE: |