diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2016-10-30 22:08:46 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-31 06:08:01 +0000 |
| commit | 85101d2a4da95f6c8a8e51065985409b285d2ebd (patch) | |
| tree | a10477128cb363985f047b3cecb002f94be0e037 | |
| parent | ee33745ced5ae12f9ae7735fac16a7298ccae474 (diff) | |
This needs to be VclPtr too
Avoid this segfault:
Thread 1 "soffice.bin" received signal SIGSEGV, Segmentation fault.
0x00002aaad2a20e4e in VclReferenceBase::acquire (this=0x9999eeeef579c129) at /home/julien/lo/libreoffice/include/vcl/vclreferencebase.hxx:38
38 assert(mnRefCnt>0);
(gdb) bt
0 0x00002aaad2a20e4e in VclReferenceBase::acquire (this=0x9999eeeef579c129) at /home/julien/lo/libreoffice/include/vcl/vclreferencebase.hxx:38
1 0x00002aaad37325ae in rtl::Reference<AbstractScImportAsciiDlg>::Reference (this=0x7ffffffef7c0, pBody=0x55555be02790) at /home/julien/lo/libreoffice/include/rtl/ref.hxx:63
2 0x00002aaad37321b5 in VclPtr<AbstractScImportAsciiDlg>::VclPtr (this=0x7ffffffef7c0, pBody=0x55555be02790) at /home/julien/lo/libreoffice/include/vcl/vclptr.hxx:89
3 0x00002aaad3731e25 in ScopedVclPtr<AbstractScImportAsciiDlg>::ScopedVclPtr (this=0x7ffffffef7c0, pBody=0x55555be02790)
at /home/julien/lo/libreoffice/include/vcl/vclptr.hxx:305
4 0x00002aaad373055e in ScFilterOptionsObj::execute (this=0x555558d8d450) at /home/julien/lo/libreoffice/sc/source/ui/unoobj/filtuno.cxx:179
5 0x00002aaad1c03f50 in (anonymous namespace)::handleFilterOptionsRequest_ (xContext=uno::Reference to (cppu::ComponentContext *) 0x5555559ec960, rRequest=...,
rContinuations=uno::Sequence of length 2 = {...}) at /home/julien/lo/libreoffice/uui/source/iahndl-filter.cxx:259
6 0x00002aaad1c044f4 in UUIInteractionHelper::handleFilterOptionsRequest (this=0x555558c1b400, rRequest=uno::Reference to (RequestFilterOptions *) 0x555558d5edf8)
at /home/julien/lo/libreoffice/uui/source/iahndl-filter.cxx:315
Change-Id: I50f9f5c4c63328a0aaa3ecb2d83a902de6a38add
Reviewed-on: https://gerrit.libreoffice.org/30410
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | sc/inc/scabstdlg.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.hxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index a3e54faa73b2..796178725d83 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -394,7 +394,7 @@ class ScAbstractDialogFactory public: SC_DLLPUBLIC static ScAbstractDialogFactory* Create(); - virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( const OUString& aDatName, + virtual VclPtr<AbstractScImportAsciiDlg> CreateScImportAsciiDlg( const OUString& aDatName, SvStream* pInStream, ScImportAsciiCall eCall) = 0; diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index e6e3a385f6fe..93446935a45d 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -597,7 +597,7 @@ bool AbstractScTextImportOptionsDlg_Impl::IsDateConversionSet() const } // =========================Factories for createdialog =================== -AbstractScImportAsciiDlg * ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg ( const OUString& aDatName, +VclPtr<AbstractScImportAsciiDlg> ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg ( const OUString& aDatName, SvStream* pInStream, ScImportAsciiCall eCall ) { VclPtr<ScImportAsciiDlg> pDlg = VclPtr<ScImportAsciiDlg>::Create( nullptr, aDatName,pInStream, eCall ); diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index d4104b7dbc27..19f57478387f 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -409,7 +409,7 @@ class ScAbstractDialogFactory_Impl : public ScAbstractDialogFactory public: virtual ~ScAbstractDialogFactory_Impl() {} - virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( const OUString& aDatName, + virtual VclPtr<AbstractScImportAsciiDlg> CreateScImportAsciiDlg( const OUString& aDatName, SvStream* pInStream, ScImportAsciiCall eCall) override; |