officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 4 +-- sc/source/ui/view/tabvwsh3.cxx | 4 ++- sc/source/ui/view/tabvwsha.cxx | 13 +--------- 3 files changed, 7 insertions(+), 14 deletions(-)
New commits: commit f2d009a675755136e2e06b2866bc055b06cea6c8 Author: Kohei Yoshida <[email protected]> Date: Fri Mar 21 11:28:59 2014 -0400 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 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index cdfd826..249b0ba 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -550,10 +550,10 @@ </node> <node oor:name=".uno:DeletePrintArea" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">~Remove Print Area</value> + <value xml:lang="en-US">~Clear Print Area</value> </prop> <prop oor:name="ContextLabel" oor:type="xs:string"> - <value xml:lang="en-US">~Remove</value> + <value xml:lang="en-US">~Clear</value> </prop> <prop oor:name="Properties" oor:type="xs:int"> <value>1</value> diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index c74de5a..d8d4827 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 af5cd66..5e8ae2a 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: _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
