Kaydet (Commit) c74631a0 authored tarafından Michael Stahl's avatar Michael Stahl

sw: remove redundant parameter of SwXText::Impl::ConvertCell()

Change-Id: I8f435c4a8bb8e2ad118abd001df56162a3996521
üst 36a7ac0d
...@@ -110,7 +110,6 @@ public: ...@@ -110,7 +110,6 @@ public:
throw (lang::IllegalArgumentException, uno::RuntimeException); throw (lang::IllegalArgumentException, uno::RuntimeException);
void ConvertCell( void ConvertCell(
const bool bFirstCell,
const uno::Sequence< uno::Reference< text::XTextRange > > & rCell, const uno::Sequence< uno::Reference< text::XTextRange > > & rCell,
::std::vector<SwNodeRange> & rRowNodes, ::std::vector<SwNodeRange> & rRowNodes,
::std::unique_ptr< SwPaM > & rpFirstPaM, ::std::unique_ptr< SwPaM > & rpFirstPaM,
...@@ -1816,7 +1815,6 @@ static bool lcl_SimilarPosition( const sal_Int32 nPos1, const sal_Int32 nPos2 ) ...@@ -1816,7 +1815,6 @@ static bool lcl_SimilarPosition( const sal_Int32 nPos1, const sal_Int32 nPos2 )
} }
void SwXText::Impl::ConvertCell( void SwXText::Impl::ConvertCell(
const bool bFirstCell,
const uno::Sequence< uno::Reference< text::XTextRange > > & rCell, const uno::Sequence< uno::Reference< text::XTextRange > > & rCell,
::std::vector<SwNodeRange> & rRowNodes, ::std::vector<SwNodeRange> & rRowNodes,
::std::unique_ptr< SwPaM > & rpFirstPaM, ::std::unique_ptr< SwPaM > & rpFirstPaM,
...@@ -1905,7 +1903,7 @@ void SwXText::Impl::ConvertCell( ...@@ -1905,7 +1903,7 @@ void SwXText::Impl::ConvertCell(
have to be aligned on paragraph borders by inserting paragraph have to be aligned on paragraph borders by inserting paragraph
breaks. Non-consecutive ranges must initiate an exception. breaks. Non-consecutive ranges must initiate an exception.
*/ */
if (bFirstCell) if (!pLastCell) // first cell?
{ {
// align the beginning - if necessary // align the beginning - if necessary
if (aStartCellPam.Start()->nContent.GetIndex()) if (aStartCellPam.Start()->nContent.GetIndex())
...@@ -1980,8 +1978,9 @@ void SwXText::Impl::ConvertCell( ...@@ -1980,8 +1978,9 @@ void SwXText::Impl::ConvertCell(
SwNodeRange aCellRange(aStartCellPam.Start()->nNode, SwNodeRange aCellRange(aStartCellPam.Start()->nNode,
aEndCellPam.End()->nNode); aEndCellPam.End()->nNode);
rRowNodes.push_back(aCellRange); // note: invalidates pLastCell! rRowNodes.push_back(aCellRange); // note: invalidates pLastCell!
if (bFirstCell) if (!pLastCell)
{ {
assert(!rpFirstPaM);
rpFirstPaM.reset(new SwPaM(*aStartCellPam.Start())); rpFirstPaM.reset(new SwPaM(*aStartCellPam.Start()));
} }
} }
...@@ -2250,7 +2249,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) ...@@ -2250,7 +2249,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
(nCell == 0) (nCell == 0)
? ((nRow == 0) ? nullptr : &*aTableNodes.rbegin()->rbegin()) ? ((nRow == 0) ? nullptr : &*aTableNodes.rbegin()->rbegin())
: &*aRowNodes.rbegin()); : &*aRowNodes.rbegin());
m_pImpl->ConvertCell((nCell == 0) && (nRow == 0), pRow[nCell], m_pImpl->ConvertCell(pRow[nCell],
aRowNodes, pFirstPaM, pLastCell, bExcept); aRowNodes, pFirstPaM, pLastCell, bExcept);
} }
aTableNodes.push_back(aRowNodes); aTableNodes.push_back(aRowNodes);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment