summaryrefslogtreecommitdiff
path: root/fpicker
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-30 10:47:56 +0200
committerNoel Grandin <noel@peralex.com>2015-05-05 09:30:39 +0200
commitf304a7a14a4af4d3f46eab18d5494194028e61ef (patch)
tree7f51b8efe4427d01fc688925c44e0a05e3c64c7b /fpicker
parentb2b85c2b3920fdd92b8d3bf32af1cac5679e116e (diff)
loplugin:staticmethods
Change-Id: I384a5e60f4b7b2f479c89ef97630519059ab720f
Diffstat (limited to 'fpicker')
-rw-r--r--fpicker/source/office/OfficeControlAccess.hxx6
-rw-r--r--fpicker/source/office/asyncfilepicker.cxx2
-rw-r--r--fpicker/source/office/commonpicker.cxx3
-rw-r--r--fpicker/source/office/iodlg.cxx2
-rw-r--r--fpicker/source/office/iodlg.hxx4
5 files changed, 8 insertions, 9 deletions
diff --git a/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx
index e1ff8050c23c..36373af4d8ab 100644
--- a/fpicker/source/office/OfficeControlAccess.hxx
+++ b/fpicker/source/office/OfficeControlAccess.hxx
@@ -58,8 +58,8 @@ namespace svt
// XControlInformation implementation
::com::sun::star::uno::Sequence< OUString > getSupportedControls( );
::com::sun::star::uno::Sequence< OUString > getSupportedControlProperties( const OUString& _rControlName );
- bool isControlSupported( const OUString& _rControlName );
- bool isControlPropertySupported( const OUString& _rControlName, const OUString& _rControlProperty );
+ static bool isControlSupported( const OUString& _rControlName );
+ bool isControlPropertySupported( const OUString& _rControlName, const OUString& _rControlProperty );
// XFilePickerControlAccess
void setValue( sal_Int16 _nId, sal_Int16 _nCtrlAction, const ::com::sun::star::uno::Any& _rValue );
@@ -105,7 +105,7 @@ namespace svt
*/
::com::sun::star::uno::Any implGetControlProperty( Control* _pControl, sal_Int16 _nProperty ) const;
- void implDoListboxAction( ListBox* _pListbox, sal_Int16 _nCtrlAction, const ::com::sun::star::uno::Any& _rValue );
+ static void implDoListboxAction( ListBox* _pListbox, sal_Int16 _nCtrlAction, const ::com::sun::star::uno::Any& _rValue );
};
diff --git a/fpicker/source/office/asyncfilepicker.cxx b/fpicker/source/office/asyncfilepicker.cxx
index d9b18cb405c9..cf6b17b07c8f 100644
--- a/fpicker/source/office/asyncfilepicker.cxx
+++ b/fpicker/source/office/asyncfilepicker.cxx
@@ -147,7 +147,7 @@ namespace svt
if ( eTimeout == eResult )
{
- m_pDialog->displayIOException( m_sURL, ::com::sun::star::ucb::IOErrorCode_CANT_READ );
+ SvtFileDialog::displayIOException( m_sURL, ::com::sun::star::ucb::IOErrorCode_CANT_READ );
return 0L;
}
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index b3192d2c419d..170f12785ab2 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -298,8 +298,7 @@ namespace svt
SolarMutexGuard aGuard;
if ( createPicker() )
{
- ::svt::OControlAccess aAccess( m_pDlg, m_pDlg->GetView() );
- return aAccess.isControlSupported( aControlName );
+ return svt::OControlAccess::isControlSupported( aControlName );
}
return sal_False;
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 6c6dc7602734..c88e5269ecd0 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -921,7 +921,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
// if a path with wildcards is given, divide the string into path and wildcards
OUString aFilter;
- if ( !pThis->IsolateFilterFromPath_Impl( aFileName, aFilter ) )
+ if ( !SvtFileDialog::IsolateFilterFromPath_Impl( aFileName, aFilter ) )
return 0;
// if a filter was retrieved, there were wildcards !
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index 4f345799fcf0..5c67ad2c3164 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -155,7 +155,7 @@ private:
// removes a filter with wildcards from the path and returns it
- bool IsolateFilterFromPath_Impl( OUString& rPath, OUString& rFilter );
+ static bool IsolateFilterFromPath_Impl( OUString& rPath, OUString& rFilter );
void implUpdateImages( );
@@ -250,7 +250,7 @@ public:
void RemovablePlaceSelected(bool enable = true);
- void displayIOException( const OUString& _rURL, ::com::sun::star::ucb::IOErrorCode _eCode );
+ static void displayIOException( const OUString& _rURL, ::com::sun::star::ucb::IOErrorCode _eCode );
// inline
inline void SetPath( const OUString& rNewURL );