diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-06-28 13:21:17 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-06-30 10:40:03 +0200 |
commit | a1b73b37c761a4bea51fb17f1158c98f579eb305 (patch) | |
tree | 8dda3510e9f3edded2de4e14f864ab17061f9433 /sw | |
parent | 7c17cb0a52a14f4788d6f293d968e95f87c514e1 (diff) |
getCells->GetCells(): not an UNO function
Change-Id: I89335201083bd68fa199ce52e78d7750c60f8895
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/unochart.hxx | 2 | ||||
-rw-r--r-- | sw/inc/unotbl.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/unocore/unochart.cxx | 10 | ||||
-rw-r--r-- | sw/source/core/unocore/unotbl.cxx | 14 |
4 files changed, 14 insertions, 14 deletions
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index 580368a7a867..3f59dd3627f6 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -350,7 +350,7 @@ public: void FillRangeDesc( SwRangeDescriptor &rRangeDesc ) const; bool ExtendTo( bool bExtendCol, sal_Int32 nFirstNew, sal_Int32 nCount ); - std::vector< css::uno::Reference< css::table::XCell > > getCells(); + std::vector< css::uno::Reference< css::table::XCell > > GetCells(); }; typedef cppu::WeakImplHelper diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index 94fb3bdf7a89..e8009a8fedb6 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -471,7 +471,7 @@ public: void SetLabels(bool bFirstRowAsLabel, bool bFirstColumnAsLabel) { m_bFirstRowAsLabel = bFirstRowAsLabel, m_bFirstColumnAsLabel = bFirstColumnAsLabel; } virtual ~SwXCellRange() {}; - std::vector< css::uno::Reference< css::table::XCell > > getCells(); + std::vector< css::uno::Reference< css::table::XCell > > GetCells(); TYPEINFO_OVERRIDE(); diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index b95ec328b932..ed8d35a8f198 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -2135,7 +2135,7 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel( return 0; } -std::vector< css::uno::Reference< css::table::XCell > > SwChartDataSequence::getCells() +std::vector< css::uno::Reference< css::table::XCell > > SwChartDataSequence::GetCells() { if (bDisposed) throw lang::DisposedException(); @@ -2148,14 +2148,14 @@ std::vector< css::uno::Reference< css::table::XCell > > SwChartDataSequence::get SwRangeDescriptor aDesc; if(!FillRangeDescriptor(aDesc, GetCellRangeName(*pTableFormat, *pTableCrsr))) return {}; - return SwXCellRange(pTableCrsr, *pTableFormat, aDesc).getCells(); + return SwXCellRange(pTableCrsr, *pTableFormat, aDesc).GetCells(); } uno::Sequence< OUString > SAL_CALL SwChartDataSequence::getTextualData() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - auto vCells(getCells()); + auto vCells(GetCells()); uno::Sequence< OUString > vTextData(vCells.size()); std::transform(vCells.begin(), vCells.end(), @@ -2169,7 +2169,7 @@ uno::Sequence< uno::Any > SAL_CALL SwChartDataSequence::getData() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - auto vCells(getCells()); + auto vCells(GetCells()); uno::Sequence< uno::Any > vAnyData(vCells.size()); std::transform(vCells.begin(), vCells.end(), @@ -2183,7 +2183,7 @@ uno::Sequence< double > SAL_CALL SwChartDataSequence::getNumericalData() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - auto vCells(getCells()); + auto vCells(GetCells()); uno::Sequence< double > vNumData(vCells.size()); std::transform(vCells.begin(), vCells.end(), diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 1b5616d1c466..fd3e4896b644 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -3180,7 +3180,7 @@ SwXCellRange::SwXCellRange(sw::UnoCursorPointer pCrsr, SwFrameFormat& rFrameForm aRgDesc.Normalize(); } -std::vector< uno::Reference< table::XCell > > SwXCellRange::getCells() +std::vector< uno::Reference< table::XCell > > SwXCellRange::GetCells() { SwFrameFormat* const pFormat = GetFrameFormat(); const sal_Int32 nRowCount(getRowCount()); @@ -3512,7 +3512,7 @@ uno::Sequence< uno::Sequence< uno::Any > > SAL_CALL SwXCellRange::getDataArray() throw uno::RuntimeException("Table too complex", static_cast<cppu::OWeakObject*>(this)); lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this)); uno::Sequence< uno::Sequence< uno::Any > > aRowSeq(nRowCount); - auto vCells(getCells()); + auto vCells(GetCells()); auto pCurrentCell(vCells.begin()); for(auto& rRow : aRowSeq) { @@ -3542,7 +3542,7 @@ void SAL_CALL SwXCellRange::setDataArray(const uno::Sequence< uno::Sequence< uno return; if(rArray.getLength() != nRowCount) throw uno::RuntimeException("Row count mismatch. expected: " + OUString::number(nRowCount) + " got: " + OUString::number(rArray.getLength()), static_cast<cppu::OWeakObject*>(this)); - auto vCells(getCells()); + auto vCells(GetCells()); auto pCurrentCell(vCells.begin()); for(const auto& rColSeq : rArray) { @@ -3578,7 +3578,7 @@ uno::Sequence< uno::Sequence< double > > SwXCellRange::getData() throw( uno::Run return xDataRange->getData(); } uno::Sequence< uno::Sequence< double > > vRows(nRowCount); - auto vCells(getCells()); + auto vCells(GetCells()); auto pCurrentCell(vCells.begin()); for(auto& rRow : vRows) { @@ -3609,7 +3609,7 @@ void SwXCellRange::setData(const uno::Sequence< uno::Sequence< double > >& rData lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this)); if(rData.getLength() != nRowCount) throw uno::RuntimeException("Row count mismatch. expected: " + OUString::number(nRowCount) + " got: " + OUString::number(rData.getLength()), static_cast<cppu::OWeakObject*>(this)); - auto vCells(getCells()); + auto vCells(GetCells()); auto pCurrentCell(vCells.begin()); for(const auto& rRow : rData) { @@ -3651,7 +3651,7 @@ uno::Sequence<OUString> SwXCellRange::getLabelDescriptions(bool bRow) if(!(bRow ? m_bFirstColumnAsLabel : m_bFirstRowAsLabel)) return {}; // without labels we have no descriptions auto xLabelRange(getCellRangeByPosition(nLeft, nTop, nRight, nBottom)); - auto vCells(static_cast<SwXCellRange*>(xLabelRange.get())->getCells()); + auto vCells(static_cast<SwXCellRange*>(xLabelRange.get())->GetCells()); uno::Sequence<OUString> vResult(vCells.size()); std::transform(vCells.begin(), vCells.end(), vResult.begin(), [](uno::Reference<table::XCell> xCell) -> OUString { return uno::Reference<text::XText>(xCell, uno::UNO_QUERY_THROW)->getString(); }); @@ -3677,7 +3677,7 @@ void SwXCellRange::setLabelDescriptions(const uno::Sequence<OUString>& rDesc, bo if(!nRight && !nBottom) throw uno::RuntimeException("Table too complex", static_cast<cppu::OWeakObject*>(this)); auto xLabelRange(getCellRangeByPosition(nLeft, nTop, nRight, nBottom)); - auto vCells(static_cast<SwXCellRange*>(xLabelRange.get())->getCells()); + auto vCells(static_cast<SwXCellRange*>(xLabelRange.get())->GetCells()); if (sal::static_int_cast<sal_uInt32>(rDesc.getLength()) != vCells.size()) throw uno::RuntimeException("Too few or too many descriptions", static_cast<cppu::OWeakObject*>(this)); auto pDescIterator(rDesc.begin()); |