sw/source/uibase/shells/textfld.cxx | 6 ++++++ 1 file changed, 6 insertions(+)
New commits: commit c67040c157aab029373c463a9d3c033c400ff6a9 Author: Pranav Kant <pran...@collabora.co.uk> Date: Wed Jan 18 17:10:54 2017 +0530 lok: Exit early when inserting annotation if tiled annotation off Change-Id: Ia5705a07166e5c40aface506e8e8e7b727c2e376 Reviewed-on: https://gerrit.libreoffice.org/33466 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: pranavk <pran...@collabora.co.uk> diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx index 434717a..30f668b 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); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits