desktop/source/lib/init.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 1deed8dae78be05cafde17768d111035c111b567
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.com>
Date: Thu Feb 4 14:44:36 2016 +0100
lok: fix saveAs for a loaded HTML document
a HTML document is reported as "com.sun.star.text.WebDocument"
which is a unsupported document type in LOK so report it as a
LOK_DOCTYPE_TEXT instead.
Change-Id: Iaa77cb8b1f55cf31ebbb4fd4d69c02702e60e251
(cherry picked from commit 806d34981f480908645038f4cfc29ebcf25ca145)
Reviewed-on: https://gerrit.libreoffice.org/22119
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index f7a40cb..b2d6e14 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -623,6 +623,7 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, const
char* sUrl, const cha
break;
case LOK_DOCTYPE_OTHER:
default:
+ SAL_INFO("lok", "Can't save document - unsopported document
type.");
return false;
}
@@ -758,7 +759,7 @@ static int doc_getDocumentType (LibreOfficeKitDocument*
pThis)
{
return LOK_DOCTYPE_DRAWING;
}
- else if (xDocument->supportsService("com.sun.star.text.TextDocument"))
+ else if (xDocument->supportsService("com.sun.star.text.TextDocument")
|| xDocument->supportsService("com.sun.star.text.WebDocument"))
{
return LOK_DOCTYPE_TEXT;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
