summaryrefslogtreecommitdiff
path: root/fpicker
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-12-06 13:47:28 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-12-06 13:48:58 +0200
commit3531358218fb3bb2691a4a9e49bcff5beeb6eb03 (patch)
tree2d7fa0d2ff772eaad9469e1b4bd631213e88a47b /fpicker
parent57236961bbc280c401b1788532a1934bd66c54d9 (diff)
loplugin:staticmethods
Change-Id: I701dfbe69380b5e4024fe55d0045c909bd4b607a
Diffstat (limited to 'fpicker')
-rw-r--r--fpicker/source/office/PlacesListBox.cxx4
-rw-r--r--fpicker/source/office/PlacesListBox.hxx2
-rw-r--r--fpicker/source/office/iodlg.cxx2
-rw-r--r--fpicker/source/office/iodlg.hxx2
-rw-r--r--fpicker/source/office/iodlgimp.cxx2
5 files changed, 6 insertions, 6 deletions
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index 26844d216ee1..5db9d9880317 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -186,9 +186,9 @@ bool PlacesListBox::EventNotify( NotifyEvent& rNEvt )
Image PlacesListBox::getEntryIcon( const PlacePtr& pPlace )
{
- Image theImage = mpDlg->GetButtonImage( BMP_FILEDLG_PLACE_LOCAL );
+ Image theImage = SvtFileDialog::GetButtonImage( BMP_FILEDLG_PLACE_LOCAL );
if ( !pPlace->IsLocal( ) )
- theImage = mpDlg->GetButtonImage( BMP_FILEDLG_PLACE_REMOTE );
+ theImage = SvtFileDialog::GetButtonImage( BMP_FILEDLG_PLACE_REMOTE );
return theImage;
}
diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx
index ddc92d85243f..be7b48c392ce 100644
--- a/fpicker/source/office/PlacesListBox.hxx
+++ b/fpicker/source/office/PlacesListBox.hxx
@@ -74,7 +74,7 @@ class PlacesListBox : public Control
private:
- Image getEntryIcon( const PlacePtr& pPlace );
+ static Image getEntryIcon( const PlacePtr& pPlace );
DECL_LINK( Selection, SvTreeListBox*, void );
DECL_LINK( DoubleClick, SvTreeListBox*, bool );
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 4877328f8404..b845b261f51a 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -2732,7 +2732,7 @@ IMPL_LINK_NOARG( SvtFileDialog, Split_Hdl, Splitter*, void )
_pSplitter->SetPosPixel( Point( placeSize.Width(), _pSplitter->GetPosPixel().Y() ) );
}
-Image SvtFileDialog::GetButtonImage( sal_uInt16 _nButtonId ) const
+Image SvtFileDialog::GetButtonImage( sal_uInt16 _nButtonId )
{
return Image(BitmapEx(SvtResId(_nButtonId)));
}
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index 0f005f889646..8c74a9f58eac 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -237,7 +237,7 @@ public:
inline void EraseDefaultExt( sal_Int32 _nIndex = 0 );
inline const OUString& GetDefaultExt() const;
- Image GetButtonImage( sal_uInt16 _nButtonId ) const;
+ static Image GetButtonImage( sal_uInt16 _nButtonId );
bool ContentIsFolder( const OUString& rURL ) override { return m_aContent.isFolder( rURL ) && m_aContent.isValid(); }
bool ContentHasParentFolder( const OUString& rURL );
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 7df00c0b42f3..53f0b040ee97 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -94,7 +94,7 @@ SvtFileDialogURLSelector::SvtFileDialogURLSelector( vcl::Window* _pParent, SvtFi
,m_pMenu ( VclPtr<PopupMenu>::Create() )
{
SetStyle( GetStyle() | WB_NOPOINTERFOCUS | WB_RECTSTYLE | WB_SMALLSTYLE );
- SetModeImage( _pDlg->GetButtonImage( _nButtonId ) );
+ SetModeImage( SvtFileDialog::GetButtonImage( _nButtonId ) );
SetDelayMenu(true);
SetDropDown(PushButtonDropdownStyle::Toolbox);
}