summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2023-08-06 14:16:22 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2023-08-06 17:06:15 +0200
commit1e4b0e5a36b5fe5b1a391e8417b28a7900acc560 (patch)
treee310395fd933992672c7083e9e4b7999c7ee4ad4
parentad1f69d28d31725a22e7e1cbb4d950aa9ad3bea7 (diff)
fix "move SwVirtPageNumInfo to SfxHint"
commit 7f85415a2f07d62bf688cb33680054940d4dd7f1 caused > 0x7f206906bd30: note: object is of type 'sw::VirtPageNumHint' > 80 60 00 00 f0 33 8b 16 20 7f 00 00 6d 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 80 94 5c 00 > ^~~~~~~~~~~~~~~~~~~~~~~ > vptr for 'sw::VirtPageNumHint' > #0 0x7f2007e0e38b in SwTabFrame::SwClientNotify(SwModify const&, SfxHint const&) /sw/source/core/layout/tabfrm.cxx:3525:20 > #1 0x7f2004957b22 in SwModify::CallSwClientNotify(SfxHint const&) const /sw/source/core/attr/calbck.cxx:322:18 > #2 0x7f2004957e25 in sw::BroadcastingModify::CallSwClientNotify(SfxHint const&) const /sw/source/core/attr/calbck.cxx:327:15 > #3 0x7f2007ea97eb in SwFrame::GetVirtPageNum() const /sw/source/core/layout/trvlfrm.cxx:1844:19 > #4 0x7f20089f092b in SwTextFormatter::NewFieldPortion(SwTextFormatInfo&, SwTextAttr const*) const /sw/source/core/text/txtfld.cxx:160:47 > #5 0x7f20089f9be6 in SwTextFormatter::NewExtraPortion(SwTextFormatInfo&) /sw/source/core/text/txtfld.cxx:382:20 > #6 0x7f200863dbe8 in SwTextFormatter::NewPortion(SwTextFormatInfo&, std::optional<o3tl::strong_int<int, Tag_TextFrameIndex> >) /sw/source/core/text/itrform2.cxx:1737:28 > #7 0x7f200862661f in SwTextFormatter::BuildPortions(SwTextFormatInfo&) /sw/source/core/text/itrform2.cxx:440:27 > #8 0x7f200865f573 in SwTextFormatter::FormatLine(o3tl::strong_int<int, Tag_TextFrameIndex>) /sw/source/core/text/itrform2.cxx:1952:9 > #9 0x7f200844aef2 in SwTextFrame::FormatLine(SwTextFormatter&, bool) /sw/source/core/text/frmform.cxx:1303:44 > #10 0x7f2008459474 in SwTextFrame::Format_(SwTextFormatter&, SwTextFormatInfo&, bool) /sw/source/core/text/frmform.cxx:1663:23 > #11 0x7f200845edcb in SwTextFrame::FormatImpl(OutputDevice*, SwParaPortion*, std::__debug::vector<SwAnchoredObject*, std::allocator<SwAnchoredObject*> >&) /sw/source/core/text/frmform.cxx:1854:5 > #12 0x7f2008465458 in SwTextFrame::Format(OutputDevice*, SwBorderAttrs const*) /sw/source/core/text/frmform.cxx:2058:17 > #13 0x7f200758ac43 in SwContentFrame::MakeAll(OutputDevice*) /sw/source/core/layout/calcmove.cxx:1515:17 > #14 0x7f200755b0a1 in SwFrame::OptPrepareMake() /sw/source/core/layout/calcmove.cxx:399:9 > #15 0x7f2007953230 in SwFrame::OptCalc() const /sw/source/core/inc/frame.hxx:1090:37 > #16 0x7f20079208f7 in SwLayAction::FormatLayout(OutputDevice*, SwLayoutFrame*, bool) /sw/source/core/layout/layact.cxx:1430:19 > #17 0x7f200792060a in SwLayAction::FormatLayout(OutputDevice*, SwLayoutFrame*, bool) /sw/source/core/layout/layact.cxx:1423:29 > #18 0x7f20079344a2 in SwLayAction::FormatLayoutTab(SwTabFrame*, bool) /sw/source/core/layout/layact.cxx:1642:25 > #19 0x7f2007920133 in SwLayAction::FormatLayout(OutputDevice*, SwLayoutFrame*, bool) /sw/source/core/layout/layact.cxx:1417:32 > #20 0x7f200792060a in SwLayAction::FormatLayout(OutputDevice*, SwLayoutFrame*, bool) /sw/source/core/layout/layact.cxx:1423:29 > #21 0x7f2007908ac6 in SwLayAction::InternalAction(OutputDevice*) /sw/source/core/layout/layact.cxx:591:25 > #22 0x7f2007903d4e in SwLayAction::Action(OutputDevice*) /sw/source/core/layout/layact.cxx:388:5 > #23 0x7f200a3ff241 in SwViewShell::ImplEndAction(bool) /sw/source/core/view/viewsh.cxx:309:17 > #24 0x7f2004ccef61 in SwViewShell::EndAction(bool) /sw/inc/viewsh.hxx:628:9 > #25 0x7f2004c2e8a0 in SwCursorShell::EndAction(bool) /sw/source/core/crsr/crsrsh.cxx:263:18 > #26 0x7f200c9ff99c in SwView::OuterResizePixel(Point const&, Size const&) /sw/source/uibase/uiview/viewport.cxx:1107:22 > #27 0x7f2026f7a582 in SfxViewFrame::DoAdjustPosSizePixel(SfxViewShell*, Point const&, Size const&, bool) /sfx2/source/view/viewfrm.cxx:2058:18 > #28 0x7f2026fa205f in SfxViewFrame::Resize(bool) /sfx2/source/view/viewfrm.cxx:2852:13 > #29 0x7f2026ff3179 in SfxFrameViewWindow_Impl::Resize() /sfx2/source/view/viewfrm2.cxx:72:17 > #30 0x7f204ea688e0 in vcl::Window::ImplCallResize() /vcl/source/window/event.cxx:525:5 > #31 0x7f204f23f74b in vcl::Window::Show(bool, ShowFlags) /vcl/source/window/window.cxx:2293:13 > #32 0x7f2026e731b8 in SfxBaseController::ConnectSfxFrame_Impl(SfxBaseController::ConnectSfxFrame) /sfx2/source/view/sfxbasecontroller.cxx:1182:24 > #33 0x7f2026e6f0aa in SfxBaseController::attachFrame(com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&) /sfx2/source/view/sfxbasecontroller.cxx:530:9 > #34 0x7f2026dd0b8e in utl::ConnectFrameControllerModel(com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&, com::sun::star::uno::Reference<com::sun::star::frame::XController2> const&, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&) /include/unotools/fcm.hxx:48:18 > #35 0x7f2026dc47e3 in (anonymous namespace)::SfxFrameLoader_Impl::impl_createDocumentView(com::sun::star::uno::Reference<com::sun::star::frame::XModel2> const&, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&, comphelper::NamedValueCollection const&, rtl::OUString const&) /sfx2/source/view/frmload.cxx:584:5 > #36 0x7f2026dbbfde in (anonymous namespace)::SfxFrameLoader_Impl::load(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&) /sfx2/source/view/frmload.cxx:759:13 > #37 0x7f1fd762b75b in framework::LoadEnv::impl_loadContent() /framework/source/loadenv/loadenv.cxx:1176:37 > #38 0x7f1fd7621b5b in framework::LoadEnv::start() /framework/source/loadenv/loadenv.cxx:412:20 > #39 0x7f1fd7619a1c in framework::LoadEnv::startLoading(rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&, rtl::OUString const&, int, LoadEnvFeatures) /framework/source/loadenv/loadenv.cxx:308:5 > #40 0x7f1fd7614d57 in framework::LoadEnv::loadComponentFromURL(com::sun::star::uno::Reference<com::sun::star::frame::XComponentLoader> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) /framework/source/loadenv/loadenv.cxx:168:14 > #41 0x7f1fd76ed70d in framework::Desktop::loadComponentFromURL(rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) /framework/source/services/desktop.cxx:593:16 > #42 0x7f1fd76ed936 in non-virtual thunk to framework::Desktop::loadComponentFromURL(rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) /framework/source/services/desktop.cxx > #43 0x7f1ff52cbb7a in unotest::MacrosTest::loadFromDesktop(rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) /unotest/source/cpp/macros_test.cxx:71:62 > #44 0x7f20214a91ac in UnoApiTest::load(rtl::OUString const&, char const*) /test/source/unoapi_test.cxx:115:11 > #45 0x7f1ff578a483 in SwModelTestBase::loadURL(rtl::OUString const&, char const*) /sw/qa/unit/swmodeltestbase.cxx:468:20 > #46 0x7f1ff578df71 in SwModelTestBase::loadAndSave(char const*, char const*) /sw/qa/unit/swmodeltestbase.cxx:486:5 > #47 0x7f202d75f0b9 in testCrashWhileSave::TestBody() /sw/qa/extras/ooxmlexport/ooxmlexport3.cxx:1016:5 during CppunitTest_sw_ooxmlexport3 (<https://ci.libreoffice.org/job/lo_ubsan/2871/>). Change-Id: I41838d3493bd4b1a68cb29cf1e90494eb8db0077 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155383 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--sw/source/core/layout/tabfrm.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 23765a721361..58b912ad1372 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -3519,6 +3519,7 @@ void SwTabFrame::SwClientNotify(const SwModify& rMod, const SfxHint& rHint)
return;
if(const SwPageFrame* pPage = FindPageFrame())
pPage->UpdateVirtPageNumInfo(rVirtPageNumHint, this);
+ return;
}
else if (rHint.GetId() != SfxHintId::SwLegacyModify)
return;