include/unotools/fontcvt.hxx | 6 +-----
unotools/source/misc/fontcvt.cxx | 2 +-
2 files changed, 2 insertions(+), 6 deletions(-)
New commits:
commit e57d61f9c052c4ebb3f940a67ed6dddf26ad5cf0
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Dec 5 17:00:48 2018 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Dec 7 07:39:31 2018 +0100
the FontToSubsFontFlags enum is not a bitmask
Change-Id: I76a777a1da15df60f283b8f3fbfd36dd05244705
Reviewed-on: https://gerrit.libreoffice.org/64717
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/unotools/fontcvt.hxx b/include/unotools/fontcvt.hxx
index f24a5e3e48ae..2877e18972ea 100644
--- a/include/unotools/fontcvt.hxx
+++ b/include/unotools/fontcvt.hxx
@@ -28,12 +28,8 @@
enum class FontToSubsFontFlags
{
IMPORT = 0x01,
- EXPORT = 0x02,
+ EXPORT = 0x02
};
-namespace o3tl
-{
- template<> struct typed_flags<FontToSubsFontFlags> :
is_typed_flags<FontToSubsFontFlags, 0x03> {};
-}
typedef void* FontToSubsFontConverter;
UNOTOOLS_DLLPUBLIC FontToSubsFontConverter CreateFontToSubsFontConverter(
const OUString& rFontName, FontToSubsFontFlags nFlags );
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 8a47fdb27495..663954c1bfc1 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1387,7 +1387,7 @@ FontToSubsFontConverter CreateFontToSubsFontConverter(
const OUString& rOrgName,
OUString aName = GetEnglishSearchFontName( rOrgName );
- if ( nFlags & FontToSubsFontFlags::IMPORT )
+ if ( nFlags == FontToSubsFontFlags::IMPORT )
{
const int nEntries = 2; // only StarMath+StarBats
for( int i = 0; i < nEntries; ++i )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
