[Libreoffice-commits] core.git: 2 commits - include/vcl vcl/unx

[Caolán McNamara]

 include/vcl/window.hxx                      |    2 +-
 vcl/unx/generic/fontmanager/fontmanager.cxx |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit ae9f04c445ae66cafdbe24a15615f04cc6dd5415
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri May 13 12:04:59 2016 +0100

    fix ShowTrackFlags legal bits
    
    Change-Id: Iaf3db8f860e6605b3f1d2d025a2e4e4ae3ca4ed7

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index f55eb08..9f4a8dc 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -289,7 +289,7 @@ enum class ShowTrackFlags {
 };
 namespace o3tl
 {
-    template<> struct typed_flags<ShowTrackFlags> : is_typed_flags<ShowTrackFlags, 0x300a> {};
+    template<> struct typed_flags<ShowTrackFlags> : is_typed_flags<ShowTrackFlags, 0x300f> {};
 }
 
 // Flags for StartTracking()
commit 198bb1e5f055ba59d65b529cd6de25671273056a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri May 13 11:56:25 2016 +0100

    only ever seen this with Khmer OS fonts, and their name is in ascii anyway
    
    Change-Id: I4d6d7d9f79f111ea4ba7dcef201ef31c3ad7d4f9

diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 895cbfd..68b21b4 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -1088,7 +1088,9 @@ OUString PrintFontManager::convertTrueTypeName( void* pRecord )
                 eEncoding = RTL_TEXTENCODING_UTF8;
                 break;
             default:
-                SAL_WARN("vcl", "Unimplemented mac encoding " << pNameRecord->encodingID << " to unicode conversion");
+                if (aName.startsWith("Khmer OS"))
+                    eEncoding = RTL_TEXTENCODING_UTF8;
+                SAL_WARN_IF(eEncoding == RTL_TEXTENCODING_DONTKNOW, "vcl", "Unimplemented mac encoding " << pNameRecord->encodingID << " to unicode conversion for fontname " << aName);
                 break;
         }
         if (eEncoding != RTL_TEXTENCODING_DONTKNOW)