diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-06-28 12:15:15 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-06-30 10:40:01 +0200 |
commit | 9ee481cce4f26cbde09efa46bc0b2c52e53eb2bf (patch) | |
tree | d86c755d4be4e5213b88849a441d13a2d8eaf119 /sw | |
parent | 91dd43a4eaa6bd6434e538dee1a485842fbcbb4f (diff) |
kill ugly GetDataSequence, now unused
Change-Id: Ib72d52c8641b9edfbc534a490fc27d20ff17f349
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/unotbl.hxx | 8 | ||||
-rw-r--r-- | sw/source/core/unocore/unotbl.cxx | 68 |
2 files changed, 0 insertions, 76 deletions
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index c4820ce913a8..23c2116d82e1 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -543,14 +543,6 @@ public: sal_uInt16 getColumnCount(); const SwUnoCrsr* GetTableCrsr() const; - - // for SwChartDataSequence - void GetDataSequence( - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > *pAnySeq, - ::com::sun::star::uno::Sequence< OUString > *pTextSeq, - ::com::sun::star::uno::Sequence< double > *pDblSeq, - bool bForceNumberResults = false ) throw (::com::sun::star::uno::RuntimeException, std::exception); - }; class SwXTableRows SAL_FINAL : public cppu::WeakImplHelper diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index d1c69e1bc309..b3e404bc091d 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -3490,75 +3490,7 @@ void SwXCellRange::addVetoableChangeListener(const OUString& /*PropertyName*/, c void SwXCellRange::removeVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); } -void SwXCellRange::GetDataSequence( - uno::Sequence< uno::Any > *pAnySeq, //-> first pointer != 0 is used - uno::Sequence< OUString > *pTextSeq, //-> as output sequence - uno::Sequence< double > *pDblSeq, //-> (previous data gets overwritten) - bool bForceNumberResults ) //-> when 'true' requires to make an - // extra effort to return a value different - // from 0 even if the cell is formatted to text - throw (uno::RuntimeException, std::exception) -{ - SolarMutexGuard aGuard; - - // compare to SwXCellRange::getDataArray (note different return types though) - - const sal_Int32 nRowCount = getRowCount(); - const sal_Int32 nColCount = getColumnCount(); - - if(!nRowCount || !nColCount) - { - uno::RuntimeException aRuntime; - aRuntime.Message = "Table too complex"; - throw aRuntime; - } - - const size_t nSize = static_cast<size_t>(nRowCount) * static_cast<size_t>(nColCount); - OUString* pTextData(nullptr); - if (pAnySeq || pDblSeq) - { - assert(false); - } - else if (pTextSeq) - { - pTextSeq->realloc(nSize); - pTextData = pTextSeq->getArray(); - } - else - { - OSL_FAIL( "argument missing" ); - return; - } - - size_t nDtaCnt = 0; - SwFrameFormat* pFormat = GetFrameFormat(); - if(!pFormat) - return; - double fNan; - ::rtl::math::setNan(&fNan); - - uno::Reference< table::XCell > xCellRef; - for(sal_Int32 nRow = 0; nRow < nRowCount; ++nRow) - { - for(sal_Int32 nCol = 0; nCol < nColCount; ++nCol) - { - SwXCell * pXCell = lcl_CreateXCell(pFormat, - aRgDesc.nLeft + nCol, - aRgDesc.nTop + nRow); - //! keep (additional) reference to object to prevent implicit destruction - //! in following UNO calls (when object will get referenced) - xCellRef = pXCell; - SwTableBox * pBox = pXCell ? pXCell->GetTableBox() : 0; - if(!pBox) - throw uno::RuntimeException(); - pTextData[nDtaCnt++] = pXCell->getString(); - } - } - assert(nDtaCnt == nSize); -} - ///@see SwXCellRange::getData -///@see SwXCellRange::GetDataSequence uno::Sequence< uno::Sequence< uno::Any > > SAL_CALL SwXCellRange::getDataArray() throw (uno::RuntimeException, std::exception) { |