svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 2 +- vcl/win/window/salframe.cxx | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)
New commits: commit 130f620bb5f729fc8e2bb37a573bd8a8d5847606 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Aug 2 20:03:09 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Aug 7 17:51:40 2025 +0200 cid#1660401 Explicit null dereferenced Change-Id: I61ffc09df3569119597a97e1eb96dc5096410396 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188858 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> (cherry picked from commit f0ae436a49560dd78686aa4723a8751f083e942b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189049 Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit 735ed9cc93b9fdcf85baa43f1d856a9ec469b941) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189074 diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index 1b8774b62ff8..f506e0124b5a 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -1037,7 +1037,7 @@ void AreaPropertyPanelBase::updateFillBitmap(bool bDisabled, bool bDefaultOrSet, if (bDefaultOrSet) { - if(mpBitmapItem->isPattern()) + if (mpBitmapItem && mpBitmapItem->isPattern()) mxLbFillType->set_active(PATTERN); else mxLbFillType->set_active(BITMAP); commit ab32cbb059fb454f419a92c6f9ef85f187e48928 Author: Jonathan Clark <[email protected]> AuthorDate: Fri Aug 1 04:07:12 2025 -0600 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Aug 7 17:51:29 2025 +0200 tdf#167740 vcl: Fix Win IME inserting stale composition after dismissal Related to tdf#155158: Previously, the Microsoft Pinyin IME failed to send WM_IME_ENDCOMPOSITION when dismissed during composition. As a result of this, LO became stuck in an IME input state (resulting in, for example, an invisible cursor). The fix for this bug was to treat dismissing the IME in this state as also ending composition. Unfortunately, in the case of the Windows 10 Microsoft Korean IME, this bug fix caused the last character to be repeated due to stale composition state. This change updates the previous fix to also clear this data prior to ending composition. Change-Id: I5b2906c54af495e238a8335cc9c21cb42f6f3beb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188754 Tested-by: Jenkins Reviewed-by: Jonathan Clark <[email protected]> (cherry picked from commit af0da68b4176aaf6d2f6faed66446e5638f41c80) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189046 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index 74c3305aded3..4012551c514e 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -5594,6 +5594,12 @@ static bool ImplHandleIMEEndComposition( HWND hWnd ) // tdf#155158: Windows IMEs do not necessarily send a composition message if they are // dismissed during composition (for example, by an input method/language change). + // tdf#167740: Also clear the candidate text when the IME is dismissed. + SalExtTextInputEvent aEvt; + aEvt.mpTextAttr = nullptr; + aEvt.mnCursorPos = 0; + aEvt.mnCursorFlags = 0; + pFrame->CallCallback(SalEvent::ExtTextInput, &aEvt); pFrame->CallCallback(SalEvent::EndExtTextInput, nullptr); }
