summaryrefslogtreecommitdiff
path: root/odk
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-02-11 13:20:49 +0200
committerNoel Grandin <noel@peralex.com>2015-02-23 09:26:58 +0200
commitba233e87efddf0a6751b35784dca1c805364ff3b (patch)
tree9d7c8a4256e688c2d47cb6ecf580ac196c4da2c0 /odk
parenta2fa9e2468aa5c4fd4b610c5d0ebc8959e87a072 (diff)
remove unnecessary parenthesis in return statements
found with $ git grep -lP 'return\s*\(\s*\w+\s*\)\s*;' Change-Id: Ic51606877a9edcadeb647c5bf17bc928b69ab60e
Diffstat (limited to 'odk')
-rw-r--r--odk/examples/DevelopersGuide/Database/sdbcx.java2
-rw-r--r--odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.c4
-rw-r--r--odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.c4
-rw-r--r--odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java8
-rw-r--r--odk/examples/java/Inspector/UnoMethodNode.java2
-rw-r--r--odk/examples/java/Spreadsheet/CalcAddins.java28
-rw-r--r--odk/examples/java/Spreadsheet/EuroAdaption.java2
7 files changed, 25 insertions, 25 deletions
diff --git a/odk/examples/DevelopersGuide/Database/sdbcx.java b/odk/examples/DevelopersGuide/Database/sdbcx.java
index ddb263cd938d..26813ff08dc3 100644
--- a/odk/examples/DevelopersGuide/Database/sdbcx.java
+++ b/odk/examples/DevelopersGuide/Database/sdbcx.java
@@ -98,7 +98,7 @@ public class sdbcx
xMSF = UnoRuntime.queryInterface( XMultiServiceFactory.class, rXsmgr );
}
- return ( xMSF );
+ return xMSF;
}
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.c b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.c
index 4cb341ef5137..7f4bc1472d58 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.c
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.c
@@ -59,7 +59,7 @@
JNIEXPORT jint JNICALL Java_NativeView_getNativeWindowSystemType
(JNIEnv * env, jobject obj_this)
{
- return (SYSTEM_XWINDOW);
+ return SYSTEM_XWINDOW;
}
/*****************************************************************************/
@@ -106,7 +106,7 @@ JNIEXPORT jlong JNICALL Java_NativeView_getNativeWindow
/* Free the drawing surface */
awt.FreeDrawingSurface(ds);
- return ((jlong)drawable);
+ return (jlong)drawable;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.c b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.c
index 84173a0e546a..750364c01cce 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.c
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.c
@@ -63,7 +63,7 @@ static LRESULT APIENTRY NativeViewWndProc( HWND , UINT , WPARAM , LPARAM );
JNIEXPORT jint JNICALL Java_NativeView_getNativeWindowSystemType
(JNIEnv * env, jobject obj_this)
{
- return (SYSTEM_WIN32);
+ return SYSTEM_WIN32;
}
/*****************************************************************************
@@ -126,7 +126,7 @@ JNIEXPORT jlong JNICALL Java_NativeView_getNativeWindow
SetProp( hWnd, OLD_PROC_KEY, (HANDLE)hFuncPtr );
}
- return ((jlong)hWnd);
+ return (jlong)hWnd;
}
/*****************************************************************************
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java
index 70bab16fff3f..d999bd2df718 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java
@@ -76,7 +76,7 @@ public class FlatXml implements XImportFilter, XExportFilter, XServiceName,
// --- XServiceName ---
public String getServiceName() {
- return( __serviceName );
+ return __serviceName;
}
// --- XServiceInfo ---
@@ -87,10 +87,10 @@ public class FlatXml implements XImportFilter, XExportFilter, XServiceName,
return false;
}
public String getImplementationName() {
- return( this.getClass().getName() );
+ return this.getClass().getName();
}
public String[] getSupportedServiceNames() {
- return( __supportedServiceNames );
+ return __supportedServiceNames;
}
public com.sun.star.uno.Type[] getTypes() {
@@ -106,7 +106,7 @@ public class FlatXml implements XImportFilter, XExportFilter, XServiceName,
} catch( java.lang.Exception exception ) {
return null;
}
- return( typeReturn );
+ return typeReturn;
}
public boolean importer(PropertyValue[] aSourceData, XDocumentHandler xDocHandler, String[] msUserData)
diff --git a/odk/examples/java/Inspector/UnoMethodNode.java b/odk/examples/java/Inspector/UnoMethodNode.java
index 896db027cefd..3f7decafab07 100644
--- a/odk/examples/java/Inspector/UnoMethodNode.java
+++ b/odk/examples/java/Inspector/UnoMethodNode.java
@@ -190,7 +190,7 @@ public class UnoMethodNode extends UnoNode{
if ( paramMode == ParamMode.INOUT ) {
toReturn = "INOUT";
}
- return( toReturn );
+ return toReturn;
}
public TypeClass getTypeClass(){
diff --git a/odk/examples/java/Spreadsheet/CalcAddins.java b/odk/examples/java/Spreadsheet/CalcAddins.java
index 555ddde93642..790a71655a35 100644
--- a/odk/examples/java/Spreadsheet/CalcAddins.java
+++ b/odk/examples/java/Spreadsheet/CalcAddins.java
@@ -104,12 +104,12 @@ public class CalcAddins {
com.sun.star.beans.XPropertySet xOptions,
int intDummy
) {
- return( 2 + intDummy );
+ return 2 + intDummy;
}
// Implement method from interface XServiceName
public String getServiceName() {
- return( __serviceName );
+ return __serviceName;
}
// Implement methods from interface XServiceInfo
@@ -119,12 +119,12 @@ public class CalcAddins {
}
public String getImplementationName() {
- return( _CalcAddins.class.getName() );
+ return _CalcAddins.class.getName();
}
public String[] getSupportedServiceNames() {
String[] stringSupportedServiceNames = { ADDIN_SERVICE, __serviceName };
- return( stringSupportedServiceNames );
+ return stringSupportedServiceNames;
}
// Implement methods from interface XAddIn
@@ -153,7 +153,7 @@ public class CalcAddins {
}
break;
}
- return( stringReturn );
+ return stringReturn;
}
public String getDisplayFunctionName(String stringProgrammaticName) {
@@ -171,15 +171,15 @@ public class CalcAddins {
break;
}
- return( stringReturn );
+ return stringReturn;
}
public String getProgrammaticCategoryName(String p1) {
- return( "Add-In" );
+ return "Add-In";
}
public String getDisplayCategoryName(String p1) {
- return( "Add-In" );
+ return "Add-In";
}
public String getFunctionDescription(String stringProgrammaticName) {
@@ -197,7 +197,7 @@ public class CalcAddins {
break;
}
- return( stringReturn );
+ return stringReturn;
}
public String getArgumentDescription(String stringProgrammaticFunctionName,int intArgument) {
@@ -225,16 +225,16 @@ public class CalcAddins {
}
break;
}
- return( stringReturn );
+ return stringReturn;
}
public String getProgrammaticFuntionName(String p1) {
- return( "" );
+ return "";
}
// Implement methods from interface XLocalizable
public Locale getLocale() {
- return( aFuncLoc );
+ return aFuncLoc;
}
public void setLocale(Locale p1) {
@@ -245,11 +245,11 @@ public class CalcAddins {
private short getFunctionID( String stringProgrammaticName ) {
for ( int i = 0; i < stringFunctionName.length; i++ ) {
if ( stringProgrammaticName.equals( stringFunctionName[ i ] ) ) {
- return( ( short ) i );
+ return ( short ) i;
}
}
- return( -1 );
+ return -1;
}
}
diff --git a/odk/examples/java/Spreadsheet/EuroAdaption.java b/odk/examples/java/Spreadsheet/EuroAdaption.java
index 870c20978245..ef64b8e6c1d7 100644
--- a/odk/examples/java/Spreadsheet/EuroAdaption.java
+++ b/odk/examples/java/Spreadsheet/EuroAdaption.java
@@ -264,7 +264,7 @@ public class EuroAdaption {
e.printStackTrace(System.err);
}
- return( nRetKey );
+ return nRetKey;
}