include/sfx2/weldutils.hxx | 2 - include/svl/cjkoptions.hxx | 2 - include/svl/ctloptions.hxx | 13 ------- include/svx/GenericDropDownFieldDialog.hxx | 1 include/vcl/filter/PDFiumLibrary.hxx | 1 oox/inc/drawingml/textparagraphproperties.hxx | 1 sc/inc/dpobject.hxx | 1 sc/source/core/data/dpobject.cxx | 5 --- sc/source/filter/inc/numberformatsbuffer.hxx | 4 -- sc/source/filter/oox/numberformatsbuffer.cxx | 5 --- sd/inc/sdpage.hxx | 1 sdext/source/minimizer/configurationaccess.hxx | 1 svl/source/config/cjkoptions.cxx | 35 --------------------- svl/source/config/ctloptions.cxx | 41 ------------------------- sw/source/core/text/porlin.hxx | 5 --- sw/source/core/text/portxt.cxx | 1 vcl/source/pdf/PDFiumLibrary.cxx | 23 -------------- 17 files changed, 1 insertion(+), 141 deletions(-)
New commits: commit aaedabdaa33d266e394827e9a419627ef721a5b4 Author: Noel Grandin <[email protected]> AuthorDate: Mon Dec 1 15:10:54 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Dec 1 18:27:09 2025 +0100 loplugin:unusedmethods Change-Id: I85e2ca6222e33c2a99bfd0ea614d5ad238a7e8de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194890 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/sfx2/weldutils.hxx b/include/sfx2/weldutils.hxx index 571d8c237c20..98c8efdb5987 100644 --- a/include/sfx2/weldutils.hxx +++ b/include/sfx2/weldutils.hxx @@ -61,8 +61,6 @@ public: void dispose(); ~ToolbarUnoDispatcher(); - - void Select(const OUString& rCommand) { SelectHdl(rCommand); } }; #endif diff --git a/include/svl/cjkoptions.hxx b/include/svl/cjkoptions.hxx index cec2f035b780..e76fed940c0f 100644 --- a/include/svl/cjkoptions.hxx +++ b/include/svl/cjkoptions.hxx @@ -30,9 +30,7 @@ SVL_DLLPUBLIC bool IsRubyEnabled(); SVL_DLLPUBLIC bool IsChangeCaseMapEnabled(); SVL_DLLPUBLIC bool IsDoubleLinesEnabled(); -SVL_DLLPUBLIC void SetAll(bool bSet); SVL_DLLPUBLIC bool IsAnyEnabled(); -SVL_DLLPUBLIC bool IsAnyReadOnly(); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/ctloptions.hxx b/include/svl/ctloptions.hxx index 06ada1b14854..cd980f90b5b4 100644 --- a/include/svl/ctloptions.hxx +++ b/include/svl/ctloptions.hxx @@ -38,7 +38,6 @@ public: SvtCTLOptions( bool bDontLoad = false ); virtual ~SvtCTLOptions() override; - void SetCTLFontEnabled( bool _bEnabled ); static bool IsCTLFontEnabled(); void SetCTLVerticalText(bool bVertical); @@ -70,18 +69,6 @@ public: }; void SetCTLTextNumerals( TextNumerals _eNumerals ); static TextNumerals GetCTLTextNumerals(); - - enum EOption - { - E_CTLFONT, - E_CTLSEQUENCECHECKING, - E_CTLCURSORMOVEMENT, - E_CTLTEXTNUMERALS, - E_CTLSEQUENCECHECKINGRESTRICTED, - E_CTLSEQUENCECHECKINGTYPEANDREPLACE, - E_CTLVERTICALTEXT - }; - bool IsReadOnly(EOption eOption) const; }; #endif // INCLUDED_SVL_CTLOPTIONS_HXX diff --git a/include/svx/GenericDropDownFieldDialog.hxx b/include/svx/GenericDropDownFieldDialog.hxx index bfee8a651451..1d685c2f1959 100644 --- a/include/svx/GenericDropDownFieldDialog.hxx +++ b/include/svx/GenericDropDownFieldDialog.hxx @@ -26,7 +26,6 @@ public: void InsertItem(OUString aText); void SetActiveItem(sal_uInt32 nPos) { m_xComboBox->set_active(nPos); } OUString GetSelectedItem() { return m_xComboBox->get_active_text(); } - sal_Int32 ElementCount() { return m_xComboBox->get_count(); } }; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/include/vcl/filter/PDFiumLibrary.hxx b/include/vcl/filter/PDFiumLibrary.hxx index 336edf18d8ba..341c07cdeff8 100644 --- a/include/vcl/filter/PDFiumLibrary.hxx +++ b/include/vcl/filter/PDFiumLibrary.hxx @@ -187,7 +187,6 @@ public: virtual OUString getBaseFontName() = 0; virtual int getFontAngle() = 0; virtual std::unique_ptr<PDFiumFont> getFont() = 0; - virtual bool getFontProperties(FontWeight& weight) = 0; virtual PDFTextRenderMode getTextRenderMode() = 0; virtual Color getFillColor() = 0; virtual std::unique_ptr<PDFiumBitmap> getRenderedFillPattern(PDFiumDocument& rDoc, diff --git a/oox/inc/drawingml/textparagraphproperties.hxx b/oox/inc/drawingml/textparagraphproperties.hxx index ae6c3ec7a13a..c233fda17b47 100644 --- a/oox/inc/drawingml/textparagraphproperties.hxx +++ b/oox/inc/drawingml/textparagraphproperties.hxx @@ -97,7 +97,6 @@ public: TextSpacing& getLineSpacing() { return maLineSpacing; } void setLineSpacing( const TextSpacing& rLineSpacing ) { maLineSpacing = rLineSpacing; } - bool getRestartNumbering( ) { return mbRestartNumbering; } void setRestartNumbering( const bool bRestartNumbering ) { mbRestartNumbering = bRestartNumbering; } void apply( const TextParagraphProperties& rSourceProps ); void pushToPropSet( const ::oox::core::XmlFilterBase* pFilterBase, diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 68915e44142e..58c380117b96 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -178,7 +178,6 @@ public: void SetServiceData(const ScDPServiceDesc& rDesc); void WriteSourceDataTo( ScDPObject& rDest ) const; - void WriteTempDataTo( ScDPObject& rDest ) const; const ScSheetSourceDesc* GetSheetDesc() const { return mpSheetDescription.get(); } const ScImportSourceDesc* GetImportSourceDesc() const { return mpImportDescription.get(); } diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index b77cab65a259..16092c6ed3fd 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -482,11 +482,6 @@ void ScDPObject::WriteSourceDataTo( ScDPObject& rDest ) const rDest.maTableTag = maTableTag; } -void ScDPObject::WriteTempDataTo( ScDPObject& rDest ) const -{ - rDest.mnHeaderRows = mnHeaderRows; -} - bool ScDPObject::IsSheetData() const { return mpSheetDescription != nullptr; diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx b/sc/source/filter/inc/numberformatsbuffer.hxx index 7f135af95f86..1c2a09e04eca 100644 --- a/sc/source/filter/inc/numberformatsbuffer.hxx +++ b/sc/source/filter/inc/numberformatsbuffer.hxx @@ -64,10 +64,6 @@ public: void setFormatCode( const css::lang::Locale& rLocale, const OUString& rcFmtCode ); - /** Sets the passed format code, encoded in UTF-8. */ - void setFormatCode( - const css::lang::Locale& rLocale, - const char* pcFmtCode ); /** Sets the passed predefined format code identifier. */ void setPredefinedId( const css::lang::Locale& rLocale, diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index 93f07b659ea1..c6a8e4bc415c 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -1824,11 +1824,6 @@ void NumberFormat::setFormatCode(const Locale& rLocale, const OUString& rcFmtCod maModel.mnPredefId = -1; } -void NumberFormat::setFormatCode( const Locale& rLocale, const char* pcFmtCode ) -{ - setFormatCode(rLocale, OStringToOUString(pcFmtCode, RTL_TEXTENCODING_UTF8)); -} - void NumberFormat::setPredefinedId( const Locale& rLocale, sal_Int16 nPredefId ) { maModel.maLocale = rLocale; diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index 69dcca6dfd69..04e4fd1d3f3d 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -384,7 +384,6 @@ public: { return maLinkAnnotations; } - bool hasLinkAnnotations() const { return !maLinkAnnotations.empty(); } bool Equals(const SdPage&) const; virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override; diff --git a/sdext/source/minimizer/configurationaccess.hxx b/sdext/source/minimizer/configurationaccess.hxx index ec99e9a097f6..13014cda3656 100644 --- a/sdext/source/minimizer/configurationaccess.hxx +++ b/sdext/source/minimizer/configurationaccess.hxx @@ -100,7 +100,6 @@ class ConfigurationAccess private: std::vector< OptimizerSettings > maSettings; - void LoadStrings(); void LoadConfiguration(); css::uno::Reference< css::uno::XInterface > OpenConfiguration( bool bReadOnly ); static css::uno::Reference< css::uno::XInterface > GetConfigurationNode( diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx index 258dcabec3cb..79ba5a070faa 100644 --- a/svl/source/config/cjkoptions.cxx +++ b/svl/source/config/cjkoptions.cxx @@ -87,29 +87,6 @@ bool IsDoubleLinesEnabled() return true; } -void SetAll(bool bSet) -{ - SvtCJKOptions_Load(); - if ( officecfg::Office::Common::I18N::CJK::CJKFont::isReadOnly() - || officecfg::Office::Common::I18N::CJK::VerticalText::isReadOnly() - || officecfg::Office::Common::I18N::CJK::AsianTypography::isReadOnly() - || officecfg::Office::Common::I18N::CJK::JapaneseFind::isReadOnly() - || officecfg::Office::Common::I18N::CJK::Ruby::isReadOnly() - || officecfg::Office::Common::I18N::CJK::ChangeCaseMap::isReadOnly() - || officecfg::Office::Common::I18N::CJK::DoubleLines::isReadOnly() ) - return; - - std::shared_ptr<comphelper::ConfigurationChanges> xChanges(comphelper::ConfigurationChanges::create()); - officecfg::Office::Common::I18N::CJK::CJKFont::set(bSet, xChanges); - officecfg::Office::Common::I18N::CJK::VerticalText::set(bSet, xChanges); - officecfg::Office::Common::I18N::CJK::AsianTypography::set(bSet, xChanges); - officecfg::Office::Common::I18N::CJK::JapaneseFind::set(bSet, xChanges); - officecfg::Office::Common::I18N::CJK::Ruby::set(bSet, xChanges); - officecfg::Office::Common::I18N::CJK::ChangeCaseMap::set(bSet, xChanges); - officecfg::Office::Common::I18N::CJK::DoubleLines::set(bSet, xChanges); - xChanges->commit(); -} - bool IsAnyEnabled() { SvtCJKOptions_Load(); @@ -117,18 +94,6 @@ bool IsAnyEnabled() IsRubyEnabled() || IsChangeCaseMapEnabled() || IsDoubleLinesEnabled() ; } -bool IsAnyReadOnly() -{ - SvtCJKOptions_Load(); - return officecfg::Office::Common::I18N::CJK::CJKFont::isReadOnly() - || officecfg::Office::Common::I18N::CJK::VerticalText::isReadOnly() - || officecfg::Office::Common::I18N::CJK::AsianTypography::isReadOnly() - || officecfg::Office::Common::I18N::CJK::JapaneseFind::isReadOnly() - || officecfg::Office::Common::I18N::CJK::Ruby::isReadOnly() - || officecfg::Office::Common::I18N::CJK::ChangeCaseMap::isReadOnly() - || officecfg::Office::Common::I18N::CJK::DoubleLines::isReadOnly(); -} - } // namespace SvtCJKOptions diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx index b254d77bdbde..07352d4a79e5 100644 --- a/svl/source/config/ctloptions.cxx +++ b/svl/source/config/ctloptions.cxx @@ -69,7 +69,6 @@ public: void Load(); bool IsLoaded() const { return m_bIsLoaded; } - void SetCTLFontEnabled( bool _bEnabled ); void SetCTLVerticalText(bool bVertical); @@ -83,7 +82,6 @@ public: void SetCTLTextNumerals( SvtCTLOptions::TextNumerals _eNumerals ); - bool IsReadOnly(SvtCTLOptions::EOption eOption) const; }; namespace { @@ -93,22 +91,7 @@ namespace return SINGLETON; } } -bool SvtCTLOptions_Impl::IsReadOnly(SvtCTLOptions::EOption eOption) const -{ - bool bReadOnly = CFG_READONLY_DEFAULT; - switch(eOption) - { - case SvtCTLOptions::E_CTLFONT : bReadOnly = m_bROCTLFontEnabled ; break; - case SvtCTLOptions::E_CTLSEQUENCECHECKING : bReadOnly = m_bROCTLSequenceChecking ; break; - case SvtCTLOptions::E_CTLCURSORMOVEMENT : bReadOnly = m_bROCTLCursorMovement ; break; - case SvtCTLOptions::E_CTLTEXTNUMERALS : bReadOnly = m_bROCTLTextNumerals ; break; - case SvtCTLOptions::E_CTLSEQUENCECHECKINGRESTRICTED: bReadOnly = m_bROCTLRestricted ; break; - case SvtCTLOptions::E_CTLSEQUENCECHECKINGTYPEANDREPLACE: bReadOnly = m_bROCTLTypeAndReplace; break; - case SvtCTLOptions::E_CTLVERTICALTEXT : bReadOnly = m_bROCTLVerticalText ; break; - default: assert(false); - } - return bReadOnly; -} + SvtCTLOptions_Impl::SvtCTLOptions_Impl() : utl::ConfigItem(u"Office.Common/I18N/CTL"_ustr), @@ -340,15 +323,6 @@ void SvtCTLOptions_Impl::Load() m_bIsLoaded = true; } -void SvtCTLOptions_Impl::SetCTLFontEnabled( bool _bEnabled ) -{ - if(!m_bROCTLFontEnabled && m_bCTLFontEnabled != _bEnabled) - { - m_bCTLFontEnabled = _bEnabled; - SetModified(); - NotifyListeners(ConfigurationHints::NONE); - } -} void SvtCTLOptions_Impl::SetCTLVerticalText(bool bVertical) { if (!m_bROCTLVerticalText && m_bCTLVerticalText != bVertical) @@ -445,12 +419,6 @@ SvtCTLOptions::~SvtCTLOptions() m_pImpl.reset(); } -void SvtCTLOptions::SetCTLFontEnabled( bool _bEnabled ) -{ - assert(m_pImpl->IsLoaded()); - m_pImpl->SetCTLFontEnabled( _bEnabled ); -} - bool SvtCTLOptions::IsCTLFontEnabled() { // tdf#168719: The CTL font can no longer be disabled @@ -526,11 +494,4 @@ SvtCTLOptions::TextNumerals SvtCTLOptions::GetCTLTextNumerals() return static_cast<SvtCTLOptions::TextNumerals>(officecfg::Office::Common::I18N::CTL::CTLTextNumerals::get()); } -bool SvtCTLOptions::IsReadOnly(EOption eOption) const -{ - assert(m_pImpl->IsLoaded()); - return m_pImpl->IsReadOnly(eOption); -} - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/pdf/PDFiumLibrary.cxx b/vcl/source/pdf/PDFiumLibrary.cxx index b593c5cb35dd..480990fca021 100644 --- a/vcl/source/pdf/PDFiumLibrary.cxx +++ b/vcl/source/pdf/PDFiumLibrary.cxx @@ -436,7 +436,6 @@ public: OUString getBaseFontName() override; int getFontAngle() override; std::unique_ptr<PDFiumFont> getFont() override; - bool getFontProperties(FontWeight& weight) override; PDFTextRenderMode getTextRenderMode() override; Color getFillColor() override; std::unique_ptr<PDFiumBitmap> getRenderedFillPattern(PDFiumDocument& rDoc, @@ -1339,28 +1338,6 @@ sal_uInt32 PDFiumFontImpl::getGlyphIndexFromCharCode(const sal_uInt32 nCharCode) sal_Int32 PDFiumFontImpl::getFontDictObjNum() const { return FPDFFont_GetFontDictObjNum(mpFont); } -bool PDFiumPageObjectImpl::getFontProperties(FontWeight& weight) -{ - // FPDFFont_GetWeight turns out not to be that useful. It seems to just - // reports what explicit "FontWeight" feature is mentioned in the PDF font, - // which is an optional property. - // 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. - auto font = getFont(); - if (!font) - return false; - std::vector<uint8_t> aData; - if (!font->getFontData(aData)) - return false; - if (!EmbeddedFontsManager::analyzeTTF(aData.data(), aData.size(), weight)) - { - SAL_WARN("vcl.filter", "PDFiumImpl: failed to analyzeTTF"); - return false; - } - return true; -} - PDFTextRenderMode PDFiumPageObjectImpl::getTextRenderMode() { return static_cast<PDFTextRenderMode>(FPDFTextObj_GetTextRenderMode(mpPageObject)); commit c22d49b1813babe820b88c1fcf656cd9c9bab7d7 Author: Noel Grandin <[email protected]> AuthorDate: Mon Dec 1 14:47:44 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Dec 1 18:26:59 2025 +0100 m_nSpaceCount is unused since commit 97f97ba44e6af2be2e94ae26054b060b0303933a Author: László Németh <[email protected]> Date: Fri Oct 31 12:01:28 2025 +0100 tdf#169168 sw letter spacing: extend it for multiportion lines Change-Id: I8b5cd592b490334c20de9c228016b5ced37a9da4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194889 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx index 0ec1be29216e..f488798fab64 100644 --- a/sw/source/core/text/porlin.hxx +++ b/sw/source/core/text/porlin.hxx @@ -53,7 +53,6 @@ private: SwTwips m_nExtraShrunkWidth = 0; // width of not shrunk line SwTwips m_nExtraSpaceSize = 0; // extra space over normal space width bool m_bModifiedWidth = false; // applied custom letter spacing and scale width - TextFrameIndex m_nSpaceCount = TextFrameIndex(0); // space count for letter spacing TextFrameIndex m_nLetterCount = TextFrameIndex(0); // letter count for multi-portion lines std::optional<SwLinePortionLayoutContext> m_nLayoutContext; @@ -85,9 +84,7 @@ public: void ExtraSpaceSize(const SwTwips nNew) { m_nExtraSpaceSize = nNew; } bool IsModifiedWidth() const { return m_bModifiedWidth; } void SetModifiedWidth(const bool bNew) { m_bModifiedWidth = bNew; } - TextFrameIndex GetSpaceCount() const { return m_nSpaceCount; } TextFrameIndex GetLetterCount() const { return m_nLetterCount; } - void SetSpaceCount(TextFrameIndex const nSpaceCount) { m_nSpaceCount = nSpaceCount; } void SetLetterCount(TextFrameIndex const nLetterCount) { m_nLetterCount = nLetterCount; } SwTwips GetHangingBaseline() const { return mnHangingBaseline; } void SetHangingBaseline( const SwTwips nNewBaseline ) { mnHangingBaseline = nNewBaseline; } @@ -207,7 +204,6 @@ inline SwLinePortion &SwLinePortion::operator=(const SwLinePortion &rPortion) m_nExtraShrunkWidth = rPortion.m_nExtraShrunkWidth; m_nExtraSpaceSize = rPortion.m_nExtraSpaceSize; m_bModifiedWidth = rPortion.m_bModifiedWidth; - m_nSpaceCount = rPortion.m_nSpaceCount; m_nLetterCount = rPortion.m_nLetterCount; m_nLayoutContext = rPortion.m_nLayoutContext; return *this; @@ -227,7 +223,6 @@ inline SwLinePortion::SwLinePortion(const SwLinePortion &rPortion) : m_nExtraShrunkWidth(rPortion.m_nExtraShrunkWidth), m_nExtraSpaceSize(rPortion.m_nExtraSpaceSize), m_bModifiedWidth(rPortion.m_bModifiedWidth), - m_nSpaceCount(rPortion.m_nSpaceCount), m_nLetterCount(rPortion.m_nLetterCount), m_nLayoutContext(rPortion.m_nLayoutContext) { diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index 89c61a1c5d9f..784d33207900 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -690,7 +690,6 @@ bool SwTextPortion::Format_( SwTextFormatInfo &rInf ) else if ( bOldInterop ) { pGuess = std::move(pGuess2); - SetSpaceCount( TextFrameIndex(nSpacesInLineShrink)); ExtraSpaceSize(0); bFull = bFull2; }
