sc/inc/address.hxx | 11 ----------- sc/source/ui/view/viewdata.cxx | 2 -- 2 files changed, 13 deletions(-)
New commits: commit 451cb9aace6d0d207b99691be025bd4bb8968a32 Author: Tor Lillqvist <[email protected]> Date: Mon Mar 9 23:43:43 2015 +0200 SC_LIMIT_ROWS is not defined anywhere diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx index 6bf55340..cbaccc1 100644 --- a/sc/inc/address.hxx +++ b/sc/inc/address.hxx @@ -96,19 +96,8 @@ const SCROW SCROW_REPEAT_NONE = SCROW_MAX; #endif const SCROW SCROWS64K = 65536; -// old stuff defines #define MAXROW_30 8191 -#ifdef SC_LIMIT_ROWS -#undef MAXROWCOUNT_DEFINE -#define MAXROWCOUNT_DEFINE 8192 -const SCROW W16MAXROWCOUNT = MAXROWCOUNT_DEFINE; -const SCROW W16MAXROW = W16MAXROWCOUNT - 1; -#define MAXROWCOUNT W16MAXROWCOUNT -#define MAXROW W16MAXROW -#endif - -// old stuff defines end SAL_WARN_UNUSED_RESULT inline bool ValidCol( SCCOL nCol ) { return nCol >= static_cast<SCCOL>(0) && nCol <= MAXCOL; diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 5ac8886..9efad26 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -2305,11 +2305,9 @@ void ScViewData::ReadUserData(const OUString& rData) sal_Unicode cTabSep = 0; if (comphelper::string::getTokenCount(aTabOpt, SC_OLD_TABSEP) >= 11) cTabSep = SC_OLD_TABSEP; -#ifndef SC_LIMIT_ROWS else if (comphelper::string::getTokenCount(aTabOpt, SC_NEW_TABSEP) >= 11) cTabSep = SC_NEW_TABSEP; // '+' ist nur erlaubt, wenn wir mit Zeilen > 8192 umgehen koennen -#endif if (cTabSep) { _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
