summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2017-07-19 21:24:06 +0200
committerEike Rathke <erack@redhat.com>2017-07-20 09:58:24 +0200
commite059303c2dc6ecac5247c315f5b452d346512c12 (patch)
tree2ed3c6a4d752d9537811b3f7a101f1b1506b75ca
parented6c78abb8445cff51cc05118ce1f6311ed5a535 (diff)
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 <lionel@mamane.lu> Tested-by: Eike Rathke <erack@redhat.com>
-rw-r--r--sc/source/ui/unoobj/filtuno.cxx2
1 files changed, 1 insertions, 1 deletions
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;
}