commit b68987558068f88fa8016e5bd2d62f57d27d0c19
author Eike Rathke <erack@redhat.com> Mon Mar 02 16:11:01 2015 +0100
committer Eike Rathke <erack@redhat.com> Thu Mar 05 11:44:53 2015 +0100
tree f102e1e41db5fcb2bb61c1897e46845a37d5b1c9
parent 8d78888a0c62641284d5e5fbe42cb3b950e22683

remove SC_START_INDEX_DB_COLL binary file format legacy

There's no ocName that should be ocDBArea instead anymore.

Change-Id: Idbbb62330bfdc5c4e83f99436490e12d90cfd1d4

sc/inc/global.hxx

diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 85bb412..2c6c612 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -71,10 +71,6 @@ const sal_Unicode CHAR_ZWNBSP   = 0x2060;

const SCSIZE MAXSUBTOTAL        = 3;

#define SC_START_INDEX_DB_COLL 50000
                                        // Above this threshold are indices
                                        // for data base areas

#define SC_USE_PS_POINTS    1       /**< use PostScript points (72ppi) instead of old TeX points (72.27ppi) */

#define PIXEL_PER_INCH      96.0

sc/source/core/data/formulacell.cxx

diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index d4bba7d..1d6ee1e 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3568,8 +3568,7 @@ void ScFormulaCell::CompileDBFormula( sc::CompileFormulaContext& rCxt )
{
    for( FormulaToken* p = pCode->First(); p; p = pCode->Next() )
    {
        if ( p->GetOpCode() == ocDBArea
            || (p->GetOpCode() == ocName && p->GetIndex() >= SC_START_INDEX_DB_COLL) )
        if ( p->GetOpCode() == ocDBArea )
        {
            bCompile = true;
            CompileTokenArray(rCxt);

sc/source/core/tool/dbdata.cxx

diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 8a04a9c..e9299e30 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -801,7 +801,7 @@ bool ScDBCollection::AnonDBs::operator== (const AnonDBs& r) const
}

ScDBCollection::ScDBCollection(ScDocument* pDocument) :
    pDoc(pDocument), nEntryIndex(SC_START_INDEX_DB_COLL), maNamedDBs(*this, *pDocument) {}
    pDoc(pDocument), nEntryIndex(1), maNamedDBs(*this, *pDocument) {}

ScDBCollection::ScDBCollection(const ScDBCollection& r) :
    pDoc(r.pDoc), nEntryIndex(r.nEntryIndex), maNamedDBs(r.maNamedDBs), maAnonDBs(r.maAnonDBs) {}