[Libreoffice-commits] .: 3 commits - sc/inc sc/source

[Markus Mohrhard]

 sc/inc/address.hxx               |    3 ++-
 sc/source/core/tool/interpr1.cxx |    3 +++
 sc/source/ui/view/editsh.cxx     |    4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit aeddbade5428ae4794faea79c376f6c8c0e9112f
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Jan 8 04:17:53 2012 +0100

    don't set document modified for copy and select all, fdo#44423

diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 7e7cea0..c843e96 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -233,7 +233,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
 
         case SID_COPY:
             pTableView->Copy();
-            break;
+            return;
 
         case SID_CUT:
             pTableView->Cut();
@@ -334,7 +334,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
                         pTopView->SetSelection(ESelection(0,0,nPar-1,nLen));
                 }
             }
-            break;
+            return;
 
         case SID_CHARMAP:
             {
commit baed170c416fd5bcae4d17362f0efd0e6284efdc
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Jan 8 03:09:34 2012 +0100

    return earlier from ScInterpreter::GetDBParams on error, fdo#44442

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 34f027d..f54d2a0 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -6609,6 +6609,9 @@ ScDBQueryParamBase* ScInterpreter::GetDBParams( bool& rMissingField )
                 SetError( errIllegalParameter );
         }
 
+        if (nGlobalError)
+            return NULL;
+
         SAL_WNODEPRECATED_DECLARATIONS_PUSH
         auto_ptr<ScDBRangeBase> pDBRef( PopDBDoubleRef() );
         SAL_WNODEPRECATED_DECLARATIONS_POP
commit 7922d1d8b65fa18822eaba8d38460d76c1e7a2c8
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Jan 8 02:39:53 2012 +0100

    limit the number of sheets again to 10000
    
    Our 32bit builds have problems to generate more sheets and crash with a
    std::bad_alloc
    
    Increase this limit again as soon as we can handle std::bad_alloc

diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index c3eb51c..6c45311 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -87,7 +87,8 @@ const SCSIZE   SCSIZE_MAX   = ::std::numeric_limits<SCSIZE>::max();
 // Count values
 const SCROW       MAXROWCOUNT    = MAXROWCOUNT_DEFINE;
 const SCCOL       MAXCOLCOUNT    = MAXCOLCOUNT_DEFINE;
-const SCTAB       MAXTABCOUNT    = 32000;
+// limiting to 10000 for now, problem with 32 bit builds for now
+const SCTAB       MAXTABCOUNT    = 10000;
 const SCCOLROW    MAXCOLROWCOUNT = MAXROWCOUNT;
 // Maximum values
 const SCROW       MAXROW         = MAXROWCOUNT - 1;