From 7308f9e1e734fc54661b3d79c4ff8e8fbeb84867 Mon Sep 17 00:00:00 2001 From: Thomas Holder Date: Sun, 3 Nov 2019 20:02:46 +0100 Subject: refactor: Eliminate SPIString::value_default - eliminate value_default - make value private (-> _value) - add value() method --- src/extension/internal/emf-print.cpp | 4 ++-- src/extension/internal/wmf-print.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/extension/internal') diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp index ec85b9281..dd48d37ef 100644 --- a/src/extension/internal/emf-print.cpp +++ b/src/extension/internal/emf-print.cpp @@ -2027,7 +2027,7 @@ unsigned int PrintEmf::text(Inkscape::Extension::Print * /*mod*/, char const *te _lookup_ppt_fontfix("Convert To Wingdings", params); break; default: //also CVTNON - _lookup_ppt_fontfix(style->font_family.value, params); + _lookup_ppt_fontfix(style->font_family.value(), params); break; } if (params.f2 != 0 || params.f3 != 0) { @@ -2055,7 +2055,7 @@ unsigned int PrintEmf::text(Inkscape::Extension::Print * /*mod*/, char const *te // of the special fonts. uint16_t *wfacename; if (!newfont) { - wfacename = U_Utf8ToUtf16le(style->font_family.value, 0, nullptr); + wfacename = U_Utf8ToUtf16le(style->font_family.value(), 0, nullptr); } else { wfacename = U_Utf8ToUtf16le(FontName(newfont), 0, nullptr); } diff --git a/src/extension/internal/wmf-print.cpp b/src/extension/internal/wmf-print.cpp index 147a6369f..ade732964 100644 --- a/src/extension/internal/wmf-print.cpp +++ b/src/extension/internal/wmf-print.cpp @@ -1423,7 +1423,7 @@ unsigned int PrintWmf::text(Inkscape::Extension::Print * /*mod*/, char const *te _lookup_ppt_fontfix("Convert To Wingdings", params); break; default: //also CVTNON - _lookup_ppt_fontfix(style->font_family.value, params); + _lookup_ppt_fontfix(style->font_family.value(), params); break; } if (params.f2 != 0 || params.f3 != 0) { @@ -1452,7 +1452,7 @@ unsigned int PrintWmf::text(Inkscape::Extension::Print * /*mod*/, char const *te // of the special fonts. char *facename; if (!newfont) { - facename = U_Utf8ToLatin1(style->font_family.value, 0, nullptr); + facename = U_Utf8ToLatin1(style->font_family.value(), 0, nullptr); } else { facename = U_Utf8ToLatin1(FontName(newfont), 0, nullptr); } -- cgit v1.2.3