loplugin:constantfunction: various

Change-Id: I6eddda9f4b31c7ce413c328b6a857a81bd222eed

3 files changed, 18 insertions, 31 deletions

diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 9b442e2792ee..f9d755ac4fcc 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -914,7 +914,7 @@ void SAL_CALL SvtFilePicker::setImage( sal_Int16 aImageFormat, const Any& rImage
 }
 
 
-sal_Bool SAL_CALL SvtFilePicker::setShowState( sal_Bool bShowState )
+sal_Bool SAL_CALL SvtFilePicker::setShowState( sal_Bool )
     throw ( RuntimeException, std::exception )
 {
     checkAlive();
@@ -923,7 +923,21 @@ sal_Bool SAL_CALL SvtFilePicker::setShowState( sal_Bool bShowState )
     bool bRet = false;
 
     if ( getDialog() )
-        bRet = getDialog()->setShowState( bShowState );
+    {
+    // #97633 for the system filedialog it's
+    // useful to make the preview switchable
+    // because the preview occupies
+    // half of the size of the file listbox
+    // which is not the case here,
+    // so we (TRA/FS) decided not to make
+    // the preview window switchable because
+    // else we would have to change the layout
+    // of the file dialog dynamically
+    // support for set/getShowState is opionally
+    // see com::sun::star::ui::dialogs::XFilePreview
+
+        bRet = false;
+    }
 
     return bRet;
 }
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 370b2e7d2ad4..b6703074616a 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -1109,7 +1109,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
     if ( pThis->_aOKHdl.IsSet() )
         nRet = pThis->_aOKHdl.Call( pThis );
     else
-        nRet = pThis->OK();
+        nRet = 1;
 
     if ( nRet )
     {
@@ -1377,7 +1377,7 @@ void SvtFileDialog::OpenMultiSelection_Impl()
     if ( _aOKHdl.IsSet() )
         nRet = _aOKHdl.Call( this );
     else
-        nRet = OK();
+        nRet = 1;
 
     if ( nRet )
         EndDialog( sal_True );
@@ -1622,13 +1622,6 @@ bool SvtFileDialog::Notify( NotifyEvent& rNEvt )
 
 
 
-long SvtFileDialog::OK()
-{
-    return sal_True;
-}
-
-
-
 class SvtDefModalDialogParent_Impl
 {
 private:
@@ -2672,24 +2665,6 @@ void SvtFileDialog::setImage( sal_Int16 /*aImageFormat*/, const Any& rImage )
 }
 
 
-bool SvtFileDialog::setShowState( bool /*bShowState*/ )
-{
-    // #97633 for the system filedialog it's
-    // useful to make the preview switchable
-    // because the preview occupies
-    // half of the size of the file listbox
-    // which is not the case here,
-    // so we (TRA/FS) decided not to make
-    // the preview window switchable because
-    // else we would have to change the layout
-    // of the file dialog dynamically
-    // support for set/getShowState is opionally
-    // see com::sun::star::ui::dialogs::XFilePreview
-
-    return false;
-}
-
-
 OUString SvtFileDialog::getCurrentFileText( ) const
 {
     OUString sReturn;
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index c71534da4a28..1bb88689b353 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -195,7 +195,6 @@ public:
                                 SvtFileDialog( vcl::Window* _pParent, WinBits nBits );
                                 virtual ~SvtFileDialog();
 
-    long                        OK();
     virtual short               Execute() SAL_OVERRIDE;
     virtual void                StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE;
 
@@ -239,7 +238,6 @@ public:
     sal_Int32                   getAvailableWidth();
     sal_Int32                   getAvailableHeight();
     void                        setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any& rImage );
-    bool                        setShowState( bool bShowState );
     bool                        getShowState();
     bool                        isAutoExtensionEnabled();