commit d7b6b1dc1d21dd3925798954a59508a40a700cfd
author Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Sat Apr 11 02:05:45 2015 +0200
committer Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon Apr 13 17:21:30 2015 +0200
tree b6024626c66fbc185671d967ab86a03e2be0d8af
parent e5796e0263ed00a7da06ea4351a58cedbfb88822

use getCells() here

Change-Id: Iff3997af302a6ddbfd21fb25cd7f0b94a9a107fe

sw/source/core/unocore/unotbl.cxx

diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 18379c8..7deff41 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -3639,28 +3639,25 @@ uno::Sequence< uno::Sequence< uno::Any > > SAL_CALL SwXCellRange::getDataArray()
    const sal_uInt16 nColCount = getColumnCount();
    if(!nRowCount || !nColCount)
        throw uno::RuntimeException("Table too complex", static_cast<cppu::OWeakObject*>(this));
    SwFrmFmt* pFmt(GetFrmFmt());
    lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this));
    uno::Sequence< uno::Sequence< uno::Any > > aRowSeq(nRowCount);
    if(!pFmt)
        throw uno::RuntimeException();
    sal_uInt16 nRow = 0;
    auto vCells(getCells());
    auto pCurrentCell(vCells.begin());
    for(auto& rRow : aRowSeq)
    {
        rRow = uno::Sequence< uno::Any >(nColCount);
        sal_uInt16 nCol = 0;
        for(auto& rCellAny : rRow)
        {
            SwXCell* pXCell(lcl_CreateXCell(pFmt, nCol++, nRow));
            uno::Reference<table::XCell> xCell = pXCell; // to prevent distruction in UNO calls
            SwTableBox* pBox = pXCell ? pXCell->GetTblBox() : nullptr;
            auto pCell(static_cast<SwXCell*>(pCurrentCell->get()));
            SwTableBox* pBox = pCell ? pCell->GetTblBox() : nullptr;
            if(!pBox)
                throw uno::RuntimeException();
            // check if table box value item is set
            SwFrmFmt* pBoxFmt(pBox->GetFrmFmt());
            const bool bIsNum = pBoxFmt->GetItemState(RES_BOXATR_VALUE, false) == SfxItemState::SET;
            rCellAny = bIsNum ? uno::makeAny(sw_getValue(*pXCell)) : uno::makeAny(lcl_getString(*pXCell));
            rCellAny = bIsNum ? uno::makeAny(sw_getValue(*pCell)) : uno::makeAny(lcl_getString(*pCell));
            ++pCurrentCell;
        }
        ++nRow;
    }
    return aRowSeq;
}