[Libreoffice-commits] core.git: chart2/source
Stephan Bergmann
sbergman at redhat.com
Fri Jun 9 17:49:47 UTC 2017
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 89214e05e0c2f92fbe68e6c4f4a9035a94cff282
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jun 9 19:47:57 2017 +0200
Fix typo in queryAggregation
...that caused UBSan failure in UITest_calc_demo:
> framework/source/services/desktop.cxx:406:47: runtime error: member call on address 0x611000887c80 which does not point to an object of type 'com::sun::star::lang::XServiceInfo'
> 0x611000887c40: note: object is base class subobject at offset 64 within object of type 'chart::CreationWizardUnoDlg'
> 1a 06 80 29 70 23 e8 c8 5a 7f 00 00 50 87 f0 00 40 60 00 00 48 24 e8 c8 5a 7f 00 00 02 00 00 00
> ^
> #0 0x7f5d62c1413b in framework::Desktop::addTerminateListener(com::sun::star::uno::Reference<com::sun::star::frame::XTerminateListener> const&) framework/source/services/desktop.cxx:406:47
> #1 0x7f5ac78f9337 in chart::CreationWizardUnoDlg::CreationWizardUnoDlg(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx:52:15
> #2 0x7f5ac7906cdd in com_sun_star_comp_chart2_WizardDialog_get_implementation chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx:368:30
> #3 0x7f5df087ff37 in std::_Function_handler<com::sun::star::uno::XInterface* (com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&), com::sun::star::uno::XInterface* (*)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&)>::_M_invoke(std::_Any_data const&, com::sun::star::uno::XComponentContext*&&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) /usr/lib/gcc/x86_64-redhat-linux/6.3.1/../../../../include/c++/6.3.1/functional:1716:9
> #4 0x7f5df0757dab in std::function<com::sun::star::uno::XInterface* (com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&)>::operator()(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) const /usr/lib/gcc/x86_64-redhat-linux/6.3.1/../../../../include/c++/6.3.1/functional:2127:14
> #5 0x7f5df06f69f1 in cppuhelper::ServiceManager::Data::Implementation::createInstance(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, bool) cppuhelper/source/servicemanager.cxx:667:13
> #6 0x7f5df07134f2 in cppuhelper::ServiceManager::createInstanceWithContext(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) cppuhelper/source/servicemanager.cxx:998:17
> #7 0x7f5df0715d7a in non-virtual thunk to cppuhelper::ServiceManager::createInstanceWithContext(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) cppuhelper/source/servicemanager.cxx
> #8 0x7f5d47aca8ca in FuInsertChart::FuInsertChart(ScTabViewShell*, vcl::Window*, ScDrawView*, SdrModel*, SfxRequest&) sc/source/ui/drawfunc/fuins2.cxx:650:27
> #9 0x7f5d49da003c in ScTabViewShell::ExecDrawIns(SfxRequest&) sc/source/ui/view/tabvwshb.cxx:344:13
> #10 0x7f5d49ce50ed in SfxStubScTabViewShellExecDrawIns(SfxShell*, SfxRequest&) workdir/SdiTarget/sc/sdi/scslots.hxx:1407:1
> #11 0x7f5de463ea6d in SfxShell::CallExec(void (*)(SfxShell*, SfxRequest&), SfxRequest&) include/sfx2/shell.hxx:211:35
> #12 0x7f5de4600cbe in SfxDispatcher::Call_Impl(SfxShell&, SfxSlot const&, SfxRequest&, bool) sfx2/source/control/dispatch.cxx:377:20
> #13 0x7f5de4621593 in SfxDispatcher::PostMsgHandler(SfxRequest*) sfx2/source/control/dispatch.cxx:1156:17
> #14 0x7f5de460487a in SfxDispatcher::LinkStubPostMsgHandler(void*, SfxRequest*) sfx2/source/control/dispatch.cxx:1136:1
> #15 0x7f5de5f18eda in Link<SfxRequest*, void>::Call(SfxRequest*) const include/tools/link.hxx:84:45
> #16 0x7f5de5f189d2 in SfxHintPoster::DoEvent_Impl(void*) sfx2/source/notify/hintpost.cxx:44:12
> #17 0x7f5de5f18861 in SfxHintPoster::LinkStubDoEvent_Impl(void*, void*) sfx2/source/notify/hintpost.cxx:42:1
> #18 0x7f5dbc3bb9fa in Link<void*, void>::Call(void*) const include/tools/link.hxx:84:45
> #19 0x7f5dbc3a5bdf in ImplHandleUserEvent(ImplSVEvent*) vcl/source/window/winproc.cxx:1946:30
> #20 0x7f5dbc39103c in ImplWindowFrameProc(vcl::Window*, SalEvent, void const*) vcl/source/window/winproc.cxx:2495:13
> #21 0x7f5dbf2f016f in SalFrame::CallCallback(SalEvent, void const*) const vcl/inc/salframe.hxx:276:33
> #22 0x7f5dbf350db2 in SvpSalInstance::DoYield(bool, bool, unsigned long) vcl/headless/svpinst.cxx:345:31
> #23 0x7f5dbe714b69 in ImplYield(bool, bool, unsigned long) vcl/source/app/svapp.cxx:494:29
> #24 0x7f5dbe6efb53 in Application::Yield() vcl/source/app/svapp.cxx:558:5
> #25 0x7f5dbe6ef896 in Application::Execute() vcl/source/app/svapp.cxx:458:9
> #26 0x7f5dfab81984 in desktop::Desktop::DoExecute() desktop/source/app/app.cxx:1354:5
> #27 0x7f5dfab89eb6 in desktop::Desktop::Main() desktop/source/app/app.cxx:1698:17
> #28 0x7f5dbe76c6ab in ImplSVMain() vcl/source/app/svmain.cxx:192:35
> #29 0x7f5dbe779bf1 in SVMain() vcl/source/app/svmain.cxx:230:16
> #30 0x7f5dfadb8659 in soffice_main desktop/source/app/sofficemain.cxx:166:12
> #31 0x50fa39 in sal_main desktop/source/app/main.c:48:15
> #32 0x50f9e3 in main desktop/source/app/main.c:47:1
> #33 0x7f5df9322400 in __libc_start_main /usr/src/debug/glibc-2.24-33-ge9e69e4/csu/../csu/libc-start.c:289
> #34 0x419f79 in _start (instdir/program/soffice.bin+0x419f79)
Change-Id: I0a798c6d77b7349077ea44dfe112024abb2567f0
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 5ca2b85758b3..a61ae2365900 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -94,7 +94,7 @@ uno::Any SAL_CALL CreationWizardUnoDlg::queryAggregation( uno::Type const & rTyp
}
else if (rType == cppu::UnoType<lang::XServiceInfo>::get())
{
- void * p = static_cast< lang::XTypeProvider * >( this );
+ void * p = static_cast< lang::XServiceInfo * >( this );
return uno::Any( &p, rType );
}
else if (rType == cppu::UnoType<lang::XInitialization>::get())
More information about the Libreoffice-commits
mailing list