summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2016-02-03 11:59:04 +0100
committerJan Holesovsky <kendy@collabora.com>2016-02-03 11:59:04 +0100
commit9b5f1a79f52b3d541a978f117548e255febf39d4 (patch)
tree3261a59aca0cb0b44cfbef2fdc8e25b9ae7f70b5 /sc
parent64c1690fa31937bb4adfe0eb7beb42f105841c3b (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 'sc')
-rw-r--r--sc/source/ui/unoobj/docuno.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 891c69dd918b..072923f6fd3a 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -45,6 +45,7 @@
#include <tools/resary.hxx>
#include <toolkit/awt/vclxdevice.hxx>
#include <svtools/miscopt.hxx>
+#include <unotools/saveopt.hxx>
#include <ctype.h>
#include <float.h>
@@ -933,6 +934,12 @@ void ScModelObj::initializeForTiledRendering(const css::uno::Sequence<css::beans
SvtMiscOptions aMiscOpt;
aMiscOpt.SetSaveAlwaysAllowed(true);
+ // 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);
+
// default tile size in pixels
nTilePixelWidth = 256;
nTilePixelHeight = 256;