compilerplugins/clang/unusedmethodsremove.cxx | 7 +++ cui/source/customize/cfgutil.cxx | 1 cui/source/dialogs/SpellAttrib.hxx | 7 --- cui/source/dialogs/SpellDialog.cxx | 11 ----- cui/source/inc/SpellDialog.hxx | 1 cui/source/inc/acccfg.hxx | 2 - cui/source/inc/cfg.hxx | 27 +------------- cui/source/inc/cfgutil.hxx | 3 - cui/source/inc/cuigaldlg.hxx | 1 cui/source/inc/cuigrfflt.hxx | 1 cui/source/inc/cuitabarea.hxx | 4 -- cui/source/inc/cuitabline.hxx | 6 +-- cui/source/inc/dbregister.hxx | 1 cui/source/inc/dstribut.hxx | 2 - cui/source/inc/grfpage.hxx | 3 - cui/source/inc/hangulhanjadlg.hxx | 1 cui/source/inc/hldocntp.hxx | 2 - cui/source/inc/hltpbase.hxx | 1 cui/source/inc/iconcdlg.hxx | 17 +------- cui/source/inc/linkdlg.hxx | 2 - cui/source/inc/macroass.hxx | 13 ------ cui/source/inc/numpages.hxx | 10 ----- cui/source/inc/optdict.hxx | 6 --- cui/source/inc/optpath.hxx | 1 cui/source/inc/postdlg.hxx | 12 ------ cui/source/inc/scriptdlg.hxx | 2 - cui/source/inc/selector.hxx | 1 cui/source/inc/textanim.hxx | 2 - cui/source/inc/thesdlg.hxx | 1 cui/source/inc/transfrm.hxx | 3 - cui/source/inc/treeopt.hxx | 1 cui/source/options/doclinkdialog.hxx | 1 cui/source/options/fontsubs.hxx | 3 - cui/source/tabpages/dstribut.cxx | 12 ------ cui/source/tabpages/transfrm.cxx | 1 desktop/inc/app.hxx | 4 -- desktop/source/app/dispatchwatcher.hxx | 5 -- desktop/source/deployment/gui/dp_gui.h | 1 desktop/source/deployment/gui/dp_gui_dialog2.cxx | 2 - desktop/source/deployment/gui/dp_gui_dialog2.hxx | 8 ---- desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 3 - desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 2 - desktop/source/deployment/gui/dp_gui_updatedialog.hxx | 3 - desktop/source/deployment/manager/dp_extensionmanager.hxx | 3 - desktop/source/deployment/registry/inc/dp_backend.h | 13 ------ desktop/source/migration/migration_impl.hxx | 1 46 files changed, 13 insertions(+), 201 deletions(-)
New commits: commit 89ef4dea325a11c706ff9619ff4717124260f864 Author: Noel Grandin <n...@peralex.com> Date: Fri Jul 17 10:34:58 2015 +0200 loplugin:unusedmethods cui Change-Id: I8a4cb855054c487d7a8307ad219f10b06db3248b diff --git a/compilerplugins/clang/unusedmethodsremove.cxx b/compilerplugins/clang/unusedmethodsremove.cxx index 01b71b1..758b8a1 100644 --- a/compilerplugins/clang/unusedmethodsremove.cxx +++ b/compilerplugins/clang/unusedmethodsremove.cxx @@ -121,11 +121,16 @@ bool UnusedMethodsRemove::VisitCXXMethodDecl( const CXXMethodDecl* functionDecl if(!(found < mmappedData + mmapFilesize)) { return true; } - // sometimes the declaration has a semicolon just after it, and it's much neater to remove that too. SourceRange replaceRange(functionDecl->getSourceRange()); + // sometimes the declaration has a semicolon just after it, and it's much neater to remove that too. if (rewriter->getRewrittenText(SourceRange(replaceRange.getEnd(), replaceRange.getEnd().getLocWithOffset(1))) == ";") { replaceRange.setEnd(replaceRange.getEnd().getLocWithOffset(1)); } + // remove leading spaces + while (rewriter->getRewrittenText(SourceRange(replaceRange.getBegin().getLocWithOffset(-1), replaceRange.getBegin())) == " ") + { + replaceRange.setBegin(replaceRange.getBegin().getLocWithOffset(-1)); + } if (!replaceText(replaceRange, "")) { report( DiagnosticsEngine::Warning, diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index f554062..5f86a6e 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -251,7 +251,6 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle) SfxConfigFunctionListBox::SfxConfigFunctionListBox(vcl::Window* pParent, WinBits nStyle) : SvTreeListBox( pParent, nStyle ) - , pCurEntry( 0 ) , pStylesInfo( 0 ) { SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT ); diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx index d50b851..646f70b 100644 --- a/cui/source/dialogs/SpellAttrib.hxx +++ b/cui/source/dialogs/SpellAttrib.hxx @@ -131,9 +131,6 @@ public: virtual ~SpellLanguageAttrib(); LanguageType GetLanguage() const {return m_eLanguage;} - void SetLanguage(LanguageType eLang) - {m_eLanguage = eLang;} - virtual void SetFont( vcl::Font& rFont ) const SAL_OVERRIDE; virtual TextAttrib* Clone() const SAL_OVERRIDE; @@ -153,10 +150,6 @@ public: SpellBackgroundAttrib( const SpellBackgroundAttrib& rAttr ); virtual ~SpellBackgroundAttrib(); - const Color& GetColor() const { return m_aBackgroundColor;} - void SetColor( const Color& rNewCol ){m_aBackgroundColor = rNewCol;} - - virtual void SetFont( vcl::Font& rFont ) const SAL_OVERRIDE; virtual TextAttrib* Clone() const SAL_OVERRIDE; virtual bool operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE; diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 778a69a..ab539a6 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -819,17 +819,6 @@ IMPL_LINK(SpellDialog, LanguageSelectHdl, SvxLanguageBox*, pBox) } -void SpellDialog::SetLanguage( sal_uInt16 nLang ) -/* - Description: - If the language has been changed in thesaurus, - it must be changed here, too. -*/ -{ - SetTitle_Impl( nLang ); - m_pLanguageLB->SelectLanguage( nLang ); -} - void SpellDialog::SetTitle_Impl(LanguageType nLang) { OUString sTitle = rParent.HasGrammarChecking() ? m_sTitleSpellingGrammar : m_sTitleSpelling; diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 38a08cf..0d927e4 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -221,7 +221,6 @@ public: virtual ~SpellDialog(); virtual void dispose() SAL_OVERRIDE; - void SetLanguage( sal_uInt16 nLang ); virtual bool Close() SAL_OVERRIDE; void InvalidateDialog(); diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index a41bb4f..4a31d77 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -74,8 +74,6 @@ public: { m_pAccelConfigPage = pAccelConfigPage; } - - void ReplaceEntry( sal_uInt16 nPos, const OUString &rStr ); }; // class SfxAcceleratorConfigPage ---------------------------------------- diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 206c083..e42a10e 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -166,8 +166,6 @@ private: static void SetDefaultData( MenuSaveInData* pData ) {pDefaultData = pData;} static MenuSaveInData* GetDefaultData() { return pDefaultData; } - void Apply( bool bDefault ); - void Apply( SvxConfigEntry* pRootEntry, com::sun::star::uno::Reference< @@ -258,19 +256,13 @@ public: ~SvxConfigEntry(); const OUString& GetCommand() const { return aCommand; } - void SetCommand( const OUString& rCmd ) { aCommand = rCmd; } const OUString& GetName() const { return aLabel; } - void SetName( const OUString& rStr ) { aLabel = rStr; bStrEdited = true; } - bool HasChangedName() const { return bStrEdited; } - - const OUString& GetHelpText() ; - void SetHelpText( const OUString& rStr ) { aHelpText = rStr; } + void SetName( const OUString& rStr ) { aLabel = rStr; bStrEdited = true; } + bool HasChangedName() const { return bStrEdited; } - const OUString& GetHelpURL() const { return aHelpURL; } - void SetHelpURL( const OUString& rStr ) { aHelpURL = rStr; } + const OUString& GetHelpText(); - void SetPopup( bool bOn = true ) { bPopUp = bOn; } bool IsPopup() const { return bPopUp; } void SetUserDefined( bool bOn = true ) { bIsUserDefined = bOn; } @@ -281,7 +273,6 @@ public: SvxEntries* GetEntries() const { return mpEntries; } void SetEntries( SvxEntries* entries ) { mpEntries = entries; } - bool HasEntries() const { return mpEntries != NULL; } void SetMain( bool bValue = true ) { bIsMain = bValue; } bool IsMain() { return bIsMain; } @@ -353,9 +344,6 @@ private: DECL_LINK( SelectSaveInLocation, ListBox * ); DECL_LINK( AsyncInfoMsg, OUString* ); - bool SwapEntryData( SvTreeListEntry* pSourceEntry, SvTreeListEntry* pTargetEntry ); - void AlignControls(); - protected: // the top section of the tab page where top level menus and toolbars @@ -524,7 +512,6 @@ public: virtual void dispose() SAL_OVERRIDE; SvxEntries* GetEntries() { return mpEntries;} - void SetEntries( SvxEntries* ); SvxConfigEntry* GetSelectedEntry(); }; @@ -550,9 +537,6 @@ public: virtual ~SvxToolbarEntriesListBox(); virtual void dispose() SAL_OVERRIDE; - Size GetCheckBoxPixelSize() const - { return m_aCheckBoxImageSizePixel; } - virtual TriState NotifyMoving( SvTreeListEntry*, SvTreeListEntry*, SvTreeListEntry*&, sal_uLong& ) SAL_OVERRIDE; @@ -679,11 +663,6 @@ public: { return m_pEdtName->GetText(); } - - void SetEditHelpId( const OString& aHelpId) - { - m_pEdtName->SetHelpId(aHelpId); - } }; struct SvxIconSelectorToolBoxItem diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index c6ba6ea..93d151d 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -98,7 +98,6 @@ typedef boost::ptr_vector<SfxGroupInfo_Impl> SfxGroupInfoArr_Impl; class SfxConfigFunctionListBox : public SvTreeListBox { friend class SfxConfigGroupListBox; - SvTreeListEntry* pCurEntry; SfxGroupInfoArr_Impl aArr; SfxStylesInfo_Impl* pStylesInfo; @@ -111,7 +110,6 @@ public: void ClearAll(); using Window::GetHelpText; - OUString GetHelpText( SvTreeListEntry *pEntry ); OUString GetCurCommand(); OUString GetCurLabel(); OUString GetSelectedScriptURI(); @@ -166,7 +164,6 @@ public: bool bEventMode); void SetFunctionListBox( SfxConfigFunctionListBox *pBox ) { pFunctionListBox = pBox; } - void Open( SvTreeListEntry*, bool ); void GroupSelected(); void SelectMacro( const SfxMacroInfoItem* ); void SelectMacro( const OUString&, const OUString& ); diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index a238440..ee9697d 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -233,7 +233,6 @@ public: virtual void dispose() SAL_OVERRIDE; void SetXChgData( ExchangeData* pData ); - const ExchangeData* GetXChgData() const { return pData; } static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); }; diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index 1d1fb70..74a481f 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -198,7 +198,6 @@ public: virtual void dispose() SAL_OVERRIDE; virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; - RECT_POINT GetLightSource() const { return mpCtlLight->GetActualRP(); } }; #endif diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 4b00e3e..8fefdd1 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -86,18 +86,15 @@ public: { mpNewGradientList = pGrdLst; } XGradientListRef GetNewGradientList() const { return mpNewGradientList; } - const XGradientListRef GetGradientList() const { return mpGradientList; } void SetNewHatchingList( XHatchListRef pHtchLst) { mpNewHatchingList = pHtchLst; } XHatchListRef GetNewHatchingList() const { return mpNewHatchingList; } - const XHatchListRef GetHatchingList() const { return mpHatchingList; } void SetNewBitmapList( XBitmapListRef pBmpLst) { mpNewBitmapList = pBmpLst; } XBitmapListRef GetNewBitmapList() const { return mpNewBitmapList; } - const XBitmapListRef GetBitmapList() const { return mpBitmapList; } }; /************************************************************************/ @@ -374,7 +371,6 @@ public: void SetAreaTP( bool* pIn ) { pbAreaTP = pIn; } void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; } virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; - void DisablePage( bool bIn ) { bDisable = bIn; } }; /************************************************************************/ diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index d659409..e66b4b5 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -68,13 +68,11 @@ public: void SetNewDashList( XDashListRef pInLst) { pNewDashList = pInLst; } - XDashListRef GetNewDashList() const { return pNewDashList; } - XDashListRef GetDashList() const { return pDashList; } + XDashListRef GetNewDashList() const { return pNewDashList; } void SetNewLineEndList( XLineEndListRef pInLst) { pNewLineEndList = pInLst; } - XLineEndListRef GetNewLineEndList() const { return pNewLineEndList; } - XLineEndListRef GetLineEndList() const { return pLineEndList; } + XLineEndListRef GetNewLineEndList() const { return pNewLineEndList; } void SetNewColorList( XColorListRef pColTab ) { mpNewColorList = pColTab; } XColorListRef GetNewColorList() const { return mpNewColorList; } diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index ccc5ccf..d093de9 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -89,7 +89,6 @@ namespace svx virtual void dispose() SAL_OVERRIDE; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); - static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx index 46e1812..ffb78dc 100644 --- a/cui/source/inc/dstribut.hxx +++ b/cui/source/inc/dstribut.hxx @@ -47,8 +47,6 @@ public: virtual ~SvxDistributePage(); virtual void dispose() SAL_OVERRIDE; - static VclPtr<SfxTabPage> Create(vcl::Window*, const SfxItemSet&, - SvxDistributeHorizontal eHor, SvxDistributeVertical eVer); virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE; virtual void Reset(const SfxItemSet*) SAL_OVERRIDE; virtual void PointChanged(vcl::Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE; diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index 47ac000..b565def 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -39,15 +39,12 @@ public: virtual void Resize() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; - void SetTopLeft( const Point& rNew ) { aTopLeft = rNew; } void SetTop( long nVal ) { aTopLeft.X() = nVal; } void SetBottom( long nVal ) { aBottomRight.X() = nVal; } void SetLeft( long nVal ) { aTopLeft.Y() = nVal; } void SetRight( long nVal) { aBottomRight.Y() = nVal; } - void SetBottomRight(const Point& rNew ) { aBottomRight = rNew; } void SetFrameSize( const Size& rSz ); void SetGraphic( const Graphic& rGrf ) { aGrf = rGrf; } - const Graphic& GetGraphic() const { return aGrf; } }; class SvxGrfCropPage : public SfxTabPage diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index d758c7a..692e889 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -311,7 +311,6 @@ namespace svx void SetEditText( Edit& _rEdit, sal_uInt16 _nEntryNum ); void EditModify( Edit* _pEdit, sal_uInt8 _nEntryOffset ); - void EditFocusLost( Edit* _pEdit, sal_uInt8 _nEntryOffset ); bool DeleteEntryFromDictionary( const OUString& rEntry, const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionary >& xDict ); diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx index e72b133..1df2992 100644 --- a/cui/source/inc/hldocntp.hxx +++ b/cui/source/inc/hldocntp.hxx @@ -41,8 +41,6 @@ private: DECL_LINK (ClickNewHdl_Impl , void * ); - Image GetImage( sal_uInt16 nId ); - protected: void FillDlgFields(const OUString& rStrURL) SAL_OVERRIDE; void GetCurentItemData ( OUString& rStrURL, OUString& aStrName, diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index 2522ba8..fa5ddb9 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -149,7 +149,6 @@ protected: void ShowMarkWnd (); void HideMarkWnd () { static_cast<vcl::Window*>(mpMarkWnd)->Hide(); } - void InvalidateMarkWnd () { static_cast<vcl::Window*>(mpMarkWnd)->Invalidate(); } SfxDispatcher* GetDispatcher() const; diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 1944cb4..854a3d3 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -75,17 +75,11 @@ private : bool bHasExchangeSupport; VclPtr<IconChoiceDialog> pDialog; - void SetDialog( IconChoiceDialog* pNew ) { pDialog = pNew; } - IconChoiceDialog* GetDialog() const { return pDialog; } - - void SetInputSet( const SfxItemSet* pNew ) { pSet = pNew; } - void ImplInitSettings(); protected : IconChoicePage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet ); - sal_uInt16 GetSlot( sal_uInt16 nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); } sal_uInt16 GetWhich( sal_uInt16 nSlot ) const { return pSet->GetPool()->GetWhich( nSlot ); } public : @@ -111,7 +105,6 @@ public : virtual void ActivatePage( const SfxItemSet& ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - void SetUserData(const OUString& rString) { aUserString = rString; } OUString GetUserData() { return aUserString; } virtual bool QueryClose(); @@ -166,7 +159,6 @@ protected : virtual void PageCreated( sal_uInt16 nId, IconChoicePage& rPage ); static SfxItemSet* CreateInputItemSet( sal_uInt16 nId ); - inline SfxItemSet* GetInputSetImpl() { return const_cast<SfxItemSet*>(pSet); } inline IconChoicePage* GetTabPage( sal_uInt16 nPageId ) { return ( GetPageData (nPageId)->pPage ? GetPageData (nPageId)->pPage.get() : NULL); } static void RefreshInputSet(); @@ -192,13 +184,12 @@ public : bool bItemsOnDemand = false, sal_uLong nPos = TREELIST_APPEND ); void SetCurPageId( sal_uInt16 nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); } - sal_uInt16 GetCurPageId() const { return mnCurrentPageId; } + sal_uInt16 GetCurPageId() const { return mnCurrentPageId; } void ShowPage( sal_uInt16 nId ); /// gives via map converted local slots if applicable const sal_uInt16* GetInputRanges( const SfxItemPool& ); void SetInputSet( const SfxItemSet* pInSet ); - const SfxItemSet* GetOutputItemSet() const { return pOutSet; } const OKButton& GetOKButton() const { return *m_pOKBtn; } OKButton& GetOKButton() { return *m_pOKBtn; } @@ -206,14 +197,10 @@ public : PushButton& GetApplyButton() { return *m_pApplyBtn; } const CancelButton& GetCancelButton() const { return *m_pCancelBtn; } CancelButton& GetCancelButton() { return *m_pCancelBtn; } - const HelpButton& GetHelpButton() const { return *m_pHelpBtn; } - HelpButton& GetHelpButton() { return *m_pHelpBtn; } short Execute() SAL_OVERRIDE; void Start( bool bShow = true ); - bool QueryClose(); - - const SfxItemSet* GetExampleSet() const { return pExampleSet; } + bool QueryClose(); void SetCtrlStyle(); }; diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index fb5baa9..54915ab 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -86,8 +86,6 @@ class SvBaseLinksDlg : public ModalDialog OUString& Autolink() { return aStrAutolink; } OUString& Manuallink() { return aStrManuallink; } OUString& Brokenlink() { return aStrBrokenlink; } - OUString& Graphiclink() { return aStrGraphiclink; } - OUString& Buttonclose() { return aStrButtonclose; } OUString& Closelinkmsg() { return aStrCloselinkmsg; } OUString& CloselinkmsgMulti() { return aStrCloselinkmsgMulti; } OUString& Waitinglink() { return aStrWaitinglink; } diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 9cb85a1..eb54a55 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -61,9 +61,6 @@ public: void AddEvent( const OUString & rEventName, sal_uInt16 nEventId ); - const SvxMacroTableDtor& GetMacroTable() const; - void SetMacroTable( const SvxMacroTableDtor& rTbl ); - void ScriptChanged(); virtual void PageCreated (const SfxAllItemSet& aSet) SAL_OVERRIDE; using TabPage::ActivatePage; // FIXME WTF is this nonsense? @@ -77,16 +74,6 @@ public: bool IsReadOnly() const SAL_OVERRIDE; }; -inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTable() const -{ - return aTbl; -} - -inline void _SfxMacroTabPage::SetMacroTable( const SvxMacroTableDtor& rTbl ) -{ - aTbl = rTbl; -} - class SfxMacroTabPage : public _SfxMacroTabPage { public: diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 21c9753..161ea48 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -55,18 +55,12 @@ class SvxNumberingPreview : public vcl::Window void SetNumRule(const SvxNumRule* pNum) {pActNum = pNum; Invalidate();}; - void SetPageWidth(long nPgWidth) - {nPageWidth = nPgWidth;} - void SetOutlineNames(const OUString* pNames) - {pOutlineNames = pNames;} void SetPositionMode() { bPosition = true;} void SetLevel(sal_uInt16 nSet) {nActLevel = nSet;} }; - - struct SvxNumSettings_Impl { short nNumberType; @@ -118,8 +112,6 @@ public: virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - - void SetNumCharFmtName(const OUString& rName){sNumCharFmtName = rName;} }; @@ -248,8 +240,6 @@ public: virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - - void SetNumCharFmtName(const OUString& rName){sNumCharFmtName = rName;} }; diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index 398a199..ce0940f 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -145,10 +145,6 @@ private: void RemoveDictEntry(SvTreeListEntry* pEntry); sal_uLong GetLBInsertPos(const OUString &rDicWord); -protected: - -// virtual void Paint( const Rectangle& rRect ); - public: SvxEditDictionaryDialog( vcl::Window* pParent, const OUString& rName, @@ -156,8 +152,6 @@ public: ::com::sun::star::linguistic2::XSpellChecker1> &xSpl ); virtual ~SvxEditDictionaryDialog(); virtual void dispose() SAL_OVERRIDE; - - sal_uInt16 GetSelectedDict() {return pAllDictsLB->GetSelectEntryPos();} }; #endif diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index d793485..4158d02 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -73,7 +73,6 @@ public: virtual void dispose() SAL_OVERRIDE; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); - static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx index 0c98b22..b5d6c4c 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.hxx @@ -51,10 +51,8 @@ public: static const sal_uInt16* GetRanges(); const SfxItemSet* GetOutputItemSet() const { return pOutSet; } - Link<> GetPrevHdl() const { return aPrevHdlLink; } void SetPrevHdl( const Link<>& rLink ) { aPrevHdlLink = rLink; } - Link<> GetNextHdl() const { return aNextHdlLink; } void SetNextHdl( const Link<>& rLink ) { aNextHdlLink = rLink; } @@ -76,16 +74,6 @@ public: { m_pInsertAuthor->Hide(); } - void SetReadonlyPostIt(bool bDisable) - { - m_pOKBtn->Enable( !bDisable ); - m_pEditED->SetReadOnly( bDisable ); - m_pAuthorBtn->Enable( !bDisable ); - } - bool IsOkEnabled() const - { - return m_pOKBtn->IsEnabled(); - } private: VclPtr<FixedText> m_pLastEditFT; diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 5abe86f..2e0227a 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -66,7 +66,6 @@ private: static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, OUString& docName ); protected: - void ExpandTree( SvTreeListEntry* pRootEntry ); virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE; virtual void ExpandedHdl() SAL_OVERRIDE; virtual bool ExpandingHdl() SAL_OVERRIDE; @@ -126,7 +125,6 @@ public: virtual ~SFEntry() {} ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > GetNode() { return nodes ;} ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModel() { return model ;}; - sal_uInt8 GetType() const { return nType; } bool isLoaded() const { return loaded; } void setLoaded() { loaded=true; } }; diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 6d0e7da..f8bd35c 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -162,7 +162,6 @@ public: void Init(bool bShowSlots, const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame >& xFrame); - void Open( SvTreeListEntry*, bool ); void ClearAll(); void GroupSelected(); diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index 875b4d2..e0d2378 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -84,8 +84,6 @@ public: virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; - - void Construct(); }; /************************************************************************* diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index 4f1ebe0..f68b4df 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -167,7 +167,6 @@ public: void SetWindowTitle( LanguageType nLanguage ); OUString GetWord(); - sal_uInt16 GetLanguage() const { return nLookUpLanguage;} }; #endif diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 2945d28..10bc671 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -117,7 +117,6 @@ private: SfxMapUnit mePoolUnit; FieldUnit meDlgUnit; - MapUnit meMapUnit; TriState mnProtectSizeState; bool mbPageDisabled; bool mbProtectDisabled; @@ -142,8 +141,6 @@ private: DECL_LINK( ClickSizeProtectHdl, void * ); DECL_LINK( ClickAutoHdl, void * ); - void SetMaxSize( Rectangle aRect ); - public: SvxPositionSizeTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxPositionSizeTabPage(); diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 63ffc2c..0ec5697 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -144,7 +144,6 @@ class OfaTreeOptionsDialog : public SfxModalDialog { private: SvTreeListEntry* pCurrentPageEntry; - bool hasTreePendingLayout() const; VclPtr<OKButton> pOkPB; VclPtr<PushButton> pBackPB; diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx index 899c3f3..376d6f0 100644 --- a/cui/source/options/doclinkdialog.hxx +++ b/cui/source/options/doclinkdialog.hxx @@ -54,7 +54,6 @@ namespace svx // the validator link gets a pointer to a String, and should return 0 if the string is not // acceptable void setNameValidator( const Link<>& _rValidator ) { m_aNameValidator = _rValidator; } - Link<> getNameValidator( ) const { return m_aNameValidator; } void setLink( const OUString& _rName, const OUString& _rURL ); void getLink( OUString& _rName, OUString& _rURL ) const; diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index f89b173..90e0e60 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -46,9 +46,6 @@ class SvxFontSubstCheckListBox : public SvSimpleTable { } - inline void *GetUserData(sal_uLong nPos) { return GetEntry(nPos)->GetUserData(); } - inline void SetUserData(sal_uLong nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); } - bool IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0); static bool IsChecked(SvTreeListEntry* pEntry, sal_uInt16 nCol = 0); void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, bool bChecked); diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx index ac14dbd..e3ae1ca 100644 --- a/cui/source/tabpages/dstribut.cxx +++ b/cui/source/tabpages/dstribut.cxx @@ -100,18 +100,6 @@ void SvxDistributePage::dispose() } -/************************************************************************* -|* -|* create the tabpage -|* -\************************************************************************/ - -VclPtr<SfxTabPage> SvxDistributePage::Create(vcl::Window* pWindow, const SfxItemSet& rAttrs, - SvxDistributeHorizontal eHor, SvxDistributeVertical eVer) -{ - return VclPtr<SvxDistributePage>::Create(pWindow, rAttrs, eHor, eVer); -} - void SvxDistributePage::PointChanged(vcl::Window* /*pWindow*/, RECT_POINT /*eRP*/) { } diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index a597944..62199fd 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -611,7 +611,6 @@ SvxPositionSizeTabPage::SvxPositionSizeTabPage(vcl::Window* pParent, const SfxIt , mrOutAttrs(rInAttrs) , mpView(NULL) , meDlgUnit(FUNIT_NONE) - , meMapUnit(MAP_100TH_MM) , mnProtectSizeState(TRISTATE_FALSE) , mbPageDisabled(false) , mbProtectDisabled(false) commit 956cb1f777db6eb4cec6fc4c4ed3b2fc87ee1672 Author: Noel Grandin <n...@peralex.com> Date: Thu Jul 16 15:15:07 2015 +0200 loplugin:unusedmethods desktop Change-Id: I78d4cd362bebde05e5bec55eff5e38603cb3f813 diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index ccab1f9..a7159e1 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -112,8 +112,6 @@ class Desktop : public Application return m_aBootstrapStatus; } - static bool isCrashReporterEnabled(); - // first-start (ever) related methods static bool CheckExtensionDependencies(); @@ -133,13 +131,11 @@ class Desktop : public Application static void CreateTemporaryDirectory(); static void RemoveTemporaryDirectory(); - bool InitializeInstallation( const OUString& rAppFilename ); static bool InitializeConfiguration(); static void FlushConfiguration(); static bool InitializeQuickstartMode( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); static void HandleBootstrapPathErrors( ::utl::Bootstrap::Status, const OUString& aMsg ); - void StartSetup( const OUString& aParameters ); // Create a error message depending on bootstrap failure code and an optional file url static OUString CreateErrorMsgString( utl::Bootstrap::FailureCode nFailureCode, diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx index 4b99407..e50372b 100644 --- a/desktop/source/app/dispatchwatcher.hxx +++ b/desktop/source/app/dispatchwatcher.hxx @@ -41,11 +41,6 @@ namespace desktop class DispatchWatcherHashMap : public std::unordered_map< OUString, sal_Int32, OUStringHash, std::equal_to< OUString > > { - public: - inline void free() - { - DispatchWatcherHashMap().swap( *this ); // get rid of reserved capacity - } }; class DispatchWatcher : public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XDispatchResultListener > diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h index b99099f..468b14b 100644 --- a/desktop/source/deployment/gui/dp_gui.h +++ b/desktop/source/deployment/gui/dp_gui.h @@ -73,7 +73,6 @@ public: {} virtual ~SelectedPackage(); - ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage> getPackage() const { return m_xPackage; } private: SelectedPackage(SelectedPackage &) SAL_DELETED_FUNCTION; diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index bc2319f..3ff60b1 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -1190,8 +1190,6 @@ UpdateRequiredDialog::UpdateRequiredDialog(vcl::Window *pParent, TheExtensionMan , m_bProgressChanged(false) , m_bStartProgress(false) , m_bStopProgress(false) - , m_bUpdateWarning(false) - , m_bDisableWarning(false) , m_bHasLockedEntries(false) , m_nProgress(0) , m_pManager(pManager) diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 97be277..d18f86b 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -191,8 +191,6 @@ class UpdateRequiredDialog : public ModalDialog, bool m_bProgressChanged; bool m_bStartProgress; bool m_bStopProgress; - bool m_bUpdateWarning; - bool m_bDisableWarning; bool m_bHasLockedEntries; long m_nProgress; Idle m_aIdle; @@ -230,15 +228,9 @@ public: virtual long addPackageToList( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &, bool bLicenseMissing = false ) SAL_OVERRIDE; bool enablePackage( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage, bool bEnable ); - bool updatePackage( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage ); virtual void prepareChecking() SAL_OVERRIDE; virtual void checkEntries() SAL_OVERRIDE; - - ::com::sun::star::uno::Sequence< OUString > raiseAddPicker(); - - bool installForAllUsers( bool &bInstallForAll ) const; - bool installExtensionWarn( const OUString &rExtensionURL ) const; }; diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index 0d5ca8f..bb8d946 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -158,7 +158,6 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox long GetTotalHeight() const; void SetupScrollBar(); void DrawRow(vcl::RenderContext& rRenderContext, const Rectangle& rRect, const TEntry_Impl& rEntry); - bool HandleTabKey( bool bReverse ); bool HandleCursorKey( sal_uInt16 nKeyCode ); bool FindEntryPos( const TEntry_Impl& rEntry, long nStart, long nEnd, long &nFound ); void DeleteRemoved(); @@ -205,10 +204,8 @@ public: void prepareChecking(); void checkEntries(); - TheExtensionManager* getExtensionManager() const { return m_pManager; } void setExtensionManager(TheExtensionManager* pManager) { m_pManager = pManager; } - //These functions are used for automatic testing /** @return The count of the entries in the list box. */ diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index 2663e22..7227adc 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -508,8 +508,6 @@ UpdateDialog::UpdateDialog( m_thread( new UpdateDialog::Thread( context, *this, vExtensionList)), - m_nFirstLineDelta(0), - m_nOneLineMissing(0), m_nLastID(1), m_bModified( false ) // TODO: check! diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index 76851b4..806fd98 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -158,7 +158,6 @@ private: bool showDescription( ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > const & aUpdateInfo); bool showDescription( const OUString& rDescription); - bool isReadOnly( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage ) const; DECL_LINK(selectionHandler, void *); DECL_LINK(allHandler, void *); @@ -206,8 +205,6 @@ private: Point m_aFirstLinePos; Size m_aFirstLineSize; - long m_nFirstLineDelta; - long m_nOneLineMissing; sal_uInt16 m_nLastID; bool m_bModified; }; diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx index 4b78c0f..864d04b 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.hxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx @@ -47,9 +47,6 @@ public: explicit ExtensionManager( css::uno::Reference< css::uno::XComponentContext >const& xContext); virtual ~ExtensionManager(); - static css::uno::Sequence< OUString > getServiceNames(); - static OUString getImplName(); - void check(); void fireModified(); diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index e5ee57c..a8364a1 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -336,19 +336,6 @@ protected: static void deleteTempFolder( OUString const & folderUrl); - OUString getSharedRegistrationDataURL( - css::uno::Reference<css::deployment::XPackage> const & extension, - css::uno::Reference<css::deployment::XPackage> const & item); - - /* The backends must implement this function, which is called - from XPackageRegistry::packageRemoved (also implemented here). - This ensure that the backends clean up their registration data - when an extension was removed. - */ -// virtual void deleteDbEntry( OUString const & url) = 0; - - - public: struct StrRegisteringPackage : public ::dp_misc::StaticResourceString< StrRegisteringPackage, RID_STR_REGISTERING_PACKAGE> {}; diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx index 6b0fc45..f55c543 100644 --- a/desktop/source/migration/migration_impl.hxx +++ b/desktop/source/migration/migration_impl.hxx @@ -237,7 +237,6 @@ public: ~MigrationImpl(); bool initializeMigration(); bool doMigration(); - OUString getOldVersionName(); }; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits