sc/inc/address.hxx | 3 ++- sc/source/core/tool/interpr1.cxx | 3 +++ sc/source/ui/app/inputhdl.cxx | 2 +- sc/source/ui/view/editsh.cxx | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-)
New commits: commit 49f98ec53e928877a85d3dfc2a06161a27ea7fd2 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Sat Jan 7 16:55:49 2012 +0000 another missing null pointer check in multilinebar, fdo#44518 diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index c0e3cc6..95d2b7f 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -2115,7 +2115,7 @@ void ScInputHandler::DataChanged( sal_Bool bFromTopNotify ) if (eMode==SC_INPUT_TYPE || eMode==SC_INPUT_TABLE) { String aText; - if ( pInputWin->IsMultiLineInput() ) + if ( pInputWin && pInputWin->IsMultiLineInput() ) aText = ScEditUtil::GetMultilineString(*pEngine); else aText = GetEditText(pEngine); commit 71d55f30ecf972d016a2d02fc3b75c4865bb3d6c Author: Markus Mohrhard <markus.mohrh...@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 c93098a391fc46f53468ef01a059c17d4f3673ee Author: Markus Mohrhard <markus.mohrh...@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 dcdc5fe..8b359aa 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 e2222714bccd83df43a98963e26a85b9d5e28a6c Author: Markus Mohrhard <markus.mohrh...@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 761158d..64f56c7 100644 --- a/sc/inc/address.hxx +++ b/sc/inc/address.hxx @@ -88,7 +88,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; _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits