sw/qa/extras/uiwriter/uiwriter5.cxx | 3 +--
sw/qa/uibase/shells/shells.cxx | 7 +------
2 files changed, 2 insertions(+), 8 deletions(-)
New commits:
commit 7c71d1c296e8a1976aa418e9a6c8e4af1b157c93
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Aug 9 17:46:05 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Aug 9 19:18:23 2024 +0200
simplify
Change-Id: I7d8e8b13166537d0e9c60ff0be01f680a817ca5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171699
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/qa/extras/uiwriter/uiwriter5.cxx
b/sw/qa/extras/uiwriter/uiwriter5.cxx
index 3a6608e9a508..fd4bd7129e81 100644
--- a/sw/qa/extras/uiwriter/uiwriter5.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter5.cxx
@@ -932,8 +932,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf147006)
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_FRM));
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_GRF));
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), rIDMA.getAllMarksCount());
-
CPPUNIT_ASSERT_EQUAL(std::iterator_traits<IDocumentMarkAccess::iterator>::difference_type(1),
- std::distance(rIDMA.getFieldmarksBegin(),
rIDMA.getFieldmarksEnd()));
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1), rIDMA.getFieldmarksCount());
dispatchCommand(mxComponent, u".uno:SelectAll"_ustr, {});
// this crashed
diff --git a/sw/qa/uibase/shells/shells.cxx b/sw/qa/uibase/shells/shells.cxx
index 59720ff244df..e4ed7367fc29 100644
--- a/sw/qa/uibase/shells/shells.cxx
+++ b/sw/qa/uibase/shells/shells.cxx
@@ -579,13 +579,8 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testInsertFieldmarkReadonly)
// Then make sure the read-only content refuses to accept that inner
fieldmark, so we still have
// just one:
- size_t nActual = 0;
IDocumentMarkAccess& rIDMA = *pDoc->getIDocumentMarkAccess();
- for (auto it = rIDMA.getFieldmarksBegin(); it != rIDMA.getFieldmarksEnd();
++it)
- {
- ++nActual;
- }
- CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), nActual);
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1),
rIDMA.getFieldmarksCount());
}
CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testUpdateRefmarks)
