diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2017-01-18 17:10:54 +0530 |
|---|---|---|
| committer | pranavk <pranavk@collabora.co.uk> | 2017-01-27 10:51:19 +0000 |
| commit | c67040c157aab029373c463a9d3c033c400ff6a9 (patch) | |
| tree | 7671cd303cc538a1e1795024238a6194c06d3afc /sw | |
| parent | f4fac7f3411c4afad4a6d33424bf8007822e1ee6 (diff) | |
lok: Exit early when inserting annotation if tiled annotation off
Change-Id: Ia5705a07166e5c40aface506e8e8e7b727c2e376
Reviewed-on: https://gerrit.libreoffice.org/33466
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/shells/textfld.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx index 434717a16903..30f668b0e646 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <comphelper/lok.hxx> #include <chrdlgmodes.hxx> #include <hintids.hxx> #include <SidebarWin.hxx> @@ -407,6 +408,11 @@ void SwTextShell::ExecField(SfxRequest &rReq) rSh.Pop(false); // Restore cursor position } + // Client has disabled annotations rendering, no need to + // focus the postit field + if (comphelper::LibreOfficeKit::isActive() && !comphelper::LibreOfficeKit::isTiledAnnotations()) + break; + if (pPostIt) { SwFieldType* pType = rSh.GetDoc()->getIDocumentFieldsAccess().GetFieldType(RES_POSTITFLD, OUString(), false); |