diff options
author | Noel Grandin <noel@peralex.com> | 2015-04-07 16:18:28 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-04-09 11:01:06 +0200 |
commit | 14505bb67eb671ebcb91c81cbefbbc1aab930b44 (patch) | |
tree | 0ad2166f5c6c95d01f2f7204b13aaa0ca8119acc /include | |
parent | 6ea42ddf8f06b7551e80a906908dbad0766a68c6 (diff) |
loplugin:staticmethods
Change-Id: I715374b531da2850434b2436633b6042ecb9ebe0
Diffstat (limited to 'include')
-rw-r--r-- | include/svtools/addresstemplate.hxx | 2 | ||||
-rw-r--r-- | include/svtools/brwbox.hxx | 2 | ||||
-rw-r--r-- | include/svtools/ctrltool.hxx | 4 | ||||
-rw-r--r-- | include/svtools/editbrowsebox.hxx | 2 | ||||
-rw-r--r-- | include/svtools/fileview.hxx | 2 | ||||
-rw-r--r-- | include/svtools/grfmgr.hxx | 4 | ||||
-rw-r--r-- | include/svtools/htmlcfg.hxx | 2 | ||||
-rw-r--r-- | include/svtools/imap.hxx | 12 | ||||
-rw-r--r-- | include/svtools/imapobj.hxx | 4 | ||||
-rw-r--r-- | include/svtools/ivctrl.hxx | 4 | ||||
-rw-r--r-- | include/svtools/popupmenucontrollerbase.hxx | 4 | ||||
-rw-r--r-- | include/svtools/svlbitm.hxx | 6 | ||||
-rw-r--r-- | include/svtools/svtabbx.hxx | 4 | ||||
-rw-r--r-- | include/svtools/treelist.hxx | 22 | ||||
-rw-r--r-- | include/svtools/treelistbox.hxx | 12 |
15 files changed, 43 insertions, 43 deletions
diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index 020d38c70e55..d771efb5e473 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -113,7 +113,7 @@ namespace svt // implementations void implScrollFields(sal_Int32 _nPos, bool _bAdjustFocus, bool _bAdjustScrollbar); - void implSelectField(ListBox* _pBox, const OUString& _rText); + static void implSelectField(ListBox* _pBox, const OUString& _rText); void initalizeListBox(ListBox* _pList); void resetTables(); diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 009b4242c508..9248d6134667 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -458,7 +458,7 @@ public: virtual void CursorMoved(); virtual void ColumnMoved( sal_uInt16 nColId ); virtual void ColumnResized( sal_uInt16 nColId ); - long QueryColumnResize( sal_uInt16 nColId, long nWidth ); + static long QueryColumnResize( sal_uInt16 nColId, long nWidth ); /// called when the row height has been changed interactively virtual void RowHeightChanged(); virtual long QueryMinimumRowHeight(); diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx index 4cecae8859cd..23f07b093c14 100644 --- a/include/svtools/ctrltool.hxx +++ b/include/svtools/ctrltool.hxx @@ -191,8 +191,8 @@ public: } const vcl::FontInfo& GetFontName( sal_uInt16 nFont ) const; sal_Handle GetFirstFontInfo( const OUString& rName ) const; - sal_Handle GetNextFontInfo( sal_Handle hFontInfo ) const; - const vcl::FontInfo& GetFontInfo( sal_Handle hFontInfo ) const; + static sal_Handle GetNextFontInfo( sal_Handle hFontInfo ); + static const vcl::FontInfo& GetFontInfo( sal_Handle hFontInfo ); const sal_IntPtr* GetSizeAry( const vcl::FontInfo& rInfo ) const; static const sal_IntPtr* GetStdSizeAry() { return aStdSizeAry; } diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 9d39b57e0d22..30789c325c56 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -661,7 +661,7 @@ namespace svt using Control::ImplInitSettings; SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SVT_DLLPRIVATE void DetermineFocus( const sal_uInt16 _nGetFocusFlags = 0); - inline void HideAndDisable(CellControllerRef& rController); + static inline void HideAndDisable(CellControllerRef& rController); inline void EnableAndShow() const; SVT_DLLPRIVATE void implActivateCellOnMouseEvent(const BrowserMouseEvent& _rEvt, bool _bUp); diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx index f8fc70b0cc63..b123f14a5c41 100644 --- a/include/svtools/fileview.hxx +++ b/include/svtools/fileview.hxx @@ -86,7 +86,7 @@ public: virtual Size GetOptimalSize() const SAL_OVERRIDE; const OUString& GetViewURL() const; - OUString GetURL( SvTreeListEntry* pEntry ) const; + static OUString GetURL( SvTreeListEntry* pEntry ); OUString GetCurrentURL() const; bool GetParentURL( OUString& _rParentURL ) const; diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 57dd14c207ae..f75db3dfb471 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -535,7 +535,7 @@ private: bool& rCached ); - bool SVT_DLLPRIVATE ImplCreateOutput( + static bool SVT_DLLPRIVATE ImplCreateOutput( OutputDevice* pOut, const Point& rPt, const Size& rSz, @@ -544,7 +544,7 @@ private: const sal_uLong nFlags, BitmapEx* pBmpEx = NULL ); - bool SVT_DLLPRIVATE ImplCreateOutput( + static bool SVT_DLLPRIVATE ImplCreateOutput( OutputDevice* pOut, const Point& rPt, const Size& rSz, diff --git a/include/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx index b26391755b78..272dc98f80bd 100644 --- a/include/svtools/htmlcfg.hxx +++ b/include/svtools/htmlcfg.hxx @@ -38,7 +38,7 @@ struct HtmlOptions_Impl; class SVT_DLLPUBLIC SvxHtmlOptions : public utl::ConfigItem { HtmlOptions_Impl*pImp; - const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); + static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); void Load( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ); void CallListeners(); diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx index adc0a08b0ada..8255cb7bf9cc 100644 --- a/include/svtools/imap.hxx +++ b/include/svtools/imap.hxx @@ -53,15 +53,15 @@ protected: sal_uLong ImpReadNCSA( SvStream& rOStm, const OUString& rBaseURL ); void ImpReadCERNLine( const OString& rLine, const OUString& rBaseURL ); - Point ImpReadCERNCoords( const char** ppStr ); - long ImpReadCERNRadius( const char** ppStr ); - OUString ImpReadCERNURL( const char** ppStr, const OUString& rBaseURL ); + static Point ImpReadCERNCoords( const char** ppStr ); + static long ImpReadCERNRadius( const char** ppStr ); + static OUString ImpReadCERNURL( const char** ppStr, const OUString& rBaseURL ); void ImpReadNCSALine( const OString& rLine, const OUString& rBaseURL ); - OUString ImpReadNCSAURL( const char** ppStr, const OUString& rBaseURL ); - Point ImpReadNCSACoords( const char** ppStr ); + static OUString ImpReadNCSAURL( const char** ppStr, const OUString& rBaseURL ); + static Point ImpReadNCSACoords( const char** ppStr ); - sal_uLong ImpDetectFormat( SvStream& rIStm ); + static sal_uLong ImpDetectFormat( SvStream& rIStm ); public: diff --git a/include/svtools/imapobj.hxx b/include/svtools/imapobj.hxx index 633945614538..5fcd543e6383 100644 --- a/include/svtools/imapobj.hxx +++ b/include/svtools/imapobj.hxx @@ -69,9 +69,9 @@ protected: virtual void ReadIMapObject( SvStream& rIStm ) = 0; // helper methods - void AppendCERNCoords(OStringBuffer& rBuf, const Point& rPoint100) const; + static void AppendCERNCoords(OStringBuffer& rBuf, const Point& rPoint100); void AppendCERNURL(OStringBuffer& rBuf, const OUString& rBaseURL) const; - void AppendNCSACoords(OStringBuffer& rBuf, const Point& rPoint100) const; + static void AppendNCSACoords(OStringBuffer& rBuf, const Point& rPoint100); void AppendNCSAURL(OStringBuffer&rBuf, const OUString& rBaseURL) const; public: diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index b8e54755665d..db64201768b5 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -242,12 +242,12 @@ protected: virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - void DrawEntryImage( + static void DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, OutputDevice& rDev ); - OUString GetEntryText( + static OUString GetEntryText( SvxIconChoiceCtrlEntry* pEntry, bool bInplaceEdit ); diff --git a/include/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx index 739969500232..60dd06511029 100644 --- a/include/svtools/popupmenucontrollerbase.hxx +++ b/include/svtools/popupmenucontrollerbase.hxx @@ -107,10 +107,10 @@ namespace svt */ virtual void SAL_CALL disposing() SAL_OVERRIDE; - void resetPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); + static void resetPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); virtual void impl_setPopupMenu(); virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL); - OUString determineBaseURL( const OUString& aURL ); + static OUString determineBaseURL( const OUString& aURL ); DECL_STATIC_LINK( PopupMenuControllerBase, ExecuteHdl_Impl, PopupMenuControllerBaseDispatchInfo* ); diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx index e0cd847fe426..263e7a04cd3c 100644 --- a/include/svtools/svlbitm.hxx +++ b/include/svtools/svlbitm.hxx @@ -77,7 +77,7 @@ public: ~SvLBoxButtonData(); - SvBmp GetIndex( SvItemStateFlags nItemState ); + static SvBmp GetIndex( SvItemStateFlags nItemState ); long Width(); long Height(); void SetLink( const Link& rLink) { aLink=rLink; } @@ -87,7 +87,7 @@ public: void CallLink(); void StoreButtonState( SvTreeListEntry* pEntry, SvItemStateFlags nItemFlags ); - SvButtonState ConvertToButtonState( SvItemStateFlags nItemFlags ) const; + static SvButtonState ConvertToButtonState( SvItemStateFlags nItemFlags ); SvButtonState GetActButtonState() const { return eState; } @@ -159,7 +159,7 @@ class SVT_DLLPUBLIC SvLBoxButton : public SvLBoxItem SvLBoxButtonKind eKind; SvItemStateFlags nItemFlags; - void ImplAdjustBoxSize( Size& io_rCtrlSize, ControlType i_eType, vcl::Window* pParent ); + static void ImplAdjustBoxSize( Size& io_rCtrlSize, ControlType i_eType, vcl::Window* pParent ); public: // An SvLBoxButton can be of three different kinds: an // enabled checkbox (the normal kind), a disabled checkbox diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index b9239404ad21..92c04fc489da 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -94,7 +94,7 @@ public: sal_uLong nPos = TREELIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); virtual OUString GetEntryText( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; - OUString GetEntryText( SvTreeListEntry*, sal_uInt16 nCol ) const; + static OUString GetEntryText( SvTreeListEntry*, sal_uInt16 nCol ); OUString GetEntryText( sal_uLong nPos, sal_uInt16 nCol = 0xffff ) const; using SvTreeListBox::SetEntryText; void SetEntryText(const OUString&, sal_uLong, sal_uInt16 nCol=0xffff); @@ -143,7 +143,7 @@ public: virtual void Paint( const Rectangle& ) SAL_OVERRIDE; void InitHeaderBar( HeaderBar* pHeaderBar ); - bool IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol ) const; + static bool IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol ); virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, sal_uLong nPos = TREELIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ) SAL_OVERRIDE; diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx index 79b6ff640c19..22689dcf844c 100644 --- a/include/svtools/treelist.hxx +++ b/include/svtools/treelist.hxx @@ -100,12 +100,12 @@ class SVT_DLLPUBLIC SvTreeList SvTreeListEntry* PrevSelected( const SvListView*,SvTreeListEntry* pEntry ) const; SvTreeListEntry* LastSelected( const SvListView*) const; - bool Select( SvListView*,SvTreeListEntry* pEntry, bool bSelect=true ); + static bool Select( SvListView*,SvTreeListEntry* pEntry, bool bSelect=true ); void SelectAll( SvListView*, bool bSelect ); // Does not call Select Handler sal_uLong GetChildSelectionCount( const SvListView*,SvTreeListEntry* pParent ) const; - void Expand( SvListView*,SvTreeListEntry* pParent ); - void Collapse( SvListView*,SvTreeListEntry* pParent ); + static void Expand( SvListView*,SvTreeListEntry* pParent ); + static void Collapse( SvListView*,SvTreeListEntry* pParent ); SVT_DLLPRIVATE void SetAbsolutePositions(); @@ -166,9 +166,9 @@ public: SvTreeListEntry* Last() const; SvTreeListEntry* FirstChild( SvTreeListEntry* pParent ) const; - SvTreeListEntry* NextSibling( SvTreeListEntry* pEntry ) const; - SvTreeListEntry* PrevSibling( SvTreeListEntry* pEntry ) const; - SvTreeListEntry* LastSibling( SvTreeListEntry* pEntry ) const; + static SvTreeListEntry* NextSibling( SvTreeListEntry* pEntry ); + static SvTreeListEntry* PrevSibling( SvTreeListEntry* pEntry ); + static SvTreeListEntry* LastSibling( SvTreeListEntry* pEntry ); sal_uLong Insert( SvTreeListEntry* pEntry,SvTreeListEntry* pPar,sal_uLong nPos = TREELIST_APPEND); sal_uLong Insert( SvTreeListEntry* pEntry,sal_uLong nRootPos = TREELIST_APPEND ) @@ -206,7 +206,7 @@ public: GetChildIterators(SvTreeListEntry* pParent); sal_uLong GetAbsPos( const SvTreeListEntry* pEntry ) const; - sal_uLong GetRelPos( const SvTreeListEntry* pChild ) const; + static sal_uLong GetRelPos( const SvTreeListEntry* pChild ); sal_uLong GetChildCount( const SvTreeListEntry* pParent ) const; sal_uInt16 GetDepth( const SvTreeListEntry* pEntry ) const; @@ -225,7 +225,7 @@ public: { return aCloneLink; } SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource ) const; // Calls the Clone Link - SvTreeListEntry* CreateEntry() const; // To create Entries + static SvTreeListEntry* CreateEntry(); // To create Entries sal_uInt16 GetRefCount() const { return nRefCount; } void SetRefCount( sal_uInt16 nRef ) { nRefCount = nRef; } @@ -265,13 +265,13 @@ protected: SvTreeList* pModel; void ExpandListEntry( SvTreeListEntry* pParent ) - { pModel->Expand((SvListView*)this,pParent); } + { SvTreeList::Expand((SvListView*)this,pParent); } void CollapseListEntry( SvTreeListEntry* pParent ) - { pModel->Collapse((SvListView*)this,pParent); } + { SvTreeList::Collapse((SvListView*)this,pParent); } bool SelectListEntry( SvTreeListEntry* pEntry, bool bSelect ) - { return pModel->Select((SvListView*)this,pEntry,bSelect); } + { return SvTreeList::Select((SvListView*)this,pEntry,bSelect); } public: SvListView(); // Sets the Model to 0 diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index bdf27d136ae2..f7c1af30cc4b 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -143,7 +143,7 @@ public: virtual ~SvLBoxItem(); virtual sal_uInt16 GetType() const = 0; const Size& GetSize(const SvTreeListBox* pView, const SvTreeListEntry* pEntry) const; - const Size& GetSize(const SvViewDataEntry* pData, sal_uInt16 nItemPos) const; + static const Size& GetSize(const SvViewDataEntry* pData, sal_uInt16 nItemPos); virtual void Paint( const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) = 0; @@ -368,8 +368,8 @@ public: } SvTreeListEntry* FirstChild( SvTreeListEntry* pParent ) const; - SvTreeListEntry* NextSibling( SvTreeListEntry* pEntry ) const; - SvTreeListEntry* PrevSibling( SvTreeListEntry* pEntry ) const; + static SvTreeListEntry* NextSibling( SvTreeListEntry* pEntry ); + static SvTreeListEntry* PrevSibling( SvTreeListEntry* pEntry ); bool CopySelection( SvTreeListBox* pSource, SvTreeListEntry* pTarget ); bool MoveSelection( SvTreeListBox* pSource, SvTreeListEntry* pTarget ); @@ -476,7 +476,7 @@ public: void SetDragOptions( sal_Int8 nOptions ) { nDragOptions = nOptions; } sal_Int8 GetDragOptions() const { return nDragOptions; } - SvTreeListBox* GetSourceView() const; + static SvTreeListBox* GetSourceView(); virtual SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource ); virtual SvTreeListEntry* CreateEntry() const; // To create new Entries @@ -652,8 +652,8 @@ public: void SetCollapsedEntryBmp( SvTreeListEntry* _pEntry, const Image& _rImage ); virtual OUString GetEntryText( SvTreeListEntry* pEntry ) const; - const Image& GetExpandedEntryBmp(const SvTreeListEntry* _pEntry ) const; - const Image& GetCollapsedEntryBmp(const SvTreeListEntry* _pEntry ) const; + static const Image& GetExpandedEntryBmp(const SvTreeListEntry* _pEntry ); + static const Image& GetCollapsedEntryBmp(const SvTreeListEntry* _pEntry ); void SetCheckButtonHdl( const Link& rLink ) { aCheckButtonHdl=rLink; } Link GetCheckButtonHdl() const { return aCheckButtonHdl; } |