From 04ba54c3e2586155cef3421ef2a9b27565a8dbe7 Mon Sep 17 00:00:00 2001 From: John Smith Date: Mon, 4 Feb 2013 10:33:03 +0900 Subject: Fix for 1002757 : Regressions with new default font 'sans-serif' - fix map (bzr r12096) --- src/libnrtype/FontFactory.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp index 6c95c0363..a9220d867 100644 --- a/src/libnrtype/FontFactory.cpp +++ b/src/libnrtype/FontFactory.cpp @@ -407,11 +407,11 @@ const char *sp_font_description_get_family(PangoFontDescription const *fontDescr static std::map fontNameMap; std::map::iterator it; - fontNameMap.insert(std::make_pair("Sans", "sans-serif")); - fontNameMap.insert(std::make_pair("Serif", "serif")); - fontNameMap.insert(std::make_pair("Monospace", "monospace")); - //fontNameMap.insert(std::make_pair("", "cursive")); - //fontNameMap.insert(std::make_pair("", "fantasy")); + if (fontNameMap.empty()) { + fontNameMap.insert(std::make_pair("Sans", "sans-serif")); + fontNameMap.insert(std::make_pair("Serif", "serif")); + fontNameMap.insert(std::make_pair("Monospace", "monospace")); + } const char *pangoFamily = pango_font_description_get_family(fontDescr); -- cgit v1.2.3