[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - cui/source

[Tor Lillqvist]

 cui/source/options/optjava.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit c94cc62dc90b6ed3ebeab15424e0f2570432e8b5
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Sep 1 14:30:51 2015 +0300

    WaE: loplugin:staticmethods in the non-Java case
    
    Change-Id: I1fe771f01edb0ce14da01146191cfe3f48958966
    (cherry picked from commit 8002f0ddc805251e6f0f550bf8526aab8603c5df)

diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 31c94c6..c844c12 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -343,6 +343,8 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl)
     }
     else
         m_pParamDlg->SetParameters( aParameterList );
+#else
+    (void) this;                // Silence loplugin:staticmethods
 #endif
     return 0;
 }
@@ -388,6 +390,8 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl)
     }
     else
         m_pPathDlg->SetClassPath( sClassPath );
+#else
+    (void) this;
 #endif
     return 0;
 }
@@ -466,6 +470,8 @@ void SvxJavaOptionsPage::ClearJavaInfo()
         m_parJavaInfo = NULL;
         m_nInfoSize = 0;
     }
+#else
+    (void) this;
 #endif
 }
 
@@ -526,6 +532,8 @@ void SvxJavaOptionsPage::LoadJREs()
     }
 
     jfw_freeJavaInfo( pSelectedJava );
+#else
+    (void) this;
 #endif
 }
 
@@ -547,6 +555,7 @@ void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo )
     OUString* pLocation = new OUString( aLocObj.getFSysPath( INetURLObject::FSYS_DETECT ) );
     pEntry->SetUserData( pLocation );
 #else
+    (void) this;
     (void)_pInfo;
 #endif
 }
@@ -644,6 +653,7 @@ void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder )
         Application::PostUserEvent( LINK( this, SvxJavaOptionsPage, StartFolderPickerHdl ) );
     }
 #else
+    (void) this;
     (void)_rFolder;
 #endif
 }