diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-01 11:31:29 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-01 14:59:25 +0100 |
| commit | 97a857b17d06fcc5de5d284424ba1831ee3bac4a (patch) | |
| tree | 10077920ea97281bb7cb31bbdcbb04e3e8ee8ed9 /sc | |
| parent | 107399d684bae9e58f5e4020f15eb8a689f1db82 (diff) | |
Simplify nullptr
With 3741b90abe478fb04db88207b496a5238df35bb8 "tdf#138483 sc: update red circles
after merging cells", UBSan builds had started to fail as
CppunitTest_sc_subsequent_filters_test now need ScUndoRemoveMerge RTTI:
> [CUT] sc_subsequent_filters_test
> DynamicLibraryManagerException: "Failed to load dynamic library: workdir/LinkTarget/CppunitTest/libtest_sc_subsequent_filters_test.so
> workdir/LinkTarget/CppunitTest/libtest_sc_subsequent_filters_test.so: undefined symbol: _ZTI17ScUndoRemoveMerge"
But as pUndoRemoveMerge was always empty, we can just as well remove the
variable completely. (Though I do not know whether pUndoRemoveMerge being empty
is what 3741b90abe478fb04db88207b496a5238df35bb8 had actually intended.)
Change-Id: Ie67dfe3c600ca5a290d091af033a230c581bf3a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106963
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/qa/unit/subsequent_filters-test.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 2ef3cf4fb326..a00e756bcbc8 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -552,8 +552,7 @@ void ScFiltersTest::testUpdateCircleInMergedCellODS() // There should be a circle object! CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pPage->GetObjCount()); - std::unique_ptr<ScUndoRemoveMerge> pUndoRemoveMerge; - xDocSh->GetDocFunc().UnmergeCells(aCellMergeOption, true, pUndoRemoveMerge.get()); + xDocSh->GetDocFunc().UnmergeCells(aCellMergeOption, true, nullptr); // There should be four circle objects! CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(4), pPage->GetObjCount()); |