[Libreoffice-commits] core.git: 2 commits - configure.ac sc/README sc/source

[Luboš Luňák (via logerrit)]

 configure.ac                  |    4 ++--
 sc/README                     |    2 +-
 sc/source/ui/view/gridwin.cxx |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 68cd8a97510ccfccb98516539ddb4affc94d46fa
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Wed Jul 3 11:40:58 2019 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Sat Jul 6 10:08:51 2019 +0200

    increase parallelism with --enable-icecream from 10 to 40
    
    My 5-year-old desktop can build 8 jobs on its own, so 10 is a rather
    pointless default nowadays. Icecream will spawn only as many jobs
    as the cluster can handle, so this should work fine even for small
    machines/clusters.
    
    Change-Id: Iccdf3adf51f55428e89e042d83979a1e1327659e
    Reviewed-on: https://gerrit.libreoffice.org/75029
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/configure.ac b/configure.ac
index 2f1f242e76fb..ba079753729f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2217,7 +2217,7 @@ AC_ARG_WITH(parallelism,
         [Number of jobs to run simultaneously during build. Parallel builds can
         save a lot of time on multi-cpu machines. Defaults to the number of
         CPUs on the machine, unless you configure --enable-icecream - then to
-        10.]),
+        40.]),
 ,)
 
 AC_ARG_WITH(all-tarballs,
@@ -12409,7 +12409,7 @@ if test -n "$with_parallelism" -a "$with_parallelism" != "yes"; then
     fi
 else
     if test "$enable_icecream" = "yes"; then
-        PARALLELISM="10"
+        PARALLELISM="40"
     else
         case `uname -s` in
 
commit 48741ec47852d78000f71dc9f2b3e172ba94a894
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Jul 1 11:24:46 2019 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Sat Jul 6 10:08:40 2019 +0200

    change Calc's shortcut for dumping cell properties to Ctrl+Shift+F6
    
    Ctrl+Shift+F9 is the recalc-all shortcut, and so my dbgutil build
    litters dump.xml files all over the place (especially annoying
    in sc/qa/unit/data dirs, as test simply try to test all files
    in a dir and fail because of the dump.xml).
    
    Change-Id: I4d55e0aa69104626fcaa4264dc74f37203c46021
    Reviewed-on: https://gerrit.libreoffice.org/74950
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/sc/README b/sc/README
index fdee3df23ee3..e355e0c3c612 100644
--- a/sc/README
+++ b/sc/README
@@ -10,7 +10,7 @@ Dumps the column width of the first 20 columns.
 
 Dumps the graphic objects and their position and size in pixel.
 
-=== CTRL+SHIFT+F9 ===
+=== CTRL+SHIFT+F6 ===
 
 Dumps the SfxItemSet representing the cell properties' of the
 current selection as a xml file. The file will be named dump.xml
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 74826da1aa37..555a7f0ca6dc 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -3175,7 +3175,7 @@ void ScGridWindow::KeyInput(const KeyEvent& rKEvt)
         {
             dumpColumnInformationHmm();
         }
-        else if (rKeyCode.GetCode() == KEY_F9)
+        else if (rKeyCode.GetCode() == KEY_F6)
         {
             dumpCellProperties();
         }