sc/source/ui/unoobj/docuno.cxx | 7 +++++++
sd/source/ui/unoidl/unomodel.cxx | 7 +++++++
sw/source/uibase/uno/unotxdoc.cxx | 7 +++++++
3 files changed, 21 insertions(+)
New commits:
commit 9b5f1a79f52b3d541a978f117548e255febf39d4
Author: Jan Holesovsky <ke...@collabora.com>
Date: Wed Feb 3 11:59:04 2016 +0100
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
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 891c69d..072923f 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;
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index c744ea9..61e2bbc 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -64,6 +64,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>
@@ -2406,6 +2407,12 @@ void
SdXImpressDocument::initializeForTiledRendering(const css::uno::Sequence<cs
// tdf#93154: in tiled rendering LO doesn't always detect changes
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);
}
void SdXImpressDocument::registerCallback(LibreOfficeKitCallback pCallback,
void* pData)
diff --git a/sw/source/uibase/uno/unotxdoc.cxx
b/sw/source/uibase/uno/unotxdoc.cxx
index 27612b1..b1f41c5 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -115,6 +115,7 @@
#include <osl/file.hxx>
#include <comphelper/storagehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
+#include <unotools/saveopt.hxx>
#include <EnhancedPDFExportHelper.hxx>
#include <numrule.hxx>
@@ -3299,6 +3300,12 @@ void SwXTextDocument::initializeForTiledRendering(const
css::uno::Sequence<css::
// tdf#93154: in tiled rendering LO doesn't always detect changes
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);
}
void SwXTextDocument::registerCallback(LibreOfficeKitCallback pCallback, void*
pData)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
