include/registry/registry.hxx | 12 ----------- include/unotools/syslocale.hxx | 6 ----- include/vcl/font.hxx | 1 include/vcl/wmfexternal.hxx | 1 sw/inc/swabstdlg.hxx | 2 - sw/source/ui/dialog/swdlgfact.cxx | 5 ---- sw/source/ui/dialog/swdlgfact.hxx | 1 unotools/source/misc/syslocale.cxx | 35 ---------------------------------- uui/source/openlocked.hxx | 1 vcl/inc/salgeom.hxx | 30 ----------------------------- vcl/inc/unx/salframe.h | 2 - vcl/inc/unx/salgdi.h | 2 - vcl/source/filter/wmf/wmfexternal.cxx | 12 ----------- vcl/source/font/font.cxx | 5 ---- 14 files changed, 115 deletions(-)
New commits: commit dc82dd830bf4ef66451897624c946655a1526bde Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Wed Jul 13 12:49:01 2022 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Wed Jul 13 14:55:54 2022 +0200 loplugin:unusedmethods Change-Id: Ifa9c3fe86e7bad6d3839fd3fdfdb8c1f7b5053c9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137016 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx index ccc19c52ad9a..57b7895cf979 100644 --- a/include/registry/registry.hxx +++ b/include/registry/registry.hxx @@ -401,9 +401,6 @@ public: /// closes explicitly the current key inline RegError closeKey(); - /// releases the current key - inline void releaseKey(); - /** sets a value of a key. @param keyName specifies the name of the key which value will be set. @@ -783,15 +780,6 @@ inline RegError RegistryKey::closeKey() return RegError::INVALID_KEY; } -inline void RegistryKey::releaseKey() -{ - if (m_registry.isValid() && (m_hImpl != nullptr)) - { - m_registry.m_pApi->releaseKey(m_hImpl); - m_hImpl = nullptr; - } -} - inline RegError RegistryKey::setValue(const OUString& keyName, RegValueType valueType, RegValue pValue, diff --git a/include/unotools/syslocale.hxx b/include/unotools/syslocale.hxx index e5bc9dd85224..a0a67833774a 100644 --- a/include/unotools/syslocale.hxx +++ b/include/unotools/syslocale.hxx @@ -60,12 +60,6 @@ public: SvtSysLocaleOptions& GetOptions() const; const LanguageTag& GetLanguageTag() const; const LanguageTag& GetUILanguageTag() const; - - /** Get the best MIME encoding matching the system locale, or if that isn't - determinable one that matches the UI locale, or UTF8 if everything else - fails. - */ - static rtl_TextEncoding GetBestMimeEncoding(); }; #endif // INCLUDED_SVTOOLS_SYSLOCALE_HXX diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx index 9f910688de1a..824d5c0666c4 100644 --- a/include/vcl/font.hxx +++ b/include/vcl/font.hxx @@ -162,7 +162,6 @@ public: bool EqualIgnoreColor( const Font& ) const; // Compute value usable as hash. - size_t GetHashValue() const; size_t GetHashValueIgnoreColor() const; friend VCL_DLLPUBLIC SvStream& ::ReadFont( SvStream& rIStm, vcl::Font& ); diff --git a/include/vcl/wmfexternal.hxx b/include/vcl/wmfexternal.hxx index fcff240a5ff4..dc2855b4f236 100644 --- a/include/vcl/wmfexternal.hxx +++ b/include/vcl/wmfexternal.hxx @@ -50,7 +50,6 @@ struct VCL_DLLPUBLIC WmfExternal sal_uInt16 mapMode; WmfExternal(); - css::uno::Sequence<css::beans::PropertyValue> getSequence() const; bool setSequence(const css::uno::Sequence<css::beans::PropertyValue>& rSequence); }; diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index f3ab3c820d37..1c0762f84432 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -356,8 +356,6 @@ class AbstractSwModalRedlineAcceptDlg : public VclAbstractDialog { protected: virtual ~AbstractSwModalRedlineAcceptDlg() override = default; -public: - virtual void AcceptAll( bool bAccept ) = 0; }; class AbstractMarkFloatDlg : public VclAbstractDialog diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index cac21458ef9f..8aaa5566a79e 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -559,11 +559,6 @@ void AbstractSwRenameXNamedDlg_Impl::SetAlternativeAccess( m_xDlg->SetAlternativeAccess( xSecond, xThird); } -void AbstractSwModalRedlineAcceptDlg_Impl::AcceptAll( bool bAccept ) -{ - m_xDlg->AcceptAll( bAccept); -} - OUString AbstractGlossaryDlg_Impl::GetCurrGrpName() const { return m_xDlg->GetCurrGrpName(); diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 8690d9db8129..5412539472dc 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -437,7 +437,6 @@ public: { } virtual short Execute() override; - virtual void AcceptAll(bool bAccept) override; }; class SwGlossaryDlg; diff --git a/unotools/source/misc/syslocale.cxx b/unotools/source/misc/syslocale.cxx index a1325958a0d4..31b448e6583a 100644 --- a/unotools/source/misc/syslocale.cxx +++ b/unotools/source/misc/syslocale.cxx @@ -174,39 +174,4 @@ const LanguageTag& SvtSysLocale::GetUILanguageTag() const return pImpl->aSysLocaleOptions.GetRealUILanguageTag(); } -// static -rtl_TextEncoding SvtSysLocale::GetBestMimeEncoding() -{ - const char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding( - osl_getThreadTextEncoding() ); - if ( !pCharSet ) - { - // If the system locale is unknown to us, e.g. LC_ALL=xx, match the UI - // language if possible. - SvtSysLocale aSysLocale; - const LanguageTag& rLanguageTag = aSysLocale.GetUILanguageTag(); - // Converting blindly to Locale and then to rtl_Locale may feed the - // 'qlt' to rtl_locale_register() and the underlying system locale - // stuff, which doesn't know about it nor about BCP47 in the Variant - // field. So use the real language and for non-pure ISO cases hope for - // the best... the fallback to UTF-8 should solve these cases nowadays. - /* FIXME-BCP47: the script needs to go in here as well, so actually - * we'd need some variant fiddling or glibc locale string and tweak - * rtl_locale_register() to know about it! But then again the Windows - * implementation still wouldn't know anything about it ... */ - SAL_WARN_IF( !rLanguageTag.isIsoLocale(), "unotools.i18n", - "SvtSysLocale::GetBestMimeEncoding - non-ISO UI locale"); - rtl_Locale * pLocale = rtl_locale_register( rLanguageTag.getLanguage().getStr(), - rLanguageTag.getCountry().getStr(), OUString().getStr() ); - rtl_TextEncoding nEnc = osl_getTextEncodingFromLocale( pLocale ); - pCharSet = rtl_getBestMimeCharsetFromTextEncoding( nEnc ); - } - rtl_TextEncoding nRet; - if ( pCharSet ) - nRet = rtl_getTextEncodingFromMimeCharset( pCharSet ); - else - nRet = RTL_TEXTENCODING_UTF8; - return nRet; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/openlocked.hxx b/uui/source/openlocked.hxx index 90357651f30d..bd09f12d704f 100644 --- a/uui/source/openlocked.hxx +++ b/uui/source/openlocked.hxx @@ -45,7 +45,6 @@ private: std::unique_ptr<weld::Label> mxHiddenText; DECL_LINK(ClickHdl, weld::Button&, void); - DECL_LINK(ToggleHdl, weld::Toggleable&, void); }; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/salgeom.hxx b/vcl/inc/salgeom.hxx index 1b19931c5c50..418b1cf37549 100644 --- a/vcl/inc/salgeom.hxx +++ b/vcl/inc/salgeom.hxx @@ -43,28 +43,6 @@ public: { } - constexpr tools::Rectangle clientArea() const - { - tools::Long nX(x() + m_nLeftDecoration), nY(y() + m_nTopDecoration); - return { { nX, nY }, size() }; - } - void setClientArea(const tools::Rectangle& rRect) - { - setX(rRect.getX() - m_nLeftDecoration); - setY(rRect.getY() - m_nTopDecoration); - setSize(rRect.GetSize()); - } - constexpr tools::Rectangle clientRect() const { return { { 0, 0 }, size() }; } - - // returns the position and size of the window, including all margins - constexpr tools::Rectangle frameArea() const - { - tools::Long nWidth(width() + m_nLeftDecoration + m_nRightDecoration); - tools::Long nHeight(height() + m_nTopDecoration + m_nBottomDecoration); - return { pos(), Size(nWidth, nHeight) }; - } - // no setFrameArea, as it can't really be implemented, e.g. what happens, if size() > frameArea.size() etc. - constexpr sal_uInt32 leftDecoration() const { return m_nLeftDecoration; } void setLeftDecoration(sal_uInt32 nLeftDecoration) { m_nLeftDecoration = nLeftDecoration; } constexpr sal_uInt32 topDecoration() const { return m_nTopDecoration; } @@ -76,14 +54,6 @@ public: { m_nBottomDecoration = nBottomDecoration; } - void decorations(sal_uInt32& nLeft, sal_uInt32& nTop, sal_uInt32& nRight, - sal_uInt32& nBottom) const - { - nLeft = m_nLeftDecoration; - nTop = m_nTopDecoration; - nRight = m_nRightDecoration; - nBottom = m_nBottomDecoration; - } void setDecorations(sal_uInt32 nLeft, sal_uInt32 nTop, sal_uInt32 nRight, sal_uInt32 nBottom) { m_nLeftDecoration = nLeft; diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index 597657333128..c7418ac0ad00 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -169,8 +169,6 @@ public: void Init( SalFrameStyleFlags nSalFrameStyle, SalX11Screen nScreen, SystemParentData const * pParentData, bool bUseGeometry = false ); - bool IsPartialFullScreen() const { return m_bIsPartialFullScreen; } - SalDisplay* GetDisplay() const { return pDisplay_; diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 045a3848e20f..a2f4ceae9f56 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -152,8 +152,6 @@ public: virtual cairo::SurfaceSharedPtr CreateSurface(const OutputDevice& rRefDevice, int x, int y, int width, int height) const override; virtual cairo::SurfaceSharedPtr CreateBitmapSurface(const OutputDevice& rRefDevice, const BitmapSystemData& rData, const Size& rSize) const override; virtual css::uno::Any GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, const basegfx::B2ISize& rSize) const override; - - void clipRegion(cairo_t* cr); #endif // ENABLE_CAIRO_CANVAS /* use to handle GraphicsExpose/NoExpose after XCopyArea & friends diff --git a/vcl/source/filter/wmf/wmfexternal.cxx b/vcl/source/filter/wmf/wmfexternal.cxx index c5616beac71e..4d183bd30458 100644 --- a/vcl/source/filter/wmf/wmfexternal.cxx +++ b/vcl/source/filter/wmf/wmfexternal.cxx @@ -31,18 +31,6 @@ WmfExternal::WmfExternal() { } -css::uno::Sequence<css::beans::PropertyValue> WmfExternal::getSequence() const -{ - if (0 != xExt || 0 != yExt || 0 != mapMode) - { - return { comphelper::makePropertyValue("Width", static_cast<sal_Int16>(xExt)), - comphelper::makePropertyValue("Height", static_cast<sal_Int16>(yExt)), - comphelper::makePropertyValue("MapMode", static_cast<sal_Int16>(mapMode)) }; - } - - return {}; -} - bool WmfExternal::setSequence(const css::uno::Sequence<css::beans::PropertyValue>& rSequence) { bool bRetval(false); diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx index 2b7f22ad0f01..7aff5af1f7f8 100644 --- a/vcl/source/font/font.cxx +++ b/vcl/source/font/font.cxx @@ -334,11 +334,6 @@ bool Font::EqualIgnoreColor( const vcl::Font& rFont ) const return mpImplFont->EqualIgnoreColor( *rFont.mpImplFont ); } -size_t Font::GetHashValue() const -{ - return mpImplFont->GetHashValue(); -} - size_t Font::GetHashValueIgnoreColor() const { return mpImplFont->GetHashValueIgnoreColor();