sc/source/ui/unoobj/filtuno.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e059303c2dc6ecac5247c315f5b452d346512c12
Author: Eike Rathke <er...@redhat.com>
Date: Wed Jul 19 21:24:06 2017 +0200
Fix crash when saving new spreadsheet as dBase/.dbf, tdf#108789 follow-up
... as there is no input stream.
Regression from
commit 7f1465a9599e9665159dd2d823a6e9064cca5703
Date: Sun Jun 25 17:21:45 2017 +0200
Change-Id: Ib97a4878fe8cf28e5d0f1dc6cc07800ea1635e68
(cherry picked from commit 22ae038a56b85e86219922c2759544545f2d813d)
Reviewed-on: https://gerrit.libreoffice.org/40207
Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
Tested-by: Eike Rathke <er...@redhat.com>
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index 65de5d10b4e9..e98155e7688d 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -72,7 +72,7 @@ namespace
charsetSource load_CharSet(rtl_TextEncoding &nCharSet, bool bExport,
SvStream* dbf_Stream)
{
- if (dbfReadCharset(nCharSet, dbf_Stream))
+ if (dbf_Stream && dbfReadCharset(nCharSet, dbf_Stream))
{
return charsetSource::charset_from_file;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
