svx/source/form/navigatortree.cxx | 8 ++++---- test/source/sheet/xcellrangeformula.cxx | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit de81349e69ea229843a23cce1117f69f14862f6b Author: Andrea Gelmini <andrea.gelm...@gelma.net> AuthorDate: Fri Aug 28 12:17:11 2020 +0200 Commit: Julien Nabet <serval2...@yahoo.fr> CommitDate: Mon Aug 31 14:51:48 2020 +0200 Fix typo in code It passed "make check" on Linux Change-Id: Iecaab4ab9f7d8e05930685aaf5a2eb2770abbd1e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101601 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2...@yahoo.fr> diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index c84ec322bc80..de01cc9763a6 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -803,11 +803,11 @@ namespace svxform // means moving the control) // collect the ancestors of the drop target (speeds up 3) - SvLBoxEntrySortedArray arrDropAnchestors; + SvLBoxEntrySortedArray arrDropAncestors; std::unique_ptr<weld::TreeIter> xLoop(m_xTreeView->make_iterator(_pTargetEntry)); do { - arrDropAnchestors.emplace(m_xTreeView->make_iterator(xLoop.get())); + arrDropAncestors.emplace(m_xTreeView->make_iterator(xLoop.get())); } while (m_xTreeView->iter_parent(*xLoop)); @@ -835,12 +835,12 @@ namespace svxform // test for 3) if (IsFormEntry(*rCurrent)) { - auto aIter = std::find_if(arrDropAnchestors.begin(), arrDropAnchestors.end(), + auto aIter = std::find_if(arrDropAncestors.begin(), arrDropAncestors.end(), [this, &rCurrent](const auto& rElem) { return m_xTreeView->iter_compare(*rElem, *rCurrent) == 0; }); - if ( aIter != arrDropAnchestors.end() ) + if ( aIter != arrDropAncestors.end() ) return DND_ACTION_NONE; } else if (IsFormComponentEntry(*rCurrent)) commit 19cf1b4fcfb9d9d17587e4224c3c3818952cd69c Author: Andrea Gelmini <andrea.gelm...@gelma.net> AuthorDate: Mon Aug 31 12:39:14 2020 +0200 Commit: Julien Nabet <serval2...@yahoo.fr> CommitDate: Mon Aug 31 14:51:10 2020 +0200 Fix typo in code It passed "make check" on Linux Change-Id: Ia1fbd635d7d13c69c9b8911eadaa86ee5f7aadb6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101707 Reviewed-by: Julien Nabet <serval2...@yahoo.fr> Tested-by: Jenkins diff --git a/test/source/sheet/xcellrangeformula.cxx b/test/source/sheet/xcellrangeformula.cxx index 6de60149938f..8a2eeb220ba2 100644 --- a/test/source/sheet/xcellrangeformula.cxx +++ b/test/source/sheet/xcellrangeformula.cxx @@ -24,7 +24,7 @@ void XCellRangeFormula::testGetSetFormulaArray() { uno::Reference<sheet::XCellRangeFormula> xCRF(init(), UNO_QUERY_THROW); - uno::Sequence<uno::Sequence<OUString>> aFormulaArrayOrginal = xCRF->getFormulaArray(); + uno::Sequence<uno::Sequence<OUString>> aFormulaArrayOriginal = xCRF->getFormulaArray(); uno::Sequence<uno::Sequence<OUString>> aFormulaArrayNew = xCRF->getFormulaArray(); aFormulaArrayNew[0][0] = "NewValue"; @@ -32,8 +32,8 @@ void XCellRangeFormula::testGetSetFormulaArray() CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to get new FormulaArray", OUString("NewValue"), xCRF->getFormulaArray()[0][0]); - xCRF->setFormulaArray(aFormulaArrayOrginal); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to set new FormulaArray", aFormulaArrayOrginal[0][0], + xCRF->setFormulaArray(aFormulaArrayOriginal); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to set new FormulaArray", aFormulaArrayOriginal[0][0], xCRF->getFormulaArray()[0][0]); } } // namespace apitest _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits