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

[Stephan Bergmann]

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |    2 +-
 qadevOOo/tests/java/mod/_sc/ScModelObj.java              |    3 +++
 sc/source/core/tool/defaultsoptions.cxx                  |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 71056d59de59561ee1d74a3c2d9d66a223422c7e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu May 31 11:36:17 2012 +0200

    Revert "Revert "fdo#50183 Use one sheet as default in Calc""
    
    This reverts commit 3e07bdfce6ef700a94868ccc03268aa005c295b8.
    The problems with the tests still assuming three sheets by default
    have now been addressed.

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 245f2ff..1922c6c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1649,7 +1649,7 @@
 				<author>Albert Thuswaldner</author>
 				<desc>Option to set initial number of sheet tabs</desc>
 			  </info>
-		  <value>3</value>
+		  <value>1</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 034b585..9683a7a 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  = 3;
+    nInitTabCount  = 1;
     aInitTabPrefix = ScGlobal::GetRscString(STR_TABLE_DEF); // Default Prefix "Sheet"
 }
 
commit 0210ec32f779bb2098657eb4ad69cca7a60835dc
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu May 31 12:25:38 2012 +0200

    Fix one more test that implicitly assumes more than one Calc sheet
    
    ...in the vein of e43966b29cc36ce36245cfb2c63c3e24a0eb523f "Fix up unit tests
    that assumed two or more sheets per default"
    
    Change-Id: I450f561721edeaa6855499d20c2196ceb8d2f546

diff --git a/qadevOOo/tests/java/mod/_sc/ScModelObj.java b/qadevOOo/tests/java/mod/_sc/ScModelObj.java
index 6dd9394..c18e453 100644
--- a/qadevOOo/tests/java/mod/_sc/ScModelObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScModelObj.java
@@ -194,6 +194,9 @@ public class ScModelObj extends TestCase {
                 oSheet.getCellByPosition(5, 5),
                 oSheet.getCellByPosition(6, 5)
             };
+
+            // Make sure there are at least two sheets:
+            oSheets.insertNewByName("Some Sheet", (short) 1);
         } catch (com.sun.star.lang.WrappedTargetException e) {
             e.printStackTrace(log);
             throw new StatusException(