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 70a1dbb4c7fdcb6ba309aa53dac8299a3f2bc626
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 4993f18..8806a88 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -44,6 +44,7 @@
#include <tools/multisel.hxx>
#include <tools/resary.hxx>
#include <toolkit/awt/vclxdevice.hxx>
+#include <unotools/saveopt.hxx>
#include <ctype.h>
#include <float.h>
@@ -931,6 +932,12 @@ void ScModelObj::initializeForTiledRendering(const
css::uno::Sequence<css::beans
SC_MOD()->SetInputOptions(aInputOptions);
pDocShell->CalcOutputFactor();
+ // 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
mnTilePixelWidth = 256;
mnTilePixelHeight = 256;
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 36fbeec..cf0a32c 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)
diff --git a/sw/source/uibase/uno/unotxdoc.cxx
b/sw/source/uibase/uno/unotxdoc.cxx
index 9c64773..55b9b21 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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
