[Libreoffice-commits] .: 2 commits - officecfg/registry qadevOOo/runner sc/source

[Stephan Bergmann]

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |    2 -
 qadevOOo/runner/lib/MultiMethodTest.java                 |    1 
 qadevOOo/runner/lib/StatusException.java                 |   18 ---------------
 sc/source/core/tool/defaultsoptions.cxx                  |    2 -
 4 files changed, 4 insertions(+), 19 deletions(-)

New commits:
commit 3e07bdfce6ef700a94868ccc03268aa005c295b8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue May 29 18:23:12 2012 +0200

    Revert "fdo#50183 Use one sheet as default in Calc"
    
    This reverts commit 9a7d3d47d9b4d57b0c7380eadb294add4245ba3a.
    It caused various tests in sc/JunitTest_sc_complex and sc/JunitTest_sc_unoapi
    to fail, which apparently implicitly depend on three instead of one sheets
    per default in Calc.

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 62f0ff0..0cd2ff3 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1620,7 +1620,7 @@
 				<author>Albert Thuswaldner</author>
 				<desc>Option to set initial number of sheet tabs</desc>
 			  </info>
-		  <value>1</value>
+		  <value>3</value>
 		</prop>
 		<prop oor:name="SheetPrefix" oor:type="xs:string">
 			  <!-- UIHints: Tools - Options - Spreadsheet - Defaults -->
diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx
index 9683a7a..034b585 100644
--- a/sc/source/core/tool/defaultsoptions.cxx
+++ b/sc/source/core/tool/defaultsoptions.cxx
@@ -61,7 +61,7 @@ ScDefaultsOptions::~ScDefaultsOptions()
 
 void ScDefaultsOptions::SetDefaults()
 {
-    nInitTabCount  = 1;
+    nInitTabCount  = 3;
     aInitTabPrefix = ScGlobal::GetRscString(STR_TABLE_DEF); // Default Prefix "Sheet"
 }
 
commit 1b330990733bcffbbf485df7aaed8130c899e2b8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue May 29 18:22:25 2012 +0200

    Improved error reporting
    
    Change-Id: Ib852987c2040d47cd3de08c6aebc649a068378d6

diff --git a/qadevOOo/runner/lib/MultiMethodTest.java b/qadevOOo/runner/lib/MultiMethodTest.java
index 901f499..a68461e 100644
--- a/qadevOOo/runner/lib/MultiMethodTest.java
+++ b/qadevOOo/runner/lib/MultiMethodTest.java
@@ -222,6 +222,7 @@ public class MultiMethodTest
         }
         catch (Exception e)
         {
+            e.printStackTrace();
             setSubStates(e.toString());
             return tRes;
         }
diff --git a/qadevOOo/runner/lib/StatusException.java b/qadevOOo/runner/lib/StatusException.java
index 4768a92..a413257 100644
--- a/qadevOOo/runner/lib/StatusException.java
+++ b/qadevOOo/runner/lib/StatusException.java
@@ -34,12 +34,6 @@ package lib;
  */
 public class StatusException extends RuntimeException {
     /**
-     * Contains an exception if the StatusException was created with
-     * StatusException(String, Throwable) constructor.
-     */
-    protected Throwable exceptionThrown;
-
-    /**
      * The Status contained in the StatusException.
      */
     protected Status status;
@@ -51,8 +45,7 @@ public class StatusException extends RuntimeException {
      * @param t the exception of the exception Status
      */
     public StatusException( String message, Throwable t ) {
-        super( message );
-        exceptionThrown = t;
+        super( message, t );
         status = Status.exception( t );
     }
 
@@ -65,17 +58,9 @@ public class StatusException extends RuntimeException {
     }
 
     /**
-     * @return an exception, if this represents an exception Status,
-     * <tt>false</tt> otherwise.
-     */
-    public Throwable getThrownException() {
-        return exceptionThrown;
-    }
-
-    /**
      * @return a status contained in the StatusException.
      */
     public Status getStatus() {
         return status;
     }
-}
\ No newline at end of file
+}