include/vcl/filter/PDFiumLibrary.hxx | 8 ++++---- svx/source/inc/svdpdf.hxx | 2 +- svx/source/svdraw/svdpdf.cxx | 2 +- vcl/source/pdf/PDFiumLibrary.cxx | 14 +++++++------- 4 files changed, 13 insertions(+), 13 deletions(-)
New commits: commit f871f87af5db135dc940a053a9321d91345301ff Author: Caolán McNamara <[email protected]> AuthorDate: Fri Sep 26 11:44:02 2025 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Mon Sep 29 14:11:44 2025 +0200 fix PFDiumFont typo to PDFiumFont Change-Id: I2ca1dbf139aa54d52371be07a0416c8f1bebdb6e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191543 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/include/vcl/filter/PDFiumLibrary.hxx b/include/vcl/filter/PDFiumLibrary.hxx index 59fd5f3a0545..bc759288efbd 100644 --- a/include/vcl/filter/PDFiumLibrary.hxx +++ b/include/vcl/filter/PDFiumLibrary.hxx @@ -53,7 +53,7 @@ inline constexpr OString constDictionaryKey_RichContent = "RC"_ostr; class PDFiumBitmap; class PDFiumDocument; class PDFiumPageObject; -typedef void* PFDiumFont; +typedef void* PDFiumFont; class VCL_DLLPUBLIC PDFium { @@ -158,9 +158,9 @@ public: virtual OUString getFontName() = 0; virtual OUString getBaseFontName() = 0; virtual int getFontAngle() = 0; - virtual PFDiumFont getFont() = 0; - virtual bool getFontData(PFDiumFont font, std::vector<uint8_t>& rData) = 0; - virtual bool getFontToUnicode(PFDiumFont font, std::vector<uint8_t>& rData) = 0; + virtual PDFiumFont getFont() = 0; + virtual bool getFontData(PDFiumFont font, std::vector<uint8_t>& rData) = 0; + virtual bool getFontToUnicode(PDFiumFont font, std::vector<uint8_t>& rData) = 0; virtual bool getFontProperties(FontWeight& weight) = 0; virtual PDFTextRenderMode getTextRenderMode() = 0; virtual Color getFillColor() = 0; diff --git a/svx/source/inc/svdpdf.hxx b/svx/source/inc/svdpdf.hxx index 7a67850fea3f..5c9745a16695 100644 --- a/svx/source/inc/svdpdf.hxx +++ b/svx/source/inc/svdpdf.hxx @@ -77,7 +77,7 @@ class ImpSdrPdfImport final { std::vector<rtl::Reference<SdrObject>> maTmpList; - std::map<vcl::pdf::PFDiumFont, OfficeFontInfo> maImportedFonts; + std::map<vcl::pdf::PDFiumFont, OfficeFontInfo> maImportedFonts; std::map<OUString, SubSetInfo> maDifferentSubsetsForFont; // map of PostScriptName->Merged Font File for that font std::map<OUString, EmbeddedFontInfo> maEmbeddedFonts; diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx index ebbf241a1cba..8e7e31ff2045 100644 --- a/svx/source/svdraw/svdpdf.cxx +++ b/svx/source/svdraw/svdpdf.cxx @@ -216,7 +216,7 @@ void ImpSdrPdfImport::CollectFonts() const vcl::pdf::PDFPageObjectType ePageObjectType = pPageObject->getType(); if (ePageObjectType != vcl::pdf::PDFPageObjectType::Text) continue; - vcl::pdf::PFDiumFont font = pPageObject->getFont(); + vcl::pdf::PDFiumFont font = pPageObject->getFont(); if (!font) continue; diff --git a/vcl/source/pdf/PDFiumLibrary.cxx b/vcl/source/pdf/PDFiumLibrary.cxx index 8995732601b1..c4bfb80984ee 100644 --- a/vcl/source/pdf/PDFiumLibrary.cxx +++ b/vcl/source/pdf/PDFiumLibrary.cxx @@ -419,9 +419,9 @@ public: OUString getFontName() override; OUString getBaseFontName() override; int getFontAngle() override; - PFDiumFont getFont() override; - bool getFontData(PFDiumFont font, std::vector<uint8_t>& rData) override; - bool getFontToUnicode(PFDiumFont font, std::vector<uint8_t>& rData) override; + PDFiumFont getFont() override; + bool getFontData(PDFiumFont font, std::vector<uint8_t>& rData) override; + bool getFontToUnicode(PDFiumFont font, std::vector<uint8_t>& rData) override; bool getFontProperties(FontWeight& weight) override; PDFTextRenderMode getTextRenderMode() override; Color getFillColor() override; @@ -1168,9 +1168,9 @@ int PDFiumPageObjectImpl::getFontAngle() return nFontAngle; } -PFDiumFont PDFiumPageObjectImpl::getFont() { return FPDFTextObj_GetFont(mpPageObject); } +PDFiumFont PDFiumPageObjectImpl::getFont() { return FPDFTextObj_GetFont(mpPageObject); } -bool PDFiumPageObjectImpl::getFontData(PFDiumFont font, std::vector<uint8_t>& rData) +bool PDFiumPageObjectImpl::getFontData(PDFiumFont font, std::vector<uint8_t>& rData) { FPDF_FONT pFontObject = static_cast<FPDF_FONT>(font); size_t buflen(0); @@ -1186,7 +1186,7 @@ bool PDFiumPageObjectImpl::getFontData(PFDiumFont font, std::vector<uint8_t>& rD return bOk; } -bool PDFiumPageObjectImpl::getFontToUnicode(PFDiumFont font, std::vector<uint8_t>& rData) +bool PDFiumPageObjectImpl::getFontToUnicode(PDFiumFont font, std::vector<uint8_t>& rData) { FPDF_FONT pFontObject = static_cast<FPDF_FONT>(font); @@ -1211,7 +1211,7 @@ bool PDFiumPageObjectImpl::getFontProperties(FontWeight& weight) // So pull the font data and analyze it directly. Though the font might not // have an OS/2 table so we may end up eventually inferring the weight from // the style name. - PFDiumFont font = getFont(); + PDFiumFont font = getFont(); if (!font) return false; std::vector<uint8_t> aData;
