|
 |
f325b2 |
From ed0cf5fe7f448b471a6627b045e2ea3df464e83f Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: =?UTF-8?q?Toma=C5=BE=20Vajngerl?= <tomaz.vajngerl@collabora.com>
|
|
|
f325b2 |
Date: Thu, 4 Feb 2016 14:44:36 +0100
|
|
|
f325b2 |
Subject: [PATCH 393/398] lok: fix saveAs for a loaded HTML document
|
|
|
f325b2 |
|
|
|
f325b2 |
a HTML document is reported as "com.sun.star.text.WebDocument"
|
|
|
f325b2 |
which is a unsupported document type in LOK so report it as a
|
|
|
f325b2 |
LOK_DOCTYPE_TEXT instead.
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: Iaa77cb8b1f55cf31ebbb4fd4d69c02702e60e251
|
|
|
f325b2 |
(cherry picked from commit 806d34981f480908645038f4cfc29ebcf25ca145)
|
|
|
f325b2 |
Reviewed-on: https://gerrit.libreoffice.org/22119
|
|
|
f325b2 |
Tested-by: Jenkins <ci@libreoffice.org>
|
|
|
f325b2 |
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
(cherry picked from commit 1deed8dae78be05cafde17768d111035c111b567)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
desktop/source/lib/init.cxx | 3 ++-
|
|
|
f325b2 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
|
|
|
f325b2 |
index fe297fb09414..9e5c52917eb7 100644
|
|
|
f325b2 |
--- a/desktop/source/lib/init.cxx
|
|
|
f325b2 |
+++ b/desktop/source/lib/init.cxx
|
|
|
f325b2 |
@@ -621,6 +621,7 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* sUrl, const cha
|
|
|
f325b2 |
break;
|
|
|
f325b2 |
case LOK_DOCTYPE_OTHER:
|
|
|
f325b2 |
default:
|
|
|
f325b2 |
+ SAL_INFO("lok", "Can't save document - unsopported document type.");
|
|
|
f325b2 |
return false;
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
@@ -756,7 +757,7 @@ static int doc_getDocumentType (LibreOfficeKitDocument* pThis)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
return LOK_DOCTYPE_DRAWING;
|
|
|
f325b2 |
}
|
|
|
f325b2 |
- else if (xDocument->supportsService("com.sun.star.text.TextDocument"))
|
|
|
f325b2 |
+ else if (xDocument->supportsService("com.sun.star.text.TextDocument") || xDocument->supportsService("com.sun.star.text.WebDocument"))
|
|
|
f325b2 |
{
|
|
|
f325b2 |
return LOK_DOCTYPE_TEXT;
|
|
|
f325b2 |
}
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|