bin/find-can-be-private-symbols.functions.results | 8 ++-- bin/find-mergedlib-can-be-private-symbols.functions.results | 8 ++-- compilerplugins/clang/constantparam.booleans.results | 6 +-- include/vcl/embeddedfontsmanager.hxx | 11 ++---- include/xmloff/xmlimp.hxx | 8 ++-- ios/UnitTest/UnitTest.xcodeproj/project.pbxproj | 4 +- oox/source/export/drawingml.cxx | 6 +-- oox/source/ppt/EmbeddedFontListContext.cxx | 18 +++++----- oox/source/ppt/EmbeddedFontListContext.hxx | 4 +- sd/qa/unit/FontEmbeddingTest.cxx | 10 +++--- sd/source/filter/eppt/pptx-epptooxml.cxx | 8 ++-- sfx2/source/doc/docfile.cxx | 6 +-- solenv/clang-format/excludelist | 4 +- sw/qa/writerfilter/dmapper/FontTable.cxx | 10 +++--- sw/source/filter/ww8/docxattributeoutput.cxx | 8 ++-- sw/source/writerfilter/dmapper/FontTable.cxx | 6 +-- sw/source/writerfilter/dmapper/FontTable.hxx | 4 +- vcl/Library_vcl.mk | 2 - vcl/source/app/svmain.cxx | 6 +-- vcl/source/gdi/embeddedfontsmanager.cxx | 20 ++++++------ xmloff/source/core/xmlimp.cxx | 8 ++-- xmloff/source/style/XMLFontAutoStylePool.cxx | 8 ++-- 22 files changed, 85 insertions(+), 88 deletions(-)
New commits: commit b141a538d755c3d92c443c0e236c00ea773cb530 Author: Mike Kaganski <[email protected]> AuthorDate: Mon Aug 11 13:57:24 2025 +0500 Commit: Miklos Vajna <[email protected]> CommitDate: Thu Aug 14 08:47:34 2025 +0200 EmbeddedFontsHelper -> EmbeddedFontsManager It is not just a helper anymore, the rename reflects its function better. Change-Id: I11bf130eb34ba90841b550ab2a1fd1b3d9831b72 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189390 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 732a616b5953..d96c89f30852 100644 --- a/bin/find-can-be-private-symbols.functions.results +++ b/bin/find-can-be-private-symbols.functions.results @@ -479,10 +479,10 @@ EditUndo::GetId() const EditUndo::GetViewShellId() const EditUndo::~EditUndo() EditUndoManager::SetEditEngine(EditEngine*) -EmbeddedFontsHelper::activateFont(rtl::OUString const&, rtl::OUString const&) -EmbeddedFontsHelper::clearTemporaryFontFiles() -EmbeddedFontsHelper::fileUrlForTemporaryFont(rtl::OUString const&, std::basic_string_view<char16_t, std::char_traits<char16_t> >) -EmbeddedFontsHelper::sufficientTTFRights(void const*, long, EmbeddedFontsHelper::FontRights) +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::sufficientTTFRights(void const*, long, EmbeddedFontsManager::FontRights) EnhancedCustomShapeTypeNames::GetAccName(rtl::OUString const&) ErrorContext::GetParent() ErrorRegistry::ErrorRegistry() diff --git a/bin/find-mergedlib-can-be-private-symbols.functions.results b/bin/find-mergedlib-can-be-private-symbols.functions.results index 5a3724db6792..766ce6ec8a92 100644 --- a/bin/find-mergedlib-can-be-private-symbols.functions.results +++ b/bin/find-mergedlib-can-be-private-symbols.functions.results @@ -654,10 +654,10 @@ EditView::InsertParaBreak() EditView::IsReadOnly() const EditView::SetReadOnly(bool) EditView::SetSelectionMode(EESelectionMode) -EmbeddedFontsHelper::activateFont(rtl::OUString const&, rtl::OUString const&) -EmbeddedFontsHelper::clearTemporaryFontFiles() -EmbeddedFontsHelper::fileUrlForTemporaryFont(rtl::OUString const&, std::basic_string_view<char16_t, std::char_traits<char16_t> >) -EmbeddedFontsHelper::sufficientTTFRights(void const*, long, EmbeddedFontsHelper::FontRights) +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::sufficientTTFRights(void const*, long, EmbeddedFontsManager::FontRights) EnhancedCustomShape2d::ApplyGluePoints(SdrObject*) EnhancedCustomShape2d::CreateObject(bool) EnhancedCustomShape2d::GetEquation(unsigned short, int, int, int) diff --git a/compilerplugins/clang/constantparam.booleans.results b/compilerplugins/clang/constantparam.booleans.results index f019a6f3914e..af31b82f1ffe 100644 --- a/compilerplugins/clang/constantparam.booleans.results +++ b/compilerplugins/clang/constantparam.booleans.results @@ -1750,9 +1750,9 @@ include/vcl/dibtools.hxx:40 _Bool ReadDIB(class Bitmap &,class SvStream &,_Bool,_Bool) _Bool bMSOFormat 0 -include/vcl/embeddedfontshelper.hxx:54 - class rtl::OUString EmbeddedFontsHelper::fontFileUrl(class std::basic_string_view<char16_t>,enum FontFamily,enum FontItalic,enum FontWeight,enum FontPitch,enum EmbeddedFontsHelper::FontRights) - enum EmbeddedFontsHelper::FontRights rights +include/vcl/embeddedfontsmanager.hxx:54 + class rtl::OUString EmbeddedFontsManager::fontFileUrl(class std::basic_string_view<char16_t>,enum FontFamily,enum FontItalic,enum FontWeight,enum FontPitch,enum EmbeddedFontsManager::FontRights) + enum EmbeddedFontsManager::FontRights rights 0 include/vcl/fieldvalues.hxx:38 _Bool TextToValue(const class rtl::OUString &,double &,long,unsigned short,const class LocaleDataWrapper &,enum FieldUnit) diff --git a/include/vcl/embeddedfontshelper.hxx b/include/vcl/embeddedfontsmanager.hxx similarity index 93% rename from include/vcl/embeddedfontshelper.hxx rename to include/vcl/embeddedfontsmanager.hxx index fa4129976040..798de1f310fb 100644 --- a/include/vcl/embeddedfontshelper.hxx +++ b/include/vcl/embeddedfontsmanager.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_VCL_EMBEDDEDFONTSHELPER_HXX -#define INCLUDED_VCL_EMBEDDEDFONTSHELPER_HXX +#pragma once #include <vcl/dllapi.h> @@ -24,7 +23,7 @@ namespace com::sun::star::io { class XInputStream; } namespace com::sun::star::uno { template <typename > class Reference; } /** Helper functions for handling embedded fonts in documents. */ -class VCL_DLLPUBLIC EmbeddedFontsHelper +class VCL_DLLPUBLIC EmbeddedFontsManager { private: css::uno::Reference<css::frame::XModel> m_xDocumentModel; @@ -96,10 +95,8 @@ public: static void releaseFonts(const std::vector<std::pair<OUString, OUString>>& fonts); - EmbeddedFontsHelper(const css::uno::Reference<css::frame::XModel>& xModel); - ~EmbeddedFontsHelper() COVERITY_NOEXCEPT_FALSE; + EmbeddedFontsManager(const css::uno::Reference<css::frame::XModel>& xModel); + ~EmbeddedFontsManager() COVERITY_NOEXCEPT_FALSE; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index 89108377312a..fd41f6120a27 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -77,7 +77,7 @@ namespace xmloff { namespace xmloff::token { class FastTokenHandler; } -class EmbeddedFontsHelper; +class EmbeddedFontsManager; class ProgressBarHelper; class SvXMLNamespaceMap; class SvXMLImport_Impl; @@ -249,8 +249,8 @@ private: css::uno::Reference< css::task::XStatusIndicator > mxStatusIndicator; // tdf#69060 & tdf#137643 import embedded fonts and activate them in a - // batch in EmbeddedFontsHelper's dtor - std::unique_ptr<EmbeddedFontsHelper, o3tl::default_delete<EmbeddedFontsHelper>> mxEmbeddedFontHelper; + // batch in EmbeddedFontsManager's dtor + std::unique_ptr<EmbeddedFontsManager, o3tl::default_delete<EmbeddedFontsManager>> mxEmbeddedFontManager; protected: bool mbIsFormsSupported; @@ -583,7 +583,7 @@ public: */ bool embeddedFontAlreadyProcessed( const OUString& url ); - // see EmbeddedFontsHelper::addEmbeddedFont + // see EmbeddedFontsManager::addEmbeddedFont bool addEmbeddedFont( const css::uno::Reference< css::io::XInputStream >& stream, const OUString& fontName, std::u16string_view extra, std::vector< unsigned char > const & key, bool eot); diff --git a/ios/UnitTest/UnitTest.xcodeproj/project.pbxproj b/ios/UnitTest/UnitTest.xcodeproj/project.pbxproj index 940d62120390..ce48076bd696 100644 --- a/ios/UnitTest/UnitTest.xcodeproj/project.pbxproj +++ b/ios/UnitTest/UnitTest.xcodeproj/project.pbxproj @@ -137,7 +137,7 @@ BEA20DDF216797C10032F67B /* pdffontcache.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pdffontcache.cxx; path = ../../vcl/source/gdi/pdffontcache.cxx; sourceTree = "<group>"; }; BEA20DE0216797C10032F67B /* textlayout.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textlayout.cxx; path = ../../vcl/source/gdi/textlayout.cxx; sourceTree = "<group>"; }; BEA20DE1216797C10032F67B /* virdev.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = virdev.cxx; path = ../../vcl/source/gdi/virdev.cxx; sourceTree = "<group>"; }; - BEA20DE2216797C10032F67B /* embeddedfontshelper.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = embeddedfontshelper.cxx; path = ../../vcl/source/gdi/embeddedfontshelper.cxx; sourceTree = "<group>"; }; + BEA20DE2216797C10032F67B /* embeddedfontsmanager.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = embeddedfontsmanager.cxx; path = ../../vcl/source/gdi/embeddedfontsmanager.cxx; sourceTree = "<group>"; }; BEA20DE3216797C10032F67B /* salgdiimpl.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salgdiimpl.cxx; path = ../../vcl/source/gdi/salgdiimpl.cxx; sourceTree = "<group>"; }; BEA20DE4216797C10032F67B /* gfxlink.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gfxlink.cxx; path = ../../vcl/source/gdi/gfxlink.cxx; sourceTree = "<group>"; }; BEA20DE5216797C10032F67B /* alpha.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = alpha.cxx; path = ../../vcl/source/gdi/alpha.cxx; sourceTree = "<group>"; }; @@ -399,7 +399,7 @@ BEA20DD7216797C10032F67B /* configsettings.cxx */, BEA20DD1216797C10032F67B /* cvtgrf.cxx */, BEA20DF8216797C20032F67B /* dibtools.cxx */, - BEA20DE2216797C10032F67B /* embeddedfontshelper.cxx */, + BEA20DE2216797C10032F67B /* embeddedfontsmanager.cxx */, BEA20DD0216797C00032F67B /* extoutdevdata.cxx */, BEA20DD3216797C10032F67B /* gdimetafiletools.cxx */, BEA20DDD216797C10032F67B /* gdimtf.cxx */, diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index d7291b3da5e4..3efaac66122d 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -118,7 +118,7 @@ #include <unotools/fontdefs.hxx> #include <vcl/cvtgrf.hxx> #include <vcl/svapp.hxx> -#include <vcl/embeddedfontshelper.hxx> +#include <vcl/embeddedfontsmanager.hxx> #include <rtl/strbuf.hxx> #include <filter/msfilter/escherex.hxx> #include <filter/msfilter/util.hxx> @@ -2837,7 +2837,7 @@ void DrawingML::WriteRunProperties( const Reference< XPropertySet >& rRun, bool mAny >>= usTypeface; - if (!mbEmbedFonts || EmbeddedFontsHelper::isCommonFont(usTypeface)) + if (!mbEmbedFonts || EmbeddedFontsManager::isCommonFont(usTypeface)) { OUString aSubstName( GetSubsFontName( usTypeface, SubsFontFlags::ONLYONE | SubsFontFlags::MS ) ); if (!aSubstName.isEmpty()) @@ -2862,7 +2862,7 @@ void DrawingML::WriteRunProperties( const Reference< XPropertySet >& rRun, bool OUString usTypeface; mAny >>= usTypeface; - if (!mbEmbedFonts || EmbeddedFontsHelper::isCommonFont(usTypeface)) + if (!mbEmbedFonts || EmbeddedFontsManager::isCommonFont(usTypeface)) { OUString aSubstName( GetSubsFontName( usTypeface, SubsFontFlags::ONLYONE | SubsFontFlags::MS ) ); if (!aSubstName.isEmpty()) diff --git a/oox/source/ppt/EmbeddedFontListContext.cxx b/oox/source/ppt/EmbeddedFontListContext.cxx index 731048236b10..09d4a3735e6b 100644 --- a/oox/source/ppt/EmbeddedFontListContext.cxx +++ b/oox/source/ppt/EmbeddedFontListContext.cxx @@ -24,7 +24,7 @@ EmbeddedFontListContext::EmbeddedFontListContext( FragmentHandler2 const& rParent, bool bEmbedTrueType, css::uno::Reference<css::beans::XPropertySet> const& rxDocSettings) : FragmentHandler2(rParent) - , maEmbeddedFontHelper(getFilter().getModel()) + , maEmbeddedFontManager(getFilter().getModel()) , mbEmbedTrueType(bEmbedTrueType) , mxDocSettings(rxDocSettings) { @@ -95,32 +95,32 @@ void EmbeddedFontListContext::onEndElement() { OUString aFragmentPath = getFragmentPathFromRelId(moCurrentFont->aRegularID); uno::Reference<io::XInputStream> xInputStream = getFilter().openInputStream(aFragmentPath); - maEmbeddedFontHelper.addEmbeddedFont(xInputStream, moCurrentFont->aTypeface, u"", - std::vector<unsigned char>(), true, false); + maEmbeddedFontManager.addEmbeddedFont(xInputStream, moCurrentFont->aTypeface, u"", + std::vector<unsigned char>(), true, false); } if (!moCurrentFont->aBoldID.isEmpty()) { OUString aFragmentPath = getFragmentPathFromRelId(moCurrentFont->aBoldID); uno::Reference<io::XInputStream> xInputStream = getFilter().openInputStream(aFragmentPath); - maEmbeddedFontHelper.addEmbeddedFont(xInputStream, moCurrentFont->aTypeface, u"b", - std::vector<unsigned char>(), true, false); + maEmbeddedFontManager.addEmbeddedFont(xInputStream, moCurrentFont->aTypeface, u"b", + std::vector<unsigned char>(), true, false); } if (!moCurrentFont->aItalicID.isEmpty()) { OUString aFragmentPath = getFragmentPathFromRelId(moCurrentFont->aItalicID); uno::Reference<io::XInputStream> xInputStream = getFilter().openInputStream(aFragmentPath); - maEmbeddedFontHelper.addEmbeddedFont(xInputStream, moCurrentFont->aTypeface, u"i", - std::vector<unsigned char>(), true, false); + maEmbeddedFontManager.addEmbeddedFont(xInputStream, moCurrentFont->aTypeface, u"i", + std::vector<unsigned char>(), true, false); } if (!moCurrentFont->aBoldItalicID.isEmpty()) { OUString aFragmentPath = getFragmentPathFromRelId(moCurrentFont->aBoldItalicID); uno::Reference<io::XInputStream> xInputStream = getFilter().openInputStream(aFragmentPath); - maEmbeddedFontHelper.addEmbeddedFont(xInputStream, moCurrentFont->aTypeface, u"bi", - std::vector<unsigned char>(), true, false); + maEmbeddedFontManager.addEmbeddedFont(xInputStream, moCurrentFont->aTypeface, u"bi", + std::vector<unsigned char>(), true, false); } moCurrentFont = std::nullopt; diff --git a/oox/source/ppt/EmbeddedFontListContext.hxx b/oox/source/ppt/EmbeddedFontListContext.hxx index 4c9dd4075fe6..0601337e716a 100644 --- a/oox/source/ppt/EmbeddedFontListContext.hxx +++ b/oox/source/ppt/EmbeddedFontListContext.hxx @@ -14,7 +14,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <oox/core/contexthandler.hxx> #include <oox/core/fragmenthandler2.hxx> -#include <vcl/embeddedfontshelper.hxx> +#include <vcl/embeddedfontsmanager.hxx> #include <rtl/ustring.hxx> #include <sal/types.h> #include <optional> @@ -44,7 +44,7 @@ struct EmbeddedFont class EmbeddedFontListContext final : public ::oox::core::FragmentHandler2 { std::optional<EmbeddedFont> moCurrentFont; - EmbeddedFontsHelper maEmbeddedFontHelper; + EmbeddedFontsManager maEmbeddedFontManager; bool mbEmbedTrueType = false; css::uno::Reference<css::beans::XPropertySet> mxDocSettings; diff --git a/sd/qa/unit/FontEmbeddingTest.cxx b/sd/qa/unit/FontEmbeddingTest.cxx index be1d91dfd1af..d4f4b741ff4f 100644 --- a/sd/qa/unit/FontEmbeddingTest.cxx +++ b/sd/qa/unit/FontEmbeddingTest.cxx @@ -11,7 +11,7 @@ #include <test/unoapi_test.hxx> #include <config_eot.h> #include <config_fonts.h> -#include <vcl/embeddedfontshelper.hxx> +#include <vcl/embeddedfontsmanager.hxx> using namespace css; @@ -38,9 +38,9 @@ CPPUNIT_TEST_FIXTURE(FontEmbeddingTest, testRoundtripEmbeddedFontsPPTX) // Expect the font to not be available { - OUString aUrl = EmbeddedFontsHelper::fontFileUrl( + OUString aUrl = EmbeddedFontsManager::fontFileUrl( u"Boldonse", FAMILY_ROMAN, ITALIC_NONE, WEIGHT_NORMAL, PITCH_VARIABLE, - EmbeddedFontsHelper::FontRights::ViewingAllowed); + EmbeddedFontsManager::FontRights::ViewingAllowed); CPPUNIT_ASSERT(aUrl.isEmpty()); } @@ -51,9 +51,9 @@ CPPUNIT_TEST_FIXTURE(FontEmbeddingTest, testRoundtripEmbeddedFontsPPTX) #if !defined(MACOSX) // Expect the font to be available now, if we imported the embedded fonts correctly { - OUString aUrl = EmbeddedFontsHelper::fontFileUrl( + OUString aUrl = EmbeddedFontsManager::fontFileUrl( u"Boldonse", FAMILY_ROMAN, ITALIC_NONE, WEIGHT_NORMAL, PITCH_VARIABLE, - EmbeddedFontsHelper::FontRights::ViewingAllowed); + EmbeddedFontsManager::FontRights::ViewingAllowed); CPPUNIT_ASSERT(!aUrl.isEmpty()); } diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 80c41260545b..7ae6bab8c189 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -69,7 +69,7 @@ #include <com/sun/star/presentation/XPresentationSupplier.hpp> #include <comphelper/diagnose_ex.hxx> #include <comphelper/hash.hxx> -#include <vcl/embeddedfontshelper.hxx> +#include <vcl/embeddedfontsmanager.hxx> #include <oox/export/utils.hxx> #include <oox/export/ThemeExport.hxx> @@ -732,7 +732,7 @@ void PowerPointExport::WriteEmbeddedFontList() aAnySeq[nSeqIndex++] >>= ePitch; aAnySeq[nSeqIndex++] >>= eCharSet; - if (EmbeddedFontsHelper::isCommonFont(sFamilyName)) + if (EmbeddedFontsManager::isCommonFont(sFamilyName)) continue; if (mbEmbedUsedOnly && !aUsedFonts.contains(sFamilyName)) @@ -755,9 +755,9 @@ void PowerPointExport::WriteEmbeddedFontList() for (auto [eItalic, eWeight] : aFontVariantCombinations) { - OUString sFontUrl = EmbeddedFontsHelper::fontFileUrl( + OUString sFontUrl = EmbeddedFontsManager::fontFileUrl( sFamilyName, FontFamily(eFamily), eItalic, eWeight, FontPitch(ePitch), - EmbeddedFontsHelper::FontRights::ViewingAllowed); + EmbeddedFontsManager::FontRights::ViewingAllowed); if (sFontUrl.isEmpty()) continue; diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 074ae9d25a26..16ecc6ea1ebf 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -126,7 +126,7 @@ #include <openflag.hxx> #include <officecfg/Office/Common.hxx> #include <comphelper/propertysequence.hxx> -#include <vcl/embeddedfontshelper.hxx> +#include <vcl/embeddedfontsmanager.hxx> #include <vcl/weld.hxx> #include <vcl/svapp.hxx> #include <comphelper/diagnose_ex.hxx> @@ -3765,7 +3765,7 @@ void SfxMedium::ReleaseEmbeddedFonts() toRelease.insert(toRelease.end(), pImpl->m_aEmbeddedFontsToActivate.begin(), pImpl->m_aEmbeddedFontsToActivate.end()); pImpl->m_aEmbeddedFontsToActivate.clear(); - EmbeddedFontsHelper::releaseFonts(toRelease); + EmbeddedFontsManager::releaseFonts(toRelease); } const OUString& SfxMedium::GetName() const @@ -4039,7 +4039,7 @@ void SfxMedium::AddEmbeddedFonts( void SfxMedium::activateEmbeddedFonts() { - EmbeddedFontsHelper::activateFonts(pImpl->m_aEmbeddedFontsToActivate); + EmbeddedFontsManager::activateFonts(pImpl->m_aEmbeddedFontsToActivate); pImpl->m_aEmbeddedFonts.insert(pImpl->m_aEmbeddedFonts.end(), pImpl->m_aEmbeddedFontsToActivate.begin(), pImpl->m_aEmbeddedFontsToActivate.end()); diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index ced5fa777b31..f8c6642f9316 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -6245,7 +6245,7 @@ include/vcl/dibtools.hxx include/vcl/dndhelp.hxx include/vcl/dockingarea.hxx include/vcl/dockwin.hxx -include/vcl/embeddedfontshelper.hxx +include/vcl/embeddedfontsmanager.hxx include/vcl/errinf.hxx include/vcl/event.hxx include/vcl/evntpost.hxx @@ -14692,7 +14692,7 @@ vcl/source/fontsubset/ttcr.hxx vcl/source/gdi/CommonSalLayout.cxx vcl/source/gdi/configsettings.cxx vcl/source/gdi/cvtgrf.cxx -vcl/source/gdi/embeddedfontshelper.cxx +vcl/source/gdi/embeddedfontsmanager.cxx vcl/source/gdi/formpdfexport.cxx vcl/source/gdi/gdimetafiletools.cxx vcl/source/gdi/gdimtf.cxx diff --git a/sw/qa/writerfilter/dmapper/FontTable.cxx b/sw/qa/writerfilter/dmapper/FontTable.cxx index 2d5a80ca0476..a72d12c5e703 100644 --- a/sw/qa/writerfilter/dmapper/FontTable.cxx +++ b/sw/qa/writerfilter/dmapper/FontTable.cxx @@ -13,7 +13,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/text/XTextDocument.hpp> -#include <vcl/embeddedfontshelper.hxx> +#include <vcl/embeddedfontsmanager.hxx> using namespace com::sun::star; @@ -35,9 +35,9 @@ CPPUNIT_TEST_FIXTURE(Test, testSubsettedEmbeddedFont) loadFromFile(u"subsetted-embedded-font.docx"); // When checking if the font is available: - OUString aUrl = EmbeddedFontsHelper::fontFileUrl( + OUString aUrl = EmbeddedFontsManager::fontFileUrl( u"IBM Plex Serif Light", FAMILY_ROMAN, ITALIC_NONE, WEIGHT_NORMAL, PITCH_VARIABLE, - EmbeddedFontsHelper::FontRights::ViewingAllowed); + EmbeddedFontsManager::FontRights::ViewingAllowed); // Then make sure the subsetted font is not available, given that the newly inserted characters // during editing may be missing from the subsetted font: @@ -52,9 +52,9 @@ CPPUNIT_TEST_FIXTURE(Test, testSubsettedFullEmbeddedFont) loadFromFile(u"subsetted-full-embedded-font.docx"); // When checking if the font is available: - OUString aUrl = EmbeddedFontsHelper::fontFileUrl( + OUString aUrl = EmbeddedFontsManager::fontFileUrl( u"IBM Plex Serif Light", FAMILY_ROMAN, ITALIC_NONE, WEIGHT_NORMAL, PITCH_VARIABLE, - EmbeddedFontsHelper::FontRights::ViewingAllowed); + EmbeddedFontsManager::FontRights::ViewingAllowed); // Then make sure the subsetted font is available, given that it has the reasonable amount of // glyphs: diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 9f985fd95e17..8a44a74d09d8 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -141,7 +141,7 @@ #include <o3tl/unit_conversion.hxx> #include <osl/file.hxx> #include <utility> -#include <vcl/embeddedfontshelper.hxx> +#include <vcl/embeddedfontsmanager.hxx> #include <com/sun/star/i18n/ScriptType.hpp> #include <com/sun/star/i18n/XBreakIterator.hpp> @@ -7553,7 +7553,7 @@ void DocxAttributeOutput::EmbedFont( std::u16string_view name, FontFamily family { if( !m_rExport.m_rDoc.getIDocumentSettingAccess().get( DocumentSettingId::EMBED_FONTS )) return; // no font embedding with this document - if (EmbeddedFontsHelper::isCommonFont(name)) + if (EmbeddedFontsManager::isCommonFont(name)) return; bool foundFont @@ -7578,8 +7578,8 @@ bool DocxAttributeOutput::EmbedFontStyle(std::u16string_view name, int tag, Font { // Embed font if at least viewing is allowed (in which case the opening app must check // the font license rights too and open either read-only or not use the font for editing). - OUString fontUrl = EmbeddedFontsHelper::fontFileUrl( name, family, italic, weight, pitch, - EmbeddedFontsHelper::FontRights::ViewingAllowed ); + OUString fontUrl = EmbeddedFontsManager::fontFileUrl( name, family, italic, weight, pitch, + EmbeddedFontsManager::FontRights::ViewingAllowed ); if( fontUrl.isEmpty()) return false; // TODO IDocumentSettingAccess::EMBED_SYSTEM_FONTS diff --git a/sw/source/writerfilter/dmapper/FontTable.cxx b/sw/source/writerfilter/dmapper/FontTable.cxx index 767031b9c13e..602a31bcb93b 100644 --- a/sw/source/writerfilter/dmapper/FontTable.cxx +++ b/sw/source/writerfilter/dmapper/FontTable.cxx @@ -255,9 +255,9 @@ void FontTable::addEmbeddedFont(const css::uno::Reference<css::io::XInputStream> std::vector<unsigned char> const & key, bool bSubsetted) { - if (!m_xEmbeddedFontHelper) - m_xEmbeddedFontHelper.reset(new EmbeddedFontsHelper(m_xModel)); - m_xEmbeddedFontHelper->addEmbeddedFont(stream, fontName, extra, key, + if (!m_xEmbeddedFontManager) + m_xEmbeddedFontManager.reset(new EmbeddedFontsManager(m_xModel)); + m_xEmbeddedFontManager->addEmbeddedFont(stream, fontName, extra, key, /*eot=*/false, bSubsetted); } diff --git a/sw/source/writerfilter/dmapper/FontTable.hxx b/sw/source/writerfilter/dmapper/FontTable.hxx index 56b949fd04c1..084116f40440 100644 --- a/sw/source/writerfilter/dmapper/FontTable.hxx +++ b/sw/source/writerfilter/dmapper/FontTable.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/frame/XModel2.hpp> #include <com/sun/star/awt/FontFamily.hpp> -#include <vcl/embeddedfontshelper.hxx> +#include <vcl/embeddedfontsmanager.hxx> #include <o3tl/deleter.hxx> namespace rtl { template<class reference_type> class Reference; } @@ -51,7 +51,7 @@ class FontTable : public LoggedProperties, public LoggedTable /*,public BinaryObj*/, public LoggedStream { css::uno::Reference<css::frame::XModel2> m_xModel; - std::unique_ptr<EmbeddedFontsHelper, o3tl::default_delete<EmbeddedFontsHelper>> m_xEmbeddedFontHelper; + std::unique_ptr<EmbeddedFontsManager, o3tl::default_delete<EmbeddedFontsManager>> m_xEmbeddedFontManager; std::vector< FontEntry::Pointer_t > m_aFontEntries; FontEntry::Pointer_t m_pCurrentEntry; bool m_bReadOnly; diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 3dcb879b5c51..0543322f6b3b 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -276,7 +276,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/gdi/formpdfexport \ vcl/source/gdi/configsettings \ vcl/source/gdi/cvtgrf \ - vcl/source/gdi/embeddedfontshelper \ + vcl/source/gdi/embeddedfontsmanager \ vcl/source/gdi/FileDefinitionWidgetDraw \ vcl/source/gdi/WidgetDefinitionReader \ vcl/source/gdi/WidgetDefinition \ diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 9ef22da996e6..9e44bc496489 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -46,7 +46,7 @@ #include <vcl/toolkit/unowrap.hxx> #include <configsettings.hxx> #include <tools/lazydelete.hxx> -#include <vcl/embeddedfontshelper.hxx> +#include <vcl/embeddedfontsmanager.hxx> #include <vcl/toolkit/dialog.hxx> #include <vcl/menu.hxx> #include <vcl/virdev.hxx> @@ -316,7 +316,7 @@ bool InitVCL() if( pExceptionHandler != nullptr ) return false; - EmbeddedFontsHelper::clearTemporaryFontFiles(); + EmbeddedFontsManager::clearTemporaryFontFiles(); if( !ImplGetSVData()->mpApp ) { @@ -640,7 +640,7 @@ void DeInitVCL() pOwnSvApp = nullptr; } - EmbeddedFontsHelper::clearTemporaryFontFiles(); + EmbeddedFontsManager::clearTemporaryFontFiles(); } namespace { diff --git a/vcl/source/gdi/embeddedfontshelper.cxx b/vcl/source/gdi/embeddedfontsmanager.cxx similarity index 95% rename from vcl/source/gdi/embeddedfontshelper.cxx rename to vcl/source/gdi/embeddedfontsmanager.cxx index 31494d9f6b3b..df73525ee695 100644 --- a/vcl/source/gdi/embeddedfontshelper.cxx +++ b/vcl/source/gdi/embeddedfontsmanager.cxx @@ -23,7 +23,7 @@ #include <rtl/uri.hxx> #include <sal/log.hxx> #include <vcl/svapp.hxx> -#include <vcl/embeddedfontshelper.hxx> +#include <vcl/embeddedfontsmanager.hxx> #include <com/sun/star/io/XInputStream.hpp> #include <comphelper/diagnose_ex.hxx> #include <comphelper/propertyvalue.hxx> @@ -163,12 +163,12 @@ OUString writeFontBytesToFile(const std::vector<char>& bytes, std::u16string_vie } } -EmbeddedFontsHelper::EmbeddedFontsHelper(const uno::Reference<frame::XModel>& xModel) +EmbeddedFontsManager::EmbeddedFontsManager(const uno::Reference<frame::XModel>& xModel) : m_xDocumentModel(xModel) { } -EmbeddedFontsHelper::~EmbeddedFontsHelper() COVERITY_NOEXCEPT_FALSE +EmbeddedFontsManager::~EmbeddedFontsManager() COVERITY_NOEXCEPT_FALSE { if (m_aAccumulatedFonts.empty()) return; @@ -196,14 +196,14 @@ EmbeddedFontsHelper::~EmbeddedFontsHelper() COVERITY_NOEXCEPT_FALSE activateFonts(m_aAccumulatedFonts); } -void EmbeddedFontsHelper::clearTemporaryFontFiles() +void EmbeddedFontsManager::clearTemporaryFontFiles() { OUString path = GetEmbeddedFontsRoot(); clearDir( path + "fromdocs/" ); clearDir( path + "fromsystem/" ); } -bool EmbeddedFontsHelper::addEmbeddedFont( const uno::Reference< io::XInputStream >& stream, const OUString& fontName, +bool EmbeddedFontsManager::addEmbeddedFont( const uno::Reference< io::XInputStream >& stream, const OUString& fontName, std::u16string_view extra, std::vector< unsigned char > const & key, bool eot, bool bSubsetted ) { @@ -323,7 +323,7 @@ namespace }; } -void EmbeddedFontsHelper::activateFonts(std::vector<std::pair<OUString, OUString>>& fonts) +void EmbeddedFontsManager::activateFonts(std::vector<std::pair<OUString, OUString>>& fonts) { if (fonts.empty()) return; @@ -353,7 +353,7 @@ void EmbeddedFontsHelper::activateFonts(std::vector<std::pair<OUString, OUString pDevice->AddTempDevFont(fileUrl, fontName); } -void EmbeddedFontsHelper::releaseFonts(const std::vector<std::pair<OUString, OUString>>& fonts) +void EmbeddedFontsManager::releaseFonts(const std::vector<std::pair<OUString, OUString>>& fonts) { std::vector<std::pair<OUString, OUString>> unregister; { @@ -396,7 +396,7 @@ void EmbeddedFontsHelper::releaseFonts(const std::vector<std::pair<OUString, OUS // to have a different meaning (guessing from code, IsSubsettable() might // possibly mean it's ttf, while IsEmbeddable() might mean it's type1). // So just try to open the data as ttf and see. -bool EmbeddedFontsHelper::sufficientTTFRights( const void* data, tools::Long size, FontRights rights ) +bool EmbeddedFontsManager::sufficientTTFRights( const void* data, tools::Long size, FontRights rights ) { TrueTypeFont* font; if( OpenTTFontBuffer( data, size, 0 /*TODO*/, &font ) == SFErrCodes::Ok ) @@ -419,7 +419,7 @@ bool EmbeddedFontsHelper::sufficientTTFRights( const void* data, tools::Long siz return true; // no known restriction } -OUString EmbeddedFontsHelper::fontFileUrl( std::u16string_view familyName, FontFamily family, FontItalic italic, +OUString EmbeddedFontsManager::fontFileUrl( std::u16string_view familyName, FontFamily family, FontItalic italic, FontWeight weight, FontPitch pitch, FontRights rights ) { OUString path = GetEmbeddedFontsRoot() + "fromsystem/"; @@ -538,7 +538,7 @@ OUString EmbeddedFontsHelper::fontFileUrl( std::u16string_view familyName, FontF return ok ? url : u""_ustr; } -bool EmbeddedFontsHelper::isCommonFont(std::u16string_view aFontName) +bool EmbeddedFontsManager::isCommonFont(std::u16string_view aFontName) { static constexpr auto aCommonFontsList = frozen::make_unordered_set<std::u16string_view>({ // LO Common diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index e5b59f57471b..e5edc29a41cd 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -27,7 +27,7 @@ #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <tools/urlobj.hxx> #include <utility> -#include <vcl/embeddedfontshelper.hxx> +#include <vcl/embeddedfontsmanager.hxx> #include <vcl/graph.hxx> #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <xmloff/namespacemap.hxx> @@ -495,9 +495,9 @@ bool SvXMLImport::addEmbeddedFont(const css::uno::Reference< css::io::XInputStre const OUString& fontName, std::u16string_view extra, std::vector<unsigned char> const & key, bool eot) { - if (!mxEmbeddedFontHelper) - mxEmbeddedFontHelper.reset(new EmbeddedFontsHelper(mxModel)); - return mxEmbeddedFontHelper->addEmbeddedFont(stream, fontName, extra, key, eot); + if (!mxEmbeddedFontManager) + mxEmbeddedFontManager.reset(new EmbeddedFontsManager(mxModel)); + return mxEmbeddedFontManager->addEmbeddedFont(stream, fontName, extra, key, eot); } namespace diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx index 6d89ee7652ea..a101755797e8 100644 --- a/xmloff/source/style/XMLFontAutoStylePool.cxx +++ b/xmloff/source/style/XMLFontAutoStylePool.cxx @@ -26,7 +26,7 @@ #include "fonthdl.hxx" #include <xmloff/xmlexp.hxx> #include <xmloff/XMLFontAutoStylePool.hxx> -#include <vcl/embeddedfontshelper.hxx> +#include <vcl/embeddedfontsmanager.hxx> #include <osl/file.hxx> #include <sal/log.hxx> #include <comphelper/diagnose_ex.hxx> @@ -428,7 +428,7 @@ void SvXMLExport::exportFonts(const std::vector<XMLFontAutoStylePoolEntry_Impl*> // When embedding is requested, and embedded only is not set or font is used if (bEmbedFonts && (!bEmbedUsedOnly || aUsedFontNames.contains(pEntry->GetFamilyName()))) { - if (EmbeddedFontsHelper::isCommonFont(pEntry->GetFamilyName())) + if (EmbeddedFontsManager::isCommonFont(pEntry->GetFamilyName())) continue; const bool bExportFlat(getExportFlags() & SvXMLExportFlags::EMBEDDED); @@ -448,9 +448,9 @@ void SvXMLExport::exportFonts(const std::vector<XMLFontAutoStylePoolEntry_Impl*> { // Embed font if at least viewing is allowed (in which case the opening app must check // the font license rights too and open either read-only or not use the font for editing). - OUString sFileUrl = EmbeddedFontsHelper::fontFileUrl( + OUString sFileUrl = EmbeddedFontsManager::fontFileUrl( pEntry->GetFamilyName(), pEntry->GetFamily(), fontItalic, fontWeight, - pEntry->GetPitch(), EmbeddedFontsHelper::FontRights::ViewingAllowed); + pEntry->GetPitch(), EmbeddedFontsManager::FontRights::ViewingAllowed); if (sFileUrl.isEmpty()) continue;
