diff options
26 files changed, 0 insertions, 180 deletions
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index 2a3162db2c2d..cc369bed6264 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -479,12 +479,6 @@ void PlayerListener::startListening(const css::uno::Reference<media::XPlayerNoti m_xNotifier->addPlayerListener(this); } -void PlayerListener::stopListening() -{ - std::unique_lock aGuard(m_aMutex); - stopListening(aGuard); -} - void PlayerListener::stopListening(std::unique_lock<std::mutex>&) { if (!m_xNotifier) diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx index 8e10b1a6756f..15ccc5a2d3fc 100644 --- a/chart2/source/view/inc/VDataSeries.hxx +++ b/chart2/source/view/inc/VDataSeries.hxx @@ -143,7 +143,6 @@ public: sal_Int32 getStartingAngle() const; void setPieChartSubType(css::chart2::PieChartSubType eSubType); - css::chart2::PieChartSubType getPieChartSubType() const; void setRoleOfSequenceForDataLabelNumberFormatDetection( std::u16string_view rRole ); diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index 0462effd8a6b..a940134509a1 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -407,11 +407,6 @@ void VDataSeries::setPieChartSubType(chart2::PieChartSubType eSubType) m_ePieChartSubType = eSubType; } -chart2::PieChartSubType VDataSeries::getPieChartSubType() const -{ - return m_ePieChartSubType; -} - chart2::StackingDirection VDataSeries::getStackingDirection() const { return m_eStackingDirection; diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index dde2eda5fac4..cd52d753afcc 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -113,7 +113,6 @@ public: void EnableRegisterMode(); void EnableContextualMode(); void EnableAutoFirstLine(); - void EnableAbsLineDist(tools::Long nMinTwip); void EnableNegativeMode(); virtual void PageCreated(const SfxAllItemSet& aSet) override; }; diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 6972b2d14e83..d3234c0c9964 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -1170,12 +1170,6 @@ void SvxStdParagraphTabPage::EnableAutoFirstLine() m_xAutoCB->show(); } -void SvxStdParagraphTabPage::EnableAbsLineDist(tools::Long nMinTwip) -{ - m_xLineDist->append_text(sAbsDist); - nMinFixDist = nMinTwip; -} - void SvxStdParagraphTabPage::PageCreated(const SfxAllItemSet& aSet) { diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 7f13edfcf1be..ce9b182c0f54 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -2234,11 +2234,6 @@ ScalingParameters EditEngine::getScalingParameters() const return getImpl().getScalingParameters(); } -void EditEngine::resetScalingParameters() -{ - getImpl().resetScalingParameters(); -} - void EditEngine::setScalingParameters(ScalingParameters const& rScalingParameters) { getImpl().setScalingParameters(rScalingParameters); diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx index 268c194652c4..ccd07199a60f 100644 --- a/editeng/source/outliner/outlin2.cxx +++ b/editeng/source/outliner/outlin2.cxx @@ -243,11 +243,6 @@ Size Outliner::CalcTextSize() return Size(pEditEngine->CalcTextWidth(),pEditEngine->GetTextHeight()); } -Size Outliner::CalcTextSizeNTP() -{ - return Size(pEditEngine->CalcTextWidth(),pEditEngine->GetTextHeightNTP()); -} - void Outliner::SetStyleSheetPool( SfxStyleSheetPool* pSPool ) { pEditEngine->SetStyleSheetPool( pSPool ); diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx index 78e1d0c66152..90e252bffafe 100644 --- a/include/avmedia/mediawindow.hxx +++ b/include/avmedia/mediawindow.hxx @@ -72,7 +72,6 @@ namespace avmedia virtual void SAL_CALL disposing(const css::lang::EventObject& rSource) override; void startListening(const css::uno::Reference<css::media::XPlayerNotifier>& rNotifier); - void stopListening(); void callPlayerWindowSizeAvailable(const css::uno::Reference<css::media::XPlayer>& rPlayer) { m_aFn(rPlayer); } private: diff --git a/include/comphelper/componentguard.hxx b/include/comphelper/componentguard.hxx deleted file mode 100644 index f3cf1bd5e426..000000000000 --- a/include/comphelper/componentguard.hxx +++ /dev/null @@ -1,58 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_COMPHELPER_COMPONENTGUARD_HXX -#define INCLUDED_COMPHELPER_COMPONENTGUARD_HXX - -#include <com/sun/star/lang/DisposedException.hpp> - -#include <cppuhelper/weak.hxx> -#include <cppuhelper/interfacecontainer.h> - - -namespace comphelper -{ - - - //= ComponentGuard - - class ComponentGuard - { - public: - ComponentGuard( ::cppu::OWeakObject& i_component, ::cppu::OBroadcastHelper & i_broadcastHelper ) - :m_aGuard( i_broadcastHelper.rMutex ) - { - if ( i_broadcastHelper.bDisposed ) - throw css::lang::DisposedException( OUString(), &i_component ); - } - - void clear() { m_aGuard.clear(); } - void reset() { m_aGuard.reset(); } - - private: - ::osl::ResettableMutexGuard m_aGuard; - }; - - -} // namespace comphelper - - -#endif // INCLUDED_COMPHELPER_COMPONENTGUARD_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 263a0931dff8..02f0e78f2359 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -417,7 +417,6 @@ public: SAL_DLLPRIVATE void QuickMarkToBeRepainted( sal_Int32 nPara ); void setScalingParameters(ScalingParameters const& rScalingParameters); - void resetScalingParameters(); ScalingParameters getScalingParameters() const; SAL_DLLPRIVATE void setRoundFontSizeToPt(bool bRound); diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index fee0b98a26a0..cd3acaf9452d 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -851,7 +851,6 @@ public: const Color& rTextLineColor); Size CalcTextSize(); - Size CalcTextSizeNTP(); void SetStyleSheetPool( SfxStyleSheetPool* pSPool ); SfxStyleSheetPool* GetStyleSheetPool(); diff --git a/include/linguistic/lngprophelp.hxx b/include/linguistic/lngprophelp.hxx index 0095f40afdd7..b0ee8467ada7 100644 --- a/include/linguistic/lngprophelp.hxx +++ b/include/linguistic/lngprophelp.hxx @@ -301,7 +301,6 @@ public: sal_Int16 GetMinTrailing() const; sal_Int16 GetCompoundMinLeading() const; sal_Int16 GetMinWordLength() const; - sal_Int16 GetTextHyphenZone() const; bool IsNoHyphenateCaps() const; /// @throws css::uno::RuntimeException bool addLinguServiceEventListener( diff --git a/include/svl/nfengine.hxx b/include/svl/nfengine.hxx index c0b463c189f3..7c72d1ca29f5 100644 --- a/include/svl/nfengine.hxx +++ b/include/svl/nfengine.hxx @@ -201,10 +201,6 @@ private: friend class SvNFEngine; friend class SvNumberFormatter; - SVL_DLLPRIVATE sal_uInt32 GetStandardFormat(SvNFLanguageData& rCurrentLanguage, - const NativeNumberWrapper* pNatNum, - SvNumFormatType eType, LanguageType eLnge); - // Obtain the format entry for a given key index. SVL_DLLPRIVATE SvNumberformat* GetFormatEntry(sal_uInt32 nKey); @@ -250,11 +246,6 @@ private: const css::i18n::NumberFormatCode& rCode, sal_uInt32 nPos, bool bAfterChangingSystemCL = false, sal_Int16 nOrgIndex = 0); - SVL_DLLPRIVATE sal_uInt32 ImpGetStandardFormat(SvNFLanguageData& rCurrentLanguage, - const NativeNumberWrapper* pNatNum, - SvNumFormatType eType, sal_uInt32 CLOffset, - LanguageType eLnge); - // Return the format index of the currency format of the current locale. // Format is created if not already present. SVL_DLLPRIVATE sal_uInt32 ImpGetDefaultCurrencyFormat(SvNFLanguageData& rCurrentLanguage, diff --git a/include/svl/numformat.hxx b/include/svl/numformat.hxx index 484a2a1bfdb7..12a68f7b69ef 100644 --- a/include/svl/numformat.hxx +++ b/include/svl/numformat.hxx @@ -589,11 +589,6 @@ private: // Whether nFIndex is a special builtin format SVL_DLLPRIVATE bool ImpIsSpecialStandardFormat(sal_uInt32 nFIndex, LanguageType eLnge); - SVL_DLLPRIVATE static bool ImpIsSpecialStandardFormat(sal_uInt32 nFIndex, sal_uInt32 nCLOffset); - - SVL_DLLPRIVATE sal_uInt32 ImpGetOrGenerateCLOffset(LanguageType eLnge); - - SVL_DLLPRIVATE LanguageType ImpResolveLanguage(LanguageType eLnge) const; // Replace the SYSTEM language/country format codes. Called upon change of // the user configurable locale. @@ -618,12 +613,6 @@ public: // return current (!) Locale const LanguageTag& GetLanguageTag() const { return m_aCurrentLanguage.GetLanguageTag(); } - // return corresponding Transliteration wrapper - const ::utl::TransliterationWrapper* GetTransliteration() const - { - return m_aCurrentLanguage.GetTransliteration(); - } - // return the corresponding CharacterClassification wrapper const CharClass* GetCharClass() const { return m_aCurrentLanguage.GetCharClass(); } @@ -641,12 +630,6 @@ public: // return the corresponding decimal separator const OUString& GetNumDecimalSep() const { return m_aCurrentLanguage.GetNumDecimalSep(); } - // return the corresponding decimal separator alternative - const OUString& GetNumDecimalSepAlt() const { return m_aCurrentLanguage.GetNumDecimalSepAlt(); } - - // return the corresponding group (AKA thousand) separator - const OUString& GetNumThousandSep() const { return m_aCurrentLanguage.GetNumThousandSep(); } - // return the corresponding date separator const OUString& GetDateSep() const { return m_aCurrentLanguage.GetDateSep(); } diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index b8817074991f..b48d1000426e 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -164,14 +164,6 @@ protected: bool m_bDeleted : 1; #endif -private: - inline void SetRefCount(sal_uInt32 n) - { - m_nRefCount = n; - m_bStaticDefault = m_bDynamicDefault = false; - } - -protected: void setStaticDefault() { m_bStaticDefault = true; } void setDynamicDefault() { m_bDynamicDefault = true; } void setIsSetItem() { m_bIsSetItem = true; } diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 24552e4e0db3..494b64f34e07 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -116,9 +116,6 @@ public: SvLockBytes() : m_pStream(nullptr), m_bOwner(false), m_bSync(false) {} - SvLockBytes(SvStream * pTheStream, bool bTheOwner = false) : - m_pStream(pTheStream), m_bOwner(bTheOwner), m_bSync(false) {} - virtual ~SvLockBytes() override { close(); } const SvStream * GetStream() const { return m_pStream; } diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx index 97b5e3332eae..e3d09665625e 100644 --- a/linguistic/source/lngprophelp.cxx +++ b/linguistic/source/lngprophelp.cxx @@ -714,11 +714,6 @@ sal_Int16 PropertyHelper_Hyphenation::GetMinWordLength() const return mxPropHelper->GetMinWordLength(); } -sal_Int16 PropertyHelper_Hyphenation::GetTextHyphenZone() const -{ - return mxPropHelper->GetTextHyphenZone(); -} - bool PropertyHelper_Hyphenation::IsNoHyphenateCaps() const { return mxPropHelper->IsNoHyphenateCaps(); diff --git a/sc/inc/interpretercontext.hxx b/sc/inc/interpretercontext.hxx index 63d23bfe227a..f679584a6d3b 100644 --- a/sc/inc/interpretercontext.hxx +++ b/sc/inc/interpretercontext.hxx @@ -90,8 +90,6 @@ struct ScInterpreterContext sal_uInt32 NFGetStandardFormat(SvNumFormatType eType, LanguageType eLnge = LANGUAGE_DONTKNOW); sal_uInt32 NFGetStandardFormat(sal_uInt32 nFIndex, SvNumFormatType eType, LanguageType eLnge); - sal_uInt32 NFGetStandardFormat(double fNumber, sal_uInt32 nFIndex, SvNumFormatType eType, - LanguageType eLnge); bool NFGetPreviewString(const OUString& sFormatString, double fPreviewNumber, OUString& sOutString, const Color** ppColor, LanguageType eLnge); diff --git a/sc/source/core/tool/interpretercontext.cxx b/sc/source/core/tool/interpretercontext.cxx index 557a9c766db1..3974f1ccb456 100644 --- a/sc/source/core/tool/interpretercontext.cxx +++ b/sc/source/core/tool/interpretercontext.cxx @@ -233,15 +233,6 @@ sal_uInt32 ScInterpreterContext::NFGetStandardFormat(sal_uInt32 nFIndex, SvNumFo nFIndex, eType, eLnge); } -sal_uInt32 ScInterpreterContext::NFGetStandardFormat(double fNumber, sal_uInt32 nFIndex, - SvNumFormatType eType, LanguageType eLnge) -{ - if (!mpDoc->IsThreadedGroupCalcInProgress()) - return GetFormatTable()->GetStandardFormat(fNumber, nFIndex, eType, eLnge); - return SvNFEngine::GetStandardFormat(*mxLanguageData, *mpFormatData, nullptr, maROPolicy, - fNumber, nFIndex, eType, eLnge); -} - void ScInterpreterContext::NFGetInputLineString(const double& fOutNumber, sal_uInt32 nFIndex, OUString& rOutString, bool bFiltering, bool bForceSystemLocale) const diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index c62b86163c03..a625ed7e70f0 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -4857,7 +4857,6 @@ include/comphelper/basicio.hxx include/comphelper/broadcasthelper.hxx include/comphelper/classids.hxx include/comphelper/componentbase.hxx -include/comphelper/componentguard.hxx include/comphelper/configuration.hxx include/comphelper/configurationhelper.hxx include/comphelper/configurationlistener.hxx diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index a7a36cd6fdb2..87a8a9cecd2c 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -1646,17 +1646,6 @@ bool SvNumberFormatter::ImpIsSpecialStandardFormat(sal_uInt32 nFIndex, LanguageT return ::ImpIsSpecialStandardFormat(m_aCurrentLanguage, GetNatNum(), m_aRWPolicy, nFIndex, eLnge); } -sal_uInt32 SvNumberFormatter::ImpGetOrGenerateCLOffset(LanguageType eLnge) -{ - ::osl::MutexGuard aGuard(GetInstanceMutex()); - sal_uInt32 nCLOffset = m_aFormatData.ImpGetCLOffset(eLnge); - if (nCLOffset > m_aFormatData.MaxCLOffset) - { - nCLOffset = m_aFormatData.ImpGenerateCL(m_aCurrentLanguage, GetNatNum(), eLnge); // create new standard formats if necessary - } - return nCLOffset; -} - sal_uInt32 SvNFEngine::GetStandardFormat(SvNFLanguageData& rCurrentLanguage, const SvNFFormatData& rFormatData, const NativeNumberWrapper* pNatNum, const Accessor& rFuncs, @@ -4037,11 +4026,6 @@ LanguageType SvNFLanguageData::ImpResolveLanguage(LanguageType eLnge) const return eLnge == LANGUAGE_DONTKNOW ? IniLnge : eLnge; } -LanguageType SvNumberFormatter::ImpResolveLanguage(LanguageType eLnge) const -{ - return m_aCurrentLanguage.ImpResolveLanguage(eLnge); -} - sal_uInt32 SvNFEngine::GetFormatIndex(SvNFLanguageData& rCurrentLanguage, const Accessor& rFuncs, const NativeNumberWrapper* pNatNum, NfIndexTableOffset nTabOff, LanguageType eLnge) diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx index a4a8b6b7c7cf..386b5add7ba7 100644 --- a/svtools/source/control/accessibleruler.cxx +++ b/svtools/source/control/accessibleruler.cxx @@ -106,14 +106,6 @@ awt::Size SAL_CALL SvtRulerAccessible::getSize() return AWTSize( GetBoundingBox().GetSize() ); } -bool SvtRulerAccessible::isVisible() -{ - std::unique_lock aGuard( m_aMutex ); - throwIfDisposed(aGuard); - - return mpRepr->IsVisible(); -} - //===== XAccessibleContext ================================================== sal_Int64 SAL_CALL SvtRulerAccessible::getAccessibleChildCount() { diff --git a/svtools/source/control/accessibleruler.hxx b/svtools/source/control/accessibleruler.hxx index 7db02b6ddc92..80e2657b04bf 100644 --- a/svtools/source/control/accessibleruler.hxx +++ b/svtools/source/control/accessibleruler.hxx @@ -49,10 +49,6 @@ public: SvtRulerAccessible( css::uno::Reference< css::accessibility::XAccessible> xParent, Ruler& rRepresentation, OUString aName ); - /// @throws css::uno::RuntimeException - bool - isVisible(); - //===== XAccessible ===================================================== virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 8a88674e124b..1c2d917ffd7c 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -422,7 +422,6 @@ public: /// Iterate over flys - for Basic-collections. SW_DLLPUBLIC size_t GetFlyCount( FlyCntType eType, bool bIgnoreTextBoxes = false ) const; - const SwFrameFormat* GetFlyNum(size_t nIdx, FlyCntType eType, bool bIgnoreTextBoxes = false) const; std::vector<SwFrameFormat const*> GetFlyFrameFormats( FlyCntType eType, bool bIgnoreTextBoxes); diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 9154758364fb..1de36fe5ddd9 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -2556,11 +2556,6 @@ size_t SwFEShell::GetFlyCount( FlyCntType eType, bool bIgnoreTextBoxes ) const return GetDoc()->GetFlyCount(eType, bIgnoreTextBoxes); } -const SwFrameFormat* SwFEShell::GetFlyNum(size_t nIdx, FlyCntType eType, bool bIgnoreTextBoxes ) const -{ - return GetDoc()->GetFlyNum(nIdx, eType, bIgnoreTextBoxes); -} - std::vector<SwFrameFormat const*> SwFEShell::GetFlyFrameFormats( FlyCntType const eType, bool const bIgnoreTextBoxes) { diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx index 5e1a085ba06f..a7dfe1b9e255 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx @@ -28,7 +28,6 @@ #include <comphelper/sequence.hxx> #include <comphelper/servicehelper.hxx> -#include <comphelper/componentguard.hxx> #include <comphelper/interfacecontainer4.hxx> #include <comphelper/compbase.hxx> #include <cppuhelper/supportsservice.hxx> |