diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-16 08:58:38 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-12-17 11:42:03 +0100 |
| commit | f4ba4c014c74d1735288fe356878d6a2effab21f (patch) | |
| tree | 2451598425030ebd0695e06dc2d610e3aa3c8658 /svtools | |
| parent | 208fcbb6337486cadf7e068c92139d371f6bb348 (diff) | |
tdf#146250 fix SvxHtmlOptions::IsDefaultTextEncoding
regression from
commit da9bba7cc3c243e936daea689fea64ecaf110f35
Author: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Mon Jul 26 10:10:17 2021 +0200
use officecfg for SvxHtmlOptions
spotted by himajin100000
Change-Id: Id237f7c4d6d816539141de97a19add0a993d92ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126902
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit d505940a7fff8674ff4d22eaa04972a56bea516e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126968
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/config/htmlcfg.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx index 8835b132bf05..b871881e0997 100644 --- a/svtools/source/config/htmlcfg.cxx +++ b/svtools/source/config/htmlcfg.cxx @@ -90,7 +90,8 @@ bool IsPrintLayoutExtension() bool IsDefaultTextEncoding() { std::optional<sal_Int32> x = officecfg::Office::Common::Filter::HTML::Export::Encoding::get(); - return bool(x); + // if we have a value, then the text encoding is not default + return !bool(x); } rtl_TextEncoding GetTextEncoding() { |