diff options
50 files changed, 10 insertions, 465 deletions
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index 5e2e73bb781d..d8e282ed93da 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -186,7 +186,6 @@ public: void SetMode (Mode eMode); void SetInsertObj( sal_uInt16 eObj ); - sal_uInt16 GetInsertObj() const { return eActObj;} void CreateDefaultObject(); Mode GetMode() const { return eMode; } bool IsCreateOK() const { return bCreateOK; } diff --git a/chart2/source/controller/inc/ChartWindow.hxx b/chart2/source/controller/inc/ChartWindow.hxx index e9c18277ffc5..5a407fdac85c 100644 --- a/chart2/source/controller/inc/ChartWindow.hxx +++ b/chart2/source/controller/inc/ChartWindow.hxx @@ -37,8 +37,6 @@ public: virtual ~ChartWindow() override; virtual void dispose() override; - void clear(); - //from base class Window: virtual void PrePaint(vcl::RenderContext& rRenderContext) override; virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 21cc0cefc2ab..b8c602b308be 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -97,12 +97,6 @@ void ChartWindow::dispose() vcl::Window::dispose(); } -void ChartWindow::clear() -{ - m_pWindowController=nullptr; - this->ReleaseMouse(); -} - void ChartWindow::PrePaint(vcl::RenderContext& rRenderContext) { // forward VCLs PrePaint window event to DrawingLayer diff --git a/compilerplugins/clang/unusedmethods.py b/compilerplugins/clang/unusedmethods.py index b5bf06ba985d..a3368f45f921 100755 --- a/compilerplugins/clang/unusedmethods.py +++ b/compilerplugins/clang/unusedmethods.py @@ -56,8 +56,11 @@ unusedMethodsExclusionSet = set([ "_Bool ScImportExport::ImportData(const class rtl::OUString &,const class com::sun::star::uno::Any &)", "void* ScannerManager::GetData()", "void ScannerManager::SetData(void *)", + "class rtl::OUString FilterConfigCache::GetImportFormatMediaType(unsigned short)", # only used by OSX build "void StyleSettings::SetHideDisabledMenuItems(_Bool)", + "_Bool TabitemValue::isLast() const", + "ApplicationEvent::ApplicationEvent(enum ApplicationEvent::Type,const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &)", # debugging methods "void oox::drawingml::TextParagraphProperties::dump() const", "void oox::PropertyMap::dumpCode(class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet>)", @@ -93,6 +96,11 @@ unusedMethodsExclusionSet = set([ "class vcl::Window * CreateWindow(class VCLXWindow **,const struct com::sun::star::awt::WindowDescriptor *,class vcl::Window *,long)", # only used when the ODBC driver is enabled "_Bool getImplementation(type-parameter-?-? *&,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &)", + # called from extensions + "unsigned short MenuBar::AddMenuBarButton(const class Image &,const class Link<struct MenuBar::MenuBarButtonCallbackArg &, _Bool> &,const class rtl::OUString &)", + "void MenuBar::SetMenuBarButtonHighlightHdl(unsigned short,const class Link<struct MenuBar::MenuBarButtonCallbackArg &, _Bool> &)", + "class Rectangle MenuBar::GetMenuBarButtonRectPixel(unsigned short)", + "void MenuBar::RemoveMenuBarButton(unsigned short)", ]) # clang does not always use exactly the same numbers in the type-parameter vars it generates diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index b419748cdab3..7d3a12f69d1b 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -750,7 +750,6 @@ private: void ImpColorCountChanged(); void FillPaletteLB(); - long FindColorInPalette(const OUString& rPaletteName) const; DECL_LINK( ClickAddHdl_Impl, Button*, void ); DECL_LINK( ClickWorkOnHdl_Impl, Button*, void ); diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index a9d2777428e1..597086e3a4d7 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -83,7 +83,6 @@ #include <editeng/langitem.hxx> #include <editeng/nlbkitem.hxx> #include <editeng/nhypitem.hxx> -#include <editeng/lcolitem.hxx> #include <editeng/blinkitem.hxx> #include <editeng/emphasismarkitem.hxx> #include <editeng/twolinesitem.hxx> @@ -2522,39 +2521,6 @@ bool SvxNoHyphenItem::GetPresentation */ -// class SvxLineColorItem (== SvxColorItem) - - -SvxLineColorItem::SvxLineColorItem( const sal_uInt16 nId ) : - SvxColorItem( nId ) -{ -} - - -SvxLineColorItem::SvxLineColorItem( const SvxLineColorItem &rCopy ) : - SvxColorItem( rCopy ) -{ -} - - -SvxLineColorItem::~SvxLineColorItem() -{ -} - - -bool SvxLineColorItem::GetPresentation -( - SfxItemPresentation ePres, - MapUnit eCoreUnit, - MapUnit ePresUnit, - OUString& rText, - const IntlWrapper * pIntlWrapper -) const -{ - return SvxColorItem::GetPresentation( ePres, eCoreUnit, ePresUnit, - rText, pIntlWrapper ); -} - // class SvxBlinkItem ------------------------------------------------- diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index 7c7e6f1ab833..8535bdc99228 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -39,7 +39,6 @@ #include <editeng/langitem.hxx> #include <editeng/nlbkitem.hxx> #include <editeng/nhypitem.hxx> -#include <editeng/lcolitem.hxx> #include <editeng/blinkitem.hxx> #include <editeng/emphasismarkitem.hxx> #include <editeng/twolinesitem.hxx> diff --git a/framework/source/uiconfiguration/ImageList.cxx b/framework/source/uiconfiguration/ImageList.cxx index cdceb4b2e179..8c0fc26bdac0 100644 --- a/framework/source/uiconfiguration/ImageList.cxx +++ b/framework/source/uiconfiguration/ImageList.cxx @@ -164,34 +164,6 @@ void ImageList::RemoveImage( sal_uInt16 nId ) } } -Image ImageList::GetImage( sal_uInt16 nId ) const -{ - Image aRet; - - if (mpImplData) - { - for (ImageAryData* pImageData : mpImplData->maImages) - { - if (pImageData->mnId == nId) - { - if (pImageData->IsLoadable()) - pImageData->Load(mpImplData->maPrefix); - aRet = Image(pImageData->maBitmapEx); - } - } - } - - if (!aRet) - { - BitmapEx rBitmap; - bool bResult = vcl::ImageRepository::loadDefaultImage(rBitmap); - if (bResult) - aRet = Image(rBitmap); - } - - return aRet; -} - Image ImageList::GetImage( const OUString& rImageName ) const { if( mpImplData ) @@ -214,21 +186,6 @@ sal_uInt16 ImageList::GetImageCount() const return mpImplData ? static_cast< sal_uInt16 >( mpImplData->maImages.size() ) : 0; } -sal_uInt16 ImageList::GetImagePos( sal_uInt16 nId ) const -{ - - if( mpImplData && nId ) - { - for( size_t i = 0; i < mpImplData->maImages.size(); ++i ) - { - if (mpImplData->maImages[ i ]->mnId == nId) - return static_cast< sal_uInt16 >( i ); - } - } - - return IMAGELIST_IMAGE_NOTFOUND; -} - sal_uInt16 ImageList::GetImagePos( const OUString& rImageName ) const { if( mpImplData && !rImageName.isEmpty() ) diff --git a/framework/source/uiconfiguration/ImageList.hxx b/framework/source/uiconfiguration/ImageList.hxx index d6db88c45848..85c9459a7b5d 100644 --- a/framework/source/uiconfiguration/ImageList.hxx +++ b/framework/source/uiconfiguration/ImageList.hxx @@ -38,10 +38,8 @@ public: void RemoveImage( sal_uInt16 nId ); - Image GetImage( sal_uInt16 nId ) const; Image GetImage( const OUString& rImageName ) const; - sal_uInt16 GetImagePos( sal_uInt16 nId ) const; sal_uInt16 GetImagePos( const OUString& rImageName ) const; sal_uInt16 GetImageId( sal_uInt16 nPos ) const; diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx index 25381c324e34..0a9383cbc402 100644 --- a/idl/inc/database.hxx +++ b/idl/inc/database.hxx @@ -94,7 +94,6 @@ public: explicit SvIdlDataBase( const SvCommand& rCmd ); ~SvIdlDataBase(); - SvRefMemberList<SvMetaSlot *>& GetSlotList() { return aSlotList; } SvRefMemberList<SvMetaType *>& GetTypeList(); SvRefMemberList<SvMetaClass *>& GetClassList() { return aClassList; } SvRefMemberList<SvMetaModule *>& GetModuleList() { return aModuleList; } diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index 01f5c99687af..5ecf4359d88a 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -104,11 +104,6 @@ public: SvRefMemberList<SvMetaEnumValue *> aEnumValueList; OString aPrefix; SvMetaTypeEnum(); - - sal_uLong Count() const { return aEnumValueList.size(); } - const OString& GetPrefix() const { return aPrefix; } - SvMetaEnumValue * GetObject( sal_uLong n ) const - { return aEnumValueList[n]; } }; class SvMetaTypevoid : public SvMetaType diff --git a/include/editeng/lcolitem.hxx b/include/editeng/lcolitem.hxx deleted file mode 100644 index 28a9e09336e1..000000000000 --- a/include/editeng/lcolitem.hxx +++ /dev/null @@ -1,52 +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_EDITENG_LCOLITEM_HXX -#define INCLUDED_EDITENG_LCOLITEM_HXX - -#include <editeng/colritem.hxx> -#include <editeng/editengdllapi.h> - -/* - * Dummy item for ToolBox controller: - * - */ - -class EDITENG_DLLPUBLIC SvxLineColorItem : public SvxColorItem -{ -public: - explicit SvxLineColorItem( const sal_uInt16 nId ); - SvxLineColorItem( const SvxLineColorItem& rCopy ); - virtual ~SvxLineColorItem() override; - - virtual bool GetPresentation( SfxItemPresentation ePres, - MapUnit eCoreMetric, - MapUnit ePresMetric, - OUString &rText, - const IntlWrapper * pIntlWrapper = nullptr ) - const override; - - SvxLineColorItem& operator=(const SvxLineColorItem& rColor) - { return static_cast<SvxLineColorItem&>(SvxColorItem:: - operator=(static_cast<const SvxColorItem&>(rColor))); } - -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx index 6afcead07dc1..003455d8405c 100644 --- a/include/oox/core/binarycodec.hxx +++ b/include/oox/core/binarycodec.hxx @@ -109,35 +109,6 @@ public: */ bool verifyKey( sal_uInt16 nKey, sal_uInt16 nHash ) const; - /** Reinitializes the codec to start a new memory block. - - Resets the internal key offset to 0. - - @precond - The codec must be initialized with the initKey() function before - this function can be used. - */ - void startBlock(); - - /** Decodes a block of memory. - - @precond - The codec must be initialized with the initKey() function before - this function can be used. - - @param pnDestData - Destination buffer. Will contain the decrypted data afterwards. - @param pnSrcData - Encrypted data block. - @param nBytes - Size of the passed data blocks. pnDestData and pnSrcData must be of - this size. - */ - void decode( - sal_uInt8* pnDestData, - const sal_uInt8* pnSrcData, - sal_Int32 nBytes ); - /** Lets the cipher skip a specific amount of bytes. This function sets the cipher to the same state as if the specified @@ -270,20 +241,6 @@ public: const sal_uInt8* pnSrcData, sal_Int32 nBytes ); - /** Lets the cipher skip a specific amount of bytes. - - This function sets the cipher to the same state as if the specified - amount of data has been decoded with one or more calls of decode(). - - @precond - The codec must be initialized with the initKey() function before - this function can be used. - - @param nBytes - Number of bytes to be skipped (cipher "seeks" forward). - */ - void skip( sal_Int32 nBytes ); - private: rtlCipher mhCipher; rtlDigest mhDigest; diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx index e8c95998b826..ee9463358ab0 100644 --- a/include/sfx2/bindings.hxx +++ b/include/sfx2/bindings.hxx @@ -141,8 +141,6 @@ public: bool IsInUpdate() const; void SetVisibleState( sal_uInt16 nId, bool bShow ); - bool IsBound( sal_uInt16 nMsgId ); - SfxStateCache* GetStateCache( sal_uInt16 nId); SAL_DLLPRIVATE SfxStateCache* GetAnyStateCache_Impl( sal_uInt16 nId ); /** diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx index 0bc391c8a6aa..5d864ade4694 100644 --- a/include/sfx2/msg.hxx +++ b/include/sfx2/msg.hxx @@ -210,9 +210,7 @@ public: SfxSlotMode GetMode() const; bool IsMode( SfxSlotMode nMode ) const; sal_uInt16 GetGroupId() const; - sal_uInt16 GetMasterSlotId() const { return nMasterSlotId; } sal_uInt16 GetWhich( const SfxItemPool &rPool ) const; - sal_uInt16 GetValue() const { return nValue; } const SfxType* GetType() const { return pType; } const char* GetUnoName() const { return pUnoName; } SFX2_DLLPUBLIC OString GetCommand() const; diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx index c004e489b5a8..f0334fb0ca46 100644 --- a/include/svl/aeitem.hxx +++ b/include/svl/aeitem.hxx @@ -49,8 +49,6 @@ class SVL_DLLPUBLIC SfxAllEnumItem: public SfxAllEnumItem_Base std::size_t GetPosByValue_( sal_uInt16 nValue ) const; public: - static SfxPoolItem* CreateDefault(); - SfxAllEnumItem(); explicit SfxAllEnumItem( sal_uInt16 nWhich); SfxAllEnumItem( sal_uInt16 nWhich, sal_uInt16 nVal ); @@ -67,8 +65,6 @@ public: virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const override; - virtual bool IsEnabled( sal_uInt16 ) const override; - void DisableValue( sal_uInt16 ); }; #endif diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx index 72e6ed65afa0..e4ea233c2f8b 100644 --- a/include/svl/cenumitm.hxx +++ b/include/svl/cenumitm.hxx @@ -49,8 +49,6 @@ public: virtual sal_uInt16 GetValueByPos(sal_uInt16 nPos) const; - virtual bool IsEnabled(sal_uInt16 nValue) const; - virtual sal_uInt16 GetEnumValue() const = 0; virtual void SetEnumValue(sal_uInt16 nValue) = 0; diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index a1e87a7f58c3..cdcd8a78d6e7 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -516,9 +516,6 @@ public: /// Count of decimals sal_uInt16 GetFormatPrecision( sal_uInt32 nFormat ) const; - /// Count of decimals with correct subformat according to fValue - sal_uInt16 GetFormatPrecision( sal_uInt32 nFormat, double fValue ) const; - /// Count of integer digits sal_uInt16 GetFormatIntegerDigits( sal_uInt32 nFormat ) const; diff --git a/include/svx/xbitmap.hxx b/include/svx/xbitmap.hxx index a20288f9e5e9..4dcc51c702cc 100644 --- a/include/svx/xbitmap.hxx +++ b/include/svx/xbitmap.hxx @@ -52,7 +52,6 @@ public: void SetBitmapType( XBitmapType eNewType ) { eType = eNewType; } void SetPixelColor( const Color& rColor ) { aPixelColor = rColor; bGraphicDirty = true; } - void SetPixelSize( const Size& rSize ) { aArraySize = rSize; bGraphicDirty = true; } void SetBackgroundColor( const Color& rColor ) { aBckgrColor = rColor; bGraphicDirty = true; } Bitmap GetBitmap() const; diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index 4bde75f84161..c86afdd28ba4 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -64,7 +64,6 @@ public: OUString &rText, const IntlWrapper * = nullptr ) const override; const GraphicObject& GetGraphicObject() const { return maGraphicObject;} - void SetGraphicObject(const GraphicObject& rGraphicObject); bool isPattern() const; static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx index 961b941df9d8..0d8ce071c852 100644 --- a/include/svx/xflhtit.hxx +++ b/include/svx/xflhtit.hxx @@ -56,7 +56,6 @@ public: virtual void ScaleMetrics(long nMul, long nDiv) override; const XHatch& GetHatchValue() const { return aHatch;} // GetValue -> GetHatchValue - void SetHatchValue(const XHatch& rNew) { aHatch = rNew; Detach(); } // SetValue -> SetHatchValue static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); XFillHatchItem* checkForUniqueItem( SdrModel* pModel ) const; diff --git a/include/svx/xsflclit.hxx b/include/svx/xsflclit.hxx index 0d4b3e746e19..061c2f573737 100644 --- a/include/svx/xsflclit.hxx +++ b/include/svx/xsflclit.hxx @@ -28,9 +28,8 @@ class SVX_DLLPUBLIC XSecondaryFillColorItem : public XColorItem { public: - SVX_DLLPRIVATE XSecondaryFillColorItem() {} - XSecondaryFillColorItem(const OUString& rName, const Color& rTheColor); - SVX_DLLPRIVATE XSecondaryFillColorItem(SvStream& rIn); + XSecondaryFillColorItem(const OUString& rName, const Color& rTheColor); + SVX_DLLPRIVATE XSecondaryFillColorItem(SvStream& rIn); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; diff --git a/include/tools/inetmime.hxx b/include/tools/inetmime.hxx index 106e5614d2fe..72dee0b69bd4 100644 --- a/include/tools/inetmime.hxx +++ b/include/tools/inetmime.hxx @@ -256,17 +256,6 @@ private: const sal_Unicode * pEnd); public: - /** Write a sequence of octets. - - @descr The supplied sequence of Unicode characters is interpreted as - a sequence of octets. It is an error if any of the elements of the - sequence has a numerical value greater than 255. - - @param pBegin Points to the start of the sequence, must not be null. - - @param pEnd Points past the end of the sequence, must be >= pBegin. - */ - inline void write(const sal_Unicode * pBegin, const sal_Unicode * pEnd); /** Write a single octet. @@ -293,12 +282,6 @@ public: }; -inline void INetMIMEOutputSink::write(const sal_Unicode * pBegin, - const sal_Unicode * pEnd) -{ - writeSequence(pBegin, pEnd); -} - inline INetMIMEOutputSink & INetMIMEOutputSink::operator <<(sal_Char nOctet) { writeSequence(&nOctet, &nOctet + 1); diff --git a/include/tools/link.hxx b/include/tools/link.hxx index de76c25dd6e9..8b65be4755dd 100644 --- a/include/tools/link.hxx +++ b/include/tools/link.hxx @@ -102,7 +102,6 @@ public: { return function_ == other.function_ && instance_ == other.instance_; }; void *GetInstance() const { return instance_; } - Stub* GetFunction() const { return function_; } private: Stub * function_; diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx index 528753a286ae..e1f34a2f8c31 100644 --- a/include/tools/poly.hxx +++ b/include/tools/poly.hxx @@ -118,7 +118,6 @@ public: void Clear(); Rectangle GetBoundRect() const; - double GetSignedArea() const; bool IsInside( const Point& rPt ) const; double CalcDistance( sal_uInt16 nPt1, sal_uInt16 nPt2 ); void Clip( const Rectangle& rRect ); diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx index 9737bac576ec..3dfdf649b390 100644 --- a/include/vcl/event.hxx +++ b/include/vcl/event.hxx @@ -175,19 +175,6 @@ inline MouseEvent::MouseEvent( const Point& rPos, sal_uInt16 nClicks, mnCode = nButtons | nModifier; } -class VCL_DLLPUBLIC ZoomEvent -{ -public: - ZoomEvent() {} -}; - -class VCL_DLLPUBLIC ScrollEvent -{ -public: - ScrollEvent() {} -}; - - enum class HelpEventMode { NONE = 0x0000, diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx index aef865dc234c..63196185701a 100644 --- a/include/vcl/lazydelete.hxx +++ b/include/vcl/lazydelete.hxx @@ -234,11 +234,6 @@ namespace vcl // set contents, returning old contents // ownership is transferred ! T* set( T* i_pNew ) { T* pOld = m_pT; m_pT = i_pNew; return pOld; } - - // set contents, deleting old contents - // ownership is transferred ! - void reset( T* i_pNew = nullptr ) - { OSL_ASSERT( i_pNew != m_pT || i_pNew == nullptr ); T* pOld = m_pT; m_pT = i_pNew; delete pOld; } }; /** Similar to DeleteOnDeinit, the DeleteUnoReferenceOnDeinit diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx index 5bff050fb196..da725103c1c7 100644 --- a/include/vcl/menubtn.hxx +++ b/include/vcl/menubtn.hxx @@ -76,7 +76,6 @@ public: PopupMenu* GetPopupMenu() const { return mpMenu; } void SetPopover(FloatingWindow* pFloatingWindow); - FloatingWindow* GetPopover() const { return mpFloatingWindow; } sal_uInt16 GetCurItemId() const { return mnCurItemId; } OString GetCurItemIdent() const; diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 533ba155e7fb..0af0d3862488 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -59,8 +59,6 @@ class Reflection; class NotifyEvent; class KeyEvent; class MouseEvent; -class ZoomEvent; -class ScrollEvent; struct ImplSVEvent; struct ConvertData; diff --git a/include/xmloff/xmlement.hxx b/include/xmloff/xmlement.hxx index d3aaba3055bd..5879324701bf 100644 --- a/include/xmloff/xmlement.hxx +++ b/include/xmloff/xmlement.hxx @@ -39,7 +39,6 @@ public: SvXMLEnumMapEntry(::xmloff::token::XMLTokenEnum eToken_, EnumT nValue_) : eToken(eToken_), nValue(nValue_) {} ::xmloff::token::XMLTokenEnum GetToken() const { return eToken; } - EnumT GetValue() const { return static_cast<EnumT>(nValue); } }; // specialisation to avoid lots of "C2398: conversion from 'const sal_Int16' to 'sal_uInt16' requires a narrowing conversion" diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index 72939eaced1f..f7137715ced3 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -573,7 +573,6 @@ public: virtual void NotifyEmbeddedFontRead() {}; bool needFixPositionAfterZ() const; - const css::uno::Reference< css::xml::sax::XFastNamespaceHandler > getNamespaceHandler() { return maNamespaceHandler.get(); } }; inline rtl::Reference< XMLTextImportHelper > const & SvXMLImport::GetTextImport() diff --git a/oox/source/core/binarycodec.cxx b/oox/source/core/binarycodec.cxx index 9ea36ee7df48..10c3a2c8941a 100644 --- a/oox/source/core/binarycodec.cxx +++ b/oox/source/core/binarycodec.cxx @@ -204,49 +204,6 @@ bool BinaryCodec_XOR::verifyKey( sal_uInt16 nKey, sal_uInt16 nHash ) const return (nKey == mnBaseKey) && (nHash == mnHash); } -void BinaryCodec_XOR::startBlock() -{ - mnOffset = 0; -} - -void BinaryCodec_XOR::decode( sal_uInt8* pnDestData, const sal_uInt8* pnSrcData, sal_Int32 nBytes ) -{ - const sal_uInt8* pnCurrKey = mpnKey + mnOffset; - const sal_uInt8* pnKeyLast = mpnKey + 0x0F; - - // switch/case outside of the for loop (performance) - const sal_uInt8* pnSrcDataEnd = pnSrcData + nBytes; - switch( meCodecType ) - { - case CODEC_WORD: - { - for( ; pnSrcData < pnSrcDataEnd; ++pnSrcData, ++pnDestData ) - { - sal_uInt8 nData = *pnSrcData ^ *pnCurrKey; - if( (*pnSrcData != 0) && (nData != 0) ) - *pnDestData = nData; - if( pnCurrKey < pnKeyLast ) ++pnCurrKey; else pnCurrKey = mpnKey; - } - } - break; - case CODEC_EXCEL: - { - for( ; pnSrcData < pnSrcDataEnd; ++pnSrcData, ++pnDestData ) - { - *pnDestData = *pnSrcData; - lclRotateLeft( *pnDestData, 3 ); - *pnDestData ^= *pnCurrKey; - if( pnCurrKey < pnKeyLast ) ++pnCurrKey; else pnCurrKey = mpnKey; - } - } - break; - // compiler will warn, if new codec type is introduced and not handled here - } - - // update offset and leave - skip( nBytes ); -} - bool BinaryCodec_XOR::skip( sal_Int32 nBytes ) { mnOffset = static_cast< sal_Int32 >( (mnOffset + nBytes) & 0x0F ); @@ -390,20 +347,6 @@ bool BinaryCodec_RCF::decode( sal_uInt8* pnDestData, const sal_uInt8* pnSrcData, return eResult == rtl_Cipher_E_None; } -void BinaryCodec_RCF::skip( sal_Int32 nBytes ) -{ - // decode dummy data in memory to update internal state of RC4 cipher - sal_uInt8 pnDummy[ 1024 ]; - sal_Int32 nBytesLeft = nBytes; - bool bResult = true; - while( bResult && (nBytesLeft > 0) ) - { - sal_Int32 nBlockLen = ::std::min( nBytesLeft, static_cast< sal_Int32 >( sizeof( pnDummy ) ) ); - bResult = decode( pnDummy, pnDummy, nBlockLen ); - nBytesLeft -= nBlockLen; - } -} - } // namespace core } // namespace oox diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx index 5781a12d48a7..7c0e3d856681 100644 --- a/reportdesign/source/ui/inc/ReportSection.hxx +++ b/reportdesign/source/ui/inc/ReportSection.hxx @@ -117,7 +117,6 @@ namespace rptui OReportPage* getPage() const { return m_pPage; } const css::uno::Reference< css::report::XSection >& getSection() const { return m_xSection; } - DlgEdMode GetMode() const { return m_eMode; } void SetMode( DlgEdMode m_eMode ); /** checks if the keycode is known by the child windows diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index dc9b2884aec5..fddb8f44cbf8 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -56,7 +56,6 @@ class SC_DLLPUBLIC ScMergeAttr: public SfxPoolItem SCsCOL nColMerge; SCsROW nRowMerge; public: - static SfxPoolItem* CreateDefault(); ScMergeAttr(); ScMergeAttr( SCsCOL nCol, SCsROW nRow ); ScMergeAttr( const ScMergeAttr& ); diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index ae47fc4e1b11..abddcd9d7ebb 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -229,7 +229,6 @@ void PushNA(); // Functions for accessing a document void ReplaceCell( ScAddress& ); // for TableOp -void ReplaceCell( SCCOL& rCol, SCROW& rRow, SCTAB& rTab ); // for TableOp bool IsTableOpInRange( const ScRange& ); sal_uLong GetCellNumberFormat( const ScAddress& rPos, ScRefCellValue& rCell ); double ConvertStringToValue( const OUString& ); diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 103d52864d17..1c64a8556ffb 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -106,30 +106,6 @@ void ScInterpreter::ReplaceCell( ScAddress& rPos ) } } -void ScInterpreter::ReplaceCell( SCCOL& rCol, SCROW& rRow, SCTAB& rTab ) -{ - ScAddress aCellPos( rCol, rRow, rTab ); - size_t ListSize = pDok->m_TableOpList.size(); - for ( size_t i = 0; i < ListSize; ++i ) - { - ScInterpreterTableOpParams *const pTOp = pDok->m_TableOpList[ i ].get(); - if ( aCellPos == pTOp->aOld1 ) - { - rCol = pTOp->aNew1.Col(); - rRow = pTOp->aNew1.Row(); - rTab = pTOp->aNew1.Tab(); - return ; - } - else if ( aCellPos == pTOp->aOld2 ) - { - rCol = pTOp->aNew2.Col(); - rRow = pTOp->aNew2.Row(); - rTab = pTOp->aNew2.Tab(); - return ; - } - } -} - bool ScInterpreter::IsTableOpInRange( const ScRange& rRange ) { if ( rRange.aStart == rRange.aEnd ) diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx index dda51c924613..c21d16ae982d 100644 --- a/sc/source/filter/orcus/interface.cxx +++ b/sc/source/filter/orcus/interface.cxx @@ -31,7 +31,6 @@ #include <editeng/udlnitem.hxx> #include <editeng/boxitem.hxx> #include <editeng/borderline.hxx> -#include <editeng/lcolitem.hxx> #include <editeng/charhiddenitem.hxx> #include <editeng/protitem.hxx> #include <editeng/prntitem.hxx> diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 1161d3cef9fb..bd64b8942679 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -778,12 +778,6 @@ void SfxBindings::Invalidate } -bool SfxBindings::IsBound( sal_uInt16 nSlotId ) -{ - return GetStateCache(nSlotId) != nullptr; -} - - std::size_t SfxBindings::GetSlotPos( sal_uInt16 nId, std::size_t nStartSearchAt ) { // answer immediately if a function-seek comes repeated diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx index fdbca831c064..d50b77d85761 100644 --- a/svl/source/items/aeitem.cxx +++ b/svl/source/items/aeitem.cxx @@ -23,9 +23,6 @@ #include <cstddef> #include <vector> -SfxPoolItem* SfxAllEnumItem::CreateDefault() { return new SfxAllEnumItem; } - - struct SfxAllEnumValue_Impl { sal_uInt16 nValue; @@ -168,27 +165,6 @@ void SfxAllEnumItem::InsertValue( sal_uInt16 nValue ) pValues->insert(pValues->begin() + GetPosByValue_(nValue), aVal); // FIXME: Duplicates? } -void SfxAllEnumItem::DisableValue( sal_uInt16 nValue ) -{ - if ( !pDisabledValues ) - pDisabledValues = new std::vector<sal_uInt16>; - - pDisabledValues->push_back( nValue ); -} - -bool SfxAllEnumItem::IsEnabled( sal_uInt16 nValue ) const -{ - if ( pDisabledValues ) - { - for (sal_uInt16 nDisabledValue : *pDisabledValues) - if ( nDisabledValue == nValue ) - return false; - } - - return true; -} - - void SfxAllEnumItem::RemoveValue( sal_uInt16 nValue ) { sal_uInt16 nPos = GetPosByValue(nValue); diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index 33b7853e563c..6c0dc09e6172 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.cxx @@ -80,11 +80,6 @@ sal_uInt16 SfxEnumItemInterface::GetValueByPos(sal_uInt16 nPos) const return nPos; } -bool SfxEnumItemInterface::IsEnabled(sal_uInt16) const -{ - return true; -} - // virtual bool SfxEnumItemInterface::HasBoolValue() const { diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 294777360c2e..9dc90b41a4f5 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -1971,18 +1971,6 @@ sal_uInt16 SvNumberFormatter::GetFormatPrecision( sal_uInt32 nFormat ) const return pFormatScanner->GetStandardPrec(); } -sal_uInt16 SvNumberFormatter::GetFormatPrecision( sal_uInt32 nFormat, double fValue ) const -{ - const SvNumberformat* pFormat = GetFormatEntry( nFormat ); - if ( pFormat ) - { - sal_uInt16 nIx = pFormat->GetSubformatIndex( fValue ); - return pFormat->GetFormatPrecision( nIx ); - } - else - return pFormatScanner->GetStandardPrec(); -} - sal_uInt16 SvNumberFormatter::GetFormatIntegerDigits( sal_uInt32 nFormat ) const { const SvNumberformat* pFormat = GetFormatEntry( nFormat ); diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index 68cdeeceb586..b9c17dd5e991 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -271,10 +271,6 @@ class SvxIconChoiceCtrl_Impl Rectangle CalcMaxTextRect( const SvxIconChoiceCtrlEntry* pEntry ) const; void ClipAtVirtOutRect( Rectangle& rRect ) const; - Point AdjustAtGrid( - const Rectangle& rCenterRect, // balance point of object (typically Bmp-Rect) - const Rectangle& rBoundRect - ) const; sal_uLong GetPredecessorGrid( const Point& rDocPos) const; void InitPredecessors(); diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 40933e230955..2452e91c5431 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -2691,33 +2691,6 @@ IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, EditTimeoutHdl, Timer *, void) } } -// Aligns a rectangle to the grid, but doesn't guarantee that the new position -// is vacant. The position can be used for SetEntryPos. The CenterRect describes -// a part of the bounding rectangle that is used for calculating the target -// rectangle. -Point SvxIconChoiceCtrl_Impl::AdjustAtGrid( const Rectangle& rCenterRect, - const Rectangle& rBoundRect ) const -{ - Point aPos( rCenterRect.TopLeft() ); - Size aSize( rCenterRect.GetSize() ); - - aPos.X() -= LROFFS_WINBORDER; - aPos.Y() -= TBOFFS_WINBORDER; - - // align (the center of the rectangle is the reference) - short nGridX = (short)((aPos.X()+(aSize.Width()/2)) / nGridDX); - short nGridY = (short)((aPos.Y()+(aSize.Height()/2)) / nGridDY); - aPos.X() = nGridX * nGridDX; - aPos.Y() = nGridY * nGridDY; - // horizontal center - aPos.X() += (nGridDX - rBoundRect.GetSize().Width() ) / 2; - - aPos.X() += LROFFS_WINBORDER; - aPos.Y() += TBOFFS_WINBORDER; - - return aPos; -} - #ifdef DBG_UTIL void SvxIconChoiceCtrl_Impl::SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry ) { diff --git a/svx/source/dialog/SafeModeDialog.hxx b/svx/source/dialog/SafeModeDialog.hxx index b70265de2c30..4fe0f02a991a 100644 --- a/svx/source/dialog/SafeModeDialog.hxx +++ b/svx/source/dialog/SafeModeDialog.hxx @@ -66,7 +66,6 @@ private: void enableDisableWidgets(); void applyChanges(); - static void openWebBrowser(const OUString & sURL, const OUString &sTitle); DECL_LINK(RadioBtnHdl, Button*, void); DECL_LINK(CheckBoxHdl, CheckBox&, void); diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index de7e28c2c743..519a10a40963 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -306,11 +306,6 @@ SvStream& XFillBitmapItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) cons } -void XFillBitmapItem::SetGraphicObject(const GraphicObject& rGraphicObject) -{ - maGraphicObject = rGraphicObject; -} - bool XFillBitmapItem::isPattern() const { BitmapColor aBack, aFront; diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index 951084b2dc61..1efc50c130ae 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -179,7 +179,6 @@ public: SwCollCondition( SwTextFormatColl* pColl, Master_CollCondition nMasterCond, sal_uLong nSubCond ); - SwCollCondition( SwTextFormatColl* pColl, Master_CollCondition nMasterCond ); virtual ~SwCollCondition() override; /// @@@ public copy ctor, but no copy assignment? diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx index b5d789fdef24..28f5df18361b 100644 --- a/sw/source/core/doc/fmtcol.cxx +++ b/sw/source/core/doc/fmtcol.cxx @@ -484,12 +484,6 @@ SwCollCondition::SwCollCondition( SwTextFormatColl* pColl, Master_CollCondition { } -SwCollCondition::SwCollCondition( SwTextFormatColl* pColl, Master_CollCondition nMasterCond ) - : SwClient( pColl ), m_nCondition( nMasterCond ), - m_nSubCondition( 0 ) -{ -} - SwCollCondition::SwCollCondition( const SwCollCondition& rCopy ) : SwClient( const_cast<SwModify*>(rCopy.GetRegisteredIn()) ), m_nCondition( rCopy.m_nCondition ), diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx index fe9faa599388..68f0abd4304c 100644 --- a/sw/source/core/inc/flyfrm.hxx +++ b/sw/source/core/inc/flyfrm.hxx @@ -70,8 +70,6 @@ class SwFlyFrame : public SwLayoutFrame, public SwAnchoredObject using SwLayoutFrame::CalcRel; - SwVirtFlyDrawObj* CreateNewRef( SwFlyDrawContact* ); - protected: // Predecessor/Successor for chaining with text flow SwFlyFrame *m_pPrevLink, *m_pNextLink; diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx index eba86e6f40b6..0faae1a39b27 100644 --- a/tools/source/generic/poly.cxx +++ b/tools/source/generic/poly.cxx @@ -1391,31 +1391,6 @@ Rectangle Polygon::GetBoundRect() const return Rectangle( nXMin, nYMin, nXMax, nYMax ); } -double Polygon::GetSignedArea() const -{ - DBG_ASSERT( !mpImplPolygon->mpFlagAry, "GetArea could fail with beziers!" ); - - double fArea = 0.0; - - if( mpImplPolygon->mnPoints > 2 ) - { - const sal_uInt16 nCount1 = mpImplPolygon->mnPoints - 1; - - for( sal_uInt16 i = 0; i < nCount1; ) - { - const Point& rPt = mpImplPolygon->mpPointAry[ i ]; - const Point& rPt1 = mpImplPolygon->mpPointAry[ ++i ]; - fArea += ( rPt.X() - rPt1.X() ) * ( rPt.Y() + rPt1.Y() ); - } - - const Point& rPt = mpImplPolygon->mpPointAry[ nCount1 ]; - const Point& rPt0 = mpImplPolygon->mpPointAry[ 0 ]; - fArea += ( rPt.X() - rPt0.X() ) * ( rPt.Y() + rPt0.Y() ); - } - - return fArea; -} - bool Polygon::IsInside( const Point& rPoint ) const { DBG_ASSERT( !mpImplPolygon->mpFlagAry, "IsInside could fail with beziers!" ); diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index b893a0f6399b..b1ded19700a4 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -272,16 +272,6 @@ struct GlyphItem int mnFallbackLevel; public: - GlyphItem() - : mnFlags(0) - , mnCharPos(0) - , mnOrigWidth(0) - , mnNewWidth(0) - , mnXOffset(0) - , maGlyphId(0) - , mnFallbackLevel(0) - { } - GlyphItem( int nCharPos, sal_GlyphId aGlyphId, const Point& rLinearPos, long nFlags, int nOrigWidth ) : mnFlags(nFlags) |