diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2016-02-03 11:59:04 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2016-02-03 12:24:25 +0100 |
| commit | 70a1dbb4c7fdcb6ba309aa53dac8299a3f2bc626 (patch) | |
| tree | ee32c62ed0553a794ce4d0c24095a8cad24ed232 /sw/source | |
| parent | d8a113841160c571a3f254e73b676994eb940a79 (diff) | |
lok: Avoid the 'alien format' warning in LibreOfficeKit.
We immediately cancel all the dialogs that potentially come up when using
LibreOfficeKit; which means that when you tried to save a .docx to a remote
server (which triggered the 'alien format' warning), the save operation
couldn't be completed.
Change-Id: I6bb5eadac994c1f515d7a49299c21960b3491bbe
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/uibase/uno/unotxdoc.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 9c647734b36e..55b9b2165fdf 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -116,6 +116,7 @@ #include <osl/file.hxx> #include <comphelper/storagehelper.hxx> #include <cppuhelper/supportsservice.hxx> +#include <unotools/saveopt.hxx> #include <EnhancedPDFExportHelper.hxx> #include <numrule.hxx> @@ -3263,6 +3264,12 @@ void SwXTextDocument::initializeForTiledRendering(const css::uno::Sequence<css:: // directly in twips. SwEditWin& rEditWin = pDocShell->GetView()->GetEditWin(); rEditWin.EnableMapMode(false); + + // when the "This document may contain formatting or content that cannot + // be saved..." dialog appears, it is auto-cancelled with tiled rendering, + // causing 'Save' being disabled; so let's always save to the original + // format + SvtSaveOptions().SetWarnAlienFormat(false); } void SwXTextDocument::registerCallback(LibreOfficeKitCallback pCallback, void* pData) |