sd/source/ui/slideshow/slideshowviewimpl.cxx | 6 ++++++ sd/source/ui/slideshow/slideshowviewimpl.hxx | 2 +- vcl/source/filter/imet/ios2met.cxx | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-)
New commits: commit b9519e984adc16d1c66aa7a5c0cdf77b0d0ac5e9 Author: Caolán McNamara <[email protected]> AuthorDate: Fri Oct 4 19:41:52 2024 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Oct 5 22:26:57 2024 +0200 cid#1608381 Data race condition Change-Id: I85d110e0465429a52a8286747ae9da3e271255c7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174537 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index 38dba39bc801..9b3ae107b9fb 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -552,6 +552,12 @@ void SAL_CALL SlideShowView::mouseReleased( const awt::MouseEvent& e ) } } +void SlideShowView::ignoreNextMouseReleased() +{ + std::unique_lock aGuard( m_aMutex ); + mbMousePressedEaten = true; +} + void SAL_CALL SlideShowView::mouseEntered( const awt::MouseEvent& e ) { std::unique_lock aGuard( m_aMutex ); diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx index 3a5018be41b7..91b825906c46 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.hxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx @@ -107,7 +107,7 @@ public: SlideshowImpl* pSlideShow, bool bFullScreen ); - void ignoreNextMouseReleased() { mbMousePressedEaten = true; } + void ignoreNextMouseReleased(); /// Dispose all internal references virtual void disposing(std::unique_lock<std::mutex>&) override; commit ad69113dbe01f10aed05a261870c98c784e7b962 Author: Caolán McNamara <[email protected]> AuthorDate: Fri Oct 4 19:47:15 2024 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Oct 5 22:26:50 2024 +0200 cid#1607727 silence Overflowed constant Change-Id: I0bbd29231158379c9c7986033ce052b7f149ddc6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174536 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/vcl/source/filter/imet/ios2met.cxx b/vcl/source/filter/imet/ios2met.cxx index 0a16c07f5671..c91eb770cf62 100644 --- a/vcl/source/filter/imet/ios2met.cxx +++ b/vcl/source/filter/imet/ios2met.cxx @@ -2522,8 +2522,8 @@ void OS2METReader::ReadField(sal_uInt16 nFieldType, sal_uInt16 nFieldSize) for (sal_uInt8 i = 0; i < 4; ++i) { sal_uInt8 nbyte(0),nbyte2(0); pOS2MET->ReadUChar(nbyte).ReadUChar(nbyte2); - nbyte -= 0x30; - nbyte2 -= 0x30; + nbyte = sal_uInt8(nbyte - 0x30); + nbyte2 = sal_uInt8(nbyte2 - 0x30); nbyte = (nbyte << 4) | nbyte2; pB->nID=(pB->nID>>8)|(static_cast<sal_uInt32>(nbyte)<<24); }
