compilerplugins/clang/unusedfields.only-used-in-constructor.results | 6 ++---- compilerplugins/clang/unusedfields.writeonly.results | 6 ++---- vcl/inc/unx/glyphcache.hxx | 1 - vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 9 --------- 4 files changed, 4 insertions(+), 18 deletions(-)
New commits: commit dabedcaf27b0af1e38a611b8d8e48444f848e01d Author: Noel Grandin <[email protected]> AuthorDate: Sun Jul 23 16:27:45 2023 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Tue Jul 25 07:56:37 2023 +0200 loplugin:unusedfields Change-Id: If9c76b9c500a5bee0fbf20a44597a250b7fa2af0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154808 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results index 01db79dd80aa..a81c93483c6c 100644 --- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results +++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results @@ -910,6 +910,8 @@ vcl/inc/sft.hxx:177 vcl::TTGlobalFontInfo_ fsSelection sal_uInt16 vcl/inc/svimpbox.hxx:118 SvImpLBox m_aFctSet ImpLBSelEng +vcl/inc/unx/glyphcache.hxx:146 + FreetypeFont mnLoadFlags FT_Int vcl/inc/unx/i18n_ic.hxx:40 SalI18N_InputContext maPreeditStartCallback XIMCallback vcl/inc/unx/i18n_ic.hxx:41 @@ -938,8 +940,6 @@ vcl/source/gdi/jobset.cxx:39 (anonymous namespace)::ImplOldJobSetupData cDeviceName char[32] vcl/source/gdi/jobset.cxx:40 (anonymous namespace)::ImplOldJobSetupData cPortName char[32] -vcl/source/gdi/pdfextoutdevdata.cxx:107 - vcl::GlobalSyncData mStructIdMap std::vector<sal_Int32> vcl/source/pdf/PDFiumLibrary.cxx:430 vcl::pdf::(anonymous namespace)::PDFiumDocumentImpl m_aFormCallbacks FPDF_FORMFILLINFO vcl/unx/gtk3/a11y/atkhypertext.cxx:31 @@ -972,5 +972,3 @@ xmloff/inc/XMLThemeContext.hxx:46 XMLThemeColorsContext m_aColorScheme std::vector<css::util::Color> xmloff/source/text/XMLTextListBlockContext.hxx:40 XMLTextListBlockContext mbSetDefaults _Bool -xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx:87 - (anonymous namespace)::SaveODFItem m_nODF sal_Int16 diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results index 098cd9e859a5..09664da6ea79 100644 --- a/compilerplugins/clang/unusedfields.writeonly.results +++ b/compilerplugins/clang/unusedfields.writeonly.results @@ -1248,6 +1248,8 @@ vcl/inc/svdata.hxx:464 ImplSVEvent mpInstanceRef VclPtr<vcl::Window> vcl/inc/toolbarvalue.hxx:47 ToolbarValue mbIsTopDockingArea _Bool +vcl/inc/unx/glyphcache.hxx:146 + FreetypeFont mnLoadFlags FT_Int vcl/inc/unx/gtk/gtkdata.hxx:226 DocumentFocusListener m_aRefList o3tl::sorted_vector<css::uno::Reference<css::uno::XInterface> > vcl/inc/unx/gtk/gtkframe.hxx:81 @@ -1260,8 +1262,6 @@ vcl/source/components/dtranscomp.cxx:210 vcl::(anonymous namespace)::GenericDragSource m_xTrans css::uno::Reference<css::datatransfer::XTransferable> vcl/source/fontsubset/sft.cxx:109 vcl::(anonymous namespace)::TTGlyphMetrics lsb sal_Int16 -vcl/source/gdi/pdfextoutdevdata.cxx:107 - vcl::GlobalSyncData mStructIdMap std::vector<sal_Int32> vcl/unx/generic/app/wmadaptor.cxx:1268 _mwmhints deco unsigned long vcl/unx/generic/app/wmadaptor.cxx:1268 @@ -1332,8 +1332,6 @@ xmlsecurity/inc/certificateviewer.hxx:51 CertificateViewer mxGeneralPage std::unique_ptr<CertificateViewerGeneralTP> xmlsecurity/inc/certificateviewer.hxx:52 CertificateViewer mxDetailsPage std::unique_ptr<CertificateViewerDetailsTP> -xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx:87 - (anonymous namespace)::SaveODFItem m_nODF sal_Int16 xmlsecurity/source/helper/pdfsignaturehelper.cxx:237 (anonymous namespace)::PageChecksum m_nPageContent BitmapChecksum xmlsecurity/source/helper/pdfsignaturehelper.cxx:238 diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx index f5ce328b0aa1..6d778d15d6c7 100644 --- a/vcl/inc/unx/glyphcache.hxx +++ b/vcl/inc/unx/glyphcache.hxx @@ -143,7 +143,6 @@ private: int mnWidth; int mnPrioAntiAlias; std::shared_ptr<FreetypeFontInfo> mxFontInfo; - FT_Int mnLoadFlags; double mfStretch; FT_FaceRec_* maFaceFT; FT_SizeRec_* maSizeFT; diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index 2543b76b5719..5745f94a223e 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -394,13 +394,10 @@ FreetypeFont::FreetypeFont(FreetypeFontInstance& rFontInstance, std::shared_ptr< mnSin( 0 ), mnPrioAntiAlias(nDefaultPrioAntiAlias), mxFontInfo(std::move(xFI)), - mnLoadFlags( 0 ), maFaceFT( nullptr ), maSizeFT( nullptr ), mbFaceOk( false ) { - int nPrioEmbedded = nDefaultPrioEmbedded; - maFaceFT = mxFontInfo->GetFaceFT(); const vcl::font::FontSelectPattern& rFSD = rFontInstance.GetFontSelectPattern(); @@ -442,12 +439,6 @@ FreetypeFont::FreetypeFont(FreetypeFontInstance& rFontInstance, std::shared_ptr< /*FT_Error rc = */ FT_Set_Pixel_Sizes( maFaceFT, mnWidth, rFSD.mnHeight ); mbFaceOk = true; - - // TODO: query GASP table for load flags - mnLoadFlags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_TRANSFORM; - - if( ((mnCos != 0) && (mnSin != 0)) || (nPrioEmbedded <= 0) ) - mnLoadFlags |= FT_LOAD_NO_BITMAP; } namespace
