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 /sd | |
| 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 'sd')
| -rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 36fbeec22d79..cf0a32ce2038 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -63,6 +63,7 @@ #include <svx/unoshape.hxx> #include <editeng/unonrule.hxx> #include <editeng/eeitem.hxx> +#include <unotools/saveopt.hxx> // Support creation of GraphicObjectResolver and EmbeddedObjectResolver #include <svx/xmleohlp.hxx> @@ -2392,6 +2393,12 @@ void SdXImpressDocument::initializeForTiledRendering(const css::uno::Sequence<cs // by the tile being rerendered - which is wasteful and ugly). pDrawView->SetSwapAsynchron(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 SdXImpressDocument::registerCallback(LibreOfficeKitCallback pCallback, void* pData) |