bin/find-can-be-private-symbols.functions.results | 2 +- bin/find-mergedlib-can-be-private-symbols.functions.results | 2 +- include/vcl/embeddedfontsmanager.hxx | 6 +++--- svx/source/svdraw/svdpdf.cxx | 8 ++++---- vcl/source/gdi/embeddedfontsmanager.cxx | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-)
New commits: commit 7011359c9e3c48dc91ef0f294fead85ff7a7818e Author: Caolán McNamara <[email protected]> AuthorDate: Mon Sep 29 10:14:28 2025 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Mon Sep 29 14:12:00 2025 +0200 fileUrlForTemporaryFont->getFileUrlForTemporaryFont Change-Id: I1c023feae73828fdf5cf88ffc9dc871ac2e3d51a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191602 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/bin/find-can-be-private-symbols.functions.results b/bin/find-can-be-private-symbols.functions.results index d96c89f30852..81a628411548 100644 --- a/bin/find-can-be-private-symbols.functions.results +++ b/bin/find-can-be-private-symbols.functions.results @@ -481,7 +481,7 @@ EditUndo::~EditUndo() EditUndoManager::SetEditEngine(EditEngine*) EmbeddedFontsManager::activateFont(rtl::OUString const&, rtl::OUString const&) EmbeddedFontsManager::clearTemporaryFontFiles() -EmbeddedFontsManager::fileUrlForTemporaryFont(rtl::OUString const&, std::basic_string_view<char16_t, std::char_traits<char16_t> >) +EmbeddedFontsManager::getFileUrlForTemporaryFont(rtl::OUString const&, std::basic_string_view<char16_t, std::char_traits<char16_t> >) EmbeddedFontsManager::sufficientTTFRights(void const*, long, EmbeddedFontsManager::FontRights) EnhancedCustomShapeTypeNames::GetAccName(rtl::OUString const&) ErrorContext::GetParent() diff --git a/bin/find-mergedlib-can-be-private-symbols.functions.results b/bin/find-mergedlib-can-be-private-symbols.functions.results index 766ce6ec8a92..26940a6c43a3 100644 --- a/bin/find-mergedlib-can-be-private-symbols.functions.results +++ b/bin/find-mergedlib-can-be-private-symbols.functions.results @@ -656,7 +656,7 @@ EditView::SetReadOnly(bool) EditView::SetSelectionMode(EESelectionMode) EmbeddedFontsManager::activateFont(rtl::OUString const&, rtl::OUString const&) EmbeddedFontsManager::clearTemporaryFontFiles() -EmbeddedFontsManager::fileUrlForTemporaryFont(rtl::OUString const&, std::basic_string_view<char16_t, std::char_traits<char16_t> >) +EmbeddedFontsManager::getFileUrlForTemporaryFont(rtl::OUString const&, std::basic_string_view<char16_t, std::char_traits<char16_t> >) EmbeddedFontsManager::sufficientTTFRights(void const*, long, EmbeddedFontsManager::FontRights) EnhancedCustomShape2d::ApplyGluePoints(SdrObject*) EnhancedCustomShape2d::CreateObject(bool) diff --git a/include/vcl/embeddedfontsmanager.hxx b/include/vcl/embeddedfontsmanager.hxx index 15028ebb7f8e..c502146631fa 100644 --- a/include/vcl/embeddedfontsmanager.hxx +++ b/include/vcl/embeddedfontsmanager.hxx @@ -61,7 +61,7 @@ public: bool bSubsetted = false); /** - fileUrl needs to be created via fileUrlForTemporaryFont + fileUrl needs to be created via getFileUrlForTemporaryFont */ bool addEmbeddedFont( const OUString& fileUrl, const OUString& fontName, bool sufficientFontRights ); @@ -92,7 +92,7 @@ public: static bool analyzeTTF(const void* data, tools::Long size, FontWeight& weight); /** - Removes all temporary fonts in the path used by fileUrlForTemporaryFont(). + Removes all temporary fonts in the path used by getFileUrlForTemporaryFont(). @internal */ static void clearTemporaryFontFiles(); @@ -124,7 +124,7 @@ public: EmbeddedFontsManager(const css::uno::Reference<css::frame::XModel>& xModel); ~EmbeddedFontsManager() COVERITY_NOEXCEPT_FALSE; - static OUString fileUrlForTemporaryFont(std::u16string_view name, std::u16string_view suffix); + static OUString getFileUrlForTemporaryFont(std::u16string_view name, std::u16string_view suffix); // write text dump static bool tx_dump(const OUString& srcFontUrl, const OUString& destFileUrl); diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx index 8e7e31ff2045..d9da0ba88ed1 100644 --- a/svx/source/svdraw/svdpdf.cxx +++ b/svx/source/svdraw/svdpdf.cxx @@ -254,7 +254,7 @@ void ImpSdrPdfImport::CollectFonts() bool bTTF = EmbeddedFontsManager::analyzeTTF(aFontData.data(), aFontData.size(), eFontWeight); SAL_INFO_IF(!bTTF, "sd.filter", "not ttf/otf, converting"); - OUString fileUrl = EmbeddedFontsManager::fileUrlForTemporaryFont( + OUString fileUrl = EmbeddedFontsManager::getFileUrlForTemporaryFont( sFontFileName, bTTF ? u".ttf" : u".t1"); if (!writeFontFile(fileUrl, aFontData)) SAL_WARN("sd.filter", "ttf not written"); @@ -1377,7 +1377,7 @@ static EmbeddedFontInfo mergeFontSubsets(const OUString& mergedFontUrl, Features.Close(); } - OUString otfUrl = EmbeddedFontsManager::fileUrlForTemporaryFont(postScriptName, u".otf"); + OUString otfUrl = EmbeddedFontsManager::getFileUrlForTemporaryFont(postScriptName, u".otf"); OUString features = !ligatureGlyphToChars.empty() ? mergedFeaturesUrl : OUString(); if (EmbeddedFontsManager::makeotf(mergedFontUrl, otfUrl, FontMenuNameDBUrl, mergedCMapUrl, features)) @@ -1427,13 +1427,13 @@ EmbeddedFontInfo ImpSdrPdfImport::convertToOTF(SubSetInfo& rSubSetInfo, const OU if (rSubSetInfo.aComponents.size() > 1) { OUString mergedFontUrl - = EmbeddedFontsManager::fileUrlForTemporaryFont(postScriptName, u".merged.pfa.cid"); + = EmbeddedFontsManager::getFileUrlForTemporaryFont(postScriptName, u".merged.pfa.cid"); return mergeFontSubsets(mergedFontUrl, FontMenuNameDBUrl, postScriptName, longFontName, Weight, rSubSetInfo); } // Otherwise not merged font, just a single subset - OUString otfUrl = EmbeddedFontsManager::fileUrlForTemporaryFont(fontFileName, u".otf"); + OUString otfUrl = EmbeddedFontsManager::getFileUrlForTemporaryFont(fontFileName, u".otf"); OUString features = bFeatures ? FeaturesUrl : OUString(); if (EmbeddedFontsManager::makeotf(pfaCIDUrl, otfUrl, FontMenuNameDBUrl, CMapUrl, features)) return { longFontName, otfUrl, toOfficeWeight(Weight) }; diff --git a/vcl/source/gdi/embeddedfontsmanager.cxx b/vcl/source/gdi/embeddedfontsmanager.cxx index e0972371cdd9..a32910004b26 100644 --- a/vcl/source/gdi/embeddedfontsmanager.cxx +++ b/vcl/source/gdi/embeddedfontsmanager.cxx @@ -111,7 +111,7 @@ void clearDir( const OUString& path ) // The file may or not may not exist yet, and will be cleaned up automatically as appropriate. // Use activateFonts() to actually enable usage of the font. // static -OUString EmbeddedFontsManager::fileUrlForTemporaryFont(std::u16string_view name, std::u16string_view suffix) +OUString EmbeddedFontsManager::getFileUrlForTemporaryFont(std::u16string_view name, std::u16string_view suffix) { OUString filename = OUString::Concat(name) + suffix; @@ -168,7 +168,7 @@ bool writeFontBytesToFile(osl::File& file, const void* data, sal_uInt64 size) // @param name name of the font file OUString writeFontBytesToFile(const std::vector<char>& bytes, std::u16string_view name) { - OUString url = EmbeddedFontsManager::fileUrlForTemporaryFont(name, u".ttf"); + OUString url = EmbeddedFontsManager::getFileUrlForTemporaryFont(name, u".ttf"); std::optional<osl::File> file(url); auto rc = file->open(osl_File_OpenFlag_Create | osl_File_OpenFlag_Write); @@ -195,7 +195,7 @@ OUString writeFontBytesToFile(const std::vector<char>& bytes, std::u16string_vie } } } - url = EmbeddedFontsManager::fileUrlForTemporaryFont(Concat2View(name + OUString::number(counter++)), u".ttf"); + url = EmbeddedFontsManager::getFileUrlForTemporaryFont(Concat2View(name + OUString::number(counter++)), u".ttf"); file.emplace(url); rc = file->open(osl_File_OpenFlag_Create | osl_File_OpenFlag_Write); }
