summaryrefslogtreecommitdiffstats
path: root/include/sfx2
diff options
context:
space:
mode:
authorAshod Nakashian <ashod.nakashian@collabora.co.uk>2019-07-27 23:35:13 -0400
committerMichael Meeks <michael.meeks@collabora.com>2019-12-16 13:50:21 +0100
commite573919cd8561a81d967c1a4566c5733dd44b7b1 (patch)
tree47128453c47a48492556f3d92a05fe7b1ec5d811 /include/sfx2
parentsc: spelldialog: lock before resetting the editview (diff)
downloadcore-e573919cd8561a81d967c1a4566c5733dd44b7b1.tar.gz
core-e573919cd8561a81d967c1a4566c5733dd44b7b1.zip
LOK: spelldialog: don't create the dialog when loading new views
By default dialogs/decks are re-created when a new view is created/attached, if they are visible. For the spell checker this is unexpected, as the user doesn't expect to be doing spell checking upon loading a document, just because another user was at the time spell checking. Currently the suppression is for LOK only. This also adds support to suppress the recreation of any dialog by flagging it with the SfxChildWindowFlags::NEVERCLONE flag upon invoking RegisterChildWindow. (cherry picked from commit e3fb48fe4f84b5609730c64fdb49b1bd7ddd1f96) Change-Id: I7d71c664f1b2804910c96eeb0431164d48b5679b Reviewed-on: https://gerrit.libreoffice.org/85004 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'include/sfx2')
-rw-r--r--include/sfx2/childwin.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index 9a12bf896071..e70c779b6c3a 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -49,13 +49,13 @@ enum class SfxChildWindowFlags
TASK = 0x10, // ChildWindow inside the Task
CANTGETFOCUS = 0x20, // ChildWindow can not get focus
ALWAYSAVAILABLE = 0x40, // ChildWindow is never disabled
- NEVERHIDE = 0x80 // ChildWindow is can always made
- // visible/is visible
+ NEVERHIDE = 0x80, // ChildWindow is always visible
+ NEVERCLONE = 0x100, // ChildWindow is not recreated in new view
};
namespace o3tl
{
- template<> struct typed_flags<SfxChildWindowFlags> : is_typed_flags<SfxChildWindowFlags, 0xf5> {};
+ template<> struct typed_flags<SfxChildWindowFlags> : is_typed_flags<SfxChildWindowFlags, 0x1f5> {};
}