diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2021-03-25 17:21:35 +0100 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2021-04-13 14:25:04 +0200 |
| commit | bd93f5cec54350b6f07c5b7cd4987ea3762e3f40 (patch) | |
| tree | 6f007978d9579d636d50cc96f0791f9452802666 /sc | |
| parent | f6d1da91ccda960d1ee738d688a2cb374e576aef (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 'sc')
| -rw-r--r-- | sc/inc/docuno.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/docuno.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index 4325a747a3fa..04db162fb95a 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -311,7 +311,7 @@ public: virtual Size getDocumentSize() override; /// @see vcl::ITiledRenderable::setPart(). - virtual void setPart(int nPart) override; + virtual void setPart(int nPart, bool bAllowChangeFocus = true) override; /// @see vcl::ITiledRenderable::getPart(). virtual int getPart() override; diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 1e531424a92c..5cd51ad148b1 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -565,7 +565,7 @@ void ScModelObj::paintTile( VirtualDevice& rDevice, nTilePosX, nTilePosY, nTileWidth, nTileHeight); } -void ScModelObj::setPart( int nPart ) +void ScModelObj::setPart( int nPart, bool /*bAllowChangeFocus*/ ) { ScViewData* pViewData = ScDocShell::GetViewData(); ScTabView* pTabView = pViewData->GetView(); |