diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2021-03-25 17:21:35 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-04-14 13:42:29 +0200 |
| commit | ce7bf351972bbfd64ca99e8d2fb4c5f77591c9e0 (patch) | |
| tree | 1fc90ead121f9816baffa8cc669d7570423b4714 /desktop | |
| parent | 5900fd583a6b2ea5810a78f66e75b2910b34b7cc (diff) | |
impress: don't exit textbox editing when new slide was added
When new slide is added by other user before currently visible slide
then SwitchPage is called and textbox editing is ended.
Avoid any focus change when setPart is called just for rendering
or SwitchPage is used on previously avtive slide (only slide numer changed).
Change-Id: I7fef42b863e0079acc84dadfc3f891548652b48f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113144
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113806
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 15250bc35085..bc21a07e5ac5 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -2972,7 +2972,7 @@ static int doc_getPart (LibreOfficeKitDocument* pThis) return pDoc->getPart(); } -static void doc_setPart(LibreOfficeKitDocument* pThis, int nPart) +static void doc_setPartImpl(LibreOfficeKitDocument* pThis, int nPart, bool bAllowChangeFocus = true) { comphelper::ProfileZone aZone("doc_setPart"); @@ -2986,7 +2986,12 @@ static void doc_setPart(LibreOfficeKitDocument* pThis, int nPart) return; } - pDoc->setPart( nPart ); + pDoc->setPart( nPart, bAllowChangeFocus ); +} + +static void doc_setPart(LibreOfficeKitDocument* pThis, int nPart) +{ + doc_setPartImpl(pThis, nPart, true); } static char* doc_getPartInfo(LibreOfficeKitDocument* pThis, int nPart) @@ -3300,7 +3305,7 @@ static void doc_paintPartTile(LibreOfficeKitDocument* pThis, nOrigPart = doc_getPart(pThis); if (nPart != nOrigPart) { - doc_setPart(pThis, nPart); + doc_setPartImpl(pThis, nPart, false); } } @@ -3308,7 +3313,7 @@ static void doc_paintPartTile(LibreOfficeKitDocument* pThis, if (!isText && nPart != nOrigPart) { - doc_setPart(pThis, nOrigPart); + doc_setPartImpl(pThis, nOrigPart, false); } if (!isText && nViewId != nOrigViewId) { |