sfx2/source/doc/objxtor.cxx | 4 ++--
vcl/unx/generic/app/saldisp.cxx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit dab16fd108e13b94deea01cd2fa325e9ab94fb22
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
AuthorDate: Sat Jul 21 01:57:27 2018 +0200
Commit: Aron Budea <aron.bu...@collabora.com>
CommitDate: Tue Aug 14 04:17:43 2018 +0200
fix shutdown crash when SfxApplication has already been destroyed
See e.g.
http://crashreport.libreoffice.org/stats/crash_details/dc1ae6ff-923e-44f6-99a9-84893039efd7
Change-Id: I3b5a24bfb62977ca922bf3bececb6676691bf6ea
Reviewed-on: https://gerrit.libreoffice.org/57789
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
(cherry picked from commit 715fcaff01ed048c52c69264a7a0fb773dd57b32)
Reviewed-on: https://gerrit.libreoffice.org/57809
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
(cherry picked from commit d4052d2ca523cc000132620aaecb59c14c17e20d)
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index e4784b00adbf..aa25c26b639f 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -328,13 +328,13 @@ SfxObjectShell::~SfxObjectShell()
DELETEX(AutoReloadTimer_Impl, pImpl->pReloadTimer );
SfxApplication *pSfxApp = SfxGetpApp();
- if ( USHRT_MAX != pImpl->nVisualDocumentNumber )
+ if ( USHRT_MAX != pImpl->nVisualDocumentNumber && pSfxApp )
pSfxApp->ReleaseIndex(pImpl->nVisualDocumentNumber);
// Destroy Basic-Manager
pImpl->aBasicManager.reset( nullptr );
- if ( pSfxApp->GetDdeService() )
+ if ( pSfxApp && pSfxApp->GetDdeService() )
pSfxApp->RemoveDdeTopic( this );
pImpl->pBaseModel.set( nullptr );
commit c3ed286931b68faffecb1c4457fa1a86a4eafc8b
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Jan 27 16:23:52 2017 +0100
Commit: Aron Budea <aron.bu...@collabora.com>
CommitDate: Tue Aug 14 04:02:26 2018 +0200
-Werror=int-in-bool-context (GCC 7)
Change-Id: Ide131a586d0d282993dfbf53a783f02d48860647
(cherry picked from commit 53eb2fae381f4ed9d73bcc6d8e76a6f09777ba60)
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 0bff9b8352c1..f9b47a0fb4fc 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -2263,7 +2263,7 @@ void SalDisplay::PrintInfo() const
SAL_INFO( "vcl", "\tshift ctrl alt \t" << KeyStr( nShiftKeySym_ )
<< " (0x" << std::hex << sal::static_int_cast< unsigned int >(nShiftKeySym_) <<
") "
<< KeyStr( nCtrlKeySym_ ) << " (0x" << sal::static_int_cast<
unsigned int >(nCtrlKeySym_) << ") "
<< KeyStr( nMod1KeySym_ ) << " (0x" << sal::static_int_cast<
unsigned int >(nMod1KeySym_) << ")");
- if( XExtendedMaxRequestSize(pDisp_) * 4 )
+ if( XExtendedMaxRequestSize(pDisp_) != 0 )
SAL_INFO( "vcl", "\tXMaxRequestSize \t" <<
XMaxRequestSize(pDisp_) * 4 << " " << XExtendedMaxRequestSize(pDisp_) * 4 << "
[bytes]");
SAL_INFO( "vcl", "\tWMName \t" <<
getWMAdaptor()->getWindowManagerName() );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
