framework/inc/xml/imagesdocumenthandler.hxx | 1 framework/inc/xml/statusbardocumenthandler.hxx | 1 framework/source/fwe/xml/statusbardocumenthandler.cxx | 1 framework/source/xml/imagesdocumenthandler.cxx | 1 include/package/Inflater.hxx | 4 include/sfx2/sidebar/TabBar.hxx | 1 include/svtools/ruler.hxx | 1 include/svtools/valueset.hxx | 3 include/tools/datetimeutils.hxx | 2 include/ucbhelper/resultset.hxx | 2 include/vcl/weldutils.hxx | 3 package/source/zipapi/Inflater.cxx | 9 - sc/inc/SolverSettings.hxx | 2 sc/source/core/data/SolverSettings.cxx | 3 sc/source/ui/inc/duplicaterecordsdlg.hxx | 1 sfx2/source/sidebar/TabBar.cxx | 2 svtools/source/control/ruler.cxx | 6 - svtools/source/control/valueset.cxx | 18 --- svx/source/svdraw/svdfmtf.hxx | 1 sw/inc/AnnotationWin.hxx | 2 sw/inc/unotextcursor.hxx | 3 sw/inc/unotextrange.hxx | 2 sw/source/core/inc/flyfrm.hxx | 6 - sw/source/core/inc/sectfrm.hxx | 5 sw/source/core/inc/txtfrm.hxx | 5 sw/source/core/unocore/unoobj.cxx | 8 - sw/source/core/unocore/unoobj2.cxx | 9 - sw/source/uibase/sidebar/CommentsPanel.cxx | 2 sw/source/uibase/sidebar/CommentsPanel.hxx | 2 tools/source/datetime/datetimeutils.cxx | 6 - ucbhelper/source/provider/resultset.cxx | 6 - vcl/inc/ppdparser.hxx | 1 vcl/inc/salgdi.hxx | 6 - vcl/source/app/weldutils.cxx | 9 - vcl/source/gdi/salgdilayout.cxx | 14 -- vcl/unx/generic/printer/ppdparser.cxx | 92 ------------------ 36 files changed, 3 insertions(+), 237 deletions(-)
New commits: commit 5c4fac1e9f50832852e87452f3152f01b905f9e6 Author: Noel Grandin <[email protected]> AuthorDate: Wed Oct 16 13:19:05 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Oct 16 15:52:02 2024 +0200 loplugin:unusedmethods Change-Id: I6ba4b4046190b701d4a15c6fa90b6009ecf4ab1c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175014 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index a7a0a581f941..f32f37688225 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -792,7 +792,6 @@ public: void SetDoubleClickHdl( const Link<Ruler*,void>& rLink ) { maDoubleClickHdl = rLink; } void SetTextRTL(bool bRTL); - bool GetTextRTL() const; void SetCharWidth( tools::Long nWidth ) { mnCharWidth = nWidth ; } void SetLineHeight( tools::Long nHeight ) { mnLineHeight = nHeight ; } diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index e3ff72438003..a132d80f2a60 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -264,7 +264,6 @@ private: protected: virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; - weld::ScrolledWindow* GetScrollBar() const { return mxScrolledWindow.get(); } public: ValueSet(std::unique_ptr<weld::ScrolledWindow> pScrolledWindow); @@ -350,8 +349,6 @@ public: return mbNoSelection; } - void RecalculateItemSizes(); - void SetItemImage( sal_uInt16 nItemId, const Image& rImage ); Image GetItemImage( sal_uInt16 nItemId ) const; void SetItemColor( sal_uInt16 nItemId, const Color& rColor ); diff --git a/include/tools/datetimeutils.hxx b/include/tools/datetimeutils.hxx index 96abd8fd71df..deb7d7ee4f4c 100644 --- a/include/tools/datetimeutils.hxx +++ b/include/tools/datetimeutils.hxx @@ -20,8 +20,6 @@ TOOLS_DLLPUBLIC OUString DateTimeToOUString(const DateTime& rDateTime); // This function converts a 'Date' object to an 'OString' object in ISO-8601 representation TOOLS_DLLPUBLIC OString DateToOString(const Date& rDate); -TOOLS_DLLPUBLIC OString TimeToOString(const tools::Time& rTime); - // This function converts a 'Date' object to an 'OUString' object in DD/MM/YYYY format TOOLS_DLLPUBLIC OUString DateToDDMMYYYYOUString(const Date& rDate); diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx index a4faf3a9b9d1..4d7bb6d42704 100644 --- a/include/ucbhelper/resultset.hxx +++ b/include/ucbhelper/resultset.hxx @@ -244,8 +244,6 @@ public: * * @param rEvt is a property change event. */ - void propertyChanged( - const css::beans::PropertyChangeEvent& rEvt ) const; void propertyChanged(std::unique_lock<std::mutex>& rGuard, const css::beans::PropertyChangeEvent& rEvt ) const; diff --git a/include/vcl/weldutils.hxx b/include/vcl/weldutils.hxx index 3807c83c478a..db3a8169001a 100644 --- a/include/vcl/weldutils.hxx +++ b/include/vcl/weldutils.hxx @@ -455,9 +455,6 @@ VCL_DLLPUBLIC bool IsEntryVisible(const weld::TreeView& rTreeView, const weld::T VCL_DLLPUBLIC void RemoveParentKeepChildren(weld::TreeView& rTreeView, const weld::TreeIter& rParent); -// return the min height of a weld::Entry -VCL_DLLPUBLIC int GetMinimumEditHeight(); - // return the weld::Window of the SalFrame rOutWin is in, and convert rRect // from relative to rOutWin to relative to that weld::Window suitable for use // with popup_at_rect diff --git a/sc/source/ui/inc/duplicaterecordsdlg.hxx b/sc/source/ui/inc/duplicaterecordsdlg.hxx index 07a9f64a992b..5bf726708b20 100644 --- a/sc/source/ui/inc/duplicaterecordsdlg.hxx +++ b/sc/source/ui/inc/duplicaterecordsdlg.hxx @@ -51,7 +51,6 @@ public: private: void Init(); - void Okay(); void SetDialogData(bool bToggle); std::unique_ptr<weld::CheckButton> m_xIncludesHeaders; std::unique_ptr<weld::RadioButton> m_xRadioRow; diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 074df6afabcc..d4f75c69bfce 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -2731,12 +2731,6 @@ tools::Long Ruler::GetMargin2() const return mpData->nMargin2; } - -bool Ruler::GetTextRTL() const -{ - return mpData->bTextRTL; -} - const RulerUnitData& Ruler::GetCurrentRulerUnit() const { return aImplRulerUnitTab[mnUnitIndex]; diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 05988353341a..000c4156996d 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -699,24 +699,6 @@ void ValueSet::ImplDraw(vcl::RenderContext& rRenderContext) ImplDrawSelect(rRenderContext); } -/** - * An inelegant method; sets the item width & height such that - * all of the included items and their labels fit; if we can - * calculate that. - */ -void ValueSet::RecalculateItemSizes() -{ - Size aLargestItem = GetLargestItemSize(); - - if ( mnUserItemWidth != aLargestItem.Width() || - mnUserItemHeight != aLargestItem.Height() ) - { - mnUserItemWidth = aLargestItem.Width(); - mnUserItemHeight = aLargestItem.Height(); - QueueReformat(); - } -} - void ValueSet::SetFirstLine(sal_uInt16 nNewFirstLine) { if (nNewFirstLine != mnFirstLine) diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx index 5e4c0f0865b1..ed678f063098 100644 --- a/svx/source/svdraw/svdfmtf.hxx +++ b/svx/source/svdraw/svdfmtf.hxx @@ -143,7 +143,6 @@ class ImpSdrGDIMetaFileImport final void ImportText(const Point& rPos, const OUString& rStr, const MetaAction& rAct); void SetAttributes(SdrObject* pObj, bool bForceTextAttr = false); void InsertObj(SdrObject* pObj, bool bScale = true); - void MapScaling(); // #i73407# reformulation to use new B2DPolygon classes bool CheckLastLineMerge(const basegfx::B2DPolygon& rSrcPoly); diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx index 890b84dc4e0b..0a91496bea86 100644 --- a/sw/inc/AnnotationWin.hxx +++ b/sw/inc/AnnotationWin.hxx @@ -75,8 +75,6 @@ class SAL_DLLPUBLIC_RTTI SwAnnotationWin final : public InterimItemWindow void UpdateText(const OUString& rText); void UpdateHTML(const OUString& rHtml); - static void ImportHtml(Outliner& rOutliner, const OUString& rHtml); - OUString GetAuthor() const; Date GetDate() const; tools::Time GetTime() const; diff --git a/sw/inc/unotextcursor.hxx b/sw/inc/unotextcursor.hxx index ab245e5d18c9..46df40089177 100644 --- a/sw/inc/unotextcursor.hxx +++ b/sw/inc/unotextcursor.hxx @@ -225,9 +225,6 @@ public: virtual void SAL_CALL gotoRange( const css::uno::Reference< css::text::XTextRange >& xRange, sal_Bool bExpand) override; - void gotoRange( - const rtl::Reference< SwXTextCursor >& xRange, - bool bExpand); // XWordCursor virtual sal_Bool SAL_CALL isStartOfWord() override; diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx index 57156523c396..b9f2cd2d0d73 100644 --- a/sw/inc/unotextrange.hxx +++ b/sw/inc/unotextrange.hxx @@ -70,8 +70,6 @@ namespace sw { SW_DLLPUBLIC bool XTextRangeToSwPaM(SwUnoInternalPaM& rToFill, const css::uno::Reference<css::text::XTextRange> & xTextRange, TextRangeMode eMode = TextRangeMode::RequireTextNode); - bool XTextRangeToSwPaM(SwUnoInternalPaM& rToFill, - const rtl::Reference< SwXTextCursor > & xTextRange); css::uno::Reference< SwXText > CreateParentXText(SwDoc & rDoc, const SwPosition& rPos); diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx index ef04e91419f6..31821741c85b 100644 --- a/sw/source/core/inc/flyfrm.hxx +++ b/sw/source/core/inc/flyfrm.hxx @@ -183,7 +183,6 @@ public: bool IsResizeValid(const SwBorderAttrs *pAttrs, Size aTargetSize); SwTwips Shrink_( SwTwips, bool bTst ); - SwTwips Grow_ ( SwTwips, bool bTst ); SwTwips Grow_(SwTwips, SwResizeLimitReason&, bool bTst); void Invalidate_( SwPageFrame const *pPage = nullptr ); @@ -313,11 +312,6 @@ private: void PaintDecorators() const; }; -inline SwTwips SwFlyFrame::Grow_(SwTwips nDist, bool bTst) -{ - return Grow_(nDist, o3tl::temporary(SwResizeLimitReason()), bTst); -} - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx index ad3095a912ed..1cbc5f9d4df5 100644 --- a/sw/source/core/inc/sectfrm.hxx +++ b/sw/source/core/inc/sectfrm.hxx @@ -118,7 +118,6 @@ public: SwFootnoteContFrame* ContainsFootnoteCont( const SwFootnoteContFrame* pCont = nullptr ) const; bool Growable() const; SwTwips Shrink_( SwTwips, bool bTst ); - SwTwips Grow_ ( SwTwips, bool bTst ); SwTwips Grow_(SwTwips, SwResizeLimitReason&, bool bTst); /** @@ -190,10 +189,6 @@ inline const SwContentFrame *SwSectionFrame::FindLastContent() const { return const_cast<SwSectionFrame*>(this)->FindLastContent(); } -inline SwTwips SwSectionFrame::Grow_(SwTwips nDist, bool bTst) -{ - return Grow_(nDist, o3tl::temporary(SwResizeLimitReason()), bTst); -} #endif // INCLUDED_SW_SOURCE_CORE_INC_SECTFRM_HXX diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index 369ecb839ed0..644635522103 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -510,7 +510,6 @@ public: bool IsInHyphenatedWord(SwPaM *, bool bSelection) const; /// Test grow - inline SwTwips GrowTst( const SwTwips nGrow ); inline SwTwips GrowTst( const SwTwips nGrow, SwResizeLimitReason& ); SwParaPortion *GetPara(); @@ -856,10 +855,6 @@ inline bool SwTextFrame::HasPara() const return mnCacheIndex!=USHRT_MAX && HasPara_(); } -inline SwTwips SwTextFrame::GrowTst( const SwTwips nGrow ) -{ - return GrowTst(nGrow, o3tl::temporary(SwResizeLimitReason())); -} inline SwTwips SwTextFrame::GrowTst(const SwTwips nGrow, SwResizeLimitReason& reason) { return Grow(nGrow, reason, true, false); diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 3f6dd5c46fb5..bee8090f4fe0 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -1167,14 +1167,6 @@ SwXTextCursor::gotoRange( gotoRangeImpl(pRange, pCursor, bExpand); } -void -SwXTextCursor::gotoRange( - const rtl::Reference< SwXTextCursor > & xRange, bool bExpand) -{ - assert(xRange); - gotoRangeImpl(nullptr, xRange.get(), bExpand); -} - void SwXTextCursor::gotoRangeImpl( SwXTextRange* pRange, diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index 355897d692ba..4a3cd81c3c7f 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -1148,15 +1148,6 @@ static bool XTextRangeToSwPaMImpl( SwUnoInternalPaM & rToFill, SwDoc* pDoc, const SwPaM* pUnoCursor); -bool XTextRangeToSwPaM( SwUnoInternalPaM & rToFill, - const rtl::Reference< SwXTextCursor > & xTextRange) -{ - assert(xTextRange); - SwDoc* pDoc = xTextRange->GetDoc(); - const SwPaM* pUnoCursor = xTextRange->GetPaM(); - return XTextRangeToSwPaMImpl(rToFill, pDoc, pUnoCursor); -} - bool XTextRangeToSwPaM( SwUnoInternalPaM & rToFill, const uno::Reference<text::XTextRange> & xTextRange, ::sw::TextRangeMode const eMode) diff --git a/tools/source/datetime/datetimeutils.cxx b/tools/source/datetime/datetimeutils.cxx index b102b1f410e5..345e18f4a721 100644 --- a/tools/source/datetime/datetimeutils.cxx +++ b/tools/source/datetime/datetimeutils.cxx @@ -74,12 +74,6 @@ OString DateToOString( const Date& rDate ) return DateTimeToOString( DateTime( rDate, aTime ) ); } -OString TimeToOString( const tools::Time& rTime ) -{ - Date aDate( Date::EMPTY ); - return DateTimeToOString( DateTime( aDate, rTime ) ); -} - OUString DateToDDMMYYYYOUString( const Date& rDate ) { OUStringBuffer aBuffer( 25 ); diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx index ae246db3c375..bce18cb01403 100644 --- a/ucbhelper/source/provider/resultset.cxx +++ b/ucbhelper/source/provider/resultset.cxx @@ -1342,12 +1342,6 @@ void SAL_CALL ResultSet::removeVetoableChangeListener( // Non-interface methods. -void ResultSet::propertyChanged( const beans::PropertyChangeEvent& rEvt ) const -{ - std::unique_lock aGuard( m_pImpl->m_aMutex ); - propertyChanged(aGuard, rEvt); -} - void ResultSet::propertyChanged( std::unique_lock<std::mutex>& rGuard, const beans::PropertyChangeEvent& rEvt ) const { if ( !m_pImpl->m_pPropertyChangeListeners ) diff --git a/vcl/inc/ppdparser.hxx b/vcl/inc/ppdparser.hxx index ef62c8778e2f..c6cac395f820 100644 --- a/vcl/inc/ppdparser.hxx +++ b/vcl/inc/ppdparser.hxx @@ -157,7 +157,6 @@ private: std::unique_ptr<PPDTranslator> m_pTranslator; PPDParser( OUString aFile ); - PPDParser(OUString aFile, const std::vector<PPDKey*>& keys); void parseOrderDependency(const OString& rLine); void parseOpenUI(const OString& rLine, std::string_view rPPDGroup); diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 4296cb4e3e51..6fd58da78172 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -272,12 +272,6 @@ public: const SalBitmap& rSalBitmap, const OutputDevice& rOutDev ); - SAL_DLLPRIVATE void DrawBitmap( - const SalTwoRect& rPosAry, - const SalBitmap& rSalBitmap, - const SalBitmap& rTransparentBitmap, - const OutputDevice& rOutDev ); - SAL_DLLPRIVATE void DrawMask( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, diff --git a/vcl/source/app/weldutils.cxx b/vcl/source/app/weldutils.cxx index 6a5753d5a785..96d08f38a600 100644 --- a/vcl/source/app/weldutils.cxx +++ b/vcl/source/app/weldutils.cxx @@ -489,15 +489,6 @@ PatternFormatter::~PatternFormatter() m_rEntry.connect_focus_out(Link<weld::Widget&, void>()); } -int GetMinimumEditHeight() -{ - // load this little .ui just to measure the height of an Entry - std::unique_ptr<weld::Builder> xBuilder( - Application::CreateBuilder(nullptr, u"cui/ui/namedialog.ui"_ustr)); - std::unique_ptr<weld::Entry> xEntry(xBuilder->weld_entry(u"name_entry"_ustr)); - return xEntry->get_preferred_size().Height(); -} - WidgetStatusListener::WidgetStatusListener(weld::Widget* widget, const OUString& aCommand) : mWidget(widget) { diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx index 9678c7ee674e..2654b211a2ac 100644 --- a/vcl/source/gdi/salgdilayout.cxx +++ b/vcl/source/gdi/salgdilayout.cxx @@ -666,20 +666,6 @@ void SalGraphics::DrawBitmap( const SalTwoRect& rPosAry, drawBitmap( rPosAry, rSalBitmap ); } -void SalGraphics::DrawBitmap( const SalTwoRect& rPosAry, - const SalBitmap& rSalBitmap, - const SalBitmap& rTransparentBitmap, const OutputDevice& rOutDev ) -{ - if( (m_nLayout & SalLayoutFlags::BiDiRtl) || rOutDev.IsRTLEnabled() ) - { - SalTwoRect aPosAry2 = rPosAry; - mirror( aPosAry2.mnDestX, aPosAry2.mnDestWidth, rOutDev ); - drawBitmap( aPosAry2, rSalBitmap, rTransparentBitmap ); - } - else - drawBitmap( rPosAry, rSalBitmap, rTransparentBitmap ); -} - void SalGraphics::DrawMask( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, Color nMaskColor, const OutputDevice& rOutDev ) diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 7f1df3848537..107fdb4b0d17 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -600,98 +600,6 @@ const PPDParser* PPDParser::getParser( const OUString& rFile ) return pNewParser; } -PPDParser::PPDParser(OUString aFile, const std::vector<PPDKey*>& keys) - : m_aFile(std::move(aFile)) - , m_aFileEncoding(RTL_TEXTENCODING_MS_1252) - , m_pImageableAreas(nullptr) - , m_pDefaultPaperDimension(nullptr) - , m_pPaperDimensions(nullptr) - , m_pDefaultInputSlot(nullptr) - , m_pDefaultResolution(nullptr) - , m_pTranslator(new PPDTranslator()) -{ - for (auto & key: keys) - { - insertKey( std::unique_ptr<PPDKey>(key) ); - } - - // fill in shortcuts - const PPDKey* pKey; - - pKey = getKey( u"PageSize"_ustr ); - - if ( pKey ) { - std::unique_ptr<PPDKey> pImageableAreas(new PPDKey(u"ImageableArea"_ustr)); - std::unique_ptr<PPDKey> pPaperDimensions(new PPDKey(u"PaperDimension"_ustr)); -#if ENABLE_CUPS - for (int i = 0; i < pKey->countValues(); i++) { - const PPDValue* pValue = pKey -> getValue(i); - OUString aValueName = pValue -> m_aOption; - PPDValue* pImageableAreaValue = pImageableAreas -> insertValue( aValueName, eQuoted ); - PPDValue* pPaperDimensionValue = pPaperDimensions -> insertValue( aValueName, eQuoted ); - rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - OString o = OUStringToOString( aValueName, aEncoding ); - pwg_media_t *pPWGMedia = pwgMediaForPWG(o.pData->buffer); - if (pPWGMedia != nullptr) { - OUStringBuffer aBuf( 256 ); - aBuf = "0 0 " + - OUString::number(PWG_TO_POINTS(pPWGMedia -> width)) + - " " + - OUString::number(PWG_TO_POINTS(pPWGMedia -> length)); - if ( pImageableAreaValue ) - pImageableAreaValue->m_aValue = aBuf.makeStringAndClear(); - aBuf.append( OUString::number(PWG_TO_POINTS(pPWGMedia -> width)) - + " " - + OUString::number(PWG_TO_POINTS(pPWGMedia -> length) )); - if ( pPaperDimensionValue ) - pPaperDimensionValue->m_aValue = aBuf.makeStringAndClear(); - if (aValueName.equals(pKey -> getDefaultValue() -> m_aOption)) { - pImageableAreas -> m_pDefaultValue = pImageableAreaValue; - pPaperDimensions -> m_pDefaultValue = pPaperDimensionValue; - } - } - } -#endif - insertKey(std::move(pImageableAreas)); - insertKey(std::move(pPaperDimensions)); - } - - m_pImageableAreas = getKey( u"ImageableArea"_ustr ); - const PPDValue* pDefaultImageableArea = nullptr; - if( m_pImageableAreas ) - pDefaultImageableArea = m_pImageableAreas->getDefaultValue(); - if (m_pImageableAreas == nullptr) { - SAL_WARN( "vcl.unx.print", "no ImageableArea in " << m_aFile); - } - if (pDefaultImageableArea == nullptr) { - SAL_WARN( "vcl.unx.print", "no DefaultImageableArea in " << m_aFile); - } - - m_pPaperDimensions = getKey( u"PaperDimension"_ustr ); - if( m_pPaperDimensions ) - m_pDefaultPaperDimension = m_pPaperDimensions->getDefaultValue(); - if (m_pPaperDimensions == nullptr) { - SAL_WARN( "vcl.unx.print", "no PaperDimensions in " << m_aFile); - } - if (m_pDefaultPaperDimension == nullptr) { - SAL_WARN( "vcl.unx.print", "no DefaultPaperDimensions in " << m_aFile); - } - - auto pResolutions = getKey( u"Resolution"_ustr ); - if( pResolutions ) - m_pDefaultResolution = pResolutions->getDefaultValue(); - if (pResolutions == nullptr) { - SAL_INFO( "vcl.unx.print", "no Resolution in " << m_aFile); - } - SAL_INFO_IF(!m_pDefaultResolution, "vcl.unx.print", "no DefaultResolution in " + m_aFile); - - auto pInputSlots = getKey( u"InputSlot"_ustr ); - if( pInputSlots ) - m_pDefaultInputSlot = pInputSlots->getDefaultValue(); - SAL_INFO_IF(!pInputSlots, "vcl.unx.print", "no InputSlot in " << m_aFile); - SAL_INFO_IF(!m_pDefaultInputSlot, "vcl.unx.print", "no DefaultInputSlot in " << m_aFile); -} - PPDParser::PPDParser( OUString aFile ) : m_aFile(std::move( aFile )), m_aFileEncoding( RTL_TEXTENCODING_MS_1252 ), commit 44bb2c82870f83776eb26d41aeb9defbee97b102 Author: Noel Grandin <[email protected]> AuthorDate: Wed Oct 16 11:23:05 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Oct 16 15:51:52 2024 +0200 loplugin:unusedfields Change-Id: If05b87f1e6c19b15b03b2695921a582e078d0f1a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175011 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index 727d33a77478..2dd1ee2bda1d 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -123,7 +123,6 @@ class OWriteImagesDocumentHandler final const ImageItemDescriptorList& m_rImageItemList; css::uno::Reference< css::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; - rtl::Reference< ::comphelper::AttributeList > m_xEmptyList; OUString m_aXMLImageNS; OUString m_aAttributeXlinkType; OUString m_aAttributeValueSimple; diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index 04e74f376010..c4cdb0429ed4 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -124,7 +124,6 @@ class OWriteStatusBarDocumentHandler final css::uno::Reference< css::container::XIndexAccess > m_aStatusBarItems; css::uno::Reference< css::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; - rtl::Reference< comphelper::AttributeList > m_xEmptyList; OUString m_aXMLStatusBarNS; OUString m_aXMLXlinkNS; OUString m_aAttributeURL; diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx index 46e734e34f64..2294e7f51ea4 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -453,7 +453,6 @@ OWriteStatusBarDocumentHandler::OWriteStatusBarDocumentHandler( m_aStatusBarItems( aStatusBarItems ), m_xWriteDocumentHandler( rWriteDocumentHandler ) { - m_xEmptyList = new ::comphelper::AttributeList; m_aXMLXlinkNS = XMLNS_XLINK_PREFIX; m_aXMLStatusBarNS = XMLNS_STATUSBAR_PREFIX; } diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index fe20553ee878..e11af9aae325 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -285,7 +285,6 @@ OWriteImagesDocumentHandler::OWriteImagesDocumentHandler( m_rImageItemList( rItems ), m_xWriteDocumentHandler( rWriteDocumentHandler ) { - m_xEmptyList = new ::comphelper::AttributeList; m_aXMLImageNS = XMLNS_IMAGE_PREFIX; m_aAttributeXlinkType = ATTRIBUTE_XLINK_TYPE; m_aAttributeValueSimple = ATTRIBUTE_XLINK_TYPE_VALUE; diff --git a/include/package/Inflater.hxx b/include/package/Inflater.hxx index eb28d3a547f2..6ecf3eb63757 100644 --- a/include/package/Inflater.hxx +++ b/include/package/Inflater.hxx @@ -55,8 +55,8 @@ class UNLESS_MERGELIBS(DLLPUBLIC_PACKAGE) InflaterBytes final { typedef struct z_stream_s z_stream; - bool bFinished, bNeedDict; - sal_Int32 nOffset, nLength, nLastInflateError; + bool bFinished; + sal_Int32 nOffset, nLength; std::unique_ptr<z_stream> pStream; const sal_Int8* sInBuffer; sal_Int32 doInflateBytes (sal_Int8* pOutBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength); diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx index 06707f1bc339..a453c58cc579 100644 --- a/include/sfx2/sidebar/TabBar.hxx +++ b/include/sfx2/sidebar/TabBar.hxx @@ -103,7 +103,6 @@ private: typedef ::std::function<void (const OUString& rsDeckId)> DeckActivationFunctor; DeckActivationFunctor maDeckActivationFunctor; bool mbIsHidden; - bool mbIsHiddenByDefault; }; typedef ::std::vector<std::unique_ptr<Item>> ItemContainer; ItemContainer maItems; diff --git a/package/source/zipapi/Inflater.cxx b/package/source/zipapi/Inflater.cxx index acabee88fb45..5a09415abe6c 100644 --- a/package/source/zipapi/Inflater.cxx +++ b/package/source/zipapi/Inflater.cxx @@ -136,10 +136,8 @@ sal_Int32 Inflater::doInflateBytes (Sequence < sal_Int8 > &rBuffer, sal_Int32 n InflaterBytes::InflaterBytes(bool bNoWrap) : bFinished(false), - bNeedDict(false), nOffset(0), nLength(0), - nLastInflateError(0), sInBuffer(nullptr) { pStream.reset(new z_stream); @@ -201,12 +199,9 @@ sal_Int32 InflaterBytes::doInflateBytes (sal_Int8* pOutBuffer, sal_Int32 nNewOff { if ( !pStream ) { - nLastInflateError = Z_STREAM_ERROR; return 0; } - nLastInflateError = 0; - pStream->next_in = reinterpret_cast<const unsigned char*>( sInBuffer + nOffset ); pStream->avail_in = nLength; pStream->next_out = reinterpret_cast < unsigned char* > ( pOutBuffer + nNewOffset ); @@ -229,15 +224,13 @@ sal_Int32 InflaterBytes::doInflateBytes (sal_Int8* pOutBuffer, sal_Int32 nNewOff return nNewLength - pStream->avail_out; case Z_NEED_DICT: - bNeedDict = true; nOffset += nLength - pStream->avail_in; nLength = pStream->avail_in; return 0; default: // it is no error, if there is no input or no output - if ( nLength && nNewLength ) - nLastInflateError = nResult; + break; } return 0; diff --git a/sc/inc/SolverSettings.hxx b/sc/inc/SolverSettings.hxx index b9f59aa1ba3f..442570eaee6c 100644 --- a/sc/inc/SolverSettings.hxx +++ b/sc/inc/SolverSettings.hxx @@ -168,8 +168,6 @@ private: // SCO only OUString m_sLibrarySize; - css::uno::Sequence<css::beans::PropertyValue> m_aEngineOptions; - std::vector<ModelConstraint> m_aConstraints; void Initialize(); diff --git a/sc/source/core/data/SolverSettings.cxx b/sc/source/core/data/SolverSettings.cxx index bf325c204b43..215a662080f9 100644 --- a/sc/source/core/data/SolverSettings.cxx +++ b/sc/source/core/data/SolverSettings.cxx @@ -778,9 +778,6 @@ void SolverSettings::ResetToDefaults() // The default solver engine is the first implementation available m_sLOEngineName = aEngineNames[0]; - // Default engine options - m_aEngineOptions = ScSolverUtil::GetDefaults(m_sLOEngineName); - // Clear all constraints m_aConstraints.clear(); } diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index eb495f58578b..8993b10fd92d 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -141,7 +141,6 @@ void TabBar::SetDecks(const ResourceManager::DeckContextDescriptorContainer& rDe xItem->mxButton->connect_clicked(LINK(xItem.get(), TabBar::Item, HandleClick)); xItem->maDeckActivationFunctor = maDeckActivationFunctor; xItem->mbIsHidden = !xDescriptor->mbIsEnabled; - xItem->mbIsHiddenByDefault = xItem->mbIsHidden; // the default is the state while creating xItem->mxButton->set_visible(deck.mbIsEnabled); } @@ -253,7 +252,6 @@ TabBar::Item::Item(TabBar& rTabBar) , mxBuilder(Application::CreateBuilder(rTabBar.GetContainer(), u"sfx/ui/tabbutton.ui"_ustr)) , mxButton(mxBuilder->weld_toolbar(u"button"_ustr)) , mbIsHidden(false) - , mbIsHiddenByDefault(false) { } diff --git a/sw/source/uibase/sidebar/CommentsPanel.cxx b/sw/source/uibase/sidebar/CommentsPanel.cxx index 0bfd33685093..ab50d9cfa439 100644 --- a/sw/source/uibase/sidebar/CommentsPanel.cxx +++ b/sw/source/uibase/sidebar/CommentsPanel.cxx @@ -132,8 +132,6 @@ void Comment::InitControls(const SwPostItField* pPostItField) return; msText = pPostItField->GetText(); msAuthor = pPostItField->GetPar1(); - msInitials = pPostItField->GetInitials(); - msName = pPostItField->GetName(); maDate = Date(pPostItField->GetDateTime().GetDate()); maTime = tools::Time(pPostItField->GetDateTime().GetTime()); mbResolved = pPostItField->GetResolved(); diff --git a/sw/source/uibase/sidebar/CommentsPanel.hxx b/sw/source/uibase/sidebar/CommentsPanel.hxx index a258472c9235..48f63b9dc01a 100644 --- a/sw/source/uibase/sidebar/CommentsPanel.hxx +++ b/sw/source/uibase/sidebar/CommentsPanel.hxx @@ -68,8 +68,6 @@ private: sw::sidebar::CommentsPanel& mrCommentsPanel; OUString msText; OUString msAuthor; - OUString msInitials; //Initials of Author. - OUString msName; //Name of the comment Date maDate; tools::Time maTime;
