diff options
274 files changed, 1137 insertions, 1144 deletions
diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx index 9af003a1a1e0..6ff24bed4704 100644 --- a/UnoControls/source/controls/progressbar.cxx +++ b/UnoControls/source/controls/progressbar.cxx @@ -260,7 +260,7 @@ sal_Int32 SAL_CALL ProgressBar::getValue () throw( RuntimeException, std::except // Ready for multithreading MutexGuard aGuard (m_aMutex); - return ( m_nValue ); + return m_nValue; } // XWindow diff --git a/avmedia/source/quicktime/framegrabber.mm b/avmedia/source/quicktime/framegrabber.mm index 5a92e79bcc88..79da62ee979e 100644 --- a/avmedia/source/quicktime/framegrabber.mm +++ b/avmedia/source/quicktime/framegrabber.mm @@ -83,7 +83,7 @@ bool FrameGrabber::create( const ::rtl::OUString& rURL ) [pool release]; - return( bRet ); + return bRet; } diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx index ff7d3da333a8..f2950b97ac9d 100644 --- a/basctl/source/basicide/tbxctl.cxx +++ b/basctl/source/basicide/tbxctl.cxx @@ -63,8 +63,8 @@ TbxControls::TbxControls( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxPopupWindowType TbxControls::GetPopupWindowType() const { if( nLastSlot == USHRT_MAX ) - return(SFX_POPUPWINDOW_ONCLICK); - return(SFX_POPUPWINDOW_ONTIMEOUT); + return SFX_POPUPWINDOW_ONCLICK; + return SFX_POPUPWINDOW_ONTIMEOUT; } void TbxControls::StateChanged( sal_uInt16 nSID, SfxItemState eState, @@ -146,7 +146,7 @@ SfxPopupWindow* TbxControls::CreatePopupWindow() if ( GetSlotId() == SID_CHOOSE_CONTROLS ) createAndPositionSubToolBar( aSubToolBarResName ); - return(0); + return 0; } diff --git a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c index 0bd0e04e2ce5..275e6486e6e4 100644 --- a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c +++ b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c @@ -61,7 +61,7 @@ SAL_DLLPUBLIC_EXPORT jint JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow { (void) env; /* avoid warning about unused parameter */ (void) obj_this; /* avoid warning about unused parameter */ - return (SYSTEM_XWINDOW); + return SYSTEM_XWINDOW; } @@ -115,7 +115,7 @@ SAL_DLLPUBLIC_EXPORT jlong JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindo /* Free the drawing surface */ awt.FreeDrawingSurface(ds); - return ((jlong)drawable); + return (jlong)drawable; } diff --git a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c index b4c41623c454..42f7714c2dca 100644 --- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c +++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c @@ -90,7 +90,7 @@ JNIEXPORT jint JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeW { (void) env; // unused (void) obj_this; // unused - return (SYSTEM_WIN32); + return SYSTEM_WIN32; } @@ -156,7 +156,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNative SetProp( hWnd, OLD_PROC_KEY, (HANDLE)hFuncPtr ); } - return ((jlong)hWnd); + return (jlong)hWnd; } diff --git a/comphelper/source/misc/accessibleselectionhelper.cxx b/comphelper/source/misc/accessibleselectionhelper.cxx index 814faa1df682..df9d92bcd3e0 100644 --- a/comphelper/source/misc/accessibleselectionhelper.cxx +++ b/comphelper/source/misc/accessibleselectionhelper.cxx @@ -48,7 +48,7 @@ namespace comphelper bool SAL_CALL OCommonAccessibleSelection::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - return( implIsSelected( nChildIndex ) ); + return implIsSelected( nChildIndex ); } @@ -78,7 +78,7 @@ namespace comphelper ++nRet; } - return( nRet ); + return nRet; } @@ -96,7 +96,7 @@ namespace comphelper xRet = xParentContext->getAccessibleChild( i ); } - return( xRet ); + return xRet; } @@ -121,7 +121,7 @@ namespace comphelper Reference< XAccessibleContext > OAccessibleSelectionHelper::implGetAccessibleContext() throw ( RuntimeException ) { - return( this ); + return this; } @@ -135,7 +135,7 @@ namespace comphelper sal_Bool SAL_CALL OAccessibleSelectionHelper::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); - return( OCommonAccessibleSelection::isAccessibleChildSelected( nChildIndex ) ); + return OCommonAccessibleSelection::isAccessibleChildSelected( nChildIndex ); } @@ -156,14 +156,14 @@ namespace comphelper sal_Int32 SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); - return( OCommonAccessibleSelection::getSelectedAccessibleChildCount() ); + return OCommonAccessibleSelection::getSelectedAccessibleChildCount(); } Reference< XAccessible > SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); - return( OCommonAccessibleSelection::getSelectedAccessibleChild( nSelectedChildIndex ) ); + return OCommonAccessibleSelection::getSelectedAccessibleChild( nSelectedChildIndex ); } diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx index 5a1962b7c2b1..b8527d97d0ad 100644 --- a/connectivity/source/drivers/ado/Aolevariant.cxx +++ b/connectivity/source/drivers/ado/Aolevariant.cxx @@ -682,7 +682,7 @@ SAFEARRAY* OLEVariant::getUI1SAFEARRAYPtr() const return V_ARRAY(this); if(isNull()) - return (0); + return 0; OLEVariant varDest; varDest.ChangeType((VT_ARRAY|VT_UI1), this); diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx index 9ec723094465..e87e68dee571 100644 --- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx @@ -179,7 +179,7 @@ jint read_from_storage_stream( JNIEnv * env, jobject /*obj_this*/, jstring name, if ( logger ) logger->write( tmpInt ); #endif - return(tmpInt); + return tmpInt; } } return -1; diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx index 452b58b2d447..1a29491f5b36 100644 --- a/connectivity/source/drivers/mork/MConnection.hxx +++ b/connectivity/source/drivers/mork/MConnection.hxx @@ -98,7 +98,7 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL clearWarnings() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - const OColumnAlias & getColumnAlias() const { return (m_aColumnAlias); } + const OColumnAlias & getColumnAlias() const { return m_aColumnAlias; } static OUString getDriverImplementationName(); diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx index e472236a45c5..4a2c3eaec862 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx @@ -145,7 +145,7 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( } } } - return( aRows ); + return aRows; } OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx index 610ef54264fa..6398466f7b49 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.cxx +++ b/connectivity/source/drivers/mork/MQueryHelper.cxx @@ -130,7 +130,7 @@ MQueryHelper::getByIndex(sal_uInt32 nRow) // Row numbers are from 1 to N, need to ensure this, and then // subtract 1 if ( nRow < 1 ) { - return( NULL ); + return NULL; } return m_aResults[nRow -1]; } @@ -156,11 +156,11 @@ bool MQueryHelper::checkRowAvailable( sal_Int32 nDBRow ) { if ( !m_aQueryHelper->waitForRow( nDBRow ) ) { m_aError = m_aQueryHelper->getError(); - return( sal_False ); + return sal_False; } } */ - return( getResultCount() > nDBRow ); + return getResultCount() > nDBRow; } diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx index 6241318578ff..112f97e85308 100644 --- a/connectivity/source/drivers/mozab/MConnection.hxx +++ b/connectivity/source/drivers/mozab/MConnection.hxx @@ -202,7 +202,7 @@ namespace connectivity SDBCAddress::sdbc_address_type getSDBCAddressType() const { return m_eSDBCAddressType;} - const OColumnAlias & getColumnAlias() const { return (m_aColumnAlias); } + const OColumnAlias & getColumnAlias() const { return m_aColumnAlias; } static OUString getDriverImplementationName(); diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx index 1b38325b0494..6a0b27ba069e 100644 --- a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx @@ -150,7 +150,7 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( } } } - return( aRows ); + return aRows; } OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx index 7f93b874645e..73b0c77d20d3 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx @@ -465,7 +465,7 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp rv = subDirectories -> Next(); } while ( rv == NS_OK); - return( NS_OK ); + return NS_OK; } sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection* _pCon, ::std::vector< OUString >& _rStrings, @@ -482,7 +482,7 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection* if ( ! _pCon->getForceLoadTables() && m_aTableNames.size() > 0 ) { _rStrings = m_aTableNames; _rTypes = m_aTableTypes; - return( sal_True ); + return sal_True; } m_aTableNames.clear(); @@ -604,7 +604,7 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection* _rTypes = m_aTableTypes; _pCon->setForceLoadTables(sal_False); - return( sal_True ); + return sal_True; } sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, @@ -656,7 +656,7 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, OSL_TRACE( "\tOUT MDatabaseMetaDataHelper::getTables()" ); _rRows = aRows; - return(sal_True); + return sal_True; } @@ -761,7 +761,7 @@ sal_Bool MDatabaseMetaDataHelper::NewAddressBook(OConnection* _pCon,const OUStri m_aError.set( STR_COULD_NOT_CREATE_ADDRESSBOOK, 0, OUString::number( sal_Int32(rv), 16 ) ); } OSL_TRACE( "OUT MDatabaseMetaDataHelper::NewAddressBook()" ); - return( NS_SUCCEEDED(rv) ? sal_True : sal_False ); + return NS_SUCCEEDED(rv) ? sal_True : sal_False; } nsresult NewAddressBook(const OUString * aName) { diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx index 4fc486c9c038..8b24a4266d55 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx @@ -241,7 +241,7 @@ static sal_Int32 generateExpression( MQuery* _aQuery, MQueryExpression* _aExpr, else { // Should never see this... OSL_FAIL("Unknown Expression Type!"); - return( NS_ERROR_UNEXPECTED ); + return NS_ERROR_UNEXPECTED; } } @@ -251,7 +251,7 @@ static sal_Int32 generateExpression( MQuery* _aQuery, MQueryExpression* _aExpr, else queryExpression->SetOperation(nsIAbBooleanOperationTypes::OR); - return( NS_OK ); + return NS_OK; } sal_uInt32 MQuery::InsertLoginInfo(OConnection* _pCon) { @@ -422,14 +422,14 @@ sal_Int32 MQuery::executeQueryProxied(OConnection* _pCon) // Create a nsIAbDirectory object to initialise the nsIAbDirectoryQuery object. nsCOMPtr<nsIRDFService> rdfService(do_GetService(kRDFServiceCID, &rv)) ; if (NS_FAILED(rv)) - return(-1); + return -1; nsCOMPtr<nsIAbDirectory> directory; MNameMapper *nmap = _pCon->getNameMapper(); if ( nmap->getDir( m_aAddressbook, getter_AddRefs( directory ) ) == sal_False ) - return( -1 ); + return -1; //insert ldap bind info to mozilla profile(in memery,none saved),so we can use it in mozilla part codes @@ -550,7 +550,7 @@ sal_Int32 MQuery::executeQueryProxied(OConnection* _pCon) OSL_TRACE( "****** DoQuery failed"); OSL_TRACE("\tOUT MQuery::executeQueryProxied()\n"); m_aQueryHelper->notifyQueryError() ; - return(-1); + return -1; } #if OSL_DEBUG_LEVEL > 0 else { @@ -560,7 +560,7 @@ sal_Int32 MQuery::executeQueryProxied(OConnection* _pCon) OSL_TRACE("\tOUT MQuery::executeQueryProxied()"); - return(0); + return 0; } @@ -572,7 +572,7 @@ sal_Int32 MQuery::executeQueryProxied(OConnection* _pCon) sal_Int32 MQuery::getRowCount() { - return( m_aQueryHelper->getResultCount() ); + return m_aQueryHelper->getResultCount(); } @@ -584,7 +584,7 @@ MQuery::getRowCount() sal_uInt32 MQuery::getRealRowCount() { - return( m_aQueryHelper->getRealCount() ); + return m_aQueryHelper->getRealCount(); } @@ -594,7 +594,7 @@ MQuery::getRealRowCount() sal_Bool MQuery::queryComplete( void ) { - return( hadError() || m_aQueryHelper->queryComplete() ); + return hadError() || m_aQueryHelper->queryComplete(); } sal_Bool @@ -603,7 +603,7 @@ MQuery::waitForQueryComplete( void ) if( m_aQueryHelper->waitForQueryComplete( ) ) return sal_True; m_aError = m_aQueryHelper->getError(); - return( sal_False ); + return sal_False; } @@ -614,10 +614,10 @@ MQuery::checkRowAvailable( sal_Int32 nDBRow ) while( !queryComplete() && m_aQueryHelper->getRealCount() <= (sal_uInt32)nDBRow ) if ( !m_aQueryHelper->waitForRow( nDBRow ) ) { m_aError = m_aQueryHelper->getError(); - return( sal_False ); + return sal_False; } - return( getRowCount() > nDBRow ); + return getRowCount() > nDBRow; } sal_Bool @@ -733,7 +733,7 @@ MQuery::createNewCard() MNameMapper* MQuery::CreateNameMapper() { - return( new MNameMapper() ); + return new MNameMapper(); } diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx index 61f49650ed75..b71e880c9bb7 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx @@ -201,7 +201,7 @@ MQueryHelper::next( ) m_aMutex.release(); } - return( result ); + return result; } MQueryHelperResultEntry* @@ -210,7 +210,7 @@ MQueryHelper::getByIndex( sal_uInt32 nRow ) // Row numbers are from 1 to N, need to ensure this, and then // subtract 1 if ( nRow < 1 ) { - return( NULL ); + return NULL; } do { @@ -220,19 +220,19 @@ MQueryHelper::getByIndex( sal_uInt32 nRow ) if ( m_bQueryComplete ) { m_bAtEnd = sal_True; - return( NULL ); + return NULL; } else { clearResultOrComplete(); aGuard.clear(); if ( !waitForResultOrComplete( ) ) - return( NULL ); + return NULL; } } else { - return( m_aResults[ nRow -1 ] ); + return m_aResults[ nRow -1 ]; } } while ( true ); } @@ -261,7 +261,7 @@ MQueryHelper::waitForQueryComplete( ) m_aMutex.release(); clearResultOrComplete(); if ( !waitForResultOrComplete( ) ) - return( sal_False ); + return sal_False; m_aMutex.acquire(); } while ( !m_bQueryComplete ); @@ -269,7 +269,7 @@ MQueryHelper::waitForQueryComplete( ) m_aMutex.release(); OSL_TRACE("Out : waitForQueryComplete()"); - return( sal_True ); + return sal_True; } sal_Bool @@ -281,13 +281,13 @@ MQueryHelper::waitForRow( sal_Int32 rowNum ) m_aMutex.release(); clearResultOrComplete(); if ( !waitForResultOrComplete() ) - return( sal_False ); + return sal_False; m_aMutex.acquire(); } while ( !m_bQueryComplete && m_aResults.size() < (size_t)rowNum ); m_aMutex.release(); - return( sal_True ); + return sal_True; } @@ -395,7 +395,7 @@ NS_IMETHODIMP MQueryHelper::OnQueryItem(nsIAbDirectoryQueryResult *result) notifyResultOrComplete(); - return(NS_OK); + return NS_OK; } diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index afcfc3a332d2..d1107873e9e9 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -260,7 +260,7 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickOkHdl_Impl) Apply(); Close(); - return ( 0L ); + return 0L; } /************************************************************************* @@ -273,7 +273,7 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl) { Apply(); - return( 0L ); + return 0L; } /************************************************************************* @@ -286,7 +286,7 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickCloseHdl_Impl) { Close(); - return( 0L ); + return 0L; } /************************************************************************* diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 7f988851836b..996cb810c1b8 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -234,7 +234,7 @@ void SvxHyperlinkNewDocTp::GetCurentItemData ( OUString& rStrURL, OUString& aStr IconChoicePage* SvxHyperlinkNewDocTp::Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ) { - return( new SvxHyperlinkNewDocTp( pWindow, pDlg, rItemSet ) ); + return new SvxHyperlinkNewDocTp( pWindow, pDlg, rItemSet ); } /************************************************************************* @@ -453,7 +453,7 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl) m_pCbbPath->SetText ( aStrTmp ); } - return( 0L ); + return 0L; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 80cc05b8f036..2f5b8f7efb1a 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -159,7 +159,7 @@ void SvxHyperlinkDocTp::GetCurentItemData ( OUString& rStrURL, OUString& aStrNam IconChoicePage* SvxHyperlinkDocTp::Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ) { - return( new SvxHyperlinkDocTp( pWindow, pDlg, rItemSet ) ); + return new SvxHyperlinkDocTp( pWindow, pDlg, rItemSet ); } /************************************************************************* @@ -209,7 +209,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl) ModifiedPathHdl_Impl (NULL); } - return( 0L ); + return 0L; } /************************************************************************* @@ -241,7 +241,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickTargetHdl_Impl) ShowMarkWnd (); - return( 0L ); + return 0L; } /************************************************************************* @@ -259,7 +259,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedPathHdl_Impl) m_pFtFullURL->SetText( maStrURL ); - return( 0L ); + return 0L; } /************************************************************************* @@ -284,7 +284,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, TimeoutHdl_Impl) LeaveWait(); } - return( 0L ); + return 0L; } /************************************************************************* @@ -302,7 +302,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedTargetHdl_Impl) m_pFtFullURL->SetText( maStrURL ); - return( 0L ); + return 0L; } /************************************************************************* @@ -317,7 +317,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, LostFocusPathHdl_Impl) m_pFtFullURL->SetText( maStrURL ); - return (0L); + return 0L; } /************************************************************************* diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 7b198b62f8b5..76088ba157d9 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -189,7 +189,7 @@ OUString SvxHyperlinkInternetTp::CreateAbsoluteURL() const IconChoicePage* SvxHyperlinkInternetTp::Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ) { - return( new SvxHyperlinkInternetTp( pWindow, pDlg, rItemSet ) ); + return new SvxHyperlinkInternetTp( pWindow, pDlg, rItemSet ); } /************************************************************************* @@ -219,7 +219,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl) maTimer.SetTimeout( 2500 ); maTimer.Start(); - return( 0L ); + return 0L; } /************************************************************************* @@ -231,7 +231,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl) IMPL_LINK_NOARG(SvxHyperlinkInternetTp, TimeoutHdl_Impl) { RefreshMarkWindow(); - return( 0L ); + return 0L; } /************************************************************************* @@ -249,7 +249,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl) ClickAnonymousHdl_Impl(NULL); } - return( 0L ); + return 0L; } /************************************************************************* @@ -336,7 +336,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl) { OUString aScheme = GetSchemeFromButtons(); SetScheme(aScheme); - return( 0L ); + return 0L; } /************************************************************************* @@ -366,7 +366,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl) else setFTPUser(maStrOldUser, maStrOldPassword); - return( 0L ); + return 0L; } /************************************************************************* @@ -378,7 +378,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl) IMPL_LINK_NOARG(SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl) { RefreshMarkWindow(); - return (0L); + return 0L; } /************************************************************************* @@ -403,7 +403,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl) const SfxPoolItem *ppItems[] = { &aName, &aNewView, &aSilent, &aReadOnly, &aRefererItem, &aBrowse, NULL }; static_cast<SvxHpLinkDlg*>(mpDialog)->GetBindings()->Execute( SID_OPENDOC, ppItems, 0, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); - return( 0L ); + return 0L; } void SvxHyperlinkInternetTp::RefreshMarkWindow() diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index cf7d9573869f..de79f64a3d12 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -170,7 +170,7 @@ OUString SvxHyperlinkMailTp::CreateAbsoluteURL() const IconChoicePage* SvxHyperlinkMailTp::Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ) { - return( new SvxHyperlinkMailTp( pWindow, pDlg, rItemSet ) ); + return new SvxHyperlinkMailTp( pWindow, pDlg, rItemSet ); } /************************************************************************* @@ -253,7 +253,7 @@ IMPL_LINK_NOARG(SvxHyperlinkMailTp, Click_SmartProtocol_Impl) { OUString aScheme = GetSchemeFromButtons(); SetScheme( aScheme ); - return( 0L ); + return 0L; } /************************************************************************* @@ -268,7 +268,7 @@ IMPL_LINK_NOARG(SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl) if(!aScheme.isEmpty()) SetScheme( aScheme ); - return( 0L ); + return 0L; } /************************************************************************* @@ -288,7 +288,7 @@ IMPL_LINK_NOARG(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl) } - return( 0L ); + return 0L; } diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 9bfb83412ca7..4892f0edc956 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -555,7 +555,7 @@ IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl) } } - return( 0L ); + return 0L; } /************************************************************************* @@ -599,7 +599,7 @@ IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl) Close(); - return( 0L ); + return 0L; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index de10149a9e00..ec4a270b9e2a 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -48,7 +48,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxHyperURLBox(vcl::Wi sal_Int8 SvxHyperURLBox::AcceptDrop( const AcceptDropEvent& /* rEvt */ ) { - return( IsDropFormatSupported( FORMAT_STRING ) ? DND_ACTION_COPY : DND_ACTION_NONE ); + return IsDropFormatSupported( FORMAT_STRING ) ? DND_ACTION_COPY : DND_ACTION_NONE; } sal_Int8 SvxHyperURLBox::ExecuteDrop( const ExecuteDropEvent& rEvt ) @@ -352,7 +352,7 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl) delete pItemSet; } - return( 0L ); + return 0L; } // Get Macro-Infos @@ -536,7 +536,7 @@ int SvxHyperlinkTabPageBase::DeactivatePage( SfxItemSet* _pSet) _pSet->Put( aItem ); } - return( LEAVE_PAGE ); + return LEAVE_PAGE; } bool SvxHyperlinkTabPageBase::ShouldOpenMarkWnd() diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index bed354282be4..0d9cdafb4df4 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1133,7 +1133,7 @@ int SvxColorOptionsTabPage::DeactivatePage( SfxItemSet* pSet_ ) { if ( pSet_ ) FillItemSet( pSet_ ); - return( LEAVE_PAGE ); + return LEAVE_PAGE; } void SvxColorOptionsTabPage::UpdateColorConfig() diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index 35cb0d2a777d..439737e2f295 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -371,7 +371,7 @@ bool SvxConnectionPage::FillItemSet( SfxItemSet* rAttrs) } } - return( bModified ); + return bModified; } void SvxConnectionPage::Construct() @@ -391,12 +391,12 @@ void SvxConnectionPage::Construct() SfxTabPage* SvxConnectionPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { - return( new SvxConnectionPage( pWindow, *rAttrs ) ); + return new SvxConnectionPage( pWindow, *rAttrs ); } const sal_uInt16* SvxConnectionPage::GetRanges() { - return( pRanges ); + return pRanges; } IMPL_LINK( SvxConnectionPage, ChangeAttrHdl_Impl, void *, p ) @@ -483,7 +483,7 @@ IMPL_LINK( SvxConnectionPage, ChangeAttrHdl_Impl, void *, p ) } - return( 0L ); + return 0L; } void SvxConnectionPage::FillTypeLB() diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index ebe7526d3a8f..b9b02ebc29e1 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -339,14 +339,14 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* ) SfxTabPage* SvxCaptionTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { - return( new SvxCaptionTabPage( pWindow, *rOutAttrs ) ); + return new SvxCaptionTabPage( pWindow, *rOutAttrs ); } const sal_uInt16* SvxCaptionTabPage::GetRanges() { - return( pCaptionRanges ); + return pCaptionRanges; } diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 27d88fefe2cb..eace738617a1 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -569,7 +569,7 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet* rAttrs) } } - return( bModified ); + return bModified; } /************************************************************************* @@ -596,12 +596,12 @@ void SvxMeasurePage::Construct() SfxTabPage* SvxMeasurePage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { - return( new SvxMeasurePage( pWindow, *rAttrs ) ); + return new SvxMeasurePage( pWindow, *rAttrs ); } const sal_uInt16* SvxMeasurePage::GetRanges() { - return( pRanges ); + return pRanges; } void SvxMeasurePage::PointChanged( vcl::Window* pWindow, RECT_POINT /*eRP*/ ) @@ -655,7 +655,7 @@ IMPL_LINK( SvxMeasurePage, ClickAutoPosHdl_Impl, void *, p ) } ChangeAttrHdl_Impl( p ); - return( 0L ); + return 0L; } IMPL_LINK( SvxMeasurePage, ChangeAttrHdl_Impl, void *, p ) @@ -786,7 +786,7 @@ IMPL_LINK( SvxMeasurePage, ChangeAttrHdl_Impl, void *, p ) m_pCtlPreview->SetAttributes( aAttrSet ); m_pCtlPreview->Invalidate(); - return( 0L ); + return 0L; } void SvxMeasurePage::FillUnitLB() diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index bb26490ee9fb..401cc6b4b537 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -1051,7 +1051,7 @@ int SvxSwPosSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) FillItemSet( _pSet ); - return( LEAVE_PAGE ); + return LEAVE_PAGE; } void SvxSwPosSizeTabPage::EnableAnchorTypes(sal_uInt16 nAnchorEnable) diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 43588c46aae2..1df37c42d6cc 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -436,12 +436,12 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet* rAttrs) bModified = true; } - return( bModified ); + return bModified; } const sal_uInt16* SvxTextAnimationPage::GetRanges() { - return( pRanges ); + return pRanges; } /************************************************************************* @@ -453,7 +453,7 @@ const sal_uInt16* SvxTextAnimationPage::GetRanges() SfxTabPage* SvxTextAnimationPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { - return( new SvxTextAnimationPage( pWindow, *rAttrs ) ); + return new SvxTextAnimationPage( pWindow, *rAttrs ); } IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl) @@ -511,7 +511,7 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl) } } - return( 0L ); + return 0L; } IMPL_LINK_NOARG(SvxTextAnimationPage, ClickEndlessHdl_Impl) @@ -531,7 +531,7 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, ClickEndlessHdl_Impl) m_pNumFldCount->SetValue( m_pNumFldCount->GetValue() ); } } - return( 0L ); + return 0L; } IMPL_LINK_NOARG(SvxTextAnimationPage, ClickAutoHdl_Impl) @@ -548,7 +548,7 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, ClickAutoHdl_Impl) m_pMtrFldDelay->SetValue( m_pMtrFldDelay->GetValue() ); } - return( 0L ); + return 0L; } IMPL_LINK_NOARG(SvxTextAnimationPage, ClickPixelHdl_Impl) @@ -587,7 +587,7 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, ClickPixelHdl_Impl) m_pMtrFldAmount->SetValue( nValue ); } - return( 0L ); + return 0L; } IMPL_LINK( SvxTextAnimationPage, ClickDirectionHdl_Impl, ImageButton *, pBtn ) @@ -597,7 +597,7 @@ IMPL_LINK( SvxTextAnimationPage, ClickDirectionHdl_Impl, ImageButton *, pBtn ) m_pBtnRight->Check( pBtn == m_pBtnRight ); m_pBtnDown->Check( pBtn == m_pBtnDown ); - return( 0L ); + return 0L; } void SvxTextAnimationPage::SelectDirection( SdrTextAniDirection nValue ) @@ -621,7 +621,7 @@ sal_uInt16 SvxTextAnimationPage::GetSelectedDirection() else if( m_pBtnDown->IsChecked() ) nValue = SDRTEXTANI_DOWN; - return( nValue ); + return nValue; } diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 6dfe0033e27c..3237928499eb 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -523,12 +523,12 @@ void SvxTextAttrPage::Construct() SfxTabPage* SvxTextAttrPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { - return( new SvxTextAttrPage( pWindow, *rAttrs ) ); + return new SvxTextAttrPage( pWindow, *rAttrs ); } const sal_uInt16* SvxTextAttrPage::GetRanges() { - return( pRanges ); + return pRanges; } /** Check whether we have to uncheck the "Full width" check box. @@ -627,7 +627,7 @@ IMPL_LINK_NOARG(SvxTextAttrPage, ClickFullWidthHdl_Impl) } } } - return( 0L ); + return 0L; } /************************************************************************* @@ -678,7 +678,7 @@ IMPL_LINK_NOARG(SvxTextAttrPage, ClickHdl_Impl) // #83698# enable/disable text anchoring dependent of contour m_pFlPosition->Enable(!bContour && !bHorAndVer); - return( 0L ); + return 0L; } diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index efb9ec3c92b2..1ff5a81bdca6 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -89,7 +89,7 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransOffHdl_Impl) InvalidatePreview( false ); - return( 0L ); + return 0L; } IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransLinearHdl_Impl) @@ -102,7 +102,7 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransLinearHdl_Impl) rXFSet.ClearItem (XATTR_FILLFLOATTRANSPARENCE); ModifyTransparentHdl_Impl (NULL); - return( 0L ); + return 0L; } IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransGradientHdl_Impl) @@ -115,7 +115,7 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransGradientHdl_Impl) rXFSet.ClearItem (XATTR_FILLTRANSPARENCE); ModifiedTrgrHdl_Impl (NULL); - return( 0L ); + return 0L; } void SvxTransparenceTabPage::ActivateLinear(bool bActivate) @@ -161,7 +161,7 @@ IMPL_LINK(SvxTransparenceTabPage, ModifiedTrgrHdl_Impl, void *, pControl) InvalidatePreview(); - return( 0L ); + return 0L; } void SvxTransparenceTabPage::ActivateGradient(bool bActivate) @@ -177,7 +177,7 @@ void SvxTransparenceTabPage::ActivateGradient(bool bActivate) IMPL_LINK_NOARG(SvxTransparenceTabPage, ChangeTrgrTypeHdl_Impl) { - return( 0L ); + return 0L; } void SvxTransparenceTabPage::SetControlState_Impl(css::awt::GradientStyle eXGS) @@ -293,12 +293,12 @@ void SvxTransparenceTabPage::Construct() SfxTabPage* SvxTransparenceTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rAttrs) { - return(new SvxTransparenceTabPage(pWindow, *rAttrs)); + return new SvxTransparenceTabPage(pWindow, *rAttrs); } const sal_uInt16* SvxTransparenceTabPage::GetRanges() { - return(pTransparenceRanges); + return pTransparenceRanges; } bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs) @@ -485,7 +485,7 @@ int SvxTransparenceTabPage::DeactivatePage(SfxItemSet* _pSet) { if( _pSet ) FillItemSet( _pSet ); - return(LEAVE_PAGE); + return LEAVE_PAGE; } void SvxTransparenceTabPage::PointChanged(vcl::Window* , RECT_POINT eRcPt) @@ -988,7 +988,7 @@ int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) if( _pSet ) FillItemSet( _pSet ); - return( LEAVE_PAGE ); + return LEAVE_PAGE; } @@ -1434,7 +1434,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs ) rAttrs->Put (SfxUInt16Item(SID_TABPAGE_POS,nPos)); } - return( bModified ); + return bModified; } @@ -1761,14 +1761,14 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs ) SfxTabPage* SvxAreaTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { - return( new SvxAreaTabPage( pWindow, *rAttrs ) ); + return new SvxAreaTabPage( pWindow, *rAttrs ); } const sal_uInt16* SvxAreaTabPage::GetRanges() { - return( pAreaRanges ); + return pAreaRanges; } @@ -1858,7 +1858,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyColorHdl_Impl) m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() ); m_pCtlXRectPreview->Invalidate(); - return( 0L ); + return 0L; } @@ -1914,7 +1914,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyGradientHdl_Impl) m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() ); m_pCtlXRectPreview->Invalidate(); - return( 0L ); + return 0L; } @@ -1970,7 +1970,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchingHdl_Impl) m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() ); m_pCtlXRectPreview->Invalidate(); - return( 0L ); + return 0L; } @@ -1995,7 +1995,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchBckgrdColorHdl_Impl) m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() ); m_pCtlXRectPreview->Invalidate(); - return( 0L ); + return 0L; } @@ -2020,7 +2020,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ToggleHatchBckgrdColorHdl_Impl) } } - return( 0L ); + return 0L; } @@ -2100,7 +2100,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyBitmapHdl_Impl) m_pCtlBitmapPreview->SetAttributes( aXFillAttr.GetItemSet() ); m_pCtlBitmapPreview->Invalidate(); - return( 0L ); + return 0L; } @@ -2131,7 +2131,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p ) m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() ); m_pCtlXRectPreview->Invalidate(); - return( 0L ); + return 0L; } IMPL_LINK_NOARG( SvxAreaTabPage, ClickImportHdl_Impl ) @@ -2324,7 +2324,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl) m_pCtlBitmapPreview->SetAttributes( aXFillAttr.GetItemSet() ); m_pCtlBitmapPreview->Invalidate(); - return( 0L ); + return 0L; } @@ -2362,7 +2362,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ClickScaleHdl_Impl) ModifyTileHdl_Impl( NULL ); - return( 0L ); + return 0L; } diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index ff47c806dbb2..ed3668b8ab25 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -481,12 +481,12 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& ) int SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( CheckChanges_Impl() == -1L ) - return( KEEP_PAGE ); + return KEEP_PAGE; if( _pSet ) FillItemSet( _pSet ); - return( LEAVE_PAGE ); + return LEAVE_PAGE; } @@ -621,7 +621,7 @@ void SvxColorTabPage::Reset( const SfxItemSet* rSet ) SfxTabPage* SvxColorTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { - return( new SvxColorTabPage( pWindow, *rOutAttrs ) ); + return new SvxColorTabPage( pWindow, *rOutAttrs ); } // is called when the content of the MtrFields is changed for color values @@ -1085,7 +1085,7 @@ sal_uInt16 SvxColorTabPage::ColorToPercent_Impl( sal_uInt16 nColor ) break; } - return ( nWert ); + return nWert; } @@ -1105,7 +1105,7 @@ sal_uInt16 SvxColorTabPage::PercentToColor_Impl( sal_uInt16 nPercent ) break; } - return ( nWert ); + return nWert; } diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index df15d595ce4a..baf14b5188ba 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -668,7 +668,7 @@ int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) if( _pSet ) FillItemSet( _pSet ); - return( LEAVE_PAGE ); + return LEAVE_PAGE; } @@ -954,7 +954,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) } } rAttrs->Put (CntUInt16Item(SID_PAGE_TYPE,nPageType)); - return( bModified ); + return bModified; } @@ -1491,7 +1491,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) SfxTabPage* SvxLineTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { - return( new SvxLineTabPage( pWindow, *rAttrs ) ); + return new SvxLineTabPage( pWindow, *rAttrs ); } @@ -1561,7 +1561,7 @@ IMPL_LINK( SvxLineTabPage, ChangePreviewHdl_Impl, void *, pCntrl ) m_pBoxEnd->Enable(bHasLineEnd && bHasLineStyle); - return( 0L ); + return 0L; } @@ -1580,7 +1580,7 @@ IMPL_LINK( SvxLineTabPage, ChangeStartHdl_Impl, void *, p ) ChangePreviewHdl_Impl( this ); - return( 0L ); + return 0L; } @@ -1590,7 +1590,7 @@ IMPL_LINK_NOARG(SvxLineTabPage, ChangeEdgeStyleHdl_Impl) { ChangePreviewHdl_Impl( this ); - return( 0L ); + return 0L; } @@ -1600,7 +1600,7 @@ IMPL_LINK( SvxLineTabPage, ChangeCapStyleHdl_Impl, void *, EMPTYARG ) { ChangePreviewHdl_Impl( this ); - return( 0L ); + return 0L; } @@ -1637,7 +1637,7 @@ IMPL_LINK_NOARG(SvxLineTabPage, ClickInvisibleHdl_Impl) } ChangePreviewHdl_Impl( NULL ); - return( 0L ); + return 0L; } @@ -1656,7 +1656,7 @@ IMPL_LINK( SvxLineTabPage, ChangeEndHdl_Impl, void *, p ) ChangePreviewHdl_Impl( this ); - return( 0L ); + return 0L; } @@ -1673,7 +1673,7 @@ IMPL_LINK_NOARG(SvxLineTabPage, ChangeTransparentHdl_Impl) m_pCtlPreview->Invalidate(); - return( 0L ); + return 0L; } diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 8cafbc8669b3..bfc053efafcb 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -201,7 +201,7 @@ int SvxLineDefTabPage::DeactivatePage( SfxItemSet* _pSet ) if( _pSet ) FillItemSet( _pSet ); - return( LEAVE_PAGE ); + return LEAVE_PAGE; } @@ -327,7 +327,7 @@ void SvxLineDefTabPage::Reset( const SfxItemSet* rAttrs ) SfxTabPage* SvxLineDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { - return( new SvxLineDefTabPage( pWindow, *rOutAttrs ) ); + return new SvxLineDefTabPage( pWindow, *rOutAttrs ); } @@ -361,7 +361,7 @@ IMPL_LINK( SvxLineDefTabPage, SelectLinestyleHdl_Impl, void *, p ) if( p ) *pPageType = 2; } - return( 0L ); + return 0L; } @@ -371,7 +371,7 @@ IMPL_LINK_NOARG_INLINE_START(SvxLineDefTabPage, ChangePreviewHdl_Impl) FillDash_Impl(); m_pCtlPreview->Invalidate(); - return( 0L ); + return 0L; } IMPL_LINK_NOARG_INLINE_END(SvxLineDefTabPage, ChangePreviewHdl_Impl) @@ -392,7 +392,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber1Hdl_Impl) ChangePreviewHdl_Impl( this ); - return( 0L ); + return 0L; } @@ -412,7 +412,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber2Hdl_Impl) ChangePreviewHdl_Impl( this ); - return( 0L ); + return 0L; } @@ -483,7 +483,7 @@ IMPL_LINK( SvxLineDefTabPage, ChangeMetricHdl_Impl, void *, p ) } SelectTypeHdl_Impl( NULL ); - return( 0L ); + return 0L; } @@ -518,7 +518,7 @@ IMPL_LINK( SvxLineDefTabPage, SelectTypeHdl_Impl, void *, p ) } } ChangePreviewHdl_Impl( p ); - return( 0L ); + return 0L; } @@ -609,7 +609,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl) m_pBtnDelete->Enable(); m_pBtnSave->Enable(); } - return( 0L ); + return 0L; } @@ -679,7 +679,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl) } } } - return( 0L ); + return 0L; } @@ -716,7 +716,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl) m_pBtnDelete->Disable(); m_pBtnSave->Disable(); } - return( 0L ); + return 0L; } @@ -789,7 +789,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl) m_pBtnDelete->Disable(); m_pBtnSave->Disable(); } - return( 0L ); + return 0L; } @@ -836,7 +836,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl) } } - return( 0L ); + return 0L; } diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index a4cafe54584c..b69f9d9e0b34 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -179,7 +179,7 @@ int SvxLineEndDefTabPage::DeactivatePage( SfxItemSet* _pSet ) if( _pSet ) FillItemSet( _pSet ); - return( LEAVE_PAGE ); + return LEAVE_PAGE; } @@ -271,7 +271,7 @@ void SvxLineEndDefTabPage::Reset( const SfxItemSet* ) SfxTabPage* SvxLineEndDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet ) { - return( new SvxLineEndDefTabPage( pWindow, *rSet ) ); + return new SvxLineEndDefTabPage( pWindow, *rSet ); } @@ -298,7 +298,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, SelectLineEndHdl_Impl) // if there is an entry selected in the ListBox *pPageType = 3; } - return( 0L ); + return 0L; } @@ -306,7 +306,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, SelectLineEndHdl_Impl) long SvxLineEndDefTabPage::ChangePreviewHdl_Impl( void* ) { m_pCtlPreview->Invalidate(); - return( 0L ); + return 0L; } @@ -387,7 +387,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl) } } } - return( 0L ); + return 0L; } @@ -413,10 +413,10 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl) pNewObj = pConvPolyObj = pPolyObj->ConvertToPolyObj( true, false ); if( !pNewObj || !pNewObj->ISA( SdrPathObj ) ) - return( 0L ); // cancel, additional safety, which + return 0L; // cancel, additional safety, which // has no use for group objects though. } - else return( 0L ); // cancel + else return 0L; // cancel } basegfx::B2DPolyPolygon aNewPolyPolygon(static_cast<const SdrPathObj*>(pNewObj)->GetPathPoly()); @@ -502,7 +502,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl) m_pBtnDelete->Enable(); m_pBtnSave->Enable(); } - return( 0L ); + return 0L; } @@ -538,7 +538,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickDeleteHdl_Impl) m_pBtnDelete->Disable(); m_pBtnSave->Disable(); } - return( 0L ); + return 0L; } @@ -611,7 +611,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl) m_pBtnDelete->Disable(); m_pBtnSave->Disable(); } - return( 0L ); + return 0L; } @@ -657,7 +657,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl) ,"cui/ui/querynosavefiledialog.ui").Execute(); } } - return( 0L ); + return 0L; } void SvxLineEndDefTabPage::DataChanged( const DataChangedEvent& rDCEvt ) diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 15d00d19de19..3f09743cd55a 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -237,7 +237,7 @@ int SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet ) if( _pSet ) FillItemSet( _pSet ); - return( LEAVE_PAGE ); + return LEAVE_PAGE; } @@ -347,7 +347,7 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet* rAttrs ) rAttrs->Put (CntUInt16Item(SID_PAGE_TYPE,nPageType)); - return( bModified ); + return bModified; } @@ -458,14 +458,14 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs ) SfxTabPage* SvxShadowTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { - return( new SvxShadowTabPage( pWindow, *rAttrs ) ); + return new SvxShadowTabPage( pWindow, *rAttrs ); } const sal_uInt16* SvxShadowTabPage::GetRanges() { - return( pShadowRanges ); + return pShadowRanges; } @@ -484,7 +484,7 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ClickShadowHdl_Impl) ModifyShadowHdl_Impl( NULL ); - return( 0L ); + return 0L; } @@ -527,7 +527,7 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ModifyShadowHdl_Impl) //aCtlXRectPreview.SetFillAttr( aXFillAttr ); m_pCtlXRectPreview->Invalidate(); - return( 0L ); + return 0L; } diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 9a4b72b97acb..b6792aef93f7 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -315,14 +315,14 @@ void SvxAngleTabPage::Reset(const SfxItemSet* rAttrs) SfxTabPage* SvxAngleTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet) { - return(new SvxAngleTabPage(pWindow, *rSet)); + return new SvxAngleTabPage(pWindow, *rSet); } const sal_uInt16* SvxAngleTabPage::GetRanges() { - return(pAngleRanges); + return pAngleRanges; } @@ -488,7 +488,7 @@ bool SvxSlantTabPage::FillItemSet(SfxItemSet* rAttrs) rAttrs->Put( SfxBoolItem( SID_ATTR_TRANSFORM_SHEAR_VERTICAL, false ) ); } - return( bModified ); + return bModified; } @@ -549,14 +549,14 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs) SfxTabPage* SvxSlantTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { - return( new SvxSlantTabPage( pWindow, *rOutAttrs ) ); + return new SvxSlantTabPage( pWindow, *rOutAttrs ); } const sal_uInt16* SvxSlantTabPage::GetRanges() { - return( pSlantRanges ); + return pSlantRanges; } @@ -988,14 +988,14 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* ) SfxTabPage* SvxPositionSizeTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { - return( new SvxPositionSizeTabPage( pWindow, *rOutAttrs ) ); + return new SvxPositionSizeTabPage( pWindow, *rOutAttrs ); } const sal_uInt16* SvxPositionSizeTabPage::GetRanges() { - return( pPosSizeRanges ); + return pPosSizeRanges; } @@ -1043,7 +1043,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangePosProtectHdl) // #106572# Remember user's last choice m_pTsbSizeProtect->SetState( m_pTsbPosProtect->GetState() == TRISTATE_TRUE ? TRISTATE_TRUE : mnProtectSizeState ); UpdateControlStates(); - return( 0L ); + return 0L; } @@ -1099,7 +1099,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeSizeProtectHdl) UpdateControlStates(); - return( 0L ); + return 0L; } @@ -1438,7 +1438,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeWidthHdl) } } - return( 0L ); + return 0L; } @@ -1463,7 +1463,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeHeightHdl) } } - return( 0L ); + return 0L; } @@ -1471,7 +1471,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeHeightHdl) IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickSizeProtectHdl) { UpdateControlStates(); - return( 0L ); + return 0L; } @@ -1484,7 +1484,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickAutoHdl) mfOldHeight = std::max( (double)GetCoreValue( *m_pMtrHeight, mePoolUnit ), 1.0 ); } - return( 0L ); + return 0L; } diff --git a/desktop/unx/source/file_image_unx.c b/desktop/unx/source/file_image_unx.c index f1320cc2bc56..eb3c0d56fc50 100644 --- a/desktop/unx/source/file_image_unx.c +++ b/desktop/unx/source/file_image_unx.c @@ -40,12 +40,12 @@ int file_image_open (file_image * image, const char * filename) void * p; if (image == 0) - return (EINVAL); + return EINVAL; image->m_base = MAP_FAILED, image->m_size = 0; if ((fd = open (filename, O_RDONLY)) == -1) - return (errno); + return errno; if (fstat (fd, &st) == -1) { @@ -64,7 +64,7 @@ int file_image_open (file_image * image, const char * filename) cleanup_and_leave: close (fd); - return (result); + return result; } /* @@ -79,15 +79,15 @@ int file_image_pagein (file_image * image) volatile char c = 0; if (image == 0) - return (EINVAL); + return EINVAL; if ((w.m_base = image->m_base) == 0) - return (EINVAL); + return EINVAL; if ((w.m_size = image->m_size) == 0) - return (0); + return 0; if (madvise (w.m_base, w.m_size, MADV_WILLNEED) == -1) - return (errno); + return errno; if ((s = sysconf (_SC_PAGESIZE)) == -1) s = 0x1000; @@ -104,7 +104,7 @@ int file_image_pagein (file_image * image) c ^= ((char*)(w.m_base))[0]; } - return (0); + return 0; } /* @@ -113,13 +113,13 @@ int file_image_pagein (file_image * image) int file_image_close (file_image * image) { if (image == 0) - return (EINVAL); + return EINVAL; if (munmap (image->m_base, image->m_size) == -1) - return (errno); + return errno; image->m_base = 0, image->m_size = 0; - return (0); + return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dtrans/source/win32/clipb/MtaOleClipb.cxx b/dtrans/source/win32/clipb/MtaOleClipb.cxx index c28d56493791..99ca9991ea13 100644 --- a/dtrans/source/win32/clipb/MtaOleClipb.cxx +++ b/dtrans/source/win32/clipb/MtaOleClipb.cxx @@ -788,7 +788,7 @@ unsigned int WINAPI CMtaOleClipboard::clipboardChangedNotifierThreadProc( LPVOID CoUninitialize( ); - return ( 0 ); + return 0; } bool CMtaOleClipboard::WaitForThreadReady( ) const diff --git a/embeddedobj/test/Container1/nativelib/nativeview.c b/embeddedobj/test/Container1/nativelib/nativeview.c index 2f3ea772c9f3..adee0e86a583 100644 --- a/embeddedobj/test/Container1/nativelib/nativeview.c +++ b/embeddedobj/test/Container1/nativelib/nativeview.c @@ -49,7 +49,7 @@ static LRESULT APIENTRY NativeViewWndProc( HWND , UINT , WPARAM , LPARAM ); JNIEXPORT jint JNICALL Java_embeddedobj_test_NativeView_getNativeWindowSystemType (JNIEnv * env, jobject obj_this) { - return (SYSTEM_WIN32); + return SYSTEM_WIN32; } /***************************************************************************** diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index 4261fe36918a..2e5f9a141fa4 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -757,7 +757,7 @@ GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* ) delete[] pHeader; rStream.SetEndian(nOldFormat); rStream.Seek( nOrigPos ); - return ( bRetValue ); + return bRetValue; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx index 10b285432297..7a00f1666a9a 100644 --- a/filter/source/msfilter/mscodec.cxx +++ b/filter/source/msfilter/mscodec.cxx @@ -377,7 +377,7 @@ bool MSCodec_Std97::VerifyKey ( (void)memset (pDigest, 0, sizeof(pDigest)); } - return (result); + return result; } bool MSCodec_Std97::InitCipher (sal_uInt32 nCounter) @@ -435,7 +435,7 @@ bool MSCodec_Std97::CreateSaltDigest( const sal_uInt8 nSaltData[16], sal_uInt8 n (void)memcpy(nSaltDigest, pDigest, 16); } - return (result); + return result; } bool MSCodec_Std97::Encode ( diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx index 4cd266721a2b..fe58a3a7652a 100644 --- a/filter/source/svg/svgdialog.cxx +++ b/filter/source/svg/svgdialog.cxx @@ -67,7 +67,7 @@ Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames() Reference< XInterface > SAL_CALL SVGDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw( Exception ) { - return( static_cast< cppu::OWeakObject* >( new SVGDialog( comphelper::getComponentContext(rSMgr) ) ) ); + return static_cast< cppu::OWeakObject* >( new SVGDialog( comphelper::getComponentContext(rSMgr) ) ); } @@ -98,7 +98,7 @@ Any SAL_CALL SVGDialog::queryInterface( const Type& rType ) static_cast< XExporter* >( this ) ); } - return( aReturn ); + return aReturn; } @@ -165,13 +165,13 @@ void SVGDialog::executedDialog( sal_Int16 nExecutionResult ) Reference< XPropertySetInfo > SAL_CALL SVGDialog::getPropertySetInfo() throw(RuntimeException, std::exception) { - return( Reference< XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) ) ); + return Reference< XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) ); } ::cppu::IPropertyArrayHelper& SVGDialog::getInfoHelper() { - return( *const_cast< SVGDialog *>(this)->getArrayHelper() ); + return *const_cast< SVGDialog *>(this)->getArrayHelper(); } @@ -205,7 +205,7 @@ Sequence< PropertyValue > SAL_CALL SVGDialog::getPropertyValues() maMediaDescriptor[ i ].Value <<= maFilterData; - return( maMediaDescriptor ); + return maMediaDescriptor; } diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 8b47676c7569..a9c0dc4e56fe 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -114,7 +114,7 @@ SVGAttributeWriter::~SVGAttributeWriter() double SVGAttributeWriter::ImplRound( double fValue, sal_Int32 nDecs ) { - return( floor( fValue * pow( 10.0, (int)nDecs ) + 0.5 ) / pow( 10.0, (int)nDecs ) ); + return floor( fValue * pow( 10.0, (int)nDecs ) + 0.5 ) / pow( 10.0, (int)nDecs ); } void SVGAttributeWriter::ImplGetColorStr( const Color& rColor, OUString& rColorStr ) @@ -1665,7 +1665,7 @@ long SVGActionWriter::ImplMap( sal_Int32 nVal ) const { Size aSz( nVal, nVal ); - return( ImplMap( aSz, aSz ).Width() ); + return ImplMap( aSz, aSz ).Width(); } Point& SVGActionWriter::ImplMap( const Point& rPt, Point& rDstPt ) const @@ -1696,7 +1696,7 @@ Polygon& SVGActionWriter::ImplMap( const Polygon& rPoly, Polygon& rDstPoly ) con rDstPoly.SetFlags( i, rPoly.GetFlags( i ) ); } - return( rDstPoly ); + return rDstPoly; } tools::PolyPolygon& SVGActionWriter::ImplMap( const tools::PolyPolygon& rPolyPoly, tools::PolyPolygon& rDstPolyPoly ) const @@ -1710,7 +1710,7 @@ tools::PolyPolygon& SVGActionWriter::ImplMap( const tools::PolyPolygon& rPolyPol rDstPolyPoly.Insert( ImplMap( rPolyPoly[ i ], aPoly ) ); } - return( rDstPolyPoly ); + return rDstPolyPoly; } OUString SVGActionWriter::GetPathString( const tools::PolyPolygon& rPolyPoly, bool bLine ) diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx index ec812ddd937a..a9d1cae94360 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx @@ -170,7 +170,7 @@ IMPL_LINK ( XMLFilterTabPageXSLT, ClickBrowseHdl_Impl, PushButton *, pButton ) SetURL( pURLBox, aURL ); } - return( 0L ); + return 0L; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/hwpfilter/source/hutil.cxx b/hwpfilter/source/hutil.cxx index 87c7b6e8b86b..2faf89897a81 100644 --- a/hwpfilter/source/hutil.cxx +++ b/hwpfilter/source/hutil.cxx @@ -88,7 +88,7 @@ int hstrlen(const hchar * s) while (*s++) n++; - return (n); + return n; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/source/calendar/calendar_hijri.cxx b/i18npool/source/calendar/calendar_hijri.cxx index a0200417fa39..ff1bf5126440 100644 --- a/i18npool/source/calendar/calendar_hijri.cxx +++ b/i18npool/source/calendar/calendar_hijri.cxx @@ -163,7 +163,7 @@ Calendar_hijri::NewMoon(sal_Int32 n) // convert from Ephemeris Time (ET) to (approximate) Universal Time (UT) jd += xtra - (0.41 + 1.2053 * t + 0.4992 * t2)/1440; - return (jd); + return jd; } // Get Hijri Date diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx index ef425738832a..a2b110c157fe 100644 --- a/i18npool/source/collator/collator_unicode.cxx +++ b/i18npool/source/collator/collator_unicode.cxx @@ -375,7 +375,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang:: else collator->setStrength(Collator::TERTIARY); - return(0); + return 0; } diff --git a/i18npool/source/search/levdis.cxx b/i18npool/source/search/levdis.cxx index bc32b159bae7..c0dc37a0ee80 100644 --- a/i18npool/source/search/levdis.cxx +++ b/i18npool/source/search/levdis.cxx @@ -89,7 +89,7 @@ int WLevDistance::WLD( const sal_Unicode* cString, sal_Int32 nStringLen ) // more insertions or deletions necessary as the limit? Then leave if ( (nLenDiff * nInsQ0 > nLimit) || ((nStars == 0) && (nLenDiff * nDelR0 < -nLimit)) ) - return(LEVDISBIG); + return LEVDISBIG; // comparative String greater than instantaneous array // -> adapt array size @@ -247,7 +247,7 @@ int WLevDistance::WLD( const sal_Unicode* cString, sal_Int32 nStringLen ) } } if ( (nSPMin <= nLimit) && (npDistance[nStringLen] <= nLimit) ) - return(npDistance[nStringLen]); + return npDistance[nStringLen]; else { if ( bSplitCount ) @@ -257,10 +257,10 @@ int WLevDistance::WLD( const sal_Unicode* cString, sal_Int32 nStringLen ) if ( (nSPMin <= 2 * nLimit) && (npDistance[nStringLen] <= 2 * nLimit) && (nRepS * nRepP0 <= nLimit) ) - return( -npDistance[nStringLen] ); - return(LEVDISBIG); + return -npDistance[nStringLen]; + return LEVDISBIG; } - return(LEVDISBIG); + return LEVDISBIG; } } @@ -286,7 +286,7 @@ int WLevDistance::CalcLPQR( int nX, int nY, int nZ, bool bRelaxed ) nInsQ0 = ( nY ? nLimit / nY : nLimit + 1 ); nDelR0 = ( nZ ? nLimit / nZ : nLimit + 1 ); bSplitCount = bRelaxed; - return( nLimit ); + return nLimit; } // greatest common divisior according to Euklid (chaindivision) diff --git a/i18npool/source/search/levdis.hxx b/i18npool/source/search/levdis.hxx index e25883ba91c8..426e7228de5b 100644 --- a/i18npool/source/search/levdis.hxx +++ b/i18npool/source/search/levdis.hxx @@ -171,11 +171,11 @@ public: int CalcLPQR( int nOtherX, int nShorterY, int nLongerZ, bool bRelaxed = true ); - inline int GetLimit() const { return( nLimit ); } - inline int GetReplaceP0() const { return( nRepP0 ); } - inline int GetInsertQ0() const { return( nInsQ0 ); } - inline int GetDeleteR0() const { return( nDelR0 ); } - inline bool GetSplit() const { return( bSplitCount ); } + inline int GetLimit() const { return nLimit; } + inline int GetReplaceP0() const { return nRepP0; } + inline int GetInsertQ0() const { return nInsQ0; } + inline int GetDeleteR0() const { return nDelR0; } + inline bool GetSplit() const { return bSplitCount; } inline int SetLimit( int nNewLimit ); inline int SetReplaceP0( int nNewP0 ); inline int SetInsertQ0( int nNewQ0 ); @@ -184,7 +184,7 @@ public: internal weighs! */ inline bool SetSplit( bool bNewSplit ); - inline bool IsNormal( sal_Int32 nPos ) const { return( !bpPatIsWild[nPos] ); } + inline bool IsNormal( sal_Int32 nPos ) const { return !bpPatIsWild[nPos]; } // Calculate current balance, keep this inline for performance reasons! // c == cpPattern[jj] == cString[ii] @@ -224,35 +224,35 @@ inline int WLevDistance::SetLimit( int nNewLimit ) { int nTmp = nLimit; nLimit = nNewLimit; - return( nTmp ); + return nTmp; } inline int WLevDistance::SetReplaceP0( int nNewP0 ) { int nTmp = nRepP0; nRepP0 = nNewP0; - return( nTmp ); + return nTmp; } inline int WLevDistance::SetInsertQ0( int nNewQ0 ) { int nTmp = nInsQ0; nInsQ0 = nNewQ0; - return( nTmp ); + return nTmp; } inline int WLevDistance::SetDeleteR0( int nNewR0 ) { int nTmp = nDelR0; nDelR0 = nNewR0; - return( nTmp ); + return nTmp; } inline bool WLevDistance::SetSplit( bool bNewSplit ) { bool bTmp = bSplitCount; bSplitCount = bNewSplit; - return( bTmp ); + return bTmp; } #endif diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx index 1fb47350bbdb..a90ef47d84cd 100644 --- a/i18npool/source/transliteration/transliterationImpl.cxx +++ b/i18npool/source/transliteration/transliterationImpl.cxx @@ -170,7 +170,7 @@ TransliterationImpl::getType() throw(RuntimeException, std::exception) if (numCascade > 1) return (TransliterationType::CASCADE|TransliterationType::IGNORE); if (numCascade > 0 && bodyCascade[0].is()) - return(bodyCascade[0]->getType()); + return bodyCascade[0]->getType(); throw ERROR; } diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx index dc6e27cebf98..6ca4a7c7cac2 100644 --- a/idl/source/cmptools/hash.cxx +++ b/idl/source/cmptools/hash.cxx @@ -132,7 +132,7 @@ sal_uInt32 SvStringHashTable::HashFunc( const OString& rElement ) const nShift += 4; pStr++; } - return( nHash ); + return nHash; } OString SvStringHashTable::GetNearString( const OString& rName ) const @@ -179,7 +179,7 @@ SvStringHashEntry * SvStringHashTable::Get( sal_uInt32 nIndex ) const { if( IsEntry( nIndex ) ) return pEntries + nIndex; - return( NULL ); + return NULL; } bool SvStringHashTable::equals( const OString& rElement, diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx index 0802436b52e0..ef606941af2d 100644 --- a/idl/source/cmptools/lex.cxx +++ b/idl/source/cmptools/lex.cxx @@ -207,7 +207,7 @@ sal_uLong SvTokenStream::GetNumber() } } - return( l ); + return l; } bool SvTokenStream::MakeToken( SvToken & rToken ) diff --git a/idlc/source/idlcmain.cxx b/idlc/source/idlcmain.cxx index 9d672fd7bbf0..86a9755b1d08 100644 --- a/idlc/source/idlcmain.cxx +++ b/idlc/source/idlcmain.cxx @@ -29,7 +29,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) for (int i = 1; i < argc; i++) { if (!Options::checkArgument (args, argv[i], strlen(argv[i]))) - return (1); + return 1; } Options options(argv[0]); @@ -38,7 +38,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) try { if (!options.initOptions(args)) - return (0); + return 0; setIdlc(&options); @@ -156,7 +156,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) fprintf(stderr, "Illegal argument: %s\n%s", e.m_message.getStr(), options.prepareVersion().getStr()); - return (99); + return 99; } return nErrors; diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx index dfdb9bd291a9..0db0e215d478 100644 --- a/idlc/source/options.cxx +++ b/idlc/source/options.cxx @@ -110,7 +110,7 @@ bool Options::checkArgument (std::vector< std::string > & rArgs, char const * ar break; } } - return (result); + return result; } // static @@ -120,7 +120,7 @@ bool Options::checkCommandFile (std::vector< std::string > & rArgs, char const * if (fp == 0) { fprintf(stderr, "ERROR: can't open command file \"%s\"\n", filename); - return (false); + return false; } std::string buffer; @@ -147,7 +147,7 @@ bool Options::checkCommandFile (std::vector< std::string > & rArgs, char const * if (!Options::checkArgument(rArgs, buffer.c_str(), buffer.size())) { (void) fclose(fp); - return (false); + return false; } buffer.clear(); } @@ -165,7 +165,7 @@ bool Options::checkCommandFile (std::vector< std::string > & rArgs, char const * if (!Options::checkArgument(rArgs, buffer.c_str(), buffer.size())) { (void) fclose(fp); - return (false); + return false; } buffer.clear(); } @@ -188,7 +188,7 @@ bool Options::setOption(char const * option, std::string const & rArg) bool result = (0 == strcmp(option, rArg.c_str())); if (result) m_options[rArg.c_str()] = OString(rArg.c_str(), rArg.size()); - return (result); + return result; } #ifdef WNT @@ -357,7 +357,7 @@ bool Options::initOptions(std::vector< std::string > & rArgs) throw(IllegalArgum } { (void) fprintf(stdout, "%s", prepareHelp().getStr()); - return (false); + return false; } // break; // Unreachable } @@ -374,7 +374,7 @@ bool Options::initOptions(std::vector< std::string > & rArgs) throw(IllegalArgum return badOption("unknown", option); } } - return (true); + return true; } OString Options::prepareHelp() diff --git a/include/o3tl/compat_functional.hxx b/include/o3tl/compat_functional.hxx index 6dff02bc7b74..6d04e6744ca3 100644 --- a/include/o3tl/compat_functional.hxx +++ b/include/o3tl/compat_functional.hxx @@ -43,7 +43,7 @@ struct project1st : public std::binary_function<T1, T2, T1> { T1 operator()(const T1& y, const T2&) const { - return (y); + return y; } }; @@ -53,7 +53,7 @@ struct project2nd : public std::binary_function<T1, T2, T2> { T2 operator()(const T1&, const T2& x) const { - return (x); + return x; } }; @@ -63,7 +63,7 @@ struct select1st : public std::unary_function<P, typename P::first_type> { const typename P::first_type& operator()(const P& y) const { - return (y.first); + return y.first; } }; @@ -73,7 +73,7 @@ struct select2nd : public std::unary_function<P, typename P::second_type> { const typename P::second_type& operator()(const P& y) const { - return (y.second); + return y.second; } }; @@ -86,7 +86,7 @@ class unary_compose : public std::unary_function<typename F2::argument_type, typ typename F1::result_type operator()(const typename F2::argument_type& y) const { - return (ftor1(ftor2(y))); + return ftor1(ftor2(y)); } protected: @@ -98,7 +98,7 @@ class unary_compose : public std::unary_function<typename F2::argument_type, typ template<class F1, class F2> inline unary_compose<F1, F2> compose1(const F1& fnction1, const F2& fnction2) { - return (unary_compose<F1, F2>(fnction1, fnction2)); + return unary_compose<F1, F2>(fnction1, fnction2); } } // namespace o3tl diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx index 09194c428a3e..f17a61abe8e7 100644 --- a/include/registry/registry.hxx +++ b/include/registry/registry.hxx @@ -719,7 +719,7 @@ inline RegError RegistryKeyArray::closeKeyHandles() m_phKeys = NULL; return ret; } else - return(REG_INVALID_KEY); + return REG_INVALID_KEY; } diff --git a/include/salhelper/refobj.hxx b/include/salhelper/refobj.hxx index 4a004d2c8eb8..2eee3935f016 100644 --- a/include/salhelper/refobj.hxx +++ b/include/salhelper/refobj.hxx @@ -54,7 +54,7 @@ public: } static void* operator new (size_t, void* p) { - return (p); + return p; } static void operator delete (void*, void*) {} diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx index e7a6442b6537..b51e62b4cee6 100644 --- a/include/svx/AccessibleShape.hxx +++ b/include/svx/AccessibleShape.hxx @@ -385,7 +385,7 @@ public: //===== Misc ======================================================== ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - GetXShape() { return( mxShape );} + GetXShape() { return mxShape; } /** set the index _nIndex at the accessible shape @param _nIndex diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx index 31796a24ab8a..a17e9a81ab4a 100644 --- a/include/svx/dlgctl3d.hxx +++ b/include/svx/dlgctl3d.hxx @@ -59,7 +59,7 @@ public: void Reset(); virtual void SetObjectType(sal_uInt16 nType); - sal_uInt16 GetObjectType() const { return( mnObjectType ); } + sal_uInt16 GetObjectType() const { return mnObjectType; } SfxItemSet Get3DAttributes() const; virtual void Set3DAttributes(const SfxItemSet& rAttr); }; diff --git a/include/svx/viewpt3d.hxx b/include/svx/viewpt3d.hxx index 481705b24a91..1778bffb8da4 100644 --- a/include/svx/viewpt3d.hxx +++ b/include/svx/viewpt3d.hxx @@ -96,7 +96,7 @@ class SVX_DLLPUBLIC Viewport3D void SetProjection(ProjectionType ePrj) { eProjection = ePrj; bTfValid = false; } - ProjectionType GetProjection() const { return(eProjection); } + ProjectionType GetProjection() const { return eProjection; } void SetAspectMapping(AspectMapType eAsp) { eAspectMapping = eAsp; bTfValid = false; } diff --git a/include/tools/resid.hxx b/include/tools/resid.hxx index 26f21c742536..6d9bb9204e6b 100644 --- a/include/tools/resid.hxx +++ b/include/tools/resid.hxx @@ -69,7 +69,7 @@ public: sal_uInt32 GetWinBits() const { return m_nWinBits; } void SetWinBits( sal_uInt32 nBits ) const { m_nWinBits = nBits; } - RESOURCE_TYPE GetRT() const { return( m_nRT ); } + RESOURCE_TYPE GetRT() const { return m_nRT; } /** Set the type if not already set. Ask for type with GetRT() diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java index feaca77cc9a6..0053c4dfee70 100644 --- a/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java +++ b/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java @@ -59,7 +59,7 @@ public final class InputStreamToXInputStreamAdapter implements XInputStream { throw new com.sun.star.io.IOException(e); } - return(bytesAvail); + return bytesAvail; } public void closeInput() throws @@ -88,7 +88,7 @@ public final class InputStreamToXInputStreamAdapter implements XInputStream { // must <= len. if (bytesRead <= 0) { - return(0); + return 0; } return ((int)bytesRead); @@ -114,7 +114,7 @@ public final class InputStreamToXInputStreamAdapter implements XInputStream { // must <= len. if (bytesRead <= 0) { - return(0); + return 0; } return ((int)bytesRead); diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java index c77c57b5adc1..978d10f6a5a6 100644 --- a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java +++ b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java @@ -60,7 +60,7 @@ public final class XInputStreamToInputStreamAdapter extends InputStream { throw newEx; } - return(bytesAvail); + return bytesAvail; } @Override @@ -87,7 +87,7 @@ public final class XInputStreamToInputStreamAdapter extends InputStream { if (tmpInt< 0 ){ tmpInt = 256 +tmpInt; } - return(tmpInt); + return tmpInt; } } catch (Exception e) { @@ -106,7 +106,7 @@ public final class XInputStreamToInputStreamAdapter extends InputStream { try { bytesRead = xin.readBytes(tmp, b.length); if (bytesRead <= 0) { - return(-1); + return -1; } else if (bytesRead < b.length) { System.arraycopy(tmp[0], 0, b, 0, bytesRead); } else { @@ -138,7 +138,7 @@ public final class XInputStreamToInputStreamAdapter extends InputStream { // must <= len. if (bytesRead <= 0) { - return(-1); + return -1; } else if (bytesRead < len) { System.arraycopy(tmp[0], 0, b, off, (int)bytesRead); } else { @@ -187,9 +187,9 @@ public final class XInputStreamToInputStreamAdapter extends InputStream { } while (tmpLongVal > 0); if ( avail != 0 && avail < n) { - return(avail); + return avail; } else { - return(n); + return n; } } diff --git a/lotuswordpro/source/filter/lwp9reader.cxx b/lotuswordpro/source/filter/lwp9reader.cxx index b2a91ec06973..f23c8fcbd076 100644 --- a/lotuswordpro/source/filter/lwp9reader.cxx +++ b/lotuswordpro/source/filter/lwp9reader.cxx @@ -169,7 +169,7 @@ sal_Int64 Lwp9Reader::GetFileSize() sal_Int64 size = m_pDocStream->Seek( STREAM_SEEK_TO_END); m_pDocStream->Seek(pos); - return(size); + return size; } /** diff --git a/lotuswordpro/source/filter/lwpobjfactory.cxx b/lotuswordpro/source/filter/lwpobjfactory.cxx index 13635c588fd3..d72535da872f 100644 --- a/lotuswordpro/source/filter/lwpobjfactory.cxx +++ b/lotuswordpro/source/filter/lwpobjfactory.cxx @@ -677,7 +677,7 @@ rtl::Reference<LwpObject> LwpObjectFactory::CreateObject(sal_uInt32 type, LwpObj m_IdToObjList.insert(LwpIdToObjMap::value_type(objHdr.GetID(), newObj)); } - return(newObj); + return newObj; } /** * @descr query object by object id @@ -719,7 +719,7 @@ rtl::Reference<LwpObject> LwpObjectFactory::FindObject(const LwpObjectID &objID) { LwpIdToObjMap::const_iterator it = m_IdToObjList.find(objID); if (it != m_IdToObjList.end()) { - return((*it).second); + return (*it).second; } else { diff --git a/lotuswordpro/source/filter/lwpobjid.cxx b/lotuswordpro/source/filter/lwpobjid.cxx index 54b4778e2175..887955171414 100644 --- a/lotuswordpro/source/filter/lwpobjid.cxx +++ b/lotuswordpro/source/filter/lwpobjid.cxx @@ -208,7 +208,7 @@ rtl::Reference<LwpObject> LwpObjectID::obj(VO_TYPE tag) const pObj.clear(); } } - return(pObj); + return pObj; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpobjstrm.cxx b/lotuswordpro/source/filter/lwpobjstrm.cxx index 8eb8d431fc70..55fcae7206be 100644 --- a/lotuswordpro/source/filter/lwpobjstrm.cxx +++ b/lotuswordpro/source/filter/lwpobjstrm.cxx @@ -128,11 +128,11 @@ sal_uInt8* LwpObjectStream::AllocBuffer(sal_uInt16 size) { if(size<=100) { - return(m_SmallBuffer); + return m_SmallBuffer; } else { - return (new sal_uInt8[size]); + return new sal_uInt8[size]; } } /** @@ -388,7 +388,7 @@ sal_uInt16 LwpObjectStream::DecompressBuffer(sal_uInt8* pDst, sal_uInt8* pSrc, s throw BadDecompress(); } - return(static_cast<sal_uInt16>(DstSize)); + return static_cast<sal_uInt16>(DstSize); } /** * @descr quick read string with 1252 diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index bf134e50aaf7..a47ad727ede0 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -364,7 +364,7 @@ sal_Bool SAL_CALL OConnection::isClosed() MutexGuard aGuard(m_aMutex); // just simple -> we are close when we are disposed that means someone called dispose(); (XComponent) - return (OConnection_BASE::rBHelper.bDisposed); + return OConnection_BASE::rBHelper.bDisposed; } Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData() @@ -405,7 +405,7 @@ sal_Bool SAL_CALL OConnection::isReadOnly() checkDisposed(OConnection_BASE::rBHelper.bDisposed); // return if your connection to readonly - return (m_settings.readOnly); + return m_settings.readOnly; } void SAL_CALL OConnection::setCatalog(const rtl::OUString& catalog) @@ -503,11 +503,8 @@ Reference<XNameAccess> SAL_CALL OConnection::getTypeMap() MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); - Reference<XNameAccess > t; - { - t = m_typeMap; - } - return (t); + Reference<XNameAccess > t = m_typeMap; + return t; } void SAL_CALL OConnection::setTypeMap(const Reference<XNameAccess >& typeMap) diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx index 05257fadb295..99c1ab5e7670 100644 --- a/mysqlc/source/mysqlc_preparedstatement.cxx +++ b/mysqlc/source/mysqlc_preparedstatement.cxx @@ -118,7 +118,7 @@ Any SAL_CALL OPreparedStatement::queryInterface(const Type & rType) if (!aRet.hasValue()) { aRet = OPreparedStatement_BASE::queryInterface(rType); } - return (aRet); + return aRet; } Sequence< Type > SAL_CALL OPreparedStatement::getTypes() diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx index 57521ccc6d56..bc76f7d55990 100644 --- a/mysqlc/source/mysqlc_resultset.cxx +++ b/mysqlc/source/mysqlc_resultset.cxx @@ -63,7 +63,7 @@ Sequence< rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames() Sequence< rtl::OUString > aSupported(2); aSupported[0] = "com.sun.star.sdbc.ResultSet"; aSupported[1] = "com.sun.star.sdbcx.ResultSet"; - return (aSupported); + return aSupported; } sal_Bool SAL_CALL OResultSet::supportsService(const rtl::OUString& _rServiceName) @@ -1120,7 +1120,7 @@ IPropertyArrayHelper * OResultSet::createArrayHelper() const IPropertyArrayHelper & OResultSet::getInfoHelper() { OSL_TRACE("OResultSet::getInfoHelper"); - return (*const_cast<OResultSet*>(this)->getArrayHelper()); + return *const_cast<OResultSet*>(this)->getArrayHelper(); } sal_Bool OResultSet::convertFastPropertyValue(Any & /* rConvertedValue */, @@ -1207,7 +1207,7 @@ void SAL_CALL OResultSet::release() ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) { OSL_TRACE("OResultSet::getPropertySetInfo"); - return (::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper())); + return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } void OResultSet::checkColumnIndex(sal_Int32 index) diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx index 7e42758c26a7..ebb84d401eb0 100644 --- a/mysqlc/source/mysqlc_statement.cxx +++ b/mysqlc/source/mysqlc_statement.cxx @@ -192,7 +192,7 @@ Reference< XConnection > SAL_CALL OCommonStatement::getConnection() MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); - // just return(our connection here + // just return our connection here return m_pConnection; } @@ -211,7 +211,7 @@ Any SAL_CALL OStatement::queryInterface(const Type & rType) if (!aRet.hasValue()) { aRet = OCommonStatement::queryInterface(rType); } - return (aRet); + return aRet; } void SAL_CALL OStatement::addBatch(const rtl::OUString& sql) @@ -278,8 +278,8 @@ sal_Bool SAL_CALL OCommonStatement::getMoreResults() checkDisposed(rBHelper.bDisposed); // if your driver supports more than only one resultset - // and has one more at this moment return(true - return (sal_False); + // and has one more at this moment return true + return sal_False; } Any SAL_CALL OCommonStatement::getWarnings() @@ -327,7 +327,7 @@ void SAL_CALL OCommonStatement::clearWarnings() ::cppu::IPropertyArrayHelper & OCommonStatement::getInfoHelper() { OSL_TRACE("OCommonStatement::getInfoHelper"); - return(*const_cast<OCommonStatement*>(this)->getArrayHelper()); + return *const_cast<OCommonStatement*>(this)->getArrayHelper(); } sal_Bool OCommonStatement::convertFastPropertyValue( @@ -435,7 +435,7 @@ Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OCommonStatement throw(RuntimeException, std::exception) { OSL_TRACE("OCommonStatement::getPropertySetInfo"); - return(::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper())); + return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } /* diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java index 0eb1e2a7eeac..b59b0f8b19ed 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java @@ -36,7 +36,7 @@ public class RandomGenerator { public static int intRangeRandom(int lowLimit, int upLimit) { int num = (int) Math .floor(doubleRangeRandom(lowLimit, upLimit + 1) - 1E-10); - return (num); + return num; } /** @@ -50,7 +50,7 @@ public class RandomGenerator { */ public static double doubleRangeRandom(double lowLimit, double upLimit) { double num = lowLimit + Math.random() * (upLimit - lowLimit); - return (num); + return num; } public static int[] randomSelection(int maxNum, int times) { @@ -87,4 +87,4 @@ public class RandomGenerator { } return indices; } -}
\ No newline at end of file +} 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; } diff --git a/registry/source/reflcnst.hxx b/registry/source/reflcnst.hxx index b62869645b12..78fab51c2c24 100644 --- a/registry/source/reflcnst.hxx +++ b/registry/source/reflcnst.hxx @@ -212,7 +212,7 @@ inline sal_uInt32 writeUtf8(sal_uInt8* buffer, const sal_Char* v) memcpy(buffer, v, size); - return (size); + return size; } inline sal_uInt32 readUtf8(const sal_uInt8* buffer, sal_Char* v, sal_uInt32 maxSize) @@ -227,7 +227,7 @@ inline sal_uInt32 readUtf8(const sal_uInt8* buffer, sal_Char* v, sal_uInt32 maxS if (size == maxSize) v[size - 1] = '\0'; - return (size); + return size; } diff --git a/registry/tools/options.cxx b/registry/tools/options.cxx index 4e918ec1b6e9..30d58d50d044 100644 --- a/registry/tools/options.cxx +++ b/registry/tools/options.cxx @@ -74,7 +74,7 @@ bool Options::checkArgument(std::vector< std::string> & rArgs, char const * arg, break; } } - return (result); + return result; } // static @@ -84,7 +84,7 @@ bool Options::checkCommandFile(std::vector< std::string > & rArgs, char const * if (fp == 0) { fprintf(stderr, "ERROR: Can't open command file \"%s\"\n", filename); - return (false); + return false; } std::string buffer; @@ -123,7 +123,7 @@ bool Options::checkCommandFile(std::vector< std::string > & rArgs, char const * break; } } - return (fclose(fp) == 0); + return fclose(fp) == 0; } bool Options::initOptions (std::vector< std::string > & rArgs) diff --git a/registry/tools/regcompare.cxx b/registry/tools/regcompare.cxx index 191aa1859e6a..032762d228ea 100644 --- a/registry/tools/regcompare.cxx +++ b/registry/tools/regcompare.cxx @@ -52,7 +52,7 @@ public: std::string const & getRegName1() const { return m_regName1; } std::string const & getRegName2() const { return m_regName2; } - bool isStartKeyValid() const { return (!m_startKey.isEmpty()); } + bool isStartKeyValid() const { return !m_startKey.isEmpty(); } OUString const & getStartKey() const { return m_startKey; } bool matchedWithExcludeKey( const OUString& keyName) const; @@ -1963,12 +1963,12 @@ int _cdecl main( int argc, char * argv[] ) { // failure. options.printUsage(); - return (1); + return 1; } } if (!options.initOptions(args)) { - return (1); + return 1; } OUString regName1( convertToFileUrl(options.getRegName1().c_str(), options.getRegName1().size()) ); @@ -1979,13 +1979,13 @@ int _cdecl main( int argc, char * argv[] ) { fprintf(stdout, "%s: open registry \"%s\" failed\n", options.getProgramName().c_str(), options.getRegName1().c_str()); - return (2); + return 2; } if ( reg2.open(regName2, REG_READONLY) ) { fprintf(stdout, "%s: open registry \"%s\" failed\n", options.getProgramName().c_str(), options.getRegName2().c_str()); - return (3); + return 3; } RegistryKey key1, key2; @@ -1993,13 +1993,13 @@ int _cdecl main( int argc, char * argv[] ) { fprintf(stdout, "%s: open root key of registry \"%s\" failed\n", options.getProgramName().c_str(), options.getRegName1().c_str()); - return (4); + return 4; } if ( reg2.openRootKey(key2) ) { fprintf(stdout, "%s: open root key of registry \"%s\" failed\n", options.getProgramName().c_str(), options.getRegName2().c_str()); - return (5); + return 5; } if ( options.isStartKeyValid() ) @@ -2008,20 +2008,20 @@ int _cdecl main( int argc, char * argv[] ) { fprintf(stdout, "%s: start key is equal to one of the exclude keys\n", options.getProgramName().c_str()); - return (6); + return 6; } RegistryKey sk1, sk2; if ( key1.openKey(options.getStartKey(), sk1) ) { fprintf(stdout, "%s: open start key of registry \"%s\" failed\n", options.getProgramName().c_str(), options.getRegName1().c_str()); - return (7); + return 7; } if ( key2.openKey(options.getStartKey(), sk2) ) { fprintf(stdout, "%s: open start key of registry \"%s\" failed\n", options.getProgramName().c_str(), options.getRegName2().c_str()); - return (8); + return 8; } key1 = sk1; @@ -2051,13 +2051,13 @@ int _cdecl main( int argc, char * argv[] ) { fprintf(stdout, "%s: closing registry \"%s\" failed\n", options.getProgramName().c_str(), options.getRegName1().c_str()); - return (9); + return 9; } if ( reg2.close() ) { fprintf(stdout, "%s: closing registry \"%s\" failed\n", options.getProgramName().c_str(), options.getRegName2().c_str()); - return (10); + return 10; } return ((nError > 0) ? 11 : 0); diff --git a/registry/tools/regmerge.cxx b/registry/tools/regmerge.cxx index 407849c5b914..0a712cae987b 100644 --- a/registry/tools/regmerge.cxx +++ b/registry/tools/regmerge.cxx @@ -94,17 +94,17 @@ int __cdecl main( int argc, char * argv[] ) if (!Options::checkArgument(args, argv[i], strlen(argv[i]))) { options.printUsage(); - return (1); + return 1; } } if (!options.initOptions(args)) { - return (1); + return 1; } if (args.size() < 3) { options.printUsage(); - return (1); + return 1; } Registry reg; @@ -115,7 +115,7 @@ int __cdecl main( int argc, char * argv[] ) { if (options.isVerbose()) fprintf(stderr, "open registry \"%s\" failed\n", args[0].c_str()); - return (-1); + return -1; } } @@ -124,7 +124,7 @@ int __cdecl main( int argc, char * argv[] ) { if (options.isVerbose()) fprintf(stderr, "open root key of registry \"%s\" failed\n", args[0].c_str()); - return (-4); + return -4; } OUString mergeKeyName( OUString::createFromAscii(args[1].c_str()) ); @@ -145,7 +145,7 @@ int __cdecl main( int argc, char * argv[] ) if (options.isVerbose()) fprintf(stderr, "ERROR: merging registry \"%s\" under key \"%s\" in registry \"%s\" failed.\n", args[i].c_str(), args[1].c_str(), args[0].c_str()); - return (-2); + return -2; } } else @@ -161,10 +161,10 @@ int __cdecl main( int argc, char * argv[] ) { if (options.isVerbose()) fprintf(stderr, "closing registry \"%s\" failed\n", args[0].c_str()); - return (-5); + return -5; } - return(0); + return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/registry/tools/regview.cxx b/registry/tools/regview.cxx index bdd72b22bb6b..16b1b17a5060 100644 --- a/registry/tools/regview.cxx +++ b/registry/tools/regview.cxx @@ -98,7 +98,7 @@ int __cdecl main( int argc, char * argv[] ) exit(1); } - return(0); + return 0; } diff --git a/registry/workben/regspeed.cxx b/registry/workben/regspeed.cxx index 4a850fbf0cec..cce5234c49e2 100644 --- a/registry/workben/regspeed.cxx +++ b/registry/workben/regspeed.cxx @@ -250,7 +250,7 @@ int _cdecl main( int argc, char * argv[] ) cout << "\t41. closing registry \"test.reg\" failed\n"; } - return(0); + return 0; } diff --git a/registry/workben/regtest.cxx b/registry/workben/regtest.cxx index 52cf41336a00..7b590774c1ce 100644 --- a/registry/workben/regtest.cxx +++ b/registry/workben/regtest.cxx @@ -324,7 +324,7 @@ int _cdecl main() else cout << "47.a). registry \"test4.rdb\" is closed\n"; - return(0); + return 0; } diff --git a/registry/workben/test.cxx b/registry/workben/test.cxx index 25f4b18c7d3f..96f552b08ed0 100644 --- a/registry/workben/test.cxx +++ b/registry/workben/test.cxx @@ -38,7 +38,7 @@ int _cdecl main() test_generateMerge2(); test_merge(); - return(0); + return 0; } diff --git a/rsc/inc/rscclobj.hxx b/rsc/inc/rscclobj.hxx index a66959b3425f..674b6b196486 100644 --- a/rsc/inc/rscclobj.hxx +++ b/rsc/inc/rscclobj.hxx @@ -38,21 +38,21 @@ public: ObjNode( const RscId & rId, CLASS_DATA pData, sal_uLong lKey ); ObjNode * DelObjNode( RscTop * pClass, sal_uLong lFileKey ); sal_uInt32 GetId() const SAL_OVERRIDE; - RscId GetRscId(){ return( aRscId ); } + RscId GetRscId(){ return aRscId; } sal_uLong GetFileKey(){ return lFileKey; }; ObjNode* Search( const RscId &rName ) const //< search the index in the b-tree { - return( static_cast<ObjNode *>(IdNode::Search( rName )) ); + return static_cast<ObjNode *>(IdNode::Search( rName )); } bool Insert( ObjNode* pTN ) //< insert a new node in the b-tree { - return( IdNode::Insert( (IdNode *)pTN ) ); + return IdNode::Insert( (IdNode *)pTN ); } CLASS_DATA GetRscObj() //< get the Object from this Node { - return( pRscObj ); + return pRscObj; } bool IsConsistent(); }; @@ -72,11 +72,11 @@ public: sal_uInt32 GetId() const SAL_OVERRIDE; RefNode* Search( Atom typ ) const //< search the index in the b-tree { - return( static_cast<RefNode *>(IdNode::Search( typ )) ); + return static_cast<RefNode *>(IdNode::Search( typ )); } bool Insert( RefNode* pTN ) //< insert a new node in the b-tree { - return( IdNode::Insert( (IdNode *)pTN ) ); + return IdNode::Insert( (IdNode *)pTN ); } bool PutObjNode( ObjNode * pPutObject ); @@ -86,7 +86,7 @@ public: ObjNode * GetObjNode() { // hole pObjBiTree - return( pObjBiTree ); + return pObjBiTree; } }; diff --git a/rsc/inc/rscerror.h b/rsc/inc/rscerror.h index 7954cf4cdf46..754e71e60b01 100644 --- a/rsc/inc/rscerror.h +++ b/rsc/inc/rscerror.h @@ -93,7 +93,7 @@ public: ERRTYPE( sal_uInt32 nErr ) { nError = nErr; } ERRTYPE( const ERRTYPE & rErr ) { nError = rErr.nError; } ERRTYPE& operator = ( const ERRTYPE & rError ); - operator sal_uInt32() const { return( nError ); } + operator sal_uInt32() const { return nError; } bool IsError() const { return nError <= ERR_ERROREND; } bool IsOk() const { return !IsError(); } bool IsWarning() const { return nError >= ERR_WARNINGSTART && nError <= ERR_WARNINGEND;} diff --git a/rsc/inc/rscflag.hxx b/rsc/inc/rscflag.hxx index 875ebadabf92..cb10c496d705 100644 --- a/rsc/inc/rscflag.hxx +++ b/rsc/inc/rscflag.hxx @@ -71,11 +71,11 @@ public: Atom nConstantId ); virtual RSCCLASS_TYPE GetClassType() const SAL_OVERRIDE; RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ) SAL_OVERRIDE; - sal_uInt32 Size() SAL_OVERRIDE { return( pRefClass->Size() ); }; + sal_uInt32 Size() SAL_OVERRIDE { return pRefClass->Size(); } // Eine Zuweisung an eine Variable bool IsDefault( const RSCINST & rInst ) SAL_OVERRIDE { - return( pRefClass->IsDefault( rInst, nConstId ) ); + return pRefClass->IsDefault( rInst, nConstId ); }; // Als Default setzen bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) SAL_OVERRIDE @@ -86,15 +86,14 @@ public: ERRTYPE SetBool( const RSCINST & rInst, bool bValue ) SAL_OVERRIDE { if( bValue ) - return( pRefClass->SetConst( rInst, nConstId, sal_Int32(bValue) ) ); + return pRefClass->SetConst( rInst, nConstId, sal_Int32(bValue) ); else - return( pRefClass-> - SetNotConst( rInst, nConstId ) ); + return pRefClass->SetNotConst( rInst, nConstId ); } ERRTYPE GetBool( const RSCINST & rInst, bool * pB ) SAL_OVERRIDE { *pB = pRefClass->IsSet( rInst, nConstId ); - return( ERR_OK ); + return ERR_OK; } void WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE; diff --git a/rsc/inc/rscpar.hxx b/rsc/inc/rscpar.hxx index 0b9bc4cb0afc..90c9eee5589a 100644 --- a/rsc/inc/rscpar.hxx +++ b/rsc/inc/rscpar.hxx @@ -54,12 +54,12 @@ public: ~RscFileInst(); bool IsEof() const { return bEof; } void SetFileIndex( sal_uLong lFIndex ) { lFileIndex = lFIndex; } - sal_uLong GetFileIndex() { return( lFileIndex ); } - sal_uLong GetSrcIndex() { return( lSrcIndex ); } - void SetLineNo( sal_uInt32 nLine ) { nLineNo = nLine; } - sal_uInt32 GetLineNo() { return( nLineNo ); } - sal_uInt32 GetScanPos() { return( nScanPos ); } - char * GetLine() { return( pLine ); } + sal_uLong GetFileIndex() { return lFileIndex; } + sal_uLong GetSrcIndex() { return lSrcIndex; } + void SetLineNo( sal_uInt32 nLine ) { nLineNo = nLine; } + sal_uInt32 GetLineNo() { return nLineNo; } + sal_uInt32 GetScanPos() { return nScanPos; } + char * GetLine() { return pLine; } int GetChar(); int GetFastChar() { diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx index e7cde4a8aa84..f8d50c02e077 100644 --- a/rsc/inc/rsctools.hxx +++ b/rsc/inc/rsctools.hxx @@ -73,13 +73,11 @@ public: RscPtrPtr(); ~RscPtrPtr(); void Reset(); - sal_uInt32 Append( void * ); - sal_uInt32 Append( char * pStr ){ - return( Append( (void *)pStr ) ); - }; - sal_uInt32 GetCount(){ return( nCount ); }; + sal_uInt32 Append( void * ); + sal_uInt32 Append( char * pStr ) { return Append( (void *)pStr ); } + sal_uInt32 GetCount() { return nCount; } void * GetEntry( sal_uInt32 nEle ); - void ** GetBlock(){ return( pMem ); }; + void ** GetBlock() { return pMem; } }; class RscWriteRc @@ -124,7 +122,7 @@ public: RSCBYTEORDER_TYPE GetByteOrder() const { return nByteOrder; } - sal_uInt32 Size(){ return( nLen ); }; + sal_uInt32 Size(){ return nLen; } void Put( sal_uInt64 lVal ) { union diff --git a/rsc/source/parser/rsckey.cxx b/rsc/source/parser/rsckey.cxx index ef3488e4fb98..b60a290362e4 100644 --- a/rsc/source/parser/rsckey.cxx +++ b/rsc/source/parser/rsckey.cxx @@ -37,11 +37,11 @@ extern "C" { int SAL_CALL KeyCompare( const void * pFirst, const void * pSecond ) { if( ((KEY_STRUCT *)pFirst)->nName > ((KEY_STRUCT *)pSecond)->nName ) - return( 1 ); + return 1; else if( ((KEY_STRUCT *)pFirst)->nName < ((KEY_STRUCT *)pSecond)->nName ) - return( -1 ); + return -1; else - return( 0 ); + return 0; } RscNameTable::RscNameTable() diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx index c5d3a195e646..6f906e67a746 100644 --- a/rsc/source/parser/rsclex.cxx +++ b/rsc/source/parser/rsclex.cxx @@ -143,7 +143,7 @@ int MakeToken( YYSTYPE * pTokenVal ) c = pFI->GetFastChar(); } else - return( c1 ); + return c1; } else break; @@ -152,7 +152,7 @@ int MakeToken( YYSTYPE * pTokenVal ) // FIXME: wtf is this supposed to do? if( (c != 0) == pFI->IsEof() ) { - return( 0 ); + return 0; } if( bLastInclude ) @@ -169,7 +169,7 @@ int MakeToken( YYSTYPE * pTokenVal ) } c = pFI->GetFastChar(); pTokenVal->string = const_cast<char*>(pStringContainer->putString( aBuf.getStr() )); - return( INCLUDE_STRING ); + return INCLUDE_STRING; } } @@ -213,7 +213,7 @@ int MakeToken( YYSTYPE * pTokenVal ) if (isdigit (c)) { pTokenVal->value = GetNumber(); - return( NUMBER ); + return NUMBER; } if( isalpha (c) || (c == '_') ) @@ -419,7 +419,7 @@ ERRTYPE parser( RscFileInst * pFileInst ) if( pFileInst->pTypCont->pEH->nErrors ) aError = ERR_ERROR; pFileInst->SetError( aError ); - return( aError ); + return aError; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/prj/gui.cxx b/rsc/source/prj/gui.cxx index f0801a8dffea..89d5d6e9e89c 100644 --- a/rsc/source/prj/gui.cxx +++ b/rsc/source/prj/gui.cxx @@ -71,9 +71,9 @@ int rsc2_main( int argc, char **argv ) delete pHS; // wird durch InitRscCompiler erzeugt if( aError.IsOk() ) - return( 0 ); + return 0; else - return( 1 ); + return 1; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx index fd2de9478a2b..af2da38984ab 100644 --- a/rsc/source/prj/start.cxx +++ b/rsc/source/prj/start.cxx @@ -235,7 +235,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) if( pStr ) { printf( "Cannot open response file <%s>\n", pStr ); - return( 1 ); + return 1; }; ppStr = (char **)aCmdLine.GetBlock(); diff --git a/rsc/source/res/rsccont.cxx b/rsc/source/res/rsccont.cxx index 03730eeaa07f..917f64df9bb1 100644 --- a/rsc/source/res/rsccont.cxx +++ b/rsc/source/res/rsccont.cxx @@ -148,7 +148,7 @@ RSCINST RscBaseCont::SearchElePos( const RSCINST & rInst, const RscId & rEleName if( pClassData->pEntries[ i ].aName == rEleName && pClassData->pEntries[ i ].aInst.pClass == pClass ) { - return( pClassData->pEntries[ i ].aInst ); + return pClassData->pEntries[ i ].aInst; } } } @@ -261,7 +261,7 @@ RSCINST RscBaseCont::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ) pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData); if( nPos < pClassData->nEntries ) - return( pClassData->pEntries[ nPos ].aInst ); + return pClassData->pEntries[ nPos ].aInst; return RSCINST(); } @@ -588,7 +588,7 @@ bool RscBaseCont::IsDefault( const RSCINST & rInst ) if( ! pClassData->pEntries[ i ].aInst.pClass-> IsDefault( pClassData->pEntries[ i ].aInst ) ) { - return( false ); + return false; } } diff --git a/rsc/source/res/rscrange.cxx b/rsc/source/res/rscrange.cxx index 40af08f8265e..07b914c12ab6 100644 --- a/rsc/source/res/rscrange.cxx +++ b/rsc/source/res/rscrange.cxx @@ -179,7 +179,7 @@ bool RscLongRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) ERRTYPE RscLongRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue ) { if( nMax < nValue || nMin > nValue ) - return( ERR_RSCRANGE_OUTDEFSET ); + return ERR_RSCRANGE_OUTDEFSET; void * pData = &reinterpret_cast<RscLongRangeInst*>(rInst.pData)->nValue; memcpy( pData, &nValue, sizeof( sal_Int32 ) ); diff --git a/rsc/source/res/rscstr.cxx b/rsc/source/res/rscstr.cxx index 8fe77e8c3850..3dbb9e308c0d 100644 --- a/rsc/source/res/rscstr.cxx +++ b/rsc/source/res/rscstr.cxx @@ -89,7 +89,7 @@ ERRTYPE RscString::SetRef( const RSCINST & rInst, const RscId & rRefId ) reinterpret_cast<RscStringInst *>(rInst.pData)->bDflt = false; } else - return( ERR_REFNOTALLOWED ); + return ERR_REFNOTALLOWED; return ERR_OK; } diff --git a/rsc/source/rscpp/cpp1.c b/rsc/source/rscpp/cpp1.c index 7f2dce10c4f9..795bbab1e152 100644 --- a/rsc/source/rscpp/cpp1.c +++ b/rsc/source/rscpp/cpp1.c @@ -353,7 +353,7 @@ int MAIN(int argc, char** argv) } if( pfargv ) free(pfargv); - return( IO_NORMAL ); + return IO_NORMAL; } diff --git a/rsc/source/rscpp/cpp2.c b/rsc/source/rscpp/cpp2.c index a0f3433dc4e5..e38914a75b45 100644 --- a/rsc/source/rscpp/cpp2.c +++ b/rsc/source/rscpp/cpp2.c @@ -70,7 +70,7 @@ int control(int counter) c = skipws(); if (c == '\n' || c == EOF_CHAR) - return (counter + 1); + return counter + 1; if (!isdigit(c)) scanid(c); /* Get #word to token[] */ else @@ -131,7 +131,7 @@ int control(int counter) case L_assert: /* compiling. */ case L_error: /* BP 5.3.92, #error */ dump_line: skipnl(); /* Ignore rest of line */ - return (counter + 1); + return counter + 1; } } /* @@ -299,7 +299,7 @@ int control(int counter) skipnl(); } } - return (counter + 1); + return counter + 1; } /* @@ -466,7 +466,7 @@ FILE_LOCAL int openinclude(char* filename, int searchlocal) } #endif if (openfile(tmpname)) - return (TRUE); + return TRUE; } /* * Look in any directories specified by -I command line @@ -494,10 +494,10 @@ FILE_LOCAL int openinclude(char* filename, int searchlocal) sprintf(tmpname, "%s%s", *incptr, filename); #endif if (openfile(tmpname)) - return (TRUE); + return TRUE; } } - return (FALSE); + return FALSE; } /* @@ -511,7 +511,7 @@ FILE_LOCAL int hasdirectory(char* source, char* result, int max) char* tp; if ((tp = strrchr(source, '/')) == NULL) - return (FALSE); + return FALSE; else { int len = (int)(tp - source); @@ -524,7 +524,7 @@ FILE_LOCAL int hasdirectory(char* source, char* result, int max) { cfatal("Filename work buffer overflow", NULLST); } - return (TRUE); + return TRUE; } #else /* @@ -537,13 +537,13 @@ FILE_LOCAL int hasdirectory(char* source, char* result, int max) if ((tp = strrchr(source, ']')) == NULL && (tp = strrchr(source, ':')) == NULL) { - return (FALSE); + return FALSE; } else { strncpy(result, source, tp - source + 1); result[tp - source + 1] = EOS; - return (TRUE); + return TRUE; } #endif } diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c index 1ab88163ac1c..ab3eea18e4e5 100644 --- a/rsc/source/rscpp/cpp3.c +++ b/rsc/source/rscpp/cpp3.c @@ -149,7 +149,7 @@ int AddInclude( char* pIncStr ) pIncPos = strtok( NULL, ";" ); } /* coverity[leaked_storage] - we know this leaks, but it doesn't matter in this short lived utility */ - return( 1 ); + return 1; } /* diff --git a/rsc/source/rscpp/cpp4.c b/rsc/source/rscpp/cpp4.c index 03f35604a562..daa91735f6cc 100755 --- a/rsc/source/rscpp/cpp4.c +++ b/rsc/source/rscpp/cpp4.c @@ -484,7 +484,7 @@ FILE_LOCAL int expcollect() if (c == EOF_CHAR) { cerror("end of file within macro argument", NULLST); - return (FALSE); /* Sorry. */ + return FALSE; /* Sorry. */ } else if (c == '\\') /* Quote next character */ { @@ -520,7 +520,7 @@ FILE_LOCAL int expcollect() fprintf( pCppOut, "parm[%d] = \"%s\"\n", nargs, parlist[nargs - 1]); #endif } /* Collect all args. */ - return (TRUE); /* Normal return */ + return TRUE; /* Normal return */ } /* diff --git a/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c index a6b9e142639c..765f7300ae5a 100644 --- a/rsc/source/rscpp/cpp5.c +++ b/rsc/source/rscpp/cpp5.c @@ -227,7 +227,7 @@ again: else if (op == OP_ADD && binop == 0) op = OP_PLU; /* Unary plus */ else if (op == OP_FAIL) - return (1); /* Error in evallex */ + return 1; /* Error in evallex */ #ifdef DEBUG_EVAL fprintf( pCppOut, "op = %s, opdope = %03o, binop = %d, skip = %d\n", opname[op], opdope[op], binop, opp->skip); @@ -237,12 +237,12 @@ again: if (binop != 0) { cerror("misplaced constant in #if", NULLST); - return (1); + return 1; } else if (valp >= &value[NEXP-1]) { cerror("#if value stack overflow", NULLST); - return (1); + return 1; } else { @@ -258,13 +258,13 @@ again: else if (op > OP_END) { cerror("Illegal #if line", NULLST); - return (1); + return 1; } prec = opdope[op]; if (binop != (prec & 1)) { cerror("Operator %s in incorrect context", opname[op]); - return (1); + return 1; } binop = (prec & 2) >> 1; for (;;) @@ -288,7 +288,7 @@ again: { cerror("expression stack overflow at op \"%s\"", opname[op]); - return (1); + return 1; } opp->op = (char)op; opp->prec = (char)prec; @@ -328,14 +328,14 @@ again: { case OP_END: /* Stack end marker */ if (op == OP_EOE) - return (valp[-1]); /* Finished ok. */ + return valp[-1]; /* Finished ok. */ goto again; /* Read another op. */ case OP_LPA: /* ( on stack */ if (op != OP_RPA) /* Matches ) on input */ { cerror("unbalanced paren's, op is \"%s\"", opname[op]); - return (1); + return 1; } opp--; /* Unstack it */ /* goto again; -- Fall through */ @@ -349,7 +349,7 @@ again: { cerror("Misplaced '?' or ':', previous operator is %s", opname[(int)opp->op]); - return (1); + return 1; } /* * Evaluate op1. @@ -389,7 +389,7 @@ again: if ((c = macroid(c)) == EOF_CHAR || c == '\n') { unget(); - return (OP_EOE); /* End of expression */ + return OP_EOE; /* End of expression */ } } while ((t = type[c]) == LET && catenate()); @@ -402,7 +402,7 @@ again: else cierror("illegal character (%d decimal) in #if", c); } - return (OP_FAIL); + return OP_FAIL; } else if (t == QUO) /* ' or " */ { @@ -412,10 +412,10 @@ again: #ifdef DEBUG_EVAL fprintf( pCppOut, "evalchar returns %d.\n", evalue); #endif - return (DIG); /* Return a value */ + return DIG; /* Return a value */ } cerror("Can't use a string in an #if", NULLST); - return (OP_FAIL); + return OP_FAIL; } else if (t == LET) /* ID must be a macro */ { @@ -430,14 +430,14 @@ again: if (c1 != '(' || /* Need to balance */ skipws() == ')') /* Did we balance? */ { - return (DIG); /* Parsed ok */ + return DIG; /* Parsed ok */ } } cerror("Bad #if ... defined() syntax", NULLST); - return (OP_FAIL); + return OP_FAIL; } else if (streq(token, "sizeof")) /* New sizeof hackery */ - return (dosizeof()); /* Gets own routine */ + return dosizeof(); /* Gets own routine */ /* * The Draft ANSI C Standard says that an undefined symbol * in an #if has the value zero. We are a bit pickier, @@ -449,7 +449,7 @@ again: cwarn("undefined symbol \"%s\" in #if, 0 used", token); #endif evalue = 0; - return (DIG); + return DIG; } else if (t == DIG) /* Numbers are harder */ { @@ -468,7 +468,7 @@ again: { case '!': if (c1 == '=') - return (OP_NE); + return OP_NE; break; case '=': @@ -476,9 +476,9 @@ again: { unget(); cerror("= not allowed in #if", NULLST); - return (OP_FAIL); + return OP_FAIL; } - return (OP_EQ); + return OP_EQ; case '>': case '<': @@ -498,11 +498,11 @@ again: if (c1 == '\n') /* Multi-line if */ goto again; cerror("Unexpected \\ in #if", NULLST); - return (OP_FAIL); + return OP_FAIL; } unget(); } - return (t); + return t; } /* @@ -560,7 +560,7 @@ FILE_LOCAL int dosizeof() if (tp->name == NULLST) { cerror("#if sizeof, unknown type \"%s\"", token); - return (OP_FAIL); + return OP_FAIL; } typecode |= tp->type; /* Or in the type bit */ } @@ -580,7 +580,7 @@ FILE_LOCAL int dosizeof() if (!bittest(typecode & *testp)) { cerror("#if ... sizeof: illegal type combination", NULLST); - return (OP_FAIL); + return OP_FAIL; } } /* @@ -600,7 +600,7 @@ FILE_LOCAL int dosizeof() if ((typecode & ~T_PTR) == 0) { cerror("#if sizeof() error, no type specified", NULLST); - return (OP_FAIL); + return OP_FAIL; } /* * Exactly one bit (and possibly T_PTR) may be set. @@ -611,17 +611,17 @@ FILE_LOCAL int dosizeof() { evalue = ((typecode & T_PTR) != 0) ? sizp->psize : sizp->size; - return (DIG); + return DIG; } } /* We shouldn't fail */ cierror("#if ... sizeof: bug, unknown type code 0x%x", typecode); - return (OP_FAIL); + return OP_FAIL; } nogood: unget(); cerror("#if ... sizeof() syntax error", NULLST); - return (OP_FAIL); + return OP_FAIL; } /* @@ -679,7 +679,7 @@ FILE_LOCAL int evalnum(int c) if (c == 'u' || c == 'U') /* Unsigned nonsense */ cget(); unget(); - return (value); + return value; } /* @@ -779,7 +779,7 @@ FILE_LOCAL int evalchar(int skip) value += c; } instring = FALSE; - return (value); + return value; } /* @@ -920,7 +920,7 @@ FILE_LOCAL int * evaleval(int* valp, int op, int skip) v1 = 0; } *valp++ = v1; - return (valp); + return valp; } #ifdef DEBUG_EVAL diff --git a/rsc/source/rscpp/cpp6.c b/rsc/source/rscpp/cpp6.c index 9444b720c80b..b94c81fe2395 100755 --- a/rsc/source/rscpp/cpp6.c +++ b/rsc/source/rscpp/cpp6.c @@ -170,7 +170,7 @@ int skipws() do { /* Skip whitespace */ c = get(); } while (type[c] == SPA); - return (c); + return c; } /* @@ -213,7 +213,7 @@ int macroid(int c) expand(dp); c = get(); } - return (c); + return c; } /* @@ -231,7 +231,7 @@ int catenate() if (get() != TOK_SEP) /* Token concatenation */ { unget(); - return (FALSE); + return FALSE; } else { @@ -276,7 +276,7 @@ int catenate() */ free(token1); /* Free up memory */ ungetstring(work); /* Unget the new thing, */ - return (TRUE); + return TRUE; } } @@ -310,13 +310,13 @@ int scanstring(int delim, if (c == delim) { (*outfun)(c); - return (TRUE); + return TRUE; } else { cerror("Unterminated string", NULLST); unget(); - return (FALSE); + return FALSE; } } @@ -488,7 +488,7 @@ char* savestring(char* text) size_t size = strlen(text) + 1; result = getmem(size); strcpy(result, text); - return (result); + return result; } /* @@ -513,7 +513,7 @@ FILEINFO* getfile(size_t bufsize, char* name) infile->line = line; /* Save current line */ infile = file; /* New current file */ line = 1; /* Note first line */ - return (file); /* All done. */ + return file; /* All done. */ } /* @@ -525,7 +525,7 @@ char* getmem(size_t size) if ((result = malloc((unsigned) size)) == NULL) cfatal("Out of memory", NULLST); - return (result); + return result; } /* @@ -557,7 +557,7 @@ DEFBUF* lookid(int c) unget(); /* Rescan terminator */ *np = EOS; /* Terminate token */ if (isrecurse) /* Recursive definition */ - return (NULL); /* undefined just now */ + return NULL; /* undefined just now */ nhash += (np - token); /* Fix hash value */ dp = symtab[nhash & SBMASK]; /* Starting bucket */ while (dp != (DEFBUF*) NULL) /* Search symbol table */ @@ -621,7 +621,7 @@ DEFBUF* defendel(char* name, int delete) dp->nargs = 0; strcpy(dp->name, name); } - return (dp); + return dp; } #if OSL_DEBUG_LEVEL > 1 @@ -769,7 +769,7 @@ int get() popped = 0; get_from_file: if ((file = infile) == NULL) - return (EOF_CHAR); + return EOF_CHAR; newline: /* @@ -833,7 +833,7 @@ int get() free(file->progname); /* free it, too. */ free((char*) file); /* Free file space */ if (infile == NULL) /* If at end of file */ - return (EOF_CHAR); /* Return end of file */ + return EOF_CHAR; /* Return end of file */ line = infile->line; /* Reset line number */ goto get_from_file; /* Get from the top. */ } @@ -861,7 +861,7 @@ int get() if (c == '\n') /* Maintain current */ ++line; /* line counter */ if (instring) /* Strings just return */ - return (c); /* the character. */ + return c; /* the character. */ else if (c == '/') /* Comment? */ { instring = TRUE; /* So get() won't loop */ @@ -871,7 +871,7 @@ int get() { instring = FALSE; /* Nope, no comment */ unget(); /* Push the char. back */ - return ('/'); /* Return the slash */ + return '/'; /* Return the slash */ } if (keepcomments) /* If writing comments */ { @@ -894,7 +894,7 @@ int get() { case EOF_CHAR: cerror("EOF in comment", NULLST); - return (EOF_CHAR); + return EOF_CHAR; case '/': if ((c = get()) != '*') /* Don't let comments */ @@ -928,7 +928,7 @@ int get() */ if (*file->bptr == '\n' || type[*file->bptr & 0xFF] == SPA) goto newline; - return ((file->bptr[-1] = ' ')); + return (file->bptr[-1] = ' '); case '\n': /* we'll need a #line */ if (!keepcomments) @@ -946,11 +946,11 @@ int get() if (keepcomments && c != EOF_CHAR) cput(c); if( EOF_CHAR == c ) - return (EOF_CHAR); + return EOF_CHAR; else if( '\n' == c ) { instring = FALSE; /* End of comment, */ - return( c ); + return c; } } } @@ -965,7 +965,7 @@ int get() else /* Backslash anything */ { unget(); /* Get it later */ - return ('\\'); /* Return the backslash */ + return '\\'; /* Return the backslash */ } } else if (c == '\f' || c == VT) /* Form Feed, Vertical */ @@ -994,7 +994,7 @@ int get() return 0xef; } } - return (c); /* Just return the char */ + return c; /* Just return the char */ } /* @@ -1039,7 +1039,7 @@ int cget() c = get(); } while (c == TOK_SEP); - return (c); + return c; } /* diff --git a/rsc/source/tools/rscchar.cxx b/rsc/source/tools/rscchar.cxx index 526e695d6edc..38f0ec6db52f 100644 --- a/rsc/source/tools/rscchar.cxx +++ b/rsc/source/tools/rscchar.cxx @@ -95,7 +95,7 @@ char * RscChar::MakeUTF8( char * pStr, sal_uInt16 nTextEncoding ) { // value is too big, or more than 3 digits delete [] pOrgStr; - return( NULL ); + return NULL; } c = (char)nChar; pStr--; diff --git a/sal/cpprt/operators_new_delete.cxx b/sal/cpprt/operators_new_delete.cxx index e74cafedffb8..c03d8bda9830 100644 --- a/sal/cpprt/operators_new_delete.cxx +++ b/sal/cpprt/operators_new_delete.cxx @@ -128,7 +128,7 @@ static void* allocate_nothrow ( } catch (std::bad_alloc const &) { - return (0); + return 0; } } diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index dff8579cb76f..4d60a6c41ce7 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -303,28 +303,28 @@ oslFileError FileHandle_Impl::setSize (sal_uInt64 uSize) if (uSize <= getSize()) { /* Failure upon 'shrink'. Return original result */ - return (result); + return result; } /* Save current position */ off_t const nCurPos = (off_t)lseek (m_fd, (off_t)0, SEEK_CUR); if (nCurPos == (off_t)(-1)) - return (result); + return result; /* Try 'expand' via 'lseek()' and 'write()' */ if (-1 == lseek (m_fd, (off_t)(nSize - 1), SEEK_SET)) - return (result); + return result; if (-1 == write (m_fd, (char*)"", (size_t)1)) { /* Failure. Restore saved position */ (void) lseek (m_fd, (off_t)(nCurPos), SEEK_SET); - return (result); + return result; } /* Success. Restore saved position */ if (-1 == lseek (m_fd, (off_t)nCurPos, SEEK_SET)) - return (result); + return result; } SAL_INFO("sal.file", "osl_setFileSize(" << m_fd << ", " << getSize() << ") => " << nSize); @@ -437,7 +437,7 @@ oslFileError FileHandle_Impl::readFileAt ( // flush current buffer oslFileError result = syncFile(); if (result != osl_File_E_None) - return (result); + return result; m_bufptr = -1, m_buflen = 0; if (nBytesRequested >= m_bufsiz) @@ -446,7 +446,7 @@ oslFileError FileHandle_Impl::readFileAt ( sal_uInt64 uDone = 0; result = readAt (nOffset, &(buffer[*pBytesRead]), nBytesRequested, &uDone); if (result != osl_File_E_None) - return (result); + return result; *pBytesRead += uDone; return osl_File_E_None; @@ -456,7 +456,7 @@ oslFileError FileHandle_Impl::readFileAt ( sal_uInt64 uDone = 0; result = readAt (bufptr, m_buffer, m_bufsiz, &uDone); if (result != osl_File_E_None) - return (result); + return result; m_bufptr = bufptr, m_buflen = uDone; } if (bufpos >= m_buflen) @@ -507,7 +507,7 @@ oslFileError FileHandle_Impl::writeFileAt ( // flush current buffer oslFileError result = syncFile(); if (result != osl_File_E_None) - return (result); + return result; m_bufptr = -1, m_buflen = 0; if (nBytesToWrite >= m_bufsiz) @@ -516,7 +516,7 @@ oslFileError FileHandle_Impl::writeFileAt ( sal_uInt64 uDone = 0; result = writeAt (nOffset, &(buffer[*pBytesWritten]), nBytesToWrite, &uDone); if (result != osl_File_E_None) - return (result); + return result; if (uDone != nBytesToWrite) return osl_File_E_IO; @@ -528,7 +528,7 @@ oslFileError FileHandle_Impl::writeFileAt ( sal_uInt64 uDone = 0; result = readAt (bufptr, m_buffer, m_bufsiz, &uDone); if (result != osl_File_E_None) - return (result); + return result; m_bufptr = bufptr, m_buflen = uDone; } @@ -558,13 +558,13 @@ oslFileError FileHandle_Impl::readLineAt ( /* flush current buffer */ result = syncFile(); if (result != osl_File_E_None) - return (result); + return result; /* update buffer (pointer) */ sal_uInt64 uDone = 0; result = readAt (bufptr, m_buffer, m_bufsiz, &uDone); if (result != osl_File_E_None) - return (result); + return result; m_bufptr = bufptr, m_buflen = uDone; } @@ -587,7 +587,7 @@ oslFileError FileHandle_Impl::readLineAt ( result = writeSequence_Impl ( ppSequence, &dstpos, &(m_buffer[bufpos]), curpos - bufpos); if (result != osl_File_E_None) - return (result); + return result; *pBytesRead += curpos - bufpos, nOffset += curpos - bufpos; } @@ -598,7 +598,7 @@ oslFileError FileHandle_Impl::readLineAt ( sal_uInt64 uDone = 0; result = readAt (bufptr, m_buffer, m_bufsiz, &uDone); if (result != osl_File_E_None) - return (result); + return result; m_bufptr = bufptr, m_buflen = uDone; } @@ -644,7 +644,7 @@ oslFileError FileHandle_Impl::readLineAt ( result = writeSequence_Impl ( ppSequence, &dstpos, &(m_buffer[bufpos]), curpos - bufpos - 1); if (result != osl_File_E_None) - return (result); + return result; *pBytesRead += curpos - bufpos, nOffset += curpos - bufpos; } break; @@ -653,7 +653,7 @@ oslFileError FileHandle_Impl::readLineAt ( result = writeSequence_Impl (ppSequence, &dstpos, 0, 0); if (result != osl_File_E_None) - return (result); + return result; if (0 < dstpos) return osl_File_E_None; if (bufpos >= m_buflen) @@ -694,12 +694,12 @@ oslFileError FileHandle_Impl::syncFile() sal_uInt64 uDone = 0; result = writeAt (m_bufptr, m_buffer, m_buflen, &uDone); if (result != osl_File_E_None) - return (result); + return result; if (uDone != m_buflen) return osl_File_E_IO; m_state &= ~STATE_MODIFIED; } - return (result); + return result; } oslFileHandle osl::detail::createFileHandleFromFD( int fd ) @@ -729,7 +729,7 @@ oslFileHandle osl::detail::createFileHandleFromFD( int fd ) } SAL_INFO("sal.file", "osl::detail::createFileHandleFromFD(" << pImpl->m_fd << ", writeable) => " << pImpl->m_strFilePath); - return (oslFileHandle)(pImpl); + return (oslFileHandle)pImpl; } static int osl_file_adjustLockFlags (const char * path, int flags) @@ -1066,7 +1066,7 @@ SAL_CALL osl_closeFile( oslFileHandle Handle ) (void) pthread_mutex_unlock (&(pImpl->m_mutex)); delete pImpl; - return (result); + return result; } oslFileError @@ -1085,7 +1085,7 @@ SAL_CALL osl_syncFile(oslFileHandle Handle) SAL_INFO("sal.file", "osl_syncFile(" << pImpl->m_fd << ")"); oslFileError result = pImpl->syncFile(); if (result != osl_File_E_None) - return (result); + return result; if (-1 == fsync (pImpl->m_fd)) return oslTranslateFileError (OSL_FET_ERROR, errno); @@ -1249,7 +1249,7 @@ SAL_CALL osl_readLine ( pImpl->m_fileptr, ppSequence, &uBytesRead); if (result == osl_File_E_None) pImpl->m_fileptr += uBytesRead; - return (result); + return result; } oslFileError @@ -1275,7 +1275,7 @@ SAL_CALL osl_readFile ( pImpl->m_fileptr, pBuffer, nBytesRequested, pBytesRead); if (result == osl_File_E_None) pImpl->m_fileptr += *pBytesRead; - return (result); + return result; } oslFileError @@ -1303,7 +1303,7 @@ SAL_CALL osl_writeFile ( pImpl->m_fileptr, pBuffer, nBytesToWrite, pBytesWritten); if (result == osl_File_E_None) pImpl->m_fileptr += *pBytesWritten; - return (result); + return result; } oslFileError @@ -1467,7 +1467,7 @@ SAL_CALL osl_setFileSize( oslFileHandle Handle, sal_uInt64 uSize ) oslFileError result = pImpl->syncFile(); if (result != osl_File_E_None) - return (result); + return result; pImpl->m_bufptr = -1, pImpl->m_buflen = 0; return pImpl->setSize (uSize); diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx index 012ec37f8d6a..ae480b6274f8 100644 --- a/sal/osl/unx/file_volume.cxx +++ b/sal/osl/unx/file_volume.cxx @@ -232,7 +232,7 @@ static oslFileError osl_psz_getVolumeInformation ( if ((__OSL_STATFS(pszDirectory, &sfs)) < 0) { oslFileError result = oslTranslateFileError(OSL_FET_ERROR, errno); - return (result); + return result; } /* FIXME: how to detect the kind of storage (fixed, cdrom, ...) */ diff --git a/sal/osl/unx/interlck.cxx b/sal/osl/unx/interlck.cxx index 01e8da4ebbaf..28ba48eee90a 100644 --- a/sal/osl/unx/interlck.cxx +++ b/sal/osl/unx/interlck.cxx @@ -84,7 +84,7 @@ oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount* Count = ++(*pCount); pthread_mutex_unlock(&InterLock); - return (Count); + return Count; } oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount* pCount) @@ -95,7 +95,7 @@ oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount* Count = --(*pCount); pthread_mutex_unlock(&InterLock); - return (Count); + return Count; } #endif /* default */ diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx index f4833f363d26..9815a8236f41 100644 --- a/sal/osl/unx/pipe.cxx +++ b/sal/osl/unx/pipe.cxx @@ -299,7 +299,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions return NULL; } - return (pPipe); + return pPipe; } else { /* osl_pipe_OPEN */ @@ -307,7 +307,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions { if ( connect( pPipe->m_Socket, reinterpret_cast<sockaddr *>(&addr), len) >= 0 ) { - return (pPipe); + return pPipe; } SAL_WARN("sal.osl.pipe", "connect() failed: " << strerror(errno)); diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx index ea60b2b27049..d9b4d9567801 100644 --- a/sal/osl/unx/process.cxx +++ b/sal/osl/unx/process.cxx @@ -758,7 +758,7 @@ oslProcess SAL_CALL osl_getProcess(oslProcessIdentifier Ident) else pProcImpl = NULL; - return (pProcImpl); + return pProcImpl; } void SAL_CALL osl_freeProcessHandle(oslProcess Process) diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx index 3dc743a992e9..1462d15df48d 100644 --- a/sal/osl/unx/process_impl.cxx +++ b/sal/osl/unx/process_impl.cxx @@ -79,7 +79,7 @@ oslProcessError SAL_CALL bootstrap_getExecutableFile(rtl_uString ** ppFileURL) } } - return (result); + return result; } } @@ -111,7 +111,7 @@ oslProcessError SAL_CALL bootstrap_getExecutableFile(rtl_uString ** ppFileURL) } } - return (result); + return result; } } @@ -168,7 +168,7 @@ sal_uInt32 SAL_CALL osl_getCommandArgCount (void) result = g_command_args.m_nCount - 1; pthread_mutex_unlock (&(g_command_args.m_mutex)); - return (result); + return result; } /*************************************** @@ -187,7 +187,7 @@ oslProcessError SAL_CALL osl_getCommandArg (sal_uInt32 nArg, rtl_uString ** strC } pthread_mutex_unlock (&(g_command_args.m_mutex)); - return (result); + return result; } /*************************************** @@ -280,7 +280,7 @@ oslProcessError SAL_CALL osl_getEnvironment(rtl_uString* pustrEnvVar, rtl_uStrin rtl_string_release(pstr_env_var); } - return (result); + return result; } /*************************************** @@ -336,7 +336,7 @@ oslProcessError SAL_CALL osl_setEnvironment(rtl_uString* pustrEnvVar, rtl_uStrin if (pstr_env_var != 0) rtl_string_release(pstr_env_var); - return (result); + return result; } /*************************************** @@ -383,7 +383,7 @@ oslProcessError SAL_CALL osl_clearEnvironment(rtl_uString* pustrEnvVar) rtl_string_release(pstr_env_var); } - return (result); + return result; } /*************************************** @@ -412,7 +412,7 @@ oslProcessError SAL_CALL osl_getProcessWorkingDir(rtl_uString **ppustrWorkingDir } } - return (result); + return result; } /****************************************************************************** @@ -451,7 +451,7 @@ oslProcessError SAL_CALL osl_getProcessLocale( rtl_Locale ** ppLocale ) pthread_mutex_unlock (&(g_process_locale.m_mutex)); } - return (result); + return result; } /********************************************** @@ -471,7 +471,7 @@ oslProcessError SAL_CALL osl_setProcessLocale( rtl_Locale * pLocale ) } pthread_mutex_unlock (&(g_process_locale.m_mutex)); - return (result); + return result; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx index e2d559a1de26..9ca76445f78f 100644 --- a/sal/osl/unx/profile.cxx +++ b/sal/osl/unx/profile.cxx @@ -152,7 +152,7 @@ static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, o if ( ( pFile = openFileImpl(pszProfileName, Flags ) ) == NULL ) { - return (NULL); + return NULL; } pProfile = (osl_TProfileImpl*)calloc(1, sizeof(osl_TProfileImpl)); @@ -181,7 +181,7 @@ static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, o if (pProfile->m_pFile == NULL) closeFileImpl(pFile,pProfile->m_Flags); - return (pProfile); + return pProfile; } sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile) @@ -277,7 +277,7 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile) free(pProfile); - return (sal_True); + return sal_True; } sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile) @@ -383,7 +383,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, { pthread_mutex_unlock(&(pTmpProfile->m_AccessLock)); - return (sal_False); + return sal_False; } if (! (pProfile->m_Flags & osl_Profile_SYSTEM)) @@ -426,7 +426,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, pthread_mutex_unlock(&(pTmpProfile->m_AccessLock)); - return (sal_True); + return sal_True; } sal_Bool SAL_CALL osl_readProfileBool(oslProfile Profile, @@ -450,7 +450,7 @@ sal_Bool SAL_CALL osl_readProfileBool(oslProfile Profile, Default = sal_False; } - return (Default); + return Default; } sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile, @@ -478,7 +478,7 @@ sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile, } } - return (Default); + return Default; } sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, @@ -518,7 +518,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, { pthread_mutex_unlock(&(pTmpProfile->m_AccessLock)); - return (sal_False); + return sal_False; } Line = (sal_Char*) malloc(strlen(pszEntry)+strlen(pszString)+48); @@ -544,7 +544,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, pthread_mutex_unlock(&(pTmpProfile->m_AccessLock)); free(Line); - return (sal_False); + return sal_False; } pSec = &pProfile->m_Sections[pProfile->m_NoSections - 1]; @@ -572,7 +572,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, pthread_mutex_unlock(&(pTmpProfile->m_AccessLock)); free(Line); - return (sal_False); + return sal_False; } pProfile->m_Flags |= FLG_MODIFIED; @@ -670,7 +670,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile, { pthread_mutex_unlock(&(pTmpProfile->m_AccessLock)); - return (sal_False); + return sal_False; } if (! (pProfile->m_Flags & osl_Profile_SYSTEM)) @@ -742,7 +742,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, { pthread_mutex_unlock(&(pTmpProfile->m_AccessLock)); - return (0); + return 0; } if (! (pProfile->m_Flags & osl_Profile_SYSTEM)) @@ -789,7 +789,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, pthread_mutex_unlock(&(pTmpProfile->m_AccessLock)); - return (n); + return n; } sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, @@ -824,7 +824,7 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, { pthread_mutex_unlock(&(pTmpProfile->m_AccessLock)); - return (0); + return 0; } if (! (pProfile->m_Flags & osl_Profile_SYSTEM)) @@ -865,7 +865,7 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, pthread_mutex_unlock(&(pTmpProfile->m_AccessLock)); - return (n); + return n; } static osl_TStamp OslProfile_getFileStamp(osl_TFile* pFile) @@ -874,10 +874,10 @@ static osl_TStamp OslProfile_getFileStamp(osl_TFile* pFile) if ( (pFile->m_Handle < 0) || (fstat(pFile->m_Handle, &status) < 0) ) { - return (0); + return 0; } - return (status.st_mtime); + return status.st_mtime; } static bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode) @@ -971,7 +971,7 @@ static osl_TFile* openFileImpl(const sal_Char* pszFilename, oslProfileOption Pro ((pFile->m_Handle = open(pszFilename, O_RDWR)) < 0)) { free(pFile); - return (NULL); + return NULL; } } @@ -994,7 +994,7 @@ static osl_TFile* openFileImpl(const sal_Char* pszFilename, oslProfileOption Pro OslProfile_lockFile(pFile, bWriteable ? write_lock : read_lock); } - return (pFile); + return pFile; } static osl_TStamp closeFileImpl(osl_TFile* pFile, oslProfileOption Flags) @@ -1026,7 +1026,7 @@ static osl_TStamp closeFileImpl(osl_TFile* pFile, oslProfileOption Flags) free(pFile); - return(stamp); + return stamp; } static bool OslProfile_rewindFile(osl_TFile* pFile, bool bTruncate) @@ -1196,7 +1196,7 @@ static sal_Char* stripBlanks(sal_Char* String, sal_uInt32* pLen) while ( (*String == ' ') || (*String == '\t') ) String++; - return (String); + return String; } static sal_Char* addLine(osl_TProfileImpl* pProfile, const sal_Char* Line) @@ -1227,7 +1227,7 @@ static sal_Char* addLine(osl_TProfileImpl* pProfile, const sal_Char* Line) { pProfile->m_NoLines = 0; pProfile->m_MaxLines = 0; - return (NULL); + return NULL; } if ( pProfile->m_Lines[pProfile->m_NoLines] != 0 ) @@ -1236,7 +1236,7 @@ static sal_Char* addLine(osl_TProfileImpl* pProfile, const sal_Char* Line) } pProfile->m_Lines[pProfile->m_NoLines++] = strdup(Line); - return (pProfile->m_Lines[pProfile->m_NoLines - 1]); + return pProfile->m_Lines[pProfile->m_NoLines - 1]; } static sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Line, sal_uInt32 LineNo) @@ -1264,7 +1264,7 @@ static sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Line, sa { pProfile->m_NoLines = 0; pProfile->m_MaxLines = 0; - return (NULL); + return NULL; } } @@ -1295,7 +1295,7 @@ static sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Line, sa pProfile->m_Lines[LineNo] = strdup(Line); - return (pProfile->m_Lines[LineNo]); + return pProfile->m_Lines[LineNo]; } static void removeLine(osl_TProfileImpl* pProfile, sal_uInt32 LineNo) @@ -1540,7 +1540,7 @@ static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, else pSec = NULL; - return (pSec); + return pSec; } static bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile) @@ -1831,13 +1831,13 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, bool bWriteable) /* A readlock file could not be written */ if ((pProfile->m_Flags & osl_Profile_READLOCK) && bWriteable) { - return (NULL); + return NULL; } } } } - return (pProfile); + return pProfile; } static bool releaseProfile(osl_TProfileImpl* pProfile) @@ -1849,7 +1849,7 @@ static bool releaseProfile(osl_TProfileImpl* pProfile) if (pProfile->m_Flags & FLG_AUTOOPEN) { - return (osl_closeProfile((oslProfile)pProfile)); + return osl_closeProfile((oslProfile)pProfile); } else { diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx index f0c7ad999408..49ce7f7515f2 100644 --- a/sal/osl/unx/signal.cxx +++ b/sal/osl/unx/signal.cxx @@ -500,7 +500,7 @@ oslSignalHandler SAL_CALL osl_addSignalHandler(oslSignalHandlerFunction Handler, return (pHandler); } - return (NULL); + return NULL; } sal_Bool SAL_CALL osl_removeSignalHandler(oslSignalHandler Handler) @@ -532,7 +532,7 @@ sal_Bool SAL_CALL osl_removeSignalHandler(oslSignalHandler Handler) free(pHandler); - return (sal_True); + return sal_True; } pPrevious = pHandler; @@ -541,7 +541,7 @@ sal_Bool SAL_CALL osl_removeSignalHandler(oslSignalHandler Handler) osl_releaseMutex(SignalListMutex); - return (sal_False); + return sal_False; } oslSignalAction SAL_CALL osl_raiseSignal(sal_Int32 UserSignal, void* UserData) diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx index c8186864e5cd..efa389544f70 100644 --- a/sal/osl/unx/socket.cxx +++ b/sal/osl/unx/socket.cxx @@ -558,7 +558,7 @@ sal_Bool SAL_CALL osl_isEqualSocketAddr ( if (pAddr1 == pAddr2) { - return (sal_True); + return sal_True; } if (pAddr1->sa_family == pAddr2->sa_family) @@ -573,7 +573,7 @@ sal_Bool SAL_CALL osl_isEqualSocketAddr ( if ((pInetAddr1->sin_family == pInetAddr2->sin_family) && (pInetAddr1->sin_addr.s_addr == pInetAddr2->sin_addr.s_addr) && (pInetAddr1->sin_port == pInetAddr2->sin_port)) - return (sal_True); + return sal_True; } default: @@ -583,7 +583,7 @@ sal_Bool SAL_CALL osl_isEqualSocketAddr ( } } - return (sal_False); + return sal_False; } oslSocketAddr SAL_CALL osl_createInetBroadcastAddr ( @@ -628,7 +628,7 @@ oslSocketAddr SAL_CALL osl_createInetBroadcastAddr ( else { /* No broadcast in class D */ - return ((oslSocketAddr)NULL); + return (oslSocketAddr)NULL; } nAddr = htonl(nAddr); } @@ -785,21 +785,21 @@ static oslHostAddr _osl_hostentToHostAddr (const struct hostent *he) sal_Char *cn; if ((he == NULL) || (he->h_name == NULL) || (he->h_addr_list[0] == NULL)) - return ((oslHostAddr)NULL); + return (oslHostAddr)NULL; if (_osl_isFullQualifiedDomainName(he->h_name)) { cn= strdup(he->h_name); OSL_ASSERT(cn); if (cn == NULL) - return ((oslHostAddr)NULL); + return (oslHostAddr)NULL; } else { cn =_osl_getFullQualifiedDomainName (he->h_name); OSL_ASSERT(cn); if (cn == NULL) - return ((oslHostAddr)NULL); + return (oslHostAddr)NULL; } pSockAddr = __osl_createSocketAddr(); @@ -807,7 +807,7 @@ static oslHostAddr _osl_hostentToHostAddr (const struct hostent *he) if (pSockAddr == NULL) { free(cn); - return ((oslHostAddr)NULL); + return (oslHostAddr)NULL; } pSockAddr->m_sockaddr.sa_family= he->h_addrtype; @@ -829,7 +829,7 @@ static oslHostAddr _osl_hostentToHostAddr (const struct hostent *he) __osl_destroySocketAddr( pSockAddr ); free (cn); - return ((oslHostAddr)NULL); + return (oslHostAddr)NULL; } pAddr= (oslHostAddr) malloc(sizeof(struct oslHostAddrImpl)); @@ -838,7 +838,7 @@ static oslHostAddr _osl_hostentToHostAddr (const struct hostent *he) { __osl_destroySocketAddr( pSockAddr ); free (cn); - return ((oslHostAddr)NULL); + return (oslHostAddr)NULL; } pAddr->pHostName= cn; @@ -884,19 +884,19 @@ oslHostAddr SAL_CALL osl_psz_createHostAddr ( OSL_ASSERT(pszHostname && pAddr); if ((pszHostname == NULL) || (pAddr == NULL)) - return ((oslHostAddr)NULL); + return (oslHostAddr)NULL; cn = strdup(pszHostname); OSL_ASSERT(cn); if (cn == NULL) - return ((oslHostAddr)NULL); + return (oslHostAddr)NULL; pHostAddr= (oslHostAddr) malloc(sizeof(struct oslHostAddrImpl)); OSL_ASSERT(pHostAddr); if (pHostAddr == NULL) { free (cn); - return ((oslHostAddr)NULL); + return (oslHostAddr)NULL; } pHostAddr->pHostName= cn; @@ -951,7 +951,7 @@ oslHostAddr SAL_CALL osl_createHostAddrByAddr (const oslSocketAddr pAddr) OSL_ASSERT(pAddr); if (pAddr == NULL) - return ((oslHostAddr)NULL); + return (oslHostAddr)NULL; if (pAddr->m_sockaddr.sa_family == FAMILY_TO_NATIVE(osl_Socket_FamilyInet)) { @@ -959,7 +959,7 @@ oslHostAddr SAL_CALL osl_createHostAddrByAddr (const oslSocketAddr pAddr) struct hostent *he; if (sin->sin_addr.s_addr == htonl(INADDR_ANY)) - return ((oslHostAddr)NULL); + return (oslHostAddr)NULL; char const * addr = reinterpret_cast<char const *>(&sin->sin_addr); // at least some Androids apparently have a gethostbyaddr with char* @@ -970,7 +970,7 @@ oslHostAddr SAL_CALL osl_createHostAddrByAddr (const oslSocketAddr pAddr) return _osl_hostentToHostAddr (he); } - return ((oslHostAddr)NULL); + return (oslHostAddr)NULL; } oslHostAddr SAL_CALL osl_copyHostAddr (const oslHostAddr pAddr) @@ -980,7 +980,7 @@ oslHostAddr SAL_CALL osl_copyHostAddr (const oslHostAddr pAddr) if (pAddr) return osl_psz_createHostAddr (pAddr->pHostName, pAddr->pSockAddr); else - return ((oslHostAddr)NULL); + return (oslHostAddr)NULL; } void SAL_CALL osl_getHostnameOfHostAddr ( @@ -1009,7 +1009,7 @@ oslSocketAddr SAL_CALL osl_getSocketAddrOfHostAddr (const oslHostAddr pAddr) OSL_ASSERT(pAddr); if (pAddr) - return ((oslSocketAddr)(pAddr->pSockAddr)); + return (oslSocketAddr)pAddr->pSockAddr; else return NULL; } @@ -1129,10 +1129,10 @@ oslSocketAddr SAL_CALL osl_psz_resolveHostname(const sal_Char* pszHostname) osl_destroyHostAddr(pAddr); - return (SockAddr); + return SockAddr; } - return ((oslSocketAddr)NULL); + return (oslSocketAddr)NULL; } sal_Int32 SAL_CALL osl_getServicePort(rtl_uString *ustrServicename, rtl_uString *ustrProtocol) @@ -1459,12 +1459,12 @@ oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket) oslSocketAddr pAddr; if (pSocket == NULL) /* ENOTSOCK */ - return ((oslSocketAddr)NULL); + return (oslSocketAddr)NULL; AddrLen= sizeof(struct sockaddr); if (getsockname(pSocket->m_Socket, &Addr, &AddrLen) == OSL_SOCKET_ERROR) - return ((oslSocketAddr)NULL); + return (oslSocketAddr)NULL; pAddr = __osl_createSocketAddrFromSystem( &Addr ); return pAddr; diff --git a/sal/osl/unx/system.cxx b/sal/osl/unx/system.cxx index cddfd75b019d..847a575a0e3c 100644 --- a/sal/osl/unx/system.cxx +++ b/sal/osl/unx/system.cxx @@ -288,7 +288,7 @@ char *fcvt(double value, int ndigit, int *decpt, int *sign) strcpy(ret,buf); } - return(ret); + return ret; } #endif diff --git a/sal/osl/unx/thread.cxx b/sal/osl/unx/thread.cxx index 0ca411383c27..a0c0cc4e3743 100644 --- a/sal/osl/unx/thread.cxx +++ b/sal/osl/unx/thread.cxx @@ -155,7 +155,7 @@ Thread_Impl* osl_thread_construct_Impl (void) pthread_mutex_init (&(pImpl->m_Lock), PTHREAD_MUTEXATTR_DEFAULT); pthread_cond_init (&(pImpl->m_Cond), PTHREAD_CONDATTR_DEFAULT); } - return (pImpl); + return pImpl; } static void osl_thread_destruct_Impl (Thread_Impl ** ppImpl) @@ -246,7 +246,7 @@ static void* osl_thread_start_Impl (void* pData) } osl_thread_cleanup_Impl (pImpl); - return (0); + return 0; } static oslThread osl_thread_create_Impl ( @@ -263,7 +263,7 @@ static oslThread osl_thread_create_Impl ( pImpl = osl_thread_construct_Impl(); if (!pImpl) - return (0); /* ENOMEM */ + return 0; /* ENOMEM */ pImpl->m_WorkerFunction = pWorker; pImpl->m_pData = pThreadData; @@ -273,7 +273,7 @@ static oslThread osl_thread_create_Impl ( #if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) if (pthread_attr_init(&attr) != 0) - return (0); + return 0; #if defined OPENBSD stacksize = 262144; @@ -284,7 +284,7 @@ static oslThread osl_thread_create_Impl ( #endif if (pthread_attr_setstacksize(&attr, stacksize) != 0) { pthread_attr_destroy(&attr); - return (0); + return 0; } #endif @@ -306,7 +306,7 @@ static oslThread osl_thread_create_Impl ( pthread_mutex_unlock (&(pImpl->m_Lock)); osl_thread_destruct_Impl (&pImpl); - return (0); + return 0; } #if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) @@ -322,7 +322,7 @@ static oslThread osl_thread_create_Impl ( pthread_mutex_unlock (&(pImpl->m_Lock)); - return ((oslThread)(pImpl)); + return (oslThread)pImpl; } oslThread osl_createThread ( @@ -422,7 +422,7 @@ sal_Bool SAL_CALL osl_isThreadRunning(const oslThread Thread) active = ((pImpl->m_Flags & THREADIMPL_FLAGS_ACTIVE) > 0); pthread_mutex_unlock (&(pImpl->m_Lock)); - return (active); + return active; } void SAL_CALL osl_joinWithThread(oslThread Thread) @@ -579,14 +579,14 @@ static sal_uInt16 lookupThreadId (pthread_t hThread) if (pthread_equal(pEntry->Handle, hThread)) { pthread_mutex_unlock(&HashLock); - return (pEntry->Ident); + return pEntry->Ident; } pEntry = pEntry->Next; } pthread_mutex_unlock(&HashLock); - return (0); + return 0; } static sal_uInt16 insertThreadId (pthread_t hThread) @@ -627,7 +627,7 @@ static sal_uInt16 insertThreadId (pthread_t hThread) pthread_mutex_unlock(&HashLock); - return (pEntry->Ident); + return pEntry->Ident; } static void removeThreadId (pthread_t hThread) @@ -677,7 +677,7 @@ oslThreadIdentifier SAL_CALL osl_getThreadIdentifier(oslThread Thread) Ident = insertThreadId (current); } - return ((oslThreadIdentifier)(Ident)); + return (oslThreadIdentifier)Ident; } /***************************************************************************** @@ -953,7 +953,7 @@ oslThreadKey SAL_CALL osl_createThreadKey( oslThreadKeyCallbackFunction pCallbac } } - return ((oslThreadKey)pKey); + return (oslThreadKey)pKey; } void SAL_CALL osl_destroyThreadKey(oslThreadKey Key) diff --git a/sal/osl/w32/conditn.c b/sal/osl/w32/conditn.c index 1f83cd1cb1a2..b86ad1a3f377 100644 --- a/sal/osl/w32/conditn.c +++ b/sal/osl/w32/conditn.c @@ -110,13 +110,13 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, break; case WAIT_OBJECT_0: - return (osl_cond_result_ok); + return osl_cond_result_ok; case WAIT_TIMEOUT: - return (osl_cond_result_timeout); + return osl_cond_result_timeout; default: - return (osl_cond_result_error); + return osl_cond_result_error; } } } diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx index 1d13804e01b3..181e041c29bd 100644 --- a/sal/osl/w32/file.cxx +++ b/sal/osl/w32/file.cxx @@ -383,7 +383,7 @@ oslFileError FileHandle_Impl::readFileAt ( // flush current buffer oslFileError result = syncFile(); if (result != osl_File_E_None) - return (result); + return result; m_bufptr = -1, m_buflen = 0; if (nBytesRequested >= m_bufsiz) @@ -392,7 +392,7 @@ oslFileError FileHandle_Impl::readFileAt ( sal_uInt64 uDone = 0; result = readAt (nOffset, &(buffer[*pBytesRead]), nBytesRequested, &uDone); if (result != osl_File_E_None) - return (result); + return result; nBytesRequested -= sal::static_int_cast< DWORD >(uDone), *pBytesRead += uDone; return osl_File_E_None; @@ -402,7 +402,7 @@ oslFileError FileHandle_Impl::readFileAt ( sal_uInt64 uDone = 0; result = readAt (bufptr, m_buffer, m_bufsiz, &uDone); if (result != osl_File_E_None) - return (result); + return result; m_bufptr = bufptr, m_buflen = sal::static_int_cast< SIZE_T >(uDone); } if (bufpos >= m_buflen) @@ -456,7 +456,7 @@ oslFileError FileHandle_Impl::writeFileAt ( // flush current buffer oslFileError result = syncFile(); if (result != osl_File_E_None) - return (result); + return result; m_bufptr = -1, m_buflen = 0; if (nBytesToWrite >= m_bufsiz) @@ -465,7 +465,7 @@ oslFileError FileHandle_Impl::writeFileAt ( sal_uInt64 uDone = 0; result = writeAt (nOffset, &(buffer[*pBytesWritten]), nBytesToWrite, &uDone); if (result != osl_File_E_None) - return (result); + return result; if (uDone != nBytesToWrite) return osl_File_E_IO; @@ -477,7 +477,7 @@ oslFileError FileHandle_Impl::writeFileAt ( sal_uInt64 uDone = 0; result = readAt (bufptr, m_buffer, m_bufsiz, &uDone); if (result != osl_File_E_None) - return (result); + return result; m_bufptr = bufptr, m_buflen = sal::static_int_cast< SIZE_T >(uDone); } @@ -505,13 +505,13 @@ oslFileError FileHandle_Impl::readLineAt ( /* flush current buffer */ result = syncFile(); if (result != osl_File_E_None) - return (result); + return result; /* update buffer (pointer) */ sal_uInt64 uDone = 0; result = readAt (bufptr, m_buffer, m_bufsiz, &uDone); if (result != osl_File_E_None) - return (result); + return result; m_bufptr = bufptr, m_buflen = sal::static_int_cast< SIZE_T >(uDone); } @@ -534,7 +534,7 @@ oslFileError FileHandle_Impl::readLineAt ( result = writeSequence_Impl ( ppSequence, &dstpos, &(m_buffer[bufpos]), curpos - bufpos); if (result != osl_File_E_None) - return (result); + return result; *pBytesRead += curpos - bufpos, nOffset += curpos - bufpos; } @@ -545,7 +545,7 @@ oslFileError FileHandle_Impl::readLineAt ( sal_uInt64 uDone = 0; result = readAt (bufptr, m_buffer, m_bufsiz, &uDone); if (result != osl_File_E_None) - return (result); + return result; m_bufptr = bufptr, m_buflen = sal::static_int_cast< SIZE_T >(uDone); } @@ -591,7 +591,7 @@ oslFileError FileHandle_Impl::readLineAt ( result = writeSequence_Impl ( ppSequence, &dstpos, &(m_buffer[bufpos]), curpos - bufpos - 1); if (result != osl_File_E_None) - return (result); + return result; *pBytesRead += curpos - bufpos, nOffset += curpos - bufpos; } break; @@ -600,7 +600,7 @@ oslFileError FileHandle_Impl::readLineAt ( result = writeSequence_Impl (ppSequence, &dstpos, 0, 0); if (result != osl_File_E_None) - return (result); + return result; if (0 < dstpos) return osl_File_E_None; if (bufpos >= m_buflen) @@ -641,12 +641,12 @@ oslFileError FileHandle_Impl::syncFile() sal_uInt64 uDone = 0; result = writeAt (m_bufptr, m_buffer, m_buflen, &uDone); if (result != osl_File_E_None) - return (result); + return result; if (uDone != m_buflen) return osl_File_E_IO; m_state &= ~STATE_MODIFIED; } - return (result); + return result; } // File I/O functions @@ -688,7 +688,7 @@ SAL_CALL osl_createFileHandleFromOSHandle ( !((uFlags & osl_File_OpenFlag_Read) || (uFlags & osl_File_OpenFlag_Write)), "sal.osl", "osl_createFileHandleFromOSHandle(): missing read/write access flags"); - return (oslFileHandle)(pImpl); + return (oslFileHandle)pImpl; } oslFileError @@ -700,7 +700,7 @@ SAL_CALL osl_openFile( rtl_uString * strSysPath = 0; oslFileError result = _osl_getSystemPathFromFileURL( strPath, &strSysPath, sal_False ); if (result != osl_File_E_None) - return (result); + return result; DWORD dwAccess = GENERIC_READ, dwShare = FILE_SHARE_READ, dwCreation = 0, dwAttributes = 0; @@ -728,7 +728,7 @@ SAL_CALL osl_openFile( *pHandle = osl_createFileHandleFromOSHandle (hFile, uFlags | osl_File_OpenFlag_Read); rtl_uString_release( strSysPath ); - return (result); + return result; } oslFileError @@ -773,7 +773,7 @@ SAL_CALL osl_closeFile(oslFileHandle Handle) ::LeaveCriticalSection (&(pImpl->m_mutex)); delete pImpl; - return (result); + return result; } oslFileError @@ -882,7 +882,7 @@ SAL_CALL osl_readLine( pImpl->m_filepos, ppSequence, &uBytesRead); if (result == osl_File_E_None) pImpl->m_filepos += uBytesRead; - return (result); + return result; } oslFileError @@ -902,7 +902,7 @@ SAL_CALL osl_readFile( pImpl->m_filepos, pBuffer, uBytesRequested, pBytesRead); if (result == osl_File_E_None) pImpl->m_filepos += *pBytesRead; - return (result); + return result; } oslFileError @@ -923,7 +923,7 @@ SAL_CALL osl_writeFile( pImpl->m_filepos, pBuffer, uBytesToWrite, pBytesWritten); if (result == osl_File_E_None) pImpl->m_filepos += *pBytesWritten; - return (result); + return result; } oslFileError @@ -1074,7 +1074,7 @@ SAL_CALL osl_setFileSize (oslFileHandle Handle, sal_uInt64 uSize) FileHandle_Impl::Guard lock (&(pImpl->m_mutex)); oslFileError result = pImpl->syncFile(); if (result != osl_File_E_None) - return (result); + return result; pImpl->m_bufptr = -1, pImpl->m_buflen = 0; return pImpl->setSize (uSize); diff --git a/sal/osl/w32/pipe.c b/sal/osl/w32/pipe.c index 40fdde642c98..bbcdf098e4b4 100644 --- a/sal/osl/w32/pipe.c +++ b/sal/osl/w32/pipe.c @@ -234,7 +234,7 @@ oslPipe SAL_CALL osl_createPipe(rtl_uString *strPipeName, oslPipeOptions Options rtl_uString_release( name ); rtl_uString_release( path ); - return (pPipe); + return pPipe; } else { @@ -401,7 +401,7 @@ sal_Int32 SAL_CALL osl_receivePipe(oslPipe pPipe, } } - return (nBytes); + return nBytes; } /*****************************************************************************/ @@ -432,7 +432,7 @@ sal_Int32 SAL_CALL osl_sendPipe(oslPipe pPipe, pPipe->m_Error = osl_Pipe_E_ConnectionAbort; } - return (nBytes); + return nBytes; } sal_Int32 SAL_CALL osl_writePipe( oslPipe pPipe, const void *pBuffer , sal_Int32 n ) @@ -502,7 +502,7 @@ oslPipeError SAL_CALL osl_getLastPipeError(oslPipe pPipe) else Error = osl_Pipe_E_NotFound; - return (Error); + return Error; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx index 23001f9cd4c6..722342867d0e 100644 --- a/sal/osl/w32/process.cxx +++ b/sal/osl/w32/process.cxx @@ -76,7 +76,7 @@ oslProcess SAL_CALL osl_getProcess(oslProcessIdentifier Ident) else pProcImpl = NULL; - return (pProcImpl); + return pProcImpl; } /***************************************************************************/ @@ -229,7 +229,7 @@ oslProcessError bootstrap_getExecutableFile(rtl_uString ** ppFileURL) } } - return (result); + return result; } } @@ -296,7 +296,7 @@ static rtl_uString ** osl_createCommandArgs_Impl (int argc, char **) } } } - return (ppArgs); + return ppArgs; } #ifdef _MSC_VER @@ -337,7 +337,7 @@ sal_uInt32 SAL_CALL osl_getCommandArgCount(void) } osl_releaseMutex (*osl_getGlobalMutex()); - return (result); + return result; } /***************************************************************************/ @@ -356,7 +356,7 @@ oslProcessError SAL_CALL osl_getCommandArg( sal_uInt32 nArg, rtl_uString **strCo } osl_releaseMutex (*osl_getGlobalMutex()); - return (result); + return result; } /***************************************************************************/ diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx index 980e515d7e6f..199b618bdbc0 100644 --- a/sal/osl/w32/profile.cxx +++ b/sal/osl/w32/profile.cxx @@ -223,7 +223,7 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flag if( FileName) rtl_uString_release( FileName); - return (NULL); + return NULL; } pProfile = (osl_TProfileImpl*)calloc(1, sizeof(osl_TProfileImpl)); @@ -247,7 +247,7 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flag if( FileName) rtl_uString_release( FileName); - return (pProfile); + return pProfile; } sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile) @@ -329,7 +329,7 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile) #ifdef TRACE_OSL_PROFILE OSL_TRACE("Out osl_closeProfile [ok]"); #endif - return (sal_True); + return sal_True; } sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile) @@ -397,7 +397,7 @@ static sal_Bool writeProfileImpl(osl_TFile* pFile) OSL_ENSURE(bRet,"WriteFile failed!!!"); OSL_TRACE("write failed '%s'",strerror(errno)); - return (sal_False); + return sal_False; } free(pFile->m_pWriteBuf); @@ -432,7 +432,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, OSL_TRACE("Out osl_readProfileString [pProfile==0]"); #endif - return (sal_False); + return sal_False; } if (! (pProfile->m_Flags & osl_Profile_SYSTEM)) @@ -471,14 +471,14 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, OSL_TRACE("Out osl_readProfileString [pStr==0]"); #endif - return (sal_False); + return sal_False; } #ifdef TRACE_OSL_PROFILE OSL_TRACE("Out osl_readProfileString [ok]"); #endif - return (sal_True); + return sal_True; } sal_Bool SAL_CALL osl_readProfileBool(oslProfile Profile, @@ -508,7 +508,7 @@ sal_Bool SAL_CALL osl_readProfileBool(oslProfile Profile, OSL_TRACE("Out osl_readProfileBool [ok]"); #endif - return (Default); + return Default; } sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile, @@ -540,7 +540,7 @@ sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile, #ifdef TRACE_OSL_PROFILE OSL_TRACE("Out osl_readProfileIdent [ok]"); #endif - return (Default); + return Default; } sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, @@ -566,7 +566,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, #ifdef TRACE_OSL_PROFILE OSL_TRACE("Out osl_writeProfileString [pProfile==0]"); #endif - return (sal_False); + return sal_False; } if (! (pProfile->m_Flags & osl_Profile_SYSTEM)) @@ -588,7 +588,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, #ifdef TRACE_OSL_PROFILE OSL_TRACE("Out osl_writeProfileString [not added]"); #endif - return (sal_False); + return sal_False; } pSec = &pProfile->m_Sections[pProfile->m_NoSections - 1]; @@ -614,7 +614,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, #ifdef TRACE_OSL_PROFILE OSL_TRACE("Out osl_writeProfileString [not inserted]"); #endif - return (sal_False); + return sal_False; } pProfile->m_Flags |= FLG_MODIFIED; @@ -710,7 +710,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile, OSL_TRACE("Out osl_removeProfileEntry [pProfile==0]"); #endif - return (sal_False); + return sal_False; } if (! (pProfile->m_Flags & osl_Profile_SYSTEM)) @@ -769,7 +769,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C OSL_TRACE("Out osl_getProfileSectionEntries [pProfile=0]"); #endif - return (0); + return 0; } if (! (pProfile->m_Flags & osl_Profile_SYSTEM)) @@ -820,7 +820,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C OSL_TRACE("Out osl_getProfileSectionEntries [ok]"); #endif - return (n); + return n; } sal_Bool SAL_CALL osl_getProfileName(rtl_uString* strPath, rtl_uString* strName, rtl_uString** strProfileName) @@ -909,7 +909,7 @@ sal_Bool SAL_CALL osl_getProfileName(rtl_uString* strPath, rtl_uString* strName, bFailed = ! osl_getHomeDir(security, &strHome); osl_freeSecurityHandle(security); - if (bFailed) return (sal_False); + if (bFailed) return sal_False; if ( ::sal::static_int_cast< sal_uInt32 >( strHome->length ) >= aPath.getBufSizeInSymbols()) return sal_False; @@ -941,7 +941,7 @@ sal_Bool SAL_CALL osl_getProfileName(rtl_uString* strPath, rtl_uString* strName, bFailed = ! osl_getConfigDir(security, &strConfig); osl_freeSecurityHandle(security); - if (bFailed) return (sal_False); + if (bFailed) return sal_False; if ( ::sal::static_int_cast< sal_uInt32 >( strConfig->length ) >= aPath.getBufSizeInSymbols()) return sal_False; @@ -968,7 +968,7 @@ sal_Bool SAL_CALL osl_getProfileName(rtl_uString* strPath, rtl_uString* strName, ((nLen == RTL_CONSTASCII_LENGTH(STR_INI_METASYS)) || (pPath[RTL_CONSTASCII_LENGTH(STR_INI_METASYS)] == '/'))) { if (((nPathLen = GetWindowsDirectoryW(::osl::mingw_reinterpret_cast<LPWSTR>(aPath), aPath.getBufSizeInSymbols())) == 0) || (nPathLen >= aPath.getBufSizeInSymbols())) - return (sal_False); + return sal_False; if (nLen > RTL_CONSTASCII_LENGTH(STR_INI_METASYS)) { @@ -988,7 +988,7 @@ sal_Bool SAL_CALL osl_getProfileName(rtl_uString* strPath, rtl_uString* strName, (pPath[RTL_CONSTASCII_LENGTH(STR_INI_METAINS)] == '"') ) ) { if (! lookupProfile(pPath + RTL_CONSTASCII_LENGTH(STR_INI_METAINS), aFile, aPath)) - return (sal_False); + return sal_False; nPathLen = rtl_ustr_getLength(aPath); } @@ -1009,7 +1009,7 @@ sal_Bool SAL_CALL osl_getProfileName(rtl_uString* strPath, rtl_uString* strName, bFailed = ! osl_getConfigDir(security, &strConfigDir); osl_freeSecurityHandle(security); - if (bFailed) return (sal_False); + if (bFailed) return sal_False; if ( ::sal::static_int_cast< sal_uInt32 >( strConfigDir->length ) >= aPath.getBufSizeInSymbols() ) return sal_False; @@ -1044,7 +1044,7 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, sal_Char* pszBuff osl_TProfileImpl* pProfile = acquireProfile(Profile, sal_False); if (pProfile == NULL) - return (0); + return 0; if (! (pProfile->m_Flags & osl_Profile_SYSTEM)) { @@ -1085,7 +1085,7 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, sal_Char* pszBuff releaseProfile(pProfile); - return (n); + return n; } /*****************************************************************************/ @@ -1100,7 +1100,7 @@ static osl_TStamp getFileStamp(osl_TFile* pFile) (! GetFileTime(pFile->m_Handle, NULL, NULL, &FileTime))) memset(&FileTime, 0, sizeof(FileTime)); - return (FileTime); + return FileTime; } static sal_Bool lockFile(const osl_TFile* pFile, osl_TLockMode eMode) @@ -1109,7 +1109,7 @@ static sal_Bool lockFile(const osl_TFile* pFile, osl_TLockMode eMode) OVERLAPPED Overlapped; if (pFile->m_Handle == INVALID_HANDLE_VALUE) - return (sal_False); + return sal_False; memset(&Overlapped, 0, sizeof(Overlapped)); @@ -1132,7 +1132,7 @@ static sal_Bool lockFile(const osl_TFile* pFile, osl_TLockMode eMode) break; } - return (status); + return status; } static osl_TFile* openFileImpl(rtl_uString * strFileName, oslProfileOption ProfileFlags ) @@ -1169,7 +1169,7 @@ static osl_TFile* openFileImpl(rtl_uString * strFileName, oslProfileOption Profi == INVALID_HANDLE_VALUE) { free(pFile); - return (NULL); + return NULL; } } @@ -1186,7 +1186,7 @@ static osl_TFile* openFileImpl(rtl_uString * strFileName, oslProfileOption Profi lockFile(pFile, bWriteable ? write_lock : read_lock); } - return (pFile); + return pFile; } static osl_TStamp closeFileImpl(osl_TFile* pFile) @@ -1215,7 +1215,7 @@ static osl_TStamp closeFileImpl(osl_TFile* pFile) free(pFile); - return(stamp); + return stamp; } static sal_Bool rewindFile(osl_TFile* pFile, sal_Bool bTruncate) @@ -1230,7 +1230,7 @@ static sal_Bool rewindFile(osl_TFile* pFile, sal_Bool bTruncate) SetEndOfFile(pFile->m_Handle); } - return (sal_True); + return sal_True; } static sal_Bool getLine(osl_TFile* pFile, const sal_Char *pszLine, int MaxLen) @@ -1241,7 +1241,7 @@ static sal_Bool getLine(osl_TFile* pFile, const sal_Char *pszLine, int MaxLen) sal_Char* pLine = (sal_Char *)pszLine; if (pFile->m_Handle == INVALID_HANDLE_VALUE) - return (sal_False); + return sal_False; MaxLen -= 1; @@ -1260,7 +1260,7 @@ static sal_Bool getLine(osl_TFile* pFile, const sal_Char *pszLine, int MaxLen) if (! ReadFile(pFile->m_Handle, &pFile->m_ReadBuf[Bytes], Free, &Max, NULL)) { *pLine = '\0'; - return (sal_False); + return sal_False; } if (Max < Free) @@ -1268,7 +1268,7 @@ static sal_Bool getLine(osl_TFile* pFile, const sal_Char *pszLine, int MaxLen) if ((Max == 0) && (pLine == pszLine)) { *pLine = '\0'; - return (sal_False); + return sal_False; } pFile->m_ReadBuf[Bytes + Max] = '\0'; @@ -1309,7 +1309,7 @@ static sal_Bool getLine(osl_TFile* pFile, const sal_Char *pszLine, int MaxLen) } while (MaxLen > 0); - return (sal_True); + return sal_True; } static sal_Bool putLine(osl_TFile* pFile, const sal_Char *pszLine) @@ -1318,7 +1318,7 @@ static sal_Bool putLine(osl_TFile* pFile, const sal_Char *pszLine) if ( pFile == 0 || pFile->m_Handle == INVALID_HANDLE_VALUE ) { - return (sal_False); + return sal_False; } if ( pFile->m_pWriteBuf == 0 ) @@ -1353,7 +1353,7 @@ static sal_Bool putLine(osl_TFile* pFile, const sal_Char *pszLine) pFile->m_nWriteBufFree-=Len+2; - return (sal_True); + return sal_True; } /* platform specific end */ @@ -1375,7 +1375,7 @@ static const sal_Char* stripBlanks(const sal_Char* String, sal_uInt32* pLen) while ((*String == ' ') || (*String == '\t')) String++; - return (String); + return String; } static const sal_Char* addLine(osl_TProfileImpl* pProfile, const sal_Char* Line) @@ -1406,7 +1406,7 @@ static const sal_Char* addLine(osl_TProfileImpl* pProfile, const sal_Char* Line) { pProfile->m_NoLines = 0; pProfile->m_MaxLines = 0; - return (NULL); + return NULL; } } @@ -1417,7 +1417,7 @@ static const sal_Char* addLine(osl_TProfileImpl* pProfile, const sal_Char* Line) } pProfile->m_Lines[pProfile->m_NoLines++] = strdup(Line); - return (pProfile->m_Lines[pProfile->m_NoLines - 1]); + return pProfile->m_Lines[pProfile->m_NoLines - 1]; } static const sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Line, sal_uInt32 LineNo) @@ -1445,7 +1445,7 @@ static const sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Li { pProfile->m_NoLines = 0; pProfile->m_MaxLines = 0; - return (NULL); + return NULL; } } @@ -1476,7 +1476,7 @@ static const sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Li pProfile->m_Lines[LineNo] = strdup(Line); - return (pProfile->m_Lines[LineNo]); + return pProfile->m_Lines[LineNo]; } static void removeLine(osl_TProfileImpl* pProfile, sal_uInt32 LineNo) @@ -1556,7 +1556,7 @@ static sal_Bool addEntry(osl_TProfileImpl* pProfile, osl_TProfileSection *pSecti { pSection->m_NoEntries = 0; pSection->m_MaxEntries = 0; - return (sal_False); + return sal_False; } } @@ -1566,10 +1566,10 @@ static sal_Bool addEntry(osl_TProfileImpl* pProfile, osl_TProfileSection *pSecti setEntry(pProfile, pSection, pSection->m_NoEntries - 1, Line, Entry, Len); - return (sal_True); + return sal_True; } - return (sal_False); + return sal_False; } static void removeEntry(osl_TProfileSection *pSection, sal_uInt32 NoEntry) @@ -1620,7 +1620,7 @@ static sal_Bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* { pProfile->m_NoSections = 0; pProfile->m_MaxSections = 0; - return (sal_False); + return sal_False; } } @@ -1639,7 +1639,7 @@ static sal_Bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* pProfile->m_Sections[pProfile->m_NoSections - 1].m_Offset = Section - pProfile->m_Lines[Line]; pProfile->m_Sections[pProfile->m_NoSections - 1].m_Len = Len; - return (sal_True); + return sal_True; } static void removeSection(osl_TProfileImpl* pProfile, osl_TProfileSection *pSection) @@ -1720,7 +1720,7 @@ static sal_uInt32 Sect = 0; else pSec = NULL; - return (pSec); + return pSec; } static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile) @@ -1738,7 +1738,7 @@ static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile) while (getLine(pFile, Line, sizeof(Line))) { if (! addLine(pProfile, Line)) - return (sal_False); + return sal_False; } for (i = 0; i < pProfile->m_NoLines; i++) @@ -1761,17 +1761,17 @@ static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile) if (! addEntry(pProfile, &pProfile->m_Sections[pProfile->m_NoSections - 1], i, pStr, pChar - pStr)) - return (sal_False); + return sal_False; } else { /* new section */ if (! addSection(pProfile, i, pStr + 1, pChar - pStr - 1)) - return (sal_False); + return sal_False; } } - return (sal_True); + return sal_True; } static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup) @@ -1851,7 +1851,7 @@ static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup) #ifdef TRACE_OSL_PROFILE OSL_TRACE("Out storeProfile [ok]"); #endif - return (sal_True); + return sal_True; } static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl* pProfile) @@ -2011,13 +2011,13 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable) /* A readlock file could not be written */ if ((pProfile->m_Flags & osl_Profile_READLOCK) && bWriteable) { - return (NULL); + return NULL; } } } } - return (pProfile); + return pProfile; } static sal_Bool releaseProfile(osl_TProfileImpl* pProfile) @@ -2041,7 +2041,7 @@ static sal_Bool releaseProfile(osl_TProfileImpl* pProfile) #ifdef TRACE_OSL_PROFILE OSL_TRACE("Out releaseProfile [AUTOOPEN]"); #endif - return (osl_closeProfile((oslProfile)pProfile)); + return osl_closeProfile((oslProfile)pProfile); } else { @@ -2063,7 +2063,7 @@ static sal_Bool releaseProfile(osl_TProfileImpl* pProfile) #ifdef TRACE_OSL_PROFILE OSL_TRACE("Out releaseProfile [ok]"); #endif - return (sal_True); + return sal_True; } static sal_Bool lookupProfile(const sal_Unicode *strPath, const sal_Unicode *strFile, sal_Unicode *strProfile) @@ -2254,7 +2254,7 @@ static sal_Bool lookupProfile(const sal_Unicode *strPath, const sal_Unicode *str /* try to find the file in the directory of the executbale */ if (osl_getExecutableFile(&strTmp) != osl_Process_E_None) - return (sal_False); + return sal_False; /* convert to native path */ if (osl_getSystemPathFromFileURL(strTmp, &strExecutable) != osl_File_E_None) diff --git a/sal/osl/w32/security.c b/sal/osl/w32/security.c index d4d7d125675d..cc4a1b0853a7 100644 --- a/sal/osl/w32/security.c +++ b/sal/osl/w32/security.c @@ -90,7 +90,7 @@ oslSecurity SAL_CALL osl_getCurrentSecurity(void) pSecImpl->m_hToken = NULL; pSecImpl->m_hProfile = NULL; - return ((oslSecurity)pSecImpl); + return (oslSecurity)pSecImpl; } oslSecurityError SAL_CALL osl_loginUser( rtl_uString *strUserName, rtl_uString *strPasswd, oslSecurity *pSecurity ) @@ -269,10 +269,10 @@ sal_Bool SAL_CALL osl_isAdministrator(oslSecurity Security) if ( hImpersonationToken ) CloseHandle( hImpersonationToken ); - return (bSuccess); + return bSuccess; } else - return (sal_False); + return sal_False; } void SAL_CALL osl_freeSecurityHandle(oslSecurity Security) @@ -389,7 +389,7 @@ sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **strIdent) free(pInfoBuffer); free(Ident); - return (sal_True); + return sal_True; } } else @@ -749,7 +749,7 @@ static sal_Bool GetSpecialFolder(rtl_uString **strPath, int nFolder) FreeLibrary(hLibrary); - return (bRet); + return bRet; } static BOOL Privilege(LPTSTR strPrivilege, BOOL bEnable) @@ -848,7 +848,7 @@ static sal_Bool SAL_CALL getUserNameImpl(oslSecurity Security, rtl_uString **str free(pInfoBuffer); - return (sal_True); + return sal_True; } } else @@ -865,7 +865,7 @@ static sal_Bool SAL_CALL getUserNameImpl(oslSecurity Security, rtl_uString **str if (pNameW) free(pNameW); - return (sal_True); + return sal_True; } else if (wcslen(pSecImpl->m_User) > 0) @@ -875,7 +875,7 @@ static sal_Bool SAL_CALL getUserNameImpl(oslSecurity Security, rtl_uString **str if (pNameW) free(pNameW); - return (sal_True); + return sal_True; } if (pNameW) diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx index 470c1f622675..28979f35a41e 100644 --- a/sal/osl/w32/signal.cxx +++ b/sal/osl/w32/signal.cxx @@ -149,10 +149,10 @@ static long WINAPI SignalHandlerFunction(LPEXCEPTION_POINTERS lpEP) switch ( Action ) { case osl_Signal_ActCallNextHdl: - return (EXCEPTION_CONTINUE_SEARCH); + return EXCEPTION_CONTINUE_SEARCH; case osl_Signal_ActAbortApp: - return (EXCEPTION_EXECUTE_HANDLER); + return EXCEPTION_EXECUTE_HANDLER; case osl_Signal_ActKillApp: SetErrorMode(SEM_NOGPFAULTERRORBOX); @@ -162,7 +162,7 @@ static long WINAPI SignalHandlerFunction(LPEXCEPTION_POINTERS lpEP) break; } - return (EXCEPTION_CONTINUE_EXECUTION); + return EXCEPTION_CONTINUE_EXECUTION; } /*****************************************************************************/ @@ -191,10 +191,10 @@ oslSignalHandler SAL_CALL osl_addSignalHandler(oslSignalHandlerFunction Handler, osl_releaseMutex(SignalListMutex); - return (pHandler); + return pHandler; } - return (NULL); + return NULL; } /*****************************************************************************/ @@ -229,7 +229,7 @@ sal_Bool SAL_CALL osl_removeSignalHandler(oslSignalHandler Handler) free(pHandler); - return (sal_True); + return sal_True; } pPrevious = pHandler; @@ -238,7 +238,7 @@ sal_Bool SAL_CALL osl_removeSignalHandler(oslSignalHandler Handler) osl_releaseMutex(SignalListMutex); - return (sal_False); + return sal_False; } /*****************************************************************************/ @@ -262,7 +262,7 @@ oslSignalAction SAL_CALL osl_raiseSignal(sal_Int32 UserSignal, void* UserData) osl_releaseMutex(SignalListMutex); - return (Action); + return Action; } /*****************************************************************************/ diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx index 8722142e71cb..25eec51bc484 100644 --- a/sal/osl/w32/socket.cxx +++ b/sal/osl/w32/socket.cxx @@ -365,7 +365,7 @@ static sal_Bool __osl_querySocketDialupImpl (void) } LeaveCriticalSection (&pDialupImpl->m_hMutex); - return (result); + return result; } /* @@ -398,7 +398,7 @@ static sal_Bool __osl_attemptSocketDialupImpl (void) } LeaveCriticalSection (&pDialupImpl->m_hMutex); - return (result); + return result; } /*****************************************************************************/ @@ -560,7 +560,7 @@ sal_Bool SAL_CALL osl_isEqualSocketAddr(oslSocketAddr Addr1, oslSocketAddr Addr2 if ((pInetAddr1->sin_family == pInetAddr2->sin_family) && (pInetAddr1->sin_addr.s_addr == pInetAddr2->sin_addr.s_addr) && (pInetAddr1->sin_port == pInetAddr2->sin_port)) - return (sal_True); + return sal_True; } default: @@ -570,7 +570,7 @@ sal_Bool SAL_CALL osl_isEqualSocketAddr(oslSocketAddr Addr1, oslSocketAddr Addr2 } } - return (sal_False); + return sal_False; } /*****************************************************************************/ diff --git a/sal/osl/w32/thread.c b/sal/osl/w32/thread.c index 2eeea0681550..eb7f222ec5d6 100644 --- a/sal/osl/w32/thread.c +++ b/sal/osl/w32/thread.c @@ -58,7 +58,7 @@ static unsigned __stdcall oslWorkerWrapperFunction(void* pData) CoUninitialize(); - return (0); + return 0; } /*****************************************************************************/ @@ -128,9 +128,9 @@ oslThreadIdentifier SAL_CALL osl_getThreadIdentifier(oslThread Thread) osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread; if (pThreadImpl != NULL) - return ((oslThreadIdentifier)pThreadImpl->m_ThreadId); + return (oslThreadIdentifier)pThreadImpl->m_ThreadId; else - return ((oslThreadIdentifier)GetCurrentThreadId()); + return (oslThreadIdentifier)GetCurrentThreadId(); } /*****************************************************************************/ @@ -492,7 +492,7 @@ oslThreadKey SAL_CALL osl_createThreadKey(oslThreadKeyCallbackFunction pCallback AddKeyToList( pTls ); } - return ((oslThreadKey)pTls); + return (oslThreadKey)pTls; } /*****************************************************************************/ @@ -519,10 +519,10 @@ void* SAL_CALL osl_getThreadKeyData(oslThreadKey Key) { PTLS pTls = (PTLS)Key; - return (TlsGetValue( pTls->dwIndex )); + return TlsGetValue( pTls->dwIndex ); } - return (NULL); + return NULL; } /*****************************************************************************/ @@ -547,7 +547,7 @@ sal_Bool SAL_CALL osl_setThreadKeyData(oslThreadKey Key, void *pData) return (sal_Bool)(fSuccess != FALSE); } - return (sal_False); + return sal_False; } /*****************************************************************************/ diff --git a/sal/osl/w32/time.c b/sal/osl/w32/time.c index dd30c44da4e1..90d659a8cca0 100644 --- a/sal/osl/w32/time.c +++ b/sal/osl/w32/time.c @@ -56,7 +56,7 @@ sal_Bool SAL_CALL osl_getSystemTime(TimeValue* pTimeVal) pTimeVal->Seconds = (unsigned long) (Value / 10000000L); pTimeVal->Nanosec = (unsigned long)((Value % 10000000L) * 100); - return (sal_True); + return sal_True; } // osl_getDateTimeFromTimeValue diff --git a/sal/rtl/alloc_arena.cxx b/sal/rtl/alloc_arena.cxx index c733ecded529..b7447175039a 100644 --- a/sal/rtl/alloc_arena.cxx +++ b/sal/rtl/alloc_arena.cxx @@ -96,7 +96,7 @@ rtl_arena_segment_constructor (void * obj) QUEUE_START_NAMED(segment, s); QUEUE_START_NAMED(segment, f); - return (1); + return 1; } /** rtl_arena_segment_destructor() @@ -404,7 +404,7 @@ rtl_arena_hash_remove ( } } - return (segment); + return segment; } /* ================================================================= */ @@ -515,14 +515,14 @@ rtl_arena_segment_create ( QUEUE_INSERT_HEAD_NAMED(span, (*ppSegment), s); /* report success */ - return (1); + return 1; } rtl_arena_segment_put (arena, &span); } rtl_arena_segment_put (arena, ppSegment); } } - return (0); + return 0; } /** rtl_arena_segment_coalesce() @@ -709,7 +709,7 @@ rtl_arena_activate ( if (!(arena->m_qcache_ptr)) { /* out of memory */ - return (0); + return 0; } for (i = 1; i <= n; i++) { @@ -724,7 +724,7 @@ rtl_arena_activate ( QUEUE_INSERT_TAIL_NAMED(&(g_arena_list.m_arena_head), arena, arena_); RTL_MEMORY_LOCK_RELEASE(&(g_arena_list.m_lock)); } - return (arena); + return arena; } /** rtl_arena_deactivate() @@ -916,7 +916,7 @@ try_alloc: goto try_alloc; } } - return (result); + return result; } /** rtl_arena_destroy() @@ -1003,7 +1003,7 @@ SAL_CALL rtl_arena_alloc ( (*pSize) = size; } } - return (addr); + return addr; } /** rtl_arena_free() @@ -1151,9 +1151,9 @@ SAL_CALL rtl_machdep_alloc ( pArena->m_stats.m_mem_alloc += size; (*pSize) = size; - return (addr); + return addr; } - return (NULL); + return NULL; } /** rtl_machdep_free() @@ -1183,14 +1183,14 @@ rtl_machdep_pagesize() { #if defined(SAL_UNX) #if defined(FREEBSD) || defined(NETBSD) || defined(DRAGONFLY) - return ((sal_Size)getpagesize()); + return (sal_Size)getpagesize(); #else /* POSIX */ - return ((sal_Size)sysconf(_SC_PAGESIZE)); + return (sal_Size)sysconf(_SC_PAGESIZE); #endif /* xBSD || POSIX */ #elif defined(SAL_W32) SYSTEM_INFO info; GetSystemInfo (&info); - return ((sal_Size)(info.dwPageSize)); + return (sal_Size)info.dwPageSize; #endif /* (SAL_UNX || SAL_W32) */ } diff --git a/sal/rtl/alloc_cache.cxx b/sal/rtl/alloc_cache.cxx index e85f7520ea16..d63ae65dbb42 100644 --- a/sal/rtl/alloc_cache.cxx +++ b/sal/rtl/alloc_cache.cxx @@ -171,7 +171,7 @@ rtl_cache_hash_insert ( bufctl->m_next = (*ppHead); (*ppHead) = bufctl; - return (bufctl->m_addr); + return bufctl->m_addr; } /** rtl_cache_hash_remove() @@ -221,7 +221,7 @@ rtl_cache_hash_remove ( } } - return (bufctl); + return bufctl; } /* ================================================================= */ @@ -241,7 +241,7 @@ rtl_cache_slab_constructor (void * obj, SAL_UNUSED_PARAMETER void *) QUEUE_START_NAMED(slab, slab_); slab->m_ntypes = 0; - return (1); + return 1; } /** rtl_cache_slab_destructor() @@ -299,7 +299,7 @@ rtl_cache_slab_create ( rtl_arena_free (cache->m_source, addr, size); } } - return (slab); + return slab; } /** rtl_cache_slab_destroy() @@ -418,7 +418,7 @@ rtl_cache_slab_alloc ( { /* out of memory */ RTL_MEMORY_LOCK_RELEASE(&(cache->m_slab_lock)); - return (0); + return 0; } bufctl->m_addr = slab->m_bp; @@ -463,7 +463,7 @@ rtl_cache_slab_alloc ( } RTL_MEMORY_LOCK_RELEASE(&(cache->m_slab_lock)); - return (addr); + return addr; } /** rtl_cache_slab_free() @@ -547,7 +547,7 @@ rtl_cache_magazine_constructor (void * obj, SAL_UNUSED_PARAMETER void *) mag->m_mag_size = RTL_CACHE_MAGAZINE_SIZE; mag->m_mag_used = 0; - return (1); + return 1; } /** rtl_cache_magazine_destructor() @@ -632,7 +632,7 @@ rtl_cache_depot_dequeue ( depot->m_curr_min = depot->m_mag_count; } } - return (mag); + return mag; } /** rtl_cache_depot_exchange_alloc() @@ -659,7 +659,7 @@ rtl_cache_depot_exchange_alloc ( assert((full == 0) || (full->m_mag_used > 0)); - return (full); + return full; } /** rtl_cache_depot_exchange_free() @@ -686,7 +686,7 @@ rtl_cache_depot_exchange_free ( assert((empty == 0) || (empty->m_mag_used == 0)); - return (empty); + return empty; } /** rtl_cache_depot_populate() @@ -742,7 +742,7 @@ rtl_cache_constructor (void * obj) /* depot layer */ (void)RTL_MEMORY_LOCK_INIT(&(cache->m_depot_lock)); - return (1); + return 1; } /** rtl_cache_destructor() @@ -1102,7 +1102,7 @@ try_alloc: goto try_alloc; } } - return (result); + return result; } /** rtl_cache_destroy() @@ -1129,7 +1129,7 @@ SAL_CALL rtl_cache_alloc ( void * obj = 0; if (cache == 0) - return (0); + return 0; if (alloc_mode == AMode_SYSTEM) { @@ -1507,7 +1507,7 @@ rtl_cache_wsupdate_all (void * arg) } RTL_MEMORY_LOCK_RELEASE(&(g_cache_list.m_lock)); - return (0); + return 0; } /* ================================================================= * diff --git a/sal/rtl/alloc_global.cxx b/sal/rtl/alloc_global.cxx index a18527106f24..cff293c97083 100644 --- a/sal/rtl/alloc_global.cxx +++ b/sal/rtl/alloc_global.cxx @@ -129,7 +129,7 @@ try_alloc: } } } - return (p); + return p; } /* ================================================================= */ @@ -175,7 +175,7 @@ void * SAL_CALL rtl_reallocateMemory_CUSTOM (void * p, sal_Size n) SAL_THROW_EXT { rtl_freeMemory (p), p = 0; } - return (p); + return p; } #endif @@ -365,7 +365,7 @@ void * SAL_CALL rtl_allocateZeroMemory (sal_Size n) SAL_THROW_EXTERN_C() void * p = rtl_allocateMemory (n); if (p != 0) memset (p, 0, n); - return (p); + return p; } /* ================================================================= */ diff --git a/sal/rtl/alloc_impl.hxx b/sal/rtl/alloc_impl.hxx index 57ababe7de79..05ec242889a7 100644 --- a/sal/rtl/alloc_impl.hxx +++ b/sal/rtl/alloc_impl.hxx @@ -71,7 +71,7 @@ highbit(sal_Size n) int k = 1; if (n == 0) - return (0); + return 0; #if SAL_TYPES_SIZEOFLONG == 8 if (n & 0xffffffff00000000ul) k |= 32, n >>= 32; @@ -87,7 +87,7 @@ highbit(sal_Size n) if (n & 0x02) k++; - return (k); + return k; } /** lowbit(): find first bit set @@ -99,7 +99,7 @@ lowbit(sal_Size n) int k = 1; if (n == 0) - return (0); + return 0; #if SAL_TYPES_SIZEOFLONG == 8 if (!(n & 0xffffffff)) k |= 32, n >>= 32; @@ -114,7 +114,7 @@ lowbit(sal_Size n) k |= 2, n >>= 2; if (!(n & 0x1)) k++; - return (k); + return k; } /** Queue manipulation macros diff --git a/sal/rtl/cmdargs.cxx b/sal/rtl/cmdargs.cxx index f2d103fb48a8..ef9f9bde2ae3 100644 --- a/sal/rtl/cmdargs.cxx +++ b/sal/rtl/cmdargs.cxx @@ -88,7 +88,7 @@ oslProcessError SAL_CALL rtl_getAppCommandArg ( rtl_uString_assign( ppCommandArg, g_ppCommandArgs[nArg] ); result = osl_Process_E_None; } - return (result); + return result; } sal_uInt32 SAL_CALL rtl_getAppCommandArgCount() diff --git a/sal/rtl/digest.cxx b/sal/rtl/digest.cxx index 205db64f76b4..d8321fa9cada 100644 --- a/sal/rtl/digest.cxx +++ b/sal/rtl/digest.cxx @@ -382,7 +382,7 @@ rtlDigestError SAL_CALL rtl_digest_MD2 ( result = rtl_digest_getMD2 (&digest, pBuffer, nBufLen); memset (&digest, 0, sizeof (digest)); - return (result); + return result; } /* @@ -397,7 +397,7 @@ rtlDigest SAL_CALL rtl_digest_createMD2() SAL_THROW_EXTERN_C() pImpl->m_digest = __rtl_digest_MD2; __rtl_digest_initMD2 (&(pImpl->m_context)); } - return ((rtlDigest)pImpl); + return (rtlDigest)pImpl; } /* @@ -753,7 +753,7 @@ rtlDigestError SAL_CALL rtl_digest_MD5 ( result = rtl_digest_getMD5 (&digest, pBuffer, nBufLen); memset (&digest, 0, sizeof (digest)); - return (result); + return result; } /* @@ -768,7 +768,7 @@ rtlDigest SAL_CALL rtl_digest_createMD5() SAL_THROW_EXTERN_C() pImpl->m_digest = __rtl_digest_MD5; __rtl_digest_initMD5 (&(pImpl->m_context)); } - return ((rtlDigest)pImpl); + return (rtlDigest)pImpl; } /* @@ -1237,7 +1237,7 @@ rtlDigestError SAL_CALL rtl_digest_SHA ( result = rtl_digest_getSHA (&digest, pBuffer, nBufLen); memset (&digest, 0, sizeof (digest)); - return (result); + return result; } /* @@ -1252,7 +1252,7 @@ rtlDigest SAL_CALL rtl_digest_createSHA() SAL_THROW_EXTERN_C() pImpl->m_digest = __rtl_digest_SHA_0; __rtl_digest_initSHA (&(pImpl->m_context), __rtl_digest_updateSHA_0); } - return ((rtlDigest)pImpl); + return (rtlDigest)pImpl; } /* @@ -1427,7 +1427,7 @@ rtlDigestError SAL_CALL rtl_digest_SHA1 ( result = rtl_digest_getSHA1 (&digest, pBuffer, nBufLen); memset (&digest, 0, sizeof (digest)); - return (result); + return result; } /* @@ -1442,7 +1442,7 @@ rtlDigest SAL_CALL rtl_digest_createSHA1() SAL_THROW_EXTERN_C() pImpl->m_digest = __rtl_digest_SHA_1; __rtl_digest_initSHA (&(pImpl->m_context), __rtl_digest_updateSHA_1); } - return ((rtlDigest)pImpl); + return (rtlDigest)pImpl; } /* @@ -1670,7 +1670,7 @@ rtlDigestError SAL_CALL rtl_digest_HMAC_MD5 ( } memset (&digest, 0, sizeof (digest)); - return (result); + return result; } /* @@ -1685,7 +1685,7 @@ rtlDigest SAL_CALL rtl_digest_createHMAC_MD5() SAL_THROW_EXTERN_C() pImpl->m_digest = __rtl_digest_HMAC_MD5; __rtl_digest_initHMAC_MD5 (&(pImpl->m_context)); } - return ((rtlDigest)pImpl); + return (rtlDigest)pImpl; } /* @@ -1902,7 +1902,7 @@ rtlDigestError SAL_CALL rtl_digest_HMAC_SHA1 ( } memset (&digest, 0, sizeof (digest)); - return (result); + return result; } /* @@ -1917,7 +1917,7 @@ rtlDigest SAL_CALL rtl_digest_createHMAC_SHA1() SAL_THROW_EXTERN_C() pImpl->m_digest = __rtl_digest_HMAC_SHA1; __rtl_digest_initHMAC_SHA1 (&(pImpl->m_context)); } - return ((rtlDigest)pImpl); + return (rtlDigest)pImpl; } /* diff --git a/sal/rtl/random.cxx b/sal/rtl/random.cxx index 851dbffb1dda..912074eb789f 100644 --- a/sal/rtl/random.cxx +++ b/sal/rtl/random.cxx @@ -102,7 +102,7 @@ static double __rtl_random_data (RandomData_Impl *pImpl) ((double)(pImpl->m_nZ) / 30307.0) ); random -= ((double)((sal_uInt32)(random))); - return (random); + return random; } /* @@ -278,7 +278,7 @@ rtlRandomPool SAL_CALL rtl_random_createPool() SAL_THROW_EXTERN_C() pImpl = (RandomPool_Impl*)NULL; } } - return ((rtlRandomPool)pImpl); + return (rtlRandomPool)pImpl; } /* diff --git a/sal/workben/getlocaleinfotest.cxx b/sal/workben/getlocaleinfotest.cxx index d1f3db5328f7..b9bd0343fe14 100644 --- a/sal/workben/getlocaleinfotest.cxx +++ b/sal/workben/getlocaleinfotest.cxx @@ -33,7 +33,7 @@ int _cdecl main( int argc, char * argv[] ) if ( rtlLocale ) rtlTextEnc = osl_getTextEncodingFromLocale( rtlLocale ); - return(0); + return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/workben/t_digest.c b/sal/workben/t_digest.c index 499c7e927539..2372206950d3 100644 --- a/sal/workben/t_digest.c +++ b/sal/workben/t_digest.c @@ -151,7 +151,7 @@ static char *pt (unsigned char *md, int length) for (i=0; i<length; i++) sprintf(&(buf[i*2]),"%02x",md[i]); - return(buf); + return buf; } int SAL_CALL main (void) @@ -360,7 +360,7 @@ int SAL_CALL main (void) else printf("test (PBKDF2) %d ok\n", 1); - return (err); + return err; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/workben/t_ojp_exe.cxx b/sal/workben/t_ojp_exe.cxx index a0ea3ab67231..558ff3e722a1 100644 --- a/sal/workben/t_ojp_exe.cxx +++ b/sal/workben/t_ojp_exe.cxx @@ -38,7 +38,7 @@ int main(int argc, char* argv[]) printf("osl process test executable ended:\n"); - return (0); + return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/workben/t_random.c b/sal/workben/t_random.c index dd06f38d4902..d0d73441dfe8 100644 --- a/sal/workben/t_random.c +++ b/sal/workben/t_random.c @@ -30,7 +30,7 @@ static char *pt (unsigned char *md, int length) for (i=0; i<length; i++) sprintf(&(buf[i*2]),"%02x",md[i]); - return(buf); + return buf; } /* @@ -48,7 +48,7 @@ int SAL_CALL main (void) printf ("random: %s\n", pt (buffer, 8)); } rtl_random_destroyPool (pool); - return(0); + return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/workben/t_readline.c b/sal/workben/t_readline.c index 309881497c54..c824f10a9abf 100644 --- a/sal/workben/t_readline.c +++ b/sal/workben/t_readline.c @@ -41,7 +41,7 @@ int main (int argc, char ** argv) result = osl_getFileURLFromSystemPath (pSystemPath, &pFileUrl); rtl_uString_release (pSystemPath), pSystemPath = 0; if (result != osl_File_E_None) - return (result); + return result; result = osl_openFile (pFileUrl, &hFile, osl_File_OpenFlag_Read); rtl_uString_release (pFileUrl), pFileUrl = 0; diff --git a/sal/workben/test.cxx b/sal/workben/test.cxx index de7fc035358e..0d04bece1686 100644 --- a/sal/workben/test.cxx +++ b/sal/workben/test.cxx @@ -49,7 +49,7 @@ int _cdecl main( int argc, char * argv[] ) void test_uuid(); test_uuid(); - return(0); + return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index 998263d8794f..1769c2f3c61d 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -629,7 +629,7 @@ double ScInterpreter::GetFDist(double x, double fF1, double fF2) double arg = fF2/(fF2+fF1*x); double alpha = fF2/2.0; double beta = fF1/2.0; - return (GetBetaDist(arg, alpha, beta)); + return GetBetaDist(arg, alpha, beta); } double ScInterpreter::GetTDist( double T, double fDF, int nType ) @@ -2318,7 +2318,7 @@ double ScInterpreter::GetTInv( double fAlpha, double fSize, int nType ) double fVal = lcl_IterateInverse( aFunc, fSize * 0.5, fSize, bConvError ); if (bConvError) SetError(errNoConvergence); - return( fVal ); + return fVal; } class ScFDistFunction : public ScDistFunc diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index c330d64ae16f..4b2c13d164cc 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -899,7 +899,7 @@ OUString lclGetDataFieldCaption( const OUString& rFieldName, GeneralFunction eFu if( nResIdx ) aCaption = ScGlobal::GetRscString( nResIdx ) + " - "; aCaption += rFieldName; - return( aCaption ); + return aCaption; } } // namespace diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 9e96d1e9cc70..fcea194a773e 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -1325,7 +1325,7 @@ OUString GetNumberFormatCode(XclRoot& rRoot, const sal_uInt16 nScNumFmt, SvNumbe aFormatStr = "General"; } - return( aFormatStr ); + return aFormatStr; } } diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 4d78e1262c8a..87dad5e369aa 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -783,7 +783,7 @@ IMPL_LINK_NOARG(ScTPValidationError, SelectActionHdl) m_pFtError->Enable( !bMacro ); m_pEdError->Enable( !bMacro ); - return( 0L ); + return 0L; } IMPL_LINK_NOARG(ScTPValidationError, ClickSearchHdl) @@ -802,7 +802,7 @@ IMPL_LINK_NOARG(ScTPValidationError, ClickSearchHdl) m_pEdtTitle->SetText( aScriptURL ); } - return( 0L ); + return 0L; } bool ScValidationDlg::EnterRefStatus() diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index 0d76c7eab6d6..9f1a19598e44 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -359,7 +359,6 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt) rViewData.GetDispatcher().Execute(aSfxRequest.GetSlot(), SfxCallMode::SLOT | SfxCallMode::RECORD); } -// return (bReturn); return true; } diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index 4d03553a060c..10b1385100d1 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -176,7 +176,7 @@ IMPL_LINK(AlignmentPropertyPanel, MFLeftIndentMdyHdl, void*, EMPTYARG) SfxUInt16Item aItem( SID_ATTR_ALIGN_INDENT, (sal_uInt16)CalcToUnit( nVal, SFX_MAPUNIT_TWIP ) ); GetBindings()->GetDispatcher()->Execute(SID_ATTR_ALIGN_INDENT, SfxCallMode::RECORD, &aItem, 0L); - return( 0L ); + return 0L; } IMPL_LINK(AlignmentPropertyPanel, CBOXMergnCellClkHdl, void*, EMPTYARG) diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx index 514b45556e65..ac4d3467327b 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.cxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx @@ -173,7 +173,7 @@ IMPL_LINK(CellLineStyleControl, VSSelectHdl, void *, pControl) mrCellAppearancePropertyPanel.EndCellLineStylePopupMode(); } - return(0L); + return 0L; } IMPL_LINK(CellLineStyleControl, PBClickHdl, PushButton *, pPBtn) diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index 758578b8dbaa..c4fca2c14cfa 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -103,7 +103,7 @@ public: bool GetWaterCan() const { return bWaterCan; } void SetWaterCan( bool bWC ) { bWaterCan = bWC; } - SvxSearchItem* GetSearchItem() { return (pSearchItem); } + SvxSearchItem* GetSearchItem() { return pSearchItem; } void SetSearchItem(SvxSearchItem* pItem) { pSearchItem = pItem; } /** Return the virtual device that can be used for printer independent diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index 522791559aff..96df5f8d4827 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -292,7 +292,7 @@ public: void SetBackgroundFullSize( bool bIn ); bool IsBackgroundFullSize() const { return mbBackgroundFullSize; } - rtl_TextEncoding GetCharSet() { return(meCharSet); } + rtl_TextEncoding GetCharSet() { return meCharSet; } void SetPaperBin(sal_uInt16 nBin) { mnPaperBin = nBin; } sal_uInt16 GetPaperBin() const { return mnPaperBin; } diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index d80b5fbf93c2..d926354848a5 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -789,7 +789,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool mpOutliner->SetStyleSheetPool(static_cast<SfxStyleSheetPool*>(GetStyleSheetPool())); } - return(mpOutliner); + return mpOutliner; } // Internal outliner that is used to create text objects. We don't insert any diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index f762e9cc5c68..354942cee9a4 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -132,7 +132,7 @@ SdrObject* SdDrawDocument::GetObj(const OUString& rObjName) const nPage++; } - return (pObjFound); + return pObjFound; } // Find SdPage by name @@ -679,7 +679,7 @@ bool SdDrawDocument::CreateMissingNotesAndHandoutPages() SetChanged(false); } - return(bOK); + return bOK; } // + Move selected pages after said page diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 8052e7ee7d91..ee8739610b64 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -253,7 +253,7 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium& rMedium) pBookmarkDoc = mxBookmarkDocShRef->GetDoc(); } - return(pBookmarkDoc); + return pBookmarkDoc; } // Opens a bookmark document @@ -271,7 +271,7 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(const OUString& rBookmarkFile) pBookmarkDoc = mxBookmarkDocShRef->GetDoc(); } - return(pBookmarkDoc); + return pBookmarkDoc; } // Inserts a bookmark (page or object) @@ -417,7 +417,7 @@ bool SdDrawDocument::InsertBookmarkAsPage( if (nSdPageCount==0 || nBMSdPageCount==0 || nMPageCount==0) { bContinue = bOK = false; - return(bContinue); + return bContinue; } // Store the size and some other properties of the first page and notes @@ -468,7 +468,7 @@ bool SdDrawDocument::InsertBookmarkAsPage( if (!bContinue) { - return(bContinue); + return bContinue; } } } diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 2741cf2c56c4..f8e1f9db185c 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -873,7 +873,7 @@ IMPL_LINK_NOARG(SdDrawDocument, OnlineSpellingHdl) mpOnlineSearchItem = NULL; } - return(0); + return 0; } // Spell object (for OnlineSpelling) @@ -962,7 +962,7 @@ IMPL_LINK(SdDrawDocument, OnlineSpellEventHdl, EditStatus*, pEditStat) sal_uLong nStat = pEditStat->GetStatusWord(); mbHasOnlineSpellErrors = (nStat & EE_STAT_WRONGWORDCHANGED) != 0; - return(0); + return 0; } // Callback for ExecuteSpellPopup() diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 8cfeff17e452..7ceb101b14a2 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -558,7 +558,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, bool bVertical, const Rec pSdrObj->RecalcBoundRect(); } - return(pSdrObj); + return pSdrObj; } /************************************************************************* diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 240c06213fad..b3866bc14e20 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -708,7 +708,7 @@ void AccessibleDocumentViewBase::SetAccessibleOLEObject ( ::osl::Mutex& AccessibleDocumentViewBase::implGetMutex() { - return( maMutex ); + return maMutex; } // return ourself as context in default case @@ -716,7 +716,7 @@ uno::Reference< XAccessibleContext > AccessibleDocumentViewBase::implGetAccessibleContext() throw (uno::RuntimeException) { - return( this ); + return this; } // return sal_False in default case @@ -724,7 +724,7 @@ bool AccessibleDocumentViewBase::implIsSelected( sal_Int32 ) throw (uno::RuntimeException) { - return( false ); + return false; } // return nothing in default case diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 26210719b73b..fffc50cec5fe 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -693,7 +693,7 @@ bool } } - return( bRet ); + return bRet; } /** Select or delselect the specified shapes. The corresponding accessible diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index 8f0f06cda1eb..3821bcc56d33 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -170,7 +170,7 @@ SdOptions* SdModule::GetSdOptions(DocumentType eDocType) PutItem( SfxUInt16Item( SID_ATTR_METRIC, nMetric ) ); } - return(pOptions); + return pOptions; } /** diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index f30c937ffbb7..4613aae4248b 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -396,7 +396,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo) } } - return(0); + return 0; } /** diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx index 565498183fca..526a338df8ca 100644 --- a/sd/source/ui/app/sdpopup.cxx +++ b/sd/source/ui/app/sdpopup.cxx @@ -302,7 +302,7 @@ SvxFieldData* SdFieldPopup::GetField() static_cast<SvxAuthorField*>( pNewField )->SetFormat( eFormat ); } } - return( pNewField ); + return pNewField; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx index 1a80e8b18ea4..e2e3d7bf95c6 100644 --- a/sd/source/ui/app/tbxww.cxx +++ b/sd/source/ui/app/tbxww.cxx @@ -53,7 +53,7 @@ SdTbxControl::SdTbxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) SfxPopupWindowType SdTbxControl::GetPopupWindowType() const { - return( SFX_POPUPWINDOW_ONTIMEOUT ); + return SFX_POPUPWINDOW_ONTIMEOUT; } /** @@ -122,7 +122,7 @@ SfxPopupWindow* SdTbxControl::CreatePopupWindow() if ( !aToolBarResStr.isEmpty() ) createAndPositionSubToolBar( aToolBarResStr ); - return( pWin ); + return pWin; } /*-------------------------------------------------------------------------*/ diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 75043dc27b41..2881e392c239 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -227,13 +227,13 @@ IMPL_LINK_NOARG(AnimationWindow, ClickFirstHdl) m_nCurrentFrame = (m_FrameList.empty()) ? EMPTY_FRAMELIST : 0; UpdateControl(); - return( 0L ); + return 0L; } IMPL_LINK_NOARG(AnimationWindow, ClickStopHdl) { bMovie = false; - return( 0L ); + return 0L; } IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) @@ -352,7 +352,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) m_pBtnGetAllObjects->Enable( bBtnGetAllObjectsEnabled ); m_pBtnGetOneObject->Enable( bBtnGetOneObjectEnabled ); - return( 0L ); + return 0L; } IMPL_LINK_NOARG(AnimationWindow, ClickLastHdl) @@ -361,7 +361,7 @@ IMPL_LINK_NOARG(AnimationWindow, ClickLastHdl) (m_FrameList.empty()) ? EMPTY_FRAMELIST : m_FrameList.size() - 1 ; UpdateControl(); - return( 0L ); + return 0L; } IMPL_LINK( AnimationWindow, ClickRbtHdl, void *, p ) @@ -385,7 +385,7 @@ IMPL_LINK( AnimationWindow, ClickRbtHdl, void *, p ) m_pLbLoopCount->Enable(); } - return( 0L ); + return 0L; } IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn ) @@ -397,7 +397,7 @@ IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn ) GetBindings().GetDispatcher()->Execute( SID_ANIMATOR_ADD, SfxCallMode::SLOT | SfxCallMode::RECORD, &aItem, 0L ); - return( 0L ); + return 0L; } IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn ) @@ -472,7 +472,7 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn ) UpdateControl(); - return( 0L ); + return 0L; } IMPL_LINK_NOARG(AnimationWindow, ClickCreateGroupHdl) @@ -482,7 +482,7 @@ IMPL_LINK_NOARG(AnimationWindow, ClickCreateGroupHdl) GetBindings().GetDispatcher()->Execute( SID_ANIMATOR_CREATE, SfxCallMode::SLOT | SfxCallMode::RECORD, &aItem, 0L ); - return( 0L ); + return 0L; } IMPL_LINK_NOARG(AnimationWindow, ModifyBitmapHdl) @@ -498,7 +498,7 @@ IMPL_LINK_NOARG(AnimationWindow, ModifyBitmapHdl) UpdateControl(); - return( 0L ); + return 0L; } IMPL_LINK_NOARG(AnimationWindow, ModifyTimeHdl) @@ -509,7 +509,7 @@ IMPL_LINK_NOARG(AnimationWindow, ModifyTimeHdl) *pTime = m_pTimeField->GetTime(); - return( 0L ); + return 0L; } void AnimationWindow::UpdateControl(bool const bDisableCtrls) diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx index f79002fb3df4..8c2a255e567a 100644 --- a/sd/source/ui/dlg/brkdlg.cxx +++ b/sd/source/ui/dlg/brkdlg.cxx @@ -76,7 +76,7 @@ IMPL_LINK_NOARG(BreakDlg, CancelButtonHdl) { bCancel = true; m_pBtnCancel->Disable(); - return( 0L ); + return 0L; } /** diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index 94e0e876e67c..91e46b5fd039 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -243,7 +243,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) CheckState(); - return( 0L ); + return 0L; } // StartShow-Hdl @@ -399,7 +399,7 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p ) CheckState(); - return( 0L ); + return 0L; } /** diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index 17181cd62237..64e4d476baa7 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -149,7 +149,7 @@ SvxFieldData* SdModifyFieldDlg::GetField() } } - return( pNewField ); + return pNewField; } void SdModifyFieldDlg::FillFormatList() diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index c2791e10f83d..047d3c6f30bb 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -191,7 +191,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl) } } - return( 0L ); + return 0L; } // check whether to disable the "selection" checkbox diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx index 79c6ebe63374..b21f7104b53c 100644 --- a/sd/source/ui/dlg/gluectrl.cxx +++ b/sd/source/ui/dlg/gluectrl.cxx @@ -164,10 +164,10 @@ vcl::Window* SdTbxCtlGlueEscDir::CreateItemWindow( vcl::Window *pParent ) { if( GetSlotId() == SID_GLUE_ESCDIR ) { - return( new GlueEscDirLB( pParent, m_xFrame ) ); + return new GlueEscDirLB( pParent, m_xFrame ); } - return( NULL ); + return NULL; } /** @@ -178,9 +178,9 @@ sal_uInt16 SdTbxCtlGlueEscDir::GetEscDirPos( sal_uInt16 nEscDir ) for( sal_uInt16 i = 0; i < ESCDIR_COUNT; i++ ) { if( aEscDirArray[ i ] == nEscDir ) - return( i ); + return i; } - return( 99 ); + return 99; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index a78812f516df..473c9d4018de 100644 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -126,7 +126,7 @@ IMPL_LINK_NOARG(SdInsertPagesObjsDlg, SelectObjectHdl) else m_pCbxLink->Disable(); - return( 0 ); + return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 035d568896de..0f12f3018010 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -238,7 +238,7 @@ NavigatorDragType SdNavigatorWin::GetNavigatorDragType() if( ( eDT == NAVIGATOR_DRAGTYPE_LINK ) && ( ( pInfo && !pInfo->HasName() ) || !maTlbObjects.IsLinkableSelected() ) ) eDT = NAVIGATOR_DRAGTYPE_NONE; - return( eDT ); + return eDT; } //Get SdDrawDocShell @@ -414,7 +414,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl) } } } - return( 0L ); + return 0L; } IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl) @@ -458,7 +458,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl) SetDragImage(); } - return( 0L ); + return 0L; } /** @@ -493,7 +493,7 @@ IMPL_LINK( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu ) maTlbObjects.SetSelectionMode( MULTIPLE_SELECTION ); } } - return( 0 ); + return 0; } IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu ) @@ -736,7 +736,7 @@ sal_uInt16 SdNavigatorWin::GetDragTypeSdResId( NavigatorDragType eDT, bool bImag return( bImage ? TBI_LINK : STR_DRAGTYPE_LINK ); default: OSL_FAIL( "No resource for DragType available!" ); } - return( 0 ); + return 0; } NavDocInfo* SdNavigatorWin::GetDocInfo() @@ -747,7 +747,7 @@ NavDocInfo* SdNavigatorWin::GetDocInfo() { if( nPos == 0 ) { - return( NULL ); + return NULL; } nPos--; } @@ -791,7 +791,7 @@ bool SdNavigatorWin::Notify(NotifyEvent& rNEvt) if( !nOK ) nOK = Window::Notify( rNEvt ); - return( nOK ); + return nOK; } /** diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index d462faf8b8ce..c4b95a9d2458 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -294,7 +294,7 @@ IMPL_LINK_NOARG(SdStartPresentationDlg, ChangeRangeHdl) aLbDias->Enable( aRbtAtDia->IsChecked() ); aLbCustomshow->Enable( aRbtCustomshow->IsChecked() ); - return( 0L ); + return 0L; } /** @@ -321,7 +321,7 @@ IMPL_LINK_NOARG(SdStartPresentationDlg, ClickWindowPresentationHdl) else aCbxAlwaysOnTop->Enable(); - return( 0L ); + return 0L; } /** @@ -330,7 +330,7 @@ IMPL_LINK_NOARG(SdStartPresentationDlg, ClickWindowPresentationHdl) IMPL_LINK_NOARG(SdStartPresentationDlg, ChangePauseHdl) { aCbxAutoLogo->Enable( aRbtAuto->IsChecked() && ( aTmfPause->GetTime().GetMSFromTime() > 0 ) ); - return( 0L ); + return 0L; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index b6e89c44f153..21d8a89afb6f 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -274,7 +274,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl) } } - return( 0 ); + return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 0d9635b03db3..efe298eeb481 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -448,7 +448,7 @@ bool SdPageObjsTLB::SelectEntry( const OUString& rName ) } } } - return( bFound ); + return bFound; } /** @@ -477,7 +477,7 @@ bool SdPageObjsTLB::HasSelectedChildren( const OUString& rName ) } } } - return( bChildren ); + return bChildren; } /** @@ -857,7 +857,7 @@ bool SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc ) } // If there are still entries in the listbox, // then objects (with names) or pages were deleted - return( !pEntry ); + return !pEntry; } /** @@ -865,7 +865,7 @@ bool SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc ) */ OUString SdPageObjsTLB::GetSelectEntry() { - return( GetEntryText( GetCurEntry() ) ); + return GetEntryText( GetCurEntry() ); } std::vector<OUString> SdPageObjsTLB::GetSelectEntryList( const sal_uInt16 nDepth ) const @@ -1010,7 +1010,7 @@ SdDrawDocument* SdPageObjsTLB::GetBookmarkDoc(SfxMedium* pMed) } } - return( mpBookmarkDoc ); + return mpBookmarkDoc; } /** diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index a7e414754a1b..e281738b6a25 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -297,7 +297,7 @@ bool SdTPAction::FillItemSet( SfxItemSet* rAttrs ) } } - return( bModified ); + return bModified; } void SdTPAction::Reset( const SfxItemSet* rAttrs ) @@ -356,13 +356,13 @@ int SdTPAction::DeactivatePage( SfxItemSet* pPageSet ) if( pPageSet ) FillItemSet( pPageSet ); - return( LEAVE_PAGE ); + return LEAVE_PAGE; } SfxTabPage* SdTPAction::Create( vcl::Window* pWindow, const SfxItemSet& rAttrs ) { - return( new SdTPAction( pWindow, rAttrs ) ); + return new SdTPAction( pWindow, rAttrs ); } void SdTPAction::UpdateTree() @@ -457,7 +457,7 @@ IMPL_LINK_NOARG(SdTPAction, ClickSearchHdl) { OpenFileDialog(); - return( 0L ); + return 0L; } IMPL_LINK_NOARG(SdTPAction, ClickActionHdl) @@ -631,13 +631,13 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl) break; } - return( 0L ); + return 0L; } IMPL_LINK_NOARG(SdTPAction, SelectTreeHdl) { m_pEdtBookmark->SetText( m_pLbTree->GetSelectEntry() ); - return( 0L ); + return 0L; } IMPL_LINK_NOARG(SdTPAction, CheckFileHdl) @@ -685,7 +685,7 @@ IMPL_LINK_NOARG(SdTPAction, CheckFileHdl) m_pLbTreeDocument->Hide(); } - return( 0L ); + return 0L; } presentation::ClickAction SdTPAction::GetActualClickAction() @@ -695,7 +695,7 @@ presentation::ClickAction SdTPAction::GetActualClickAction() if (nPos != LISTBOX_ENTRY_NOTFOUND && static_cast<size_t>(nPos) < maCurrentActions.size()) eCA = maCurrentActions[ nPos ]; - return( eCA ); + return eCA; } void SdTPAction::SetActualClickAction( presentation::ClickAction eCA ) @@ -799,7 +799,7 @@ OUString SdTPAction::GetEditText( bool bFullDocDestination ) } case presentation::ClickAction_BOOKMARK: - return( m_pEdtBookmark->GetText() ); + return m_pEdtBookmark->GetText(); default: break; @@ -830,7 +830,7 @@ OUString SdTPAction::GetEditText( bool bFullDocDestination ) } } - return( aStr ); + return aStr; } sal_uInt16 SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA ) @@ -851,7 +851,7 @@ sal_uInt16 SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA ) case presentation::ClickAction_STOPPRESENTATION: return STR_CLICK_ACTION_STOPPRESENTATION; default: OSL_FAIL( "No StringResource for ClickAction available!" ); } - return( 0 ); + return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 15dbfe6c3179..9065e1ebe922 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -102,7 +102,7 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs ) SfxTabPage* SdTpOptionsSnap::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { - return( new SdTpOptionsSnap( pWindow, *rAttrs ) ); + return new SdTpOptionsSnap( pWindow, *rAttrs ); } /************************************************************************* @@ -143,7 +143,7 @@ bool SdTpOptionsContents::FillItemSet( SfxItemSet* rAttrs ) rAttrs->Put( aOptsItem ); bModified = true; } - return( bModified ); + return bModified; } void SdTpOptionsContents::Reset( const SfxItemSet* rAttrs ) @@ -168,7 +168,7 @@ void SdTpOptionsContents::Reset( const SfxItemSet* rAttrs ) SfxTabPage* SdTpOptionsContents::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { - return( new SdTpOptionsContents( pWindow, *rAttrs ) ); + return new SdTpOptionsContents( pWindow, *rAttrs ); } /************************************************************************* @@ -329,18 +329,18 @@ int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet ) { if( pActiveSet ) FillItemSet( pActiveSet ); - return( LEAVE_PAGE ); + return LEAVE_PAGE; } WarningBox aWarnBox( GetParent(), WB_YES_NO, SD_RESSTR( STR_WARN_SCALE_FAIL ) ); short nReturn = aWarnBox.Execute(); if( nReturn == RET_YES ) - return( KEEP_PAGE ); + return KEEP_PAGE; if( pActiveSet ) FillItemSet( pActiveSet ); - return( LEAVE_PAGE ); + return LEAVE_PAGE; } bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs ) @@ -407,7 +407,7 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs ) bModified = true; } - return( bModified ); + return bModified; } void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs ) @@ -491,7 +491,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs ) SfxTabPage* SdTpOptionsMisc::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { - return( new SdTpOptionsMisc( pWindow, *rAttrs ) ); + return new SdTpOptionsMisc( pWindow, *rAttrs ); } IMPL_LINK_NOARG(SdTpOptionsMisc, SelectMetricHdl_Impl) diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index 54ba78f37496..1646ed348244 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -152,7 +152,7 @@ Rectangle DrawDocShell::GetVisArea(sal_uInt16 nAspect) const } } - return (aVisArea); + return aVisArea; } void DrawDocShell::Connect(ViewShell* pViewSh) @@ -177,7 +177,7 @@ FrameView* DrawDocShell::GetFrameView() pFrameView = mpViewShell->GetFrameView(); } - return(pFrameView); + return pFrameView; } Size DrawDocShell::GetFirstPageSize() @@ -311,7 +311,7 @@ bool DrawDocShell::CheckPageName (vcl::Window* pWin, OUString& rName ) } } - return ( bIsNameValid ? sal_True : sal_False ); + return bIsNameValid; } bool DrawDocShell::IsNewPageNameValid( OUString & rInOutPageName, bool bResetStringIfStandardName /* = false */ ) diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 1709b193567c..cd9043858ba5 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -667,7 +667,7 @@ bool DrawDocShell::SaveCompleted( const ::com::sun::star::uno::Reference< ::com: SfxStyleSheetBasePool* DrawDocShell::GetStyleSheetPool() { - return( (SfxStyleSheetBasePool*) mpDoc->GetStyleSheetPool() ); + return (SfxStyleSheetBasePool*) mpDoc->GetStyleSheetPool(); } bool DrawDocShell::GotoBookmark(const OUString& rBookmark) diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index b20911cc0697..ebe60de7acb2 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -433,7 +433,7 @@ IMPL_LINK(DrawDocShell, OnlineSpellCallback, SpellCallbackInfo*, pInfo) } mpDoc->ImpOnlineSpellCallback(pInfo, pObj, pOutl); - return(0); + return 0; } void DrawDocShell::ClearUndoBuffer() diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index 76c70d2f5537..974b49e9d323 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -130,7 +130,7 @@ bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt) } } - return(bReturn); + return bReturn; } bool FuConstructBezierPolygon::MouseMove(const MouseEvent& rMEvt) @@ -213,7 +213,7 @@ bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); } - return(bReturn); + return bReturn; } /** diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index e615e9475bbe..9edd9bc866a2 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -229,7 +229,7 @@ bool FuConstruct::KeyInput(const KeyEvent& rKEvt) if ( !bReturn ) bReturn = FuDraw::KeyInput(rKEvt); - return(bReturn); + return bReturn; } void FuConstruct::Activate() diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx index ae6ee9706997..74dac4c7f3d9 100644 --- a/sd/source/ui/func/fuconuno.cxx +++ b/sd/source/ui/func/fuconuno.cxx @@ -115,7 +115,7 @@ bool FuConstructUnoControl::MouseButtonUp(const MouseEvent& rMEvt) if (!bPermanent) mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); - return (bReturn); + return bReturn; } /** diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index ce1662921501..d8a05860d1e6 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -465,7 +465,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt) mpWindow->ReleaseMouse(); } - return (bReturn); + return bReturn; } void FuDraw::Activate() @@ -790,7 +790,7 @@ bool FuDraw::RequestHelp(const HelpEvent& rHEvt) bReturn = FuPoor::RequestHelp(rHEvt); } - return(bReturn); + return bReturn; } bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewEvent& rVEvt) diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 71cf119c3620..f0b172faa67d 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -403,7 +403,7 @@ bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) mpDoc->RemoveUnnecessaryMasterPages(); } - return (bOK); + return bOK; } void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium) diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx index f68d033c7442..c35371644ac5 100644 --- a/sd/source/ui/func/fuoltext.cxx +++ b/sd/source/ui/func/fuoltext.cxx @@ -111,7 +111,7 @@ bool FuOutlineText::MouseButtonDown(const MouseEvent& rMEvt) bReturn = FuOutline::MouseButtonDown(rMEvt); } - return (bReturn); + return bReturn; } bool FuOutlineText::MouseMove(const MouseEvent& rMEvt) @@ -123,7 +123,7 @@ bool FuOutlineText::MouseMove(const MouseEvent& rMEvt) bReturn = FuOutline::MouseMove(rMEvt); } - return (bReturn); + return bReturn; } bool FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt) @@ -171,7 +171,7 @@ bool FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt) if( !bReturn ) bReturn = FuOutline::MouseButtonUp(rMEvt); - return (bReturn); + return bReturn; } /** @@ -203,7 +203,7 @@ bool FuOutlineText::KeyInput(const KeyEvent& rKEvt) } } - return (bReturn); + return bReturn; } void FuOutlineText::UpdateForKeyPress (const KeyEvent& rEvent) diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 523f5b50e59f..6097b3b41b0a 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -886,7 +886,7 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt) } } - return(bReturn); + return bReturn; } bool FuPoor::MouseMove(const MouseEvent& ) @@ -974,7 +974,7 @@ IMPL_LINK_NOARG(FuPoor, DragHdl) bool FuPoor::Command(const CommandEvent& rCEvt) { - return( mpView->Command(rCEvt,mpWindow) ); + return mpView->Command(rCEvt,mpWindow); } /** @@ -1035,7 +1035,7 @@ bool FuPoor::RequestHelp(const HelpEvent& rHEvt) } } - return(bReturn); + return bReturn; } void FuPoor::Paint(const Rectangle&, ::sd::Window* ) diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 0c1512560aec..cba210466715 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -598,7 +598,7 @@ bool FuSelection::MouseMove(const MouseEvent& rMEvt) ForcePointer(&rMEvt); - return (bReturn); + return bReturn; } bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) @@ -890,7 +890,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) FuDraw::MouseButtonUp(rMEvt); } - return (bReturn); + return bReturn; } /** @@ -996,7 +996,7 @@ bool FuSelection::KeyInput(const KeyEvent& rKEvt) } } - return(bReturn); + return bReturn; } diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index ace31a3954b3..5e9bf1ebe331 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -441,7 +441,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt) mpViewShell->GetViewFrame()->GetBindings().Invalidate(SidArray); } - return (bReturn); + return bReturn; } bool FuText::MouseMove(const MouseEvent& rMEvt) @@ -467,7 +467,7 @@ bool FuText::MouseMove(const MouseEvent& rMEvt) ForcePointer(&rMEvt); - return (bReturn); + return bReturn; } void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj) @@ -658,7 +658,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt) { mpView->UnmarkAllObj(); mpView->MarkObj(pObj,pPV,false,false); - return (bReturn); + return bReturn; } } } @@ -883,7 +883,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt) } bMBDown = false; FuConstruct::MouseButtonUp(rMEvt); - return (bReturn); + return bReturn; } /** @@ -960,7 +960,7 @@ bool FuText::KeyInput(const KeyEvent& rKEvt) bReturn = FuDraw::KeyInput(aKEvt); } - return (bReturn); + return bReturn; } void FuText::Activate() @@ -1153,7 +1153,7 @@ bool FuText::DeleteDefaultText() } } - return(bDeleted); + return bDeleted; } bool FuText::Command(const CommandEvent& rCEvt) @@ -1201,7 +1201,7 @@ bool FuText::RequestHelp(const HelpEvent& rHEvt) bReturn = FuConstruct::RequestHelp(rHEvt); } - return(bReturn); + return bReturn; } void FuText::ReceiveRequest(SfxRequest& rReq) diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index 7a16bf6150ff..54f1cfe6b73b 100644 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -58,7 +58,7 @@ public: SdCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc ); virtual ~SdCustomShowDlg(); - bool IsModified() const { return( bModified ); } + bool IsModified() const { return bModified; } bool IsCustomShow() const; }; @@ -91,7 +91,7 @@ public: SdDrawDocument& rDrawDoc, SdCustomShow*& rpCS ); virtual ~SdDefineCustomShowDlg(); - bool IsModified() const { return( bModified ); } + bool IsModified() const { return bModified; } }; #endif // INCLUDED_SD_SOURCE_UI_INC_CUSTSDLG_HXX diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index 5c66103fb8c3..e784c91f8a8c 100644 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -85,8 +85,8 @@ public: virtual void SelectionHasChanged(); - sal_uInt16 GetSlotID() const { return( nSlotId ); } - sal_uInt16 GetSlotValue() const { return( nSlotValue ); } + sal_uInt16 GetSlotID() const { return nSlotId; } + sal_uInt16 GetSlotValue() const { return nSlotValue; } void SetNoScrollUntilInside(bool bNoScroll = true) { bNoScrollUntilInside = bNoScroll; } diff --git a/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c b/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c index 35b5e90277f2..7f57d88705aa 100644 --- a/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c +++ b/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c @@ -367,7 +367,7 @@ DEBUG_EXPORT OSStatus DebugInitialize( DebugOutputType inType, ... ) exit: va_end( args ); - return( err ); + return err; } @@ -419,7 +419,7 @@ DEBUG_EXPORT OSStatus DebugGetProperty( DebugPropertyTag inTag, ... ) break; } va_end( args ); - return( err ); + return err; } @@ -456,7 +456,7 @@ DEBUG_EXPORT OSStatus DebugSetProperty( DebugPropertyTag inTag, ... ) break; } va_end( args ); - return( err ); + return err; } #if 0 @@ -484,7 +484,7 @@ DEBUG_EXPORT size_t DebugPrintF( DebugLevel inLevel, const char *inFormat, ... ) va_end( args ); exit: - return( n ); + return n; } @@ -506,7 +506,7 @@ DEBUG_EXPORT size_t DebugPrintFVAList( DebugLevel inLevel, const char *inFormat, DebugPrint( inLevel, buffer, (size_t) n ); exit: - return( n ); + return n; } @@ -604,7 +604,7 @@ static OSStatus DebugPrint( DebugLevel inLevel, char *inData, size_t inSize ) err = kNoErr; exit: - return( err ); + return err; } @@ -713,7 +713,7 @@ static OSStatus DebugFPrintFInit( DebugOutputTypeFlags inFlags, const char *inFi err = kNoErr; exit: - return( err ); + return err; } @@ -774,7 +774,7 @@ exit: #endif - return( err ); + return err; } @@ -870,7 +870,7 @@ exit: { CFRelease( bundle ); } - return( err ); + return err; } // DebugMacOSXLogPrint @@ -977,7 +977,7 @@ exit: { RegCloseKey( key ); } - return( err ); + return err; } @@ -1097,7 +1097,7 @@ DEBUG_EXPORT size_t DebugSNPrintF(char *sbuffer, size_t buflen, const char *fmt, length = DebugSNPrintFVAList(sbuffer, buflen, fmt, ptr); va_end(ptr); - return(length); + return length; } @@ -1120,7 +1120,7 @@ DEBUG_EXPORT size_t DebugSNPrintFVAList(char *sbuffer, size_t buflen, const char size_t nwritten = 0; int c; - if (buflen == 0) return(0); + if (buflen == 0) return 0; buflen--; // Pre-reserve one space in the buffer for the terminating nul if (buflen == 0) goto exit; @@ -1521,7 +1521,7 @@ number: if (!F.havePrecision) } exit: *sbuffer++ = 0; - return(nwritten); + return nwritten; } @@ -1926,7 +1926,7 @@ DEBUG_EXPORT const char * DebugGetErrorString( int_least32_t inErrorCode, char *dst = '\0'; s = inBuffer; } - return( s ); + return s; } @@ -2285,7 +2285,7 @@ DebugHexDump( // Note: The "dst - outBuffer" size calculation works even if "outBuffer" is NULL because it's all relative. - return( (size_t)( dst - outBuffer ) ); + return (size_t)( dst - outBuffer ); } @@ -2348,7 +2348,7 @@ static char * DebugNumVersionToString( uint32_t inVersion, char *inString ) dlog( kDebugLevelError, "invalid NumVersion stage (0x%02X)\n", stage ); break; } - return( inString ); + return inString; } @@ -2366,7 +2366,7 @@ DEBUG_EXPORT uint32_t DebugTaskLevel( void ) } #endif - return( level ); + return level; } #if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE ) @@ -2493,7 +2493,7 @@ DebugWinCharToTCharString( { *outTCharCount = (size_t)( dst - outTCharString ); } - return( outTCharString ); + return outTCharString; } #endif @@ -2972,7 +2972,7 @@ exit: { DebugPrintF( kDebugLevelMax, "\n\n### TEST FAILED ###\n\n" ); } - return( err ); + return err; } #endif // DEBUG diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dllmain.c b/sd/source/ui/remotecontrol/mDNSResponder/dllmain.c index ce3fce554037..49fd854c96c8 100644 --- a/sd/source/ui/remotecontrol/mDNSResponder/dllmain.c +++ b/sd/source/ui/remotecontrol/mDNSResponder/dllmain.c @@ -32,7 +32,7 @@ BOOL APIENTRY DllMain( HANDLE inModule, DWORD inReason, LPVOID inReserved ) case DLL_PROCESS_DETACH: break; } - return( TRUE ); + return TRUE; } diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientlib.c b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientlib.c index cca58853338c..a2c0dc6ad949 100644 --- a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientlib.c +++ b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientlib.c @@ -84,9 +84,9 @@ static uint8_t *InternalTXTRecordSearch uint8_t *x = p; p += 1 + p[0]; if (p <= e && *keylen <= x[0] && !strncasecmp(key, (char*)x+1, *keylen)) - if (*keylen == x[0] || x[1+*keylen] == '=') return(x); + if (*keylen == x[0] || x[1+*keylen] == '=') return x; } - return(NULL); + return NULL; } /********************************************************************************************* @@ -210,18 +210,18 @@ DNSServiceErrorType DNSSD_API TXTRecordSetValue const char *k; unsigned long keysize, keyvalsize; - for (k = key; *k; k++) if (*k < 0x20 || *k > 0x7E || *k == '=') return(kDNSServiceErr_Invalid); + for (k = key; *k; k++) if (*k < 0x20 || *k > 0x7E || *k == '=') return kDNSServiceErr_Invalid; keysize = (unsigned long)(k - key); keyvalsize = 1 + keysize + (value ? (1 + valueSize) : 0); - if (keysize < 1 || keyvalsize > 255) return(kDNSServiceErr_Invalid); + if (keysize < 1 || keyvalsize > 255) return kDNSServiceErr_Invalid; (void)TXTRecordRemoveValue(txtRecord, key); if (txtRec->datalen + keyvalsize > txtRec->buflen) { unsigned char *newbuf; unsigned long newlen = txtRec->datalen + keyvalsize; - if (newlen > 0xFFFF) return(kDNSServiceErr_Invalid); + if (newlen > 0xFFFF) return kDNSServiceErr_Invalid; newbuf = malloc((size_t)newlen); - if (!newbuf) return(kDNSServiceErr_NoMemory); + if (!newbuf) return kDNSServiceErr_NoMemory; memcpy(newbuf, txtRec->buffer, txtRec->datalen); if (txtRec->malloced) free(txtRec->buffer); txtRec->buffer = newbuf; @@ -240,7 +240,7 @@ DNSServiceErrorType DNSSD_API TXTRecordSetValue } *start = (uint8_t)(p - start - 1); txtRec->datalen += p - start; - return(kDNSServiceErr_NoError); + return kDNSServiceErr_NoError; } DNSServiceErrorType DNSSD_API TXTRecordRemoveValue @@ -251,17 +251,17 @@ DNSServiceErrorType DNSSD_API TXTRecordRemoveValue { unsigned long keylen, itemlen, remainder; uint8_t *item = InternalTXTRecordSearch(txtRec->datalen, txtRec->buffer, key, &keylen); - if (!item) return(kDNSServiceErr_NoSuchKey); + if (!item) return kDNSServiceErr_NoSuchKey; itemlen = (unsigned long)(1 + item[0]); remainder = (unsigned long)((txtRec->buffer + txtRec->datalen) - (item + itemlen)); // Use memmove because memcpy behaviour is undefined for overlapping regions memmove(item, item + itemlen, remainder); txtRec->datalen -= itemlen; - return(kDNSServiceErr_NoError); + return kDNSServiceErr_NoError; } -uint16_t DNSSD_API TXTRecordGetLength (const TXTRecordRef *txtRecord) { return(txtRec->datalen); } -const void * DNSSD_API TXTRecordGetBytesPtr(const TXTRecordRef *txtRecord) { return(txtRec->buffer); } +uint16_t DNSSD_API TXTRecordGetLength (const TXTRecordRef *txtRecord) { return txtRec->datalen; } +const void * DNSSD_API TXTRecordGetBytesPtr(const TXTRecordRef *txtRecord) { return txtRec->buffer; } /********************************************************************************************* * @@ -290,7 +290,7 @@ const void * DNSSD_API TXTRecordGetValuePtr { unsigned long keylen; uint8_t *item = InternalTXTRecordSearch(txtLen, txtRecord, key, &keylen); - if (!item || item[0] <= keylen) return(NULL); // If key not found, or found with no value, return NULL + if (!item || item[0] <= keylen) return NULL; // If key not found, or found with no value, return NULL *valueLen = (uint8_t)(item[0] - (keylen + 1)); return (item + 1 + keylen + 1); } @@ -305,7 +305,7 @@ uint16_t DNSSD_API TXTRecordGetCount uint8_t *p = (uint8_t*)txtRecord; uint8_t *e = p + txtLen; while (p<e) { p += 1 + p[0]; count++; } - return((p>e) ? (uint16_t)0 : count); + return ((p>e) ? (uint16_t)0 : count); } DNSServiceErrorType DNSSD_API TXTRecordGetItemAtIndex @@ -329,7 +329,7 @@ DNSServiceErrorType DNSSD_API TXTRecordGetItemAtIndex unsigned long len = 0; e = p + 1 + p[0]; while (x+len<e && x[len] != '=') len++; - if (len >= keyBufLen) return(kDNSServiceErr_NoMemory); + if (len >= keyBufLen) return kDNSServiceErr_NoMemory; memcpy(key, x, len); key[len] = 0; if (x+len<e) // If we found '=' @@ -342,9 +342,9 @@ DNSServiceErrorType DNSSD_API TXTRecordGetItemAtIndex *value = NULL; *valueLen = 0; } - return(kDNSServiceErr_NoError); + return kDNSServiceErr_NoError; } - return(kDNSServiceErr_Invalid); + return kDNSServiceErr_Invalid; } /********************************************************************************************* diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.c b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.c index 6059eb392c73..a538f4709001 100644 --- a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.c +++ b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.c @@ -68,7 +68,7 @@ uint32_t get_uint32(const char **ptr, const char *end) if (!*ptr || *ptr + sizeof(uint32_t) > end) { *ptr = NULL; - return(0); + return 0; } else { @@ -90,7 +90,7 @@ uint16_t get_uint16(const char **ptr, const char *end) if (!*ptr || *ptr + sizeof(uint16_t) > end) { *ptr = NULL; - return(0); + return 0; } else { @@ -121,7 +121,7 @@ int get_string(const char **ptr, const char *const end, char *buffer, int buflen while (*ptr < end && buffer < lim) { char c = *buffer++ = *(*ptr)++; - if (c == 0) return(0); // Success + if (c == 0) return 0; // Success } if (buffer == lim) buffer--; *buffer = 0; // Failed, so terminate string, @@ -141,7 +141,7 @@ const char *get_rdata(const char **ptr, const char *end, int rdlen) if (!*ptr || *ptr + rdlen > end) { *ptr = NULL; - return(0); + return 0; } else { diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 431e4c69078e..b3c8c5cfe5d2 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -557,7 +557,7 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, bool bDuplicate ) SetModified(); - return( pStandardPage ); + return pStandardPage; } void SdXImpressDocument::SetModified( bool bModified /* = sal_True */ ) throw() @@ -2909,7 +2909,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn mpModel->SetModified(); } - return( xDrawPage ); + return xDrawPage; } /** diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index b2b2d7822a02..a5ebc69bb11c 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -364,7 +364,7 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet, bOk = ::sd::View::SetAttributes(rSet, bReplaceAll); } - return (bOk); + return bOk; } /** diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 14149761ebf7..606fae612bfe 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -745,7 +745,7 @@ bool DrawViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) pClient->SetSdrGrafObj(NULL); } - return(bActivated); + return bActivated; } /** @@ -1097,7 +1097,7 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) mpDrawView->AdjustMarkHdl(); } - return (bOK); + return bOK; } /** diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx index 84a1a2e86ffe..6a3a269c0ade 100644 --- a/sd/source/ui/view/drviewsc.cxx +++ b/sd/source/ui/view/drviewsc.cxx @@ -245,7 +245,7 @@ sal_uInt16 DrawViewShell::GetIdBySubId( sal_uInt16 nSId ) nMappedSId = SID_DRAWTBX_CONNECTORS; } } - return( nMappedSId ); + return nMappedSId; } /** @@ -301,9 +301,9 @@ sal_uInt16 DrawViewShell::GetMappedSlot( sal_uInt16 nSId ) would be executed over and over again. The slot is initial available in the array in order to show the image correct. */ if( nSId == nSlot ) - return( 0 ); + return 0; - return( nSlot ); + return nSlot; } /** @@ -314,10 +314,10 @@ sal_uInt16 DrawViewShell::GetArrayId( sal_uInt16 nSId ) for( sal_uInt16 i = 0; i < SLOTARRAY_COUNT; i += 2 ) { if( mpSlotArray[ i ] == nSId ) - return( i ); + return i; } OSL_FAIL( "Slot in array not found!" ); - return( USHRT_MAX ); + return USHRT_MAX; } void DrawViewShell::UpdateIMapDlg( SdrObject* pObj ) diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 665e830e095a..56d7a88b9083 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -767,7 +767,7 @@ OUString DrawViewShell::GetSelectionText(bool bCompleteWords) } } - return (aStrSelection); + return aStrSelection; } bool DrawViewShell::HasSelection(bool bText) const diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index 11573dab6d37..fd009b74814d 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -353,7 +353,7 @@ EditMode FrameView::GetViewShEditMode(PageKind eKind) eMode = meHandoutEditMode; } - return (eMode); + return eMode; } void FrameView::SetViewShEditModeOnLoad (EditMode eMode) diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 3bee96e7e24e..1dbcd7b7e62f 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -1441,7 +1441,7 @@ bool OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) Invalidate( SID_PREVIEW_STATE ); } - return(bReturn); + return bReturn; } /** @@ -1832,7 +1832,7 @@ sal_uLong OutlineViewShell::Read(SvStream& rInput, const OUString& rBaseURL, sal rOutl.GetUndoManager().Clear(); - return( bRet ); + return bRet; } void OutlineViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, bool bBrowse ) diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 86fb77d7c753..3315364bd7ac 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -320,7 +320,7 @@ OutlinerView* OutlineView::GetViewByWindow (vcl::Window* pWin) const } } } - return (pOlView); + return pOlView; } /** @@ -1072,7 +1072,7 @@ bool OutlineView::SetAttributes(const SfxItemSet& rSet, bool ) mrOutlineViewShell.Invalidate (SID_PREVIEW_STATE); - return (bOk); + return bOk; } /** diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index ff3c6668e2ae..8224d7cc4ebc 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -525,12 +525,12 @@ void View::MarkListHasChanged() bool View::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) { bool bOk = FmFormView::SetAttributes(rSet, bReplaceAll); - return (bOk); + return bOk; } bool View::GetAttributes( SfxItemSet& rTargetSet, bool bOnlyHardAttr ) const { - return( FmFormView::GetAttributes( rTargetSet, bOnlyHardAttr ) ); + return FmFormView::GetAttributes( rTargetSet, bOnlyHardAttr ); } /** @@ -597,7 +597,7 @@ bool View::IsPresObjSelected(bool bOnPage, bool bOnMasterPage, bool bCheckPresOb delete pMarkList; } - return (bSelected); + return bSelected; } void View::SelectAll() @@ -806,7 +806,7 @@ SdrEndTextEditKind View::SdrEndTextEdit(bool bDontDeleteReally) pPage->onEndTextEdit( xObj.get() ); } - return(eKind); + return eKind; } /** restores the default text if the given text object is currently in edit mode and diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 5f5061b72aeb..466477e59d4f 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -497,7 +497,7 @@ long Window::SetZoomRect (const Rectangle& rZoomRect) } } - return(nNewZoom); + return nNewZoom; } void Window::SetMinZoomAutoCalc (bool bAuto) diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 933714044c2c..71d26c58ddb9 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -679,7 +679,7 @@ bool ViewShell::RequestHelp(const HelpEvent& rHEvt, ::sd::Window*) } } - return(bReturn); + return bReturn; } void ViewShell::SetFrameView (FrameView* pNewFrameView) diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 83dc9ca199bc..0581a7cb4238 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -460,7 +460,7 @@ bool ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) } } - return(bReturn); + return bReturn; } void ViewShell::MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin) diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx index 0860b3526a63..830bb4f486a0 100644 --- a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx @@ -104,7 +104,7 @@ CFullPropSpec::CFullPropSpec( CFullPropSpec const & src ) : } inline void * operator new( size_t /*size*/, void * p ) { - return( p ); + return p; } //+------------------------------------------------------------------------- // Member: CFullPropSpec::operator=, public @@ -158,12 +158,12 @@ BOOL CFullPropSpec::SetProperty( WCHAR const * wcsProperty ) memcpy( _psProperty.lpwstr, wcsProperty, len ); - return( TRUE ); + return TRUE; } else { _psProperty.lpwstr = 0; - return( FALSE ); + return FALSE; } } int CFullPropSpec::operator==( CFullPropSpec const & prop ) const @@ -173,7 +173,7 @@ int CFullPropSpec::operator==( CFullPropSpec const & prop ) const sizeof( _guidPropSet ) ) != 0 || prop._psProperty.ulKind != _psProperty.ulKind ) { - return( 0 ); + return 0; } switch( _psProperty.ulKind ) { @@ -184,16 +184,16 @@ int CFullPropSpec::operator==( CFullPropSpec const & prop ) const return( GetPropertyPropid() == prop.GetPropertyPropid() ); break; default: - return( 0 ); + return 0; break; } } int CFullPropSpec::operator!=( CFullPropSpec const & prop ) const { if (*this == prop) - return( 0 ); + return 0; else - return( 1 ); + return 1; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.hxx b/shell/source/win32/shlxthandler/ooofilt/propspec.hxx index 5959cbf147b1..682d7df4b665 100644 --- a/shell/source/win32/shlxthandler/ooofilt/propspec.hxx +++ b/shell/source/win32/shlxthandler/ooofilt/propspec.hxx @@ -85,11 +85,11 @@ private: inline void * CFullPropSpec::operator new( size_t size ) { void * p = CoTaskMemAlloc( size ); - return( p ); + return p; } inline void * CFullPropSpec::operator new( size_t /*size*/, void * p ) { - return( p ); + return p; } inline void CFullPropSpec::operator delete( void * p ) { @@ -107,27 +107,27 @@ inline void CFullPropSpec::SetPropSet( GUID const & guidPropSet ) } inline GUID const & CFullPropSpec::GetPropSet() const { - return( _guidPropSet ); + return _guidPropSet; } inline PROPSPEC CFullPropSpec::GetPropSpec() const { - return( _psProperty ); + return _psProperty; } inline WCHAR const * CFullPropSpec::GetPropertyName() const { - return( _psProperty.lpwstr ); + return _psProperty.lpwstr; } inline PROPID CFullPropSpec::GetPropertyPropid() const { - return( _psProperty.propid ); + return _psProperty.propid; } inline BOOL CFullPropSpec::IsPropertyName() const { - return( _psProperty.ulKind == PRSPEC_LPWSTR ); + return _psProperty.ulKind == PRSPEC_LPWSTR; } inline BOOL CFullPropSpec::IsPropertyPropid() const { - return( _psProperty.ulKind == PRSPEC_PROPID ); + return _psProperty.ulKind == PRSPEC_PROPID; } #endif // INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_OOOFILT_PROPSPEC_HXX diff --git a/soltools/mkdepend/cppsetup.c b/soltools/mkdepend/cppsetup.c index c57fe0cb6a9e..a21457b27299 100644 --- a/soltools/mkdepend/cppsetup.c +++ b/soltools/mkdepend/cppsetup.c @@ -93,7 +93,7 @@ cppsetup(line, filep, inc) outp=inp; value = yyparse(); *p = savec; - return(value); + return value; } pperror(tag, x0,x1,x2,x3,x4) diff --git a/soltools/mkdepend/include.c b/soltools/mkdepend/include.c index 4cfbff7d6fdc..cb1cc17750eb 100644 --- a/soltools/mkdepend/include.c +++ b/soltools/mkdepend/include.c @@ -144,7 +144,7 @@ struct inclist *inc_path(char *file, char *include, boolean dot, struct Includes if (!found) ip = NULL; - return(ip); + return ip; } int exists_path(struct IncludesCollection *incCollection, char *path) @@ -229,15 +229,15 @@ void remove_dotdot(char *path) int isdot(char *p) { if(p && p[0] == '.' && p[1] == '\0') - return(TRUE); - return(FALSE); + return TRUE; + return FALSE; } int isdotdot(char *p) { if(p && p[0] == '.' && p[1] == '.' && p[2] == '\0') - return(TRUE); - return(FALSE); + return TRUE; + return FALSE; } int issymbolic(char *dir, char *component) @@ -249,16 +249,16 @@ int issymbolic(char *dir, char *component) sprintf(buf, "%s%s%s", dir, *dir ? "/" : "", component); for (pp=notdotdot; *pp; pp++) if (strcmp(*pp, buf) == 0) - return (TRUE); + return TRUE; if (lstat(buf, &st) == 0 && (st.st_mode & S_IFMT) == S_IFLNK) { *pp++ = copy(buf); if (pp >= ¬dotdot[ MAXDIRS ]) fatalerr("out of .. dirs, increase MAXDIRS\n"); - return(TRUE); + return TRUE; } #endif - return(FALSE); + return FALSE; } /* @@ -281,7 +281,7 @@ struct inclist *newinclude(char *newfile, char *incstring) else ip->i_incstring = copy(incstring); - return(ip); + return ip; } void included_by(struct inclist *ip, struct inclist *newfile) diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c index 9c63e0e629e3..93c971db687b 100644 --- a/soltools/mkdepend/main.c +++ b/soltools/mkdepend/main.c @@ -486,7 +486,7 @@ struct filepointer *getfile(char *file) warning("makedepend: Cannot open file \"%s\"\n", file); content->f_p = content->f_base = content->f_end = (char *)malloc(1); *content->f_p = '\0'; - return(content); + return content; } (void)fstat(fd, &st); @@ -501,7 +501,7 @@ struct filepointer *getfile(char *file) warning("makedepend: File \"%s\" is too large.\n", file); content->f_p = content->f_base = content->f_end = (char *)malloc(1); *content->f_p = '\0'; - return(content); + return content; } content->f_base = (char *)malloc(malloc_size+1); @@ -517,7 +517,7 @@ struct filepointer *getfile(char *file) content->f_end = content->f_base + bytes_read; *content->f_end = '\0'; content->f_line = 0; - return(content); + return content; } void freefile(struct filepointer *fp) @@ -531,7 +531,7 @@ char *copy(char *str) char *p = (char *)malloc(strlen(str) + 1); strcpy(p, str); - return(p); + return p; } int match(char *str, char **list) @@ -540,8 +540,8 @@ int match(char *str, char **list) for (i=0; *list; i++, list++) if (strcmp(str, *list) == 0) - return(i); - return(-1); + return i; + return -1; } /* @@ -558,7 +558,7 @@ char *get_line(struct filepointer *filep) p = filep->f_p; eof = filep->f_end; if (p >= eof) - return((char *)NULL); + return (char *)NULL; lineno = filep->f_line; for(bol = p--; ++p < eof; ) { @@ -610,7 +610,7 @@ char *get_line(struct filepointer *filep) done: filep->f_p = p; filep->f_line = lineno; - return(bol); + return bol; } /* @@ -634,7 +634,7 @@ char *base_name(char *file) }; p--; }; - return(file); + return file; } #if defined(USG) && !defined(CRAY) && !defined(SVR4) diff --git a/soltools/mkdepend/parse.c b/soltools/mkdepend/parse.c index 0c53d019b720..01adafbbbd36 100644 --- a/soltools/mkdepend/parse.c +++ b/soltools/mkdepend/parse.c @@ -114,7 +114,7 @@ int find_includes(struct filepointer *filep, struct inclist *file, struct inclis /*fall-through*/ case ENDIF: if (recursion) - return(type); + return type; /*fall-through*/ case DEFINE: define(line, &symbols); @@ -159,7 +159,7 @@ int find_includes(struct filepointer *filep, struct inclist *file, struct inclis break; } } - return(-1); + return -1; } int gobble(struct filepointer *filep, @@ -189,7 +189,7 @@ int gobble(struct filepointer *filep, debug(0,("%s, line %d: #%s\n", file->i_file, filep->f_line, directives[type])); - return(type); + return type; case DEFINE: case UNDEF: case INCLUDE: @@ -203,14 +203,14 @@ int gobble(struct filepointer *filep, case ELIF: case ELIFFALSE: case ELIFGUESSFALSE: - return(type); + return type; case -1: warning("%s, line %d: unknown directive == \"%s\"\n", file_red->i_file, filep->f_line, line); break; } } - return(-1); + return -1; } /* @@ -257,19 +257,19 @@ int deftype (char *line, struct filepointer *filep, struct inclist *file_red, st { debug(0,("false...\n")); if (ret == IFFALSE) - return(ELIFFALSE); + return ELIFFALSE; else - return(ELIFGUESSFALSE); + return ELIFGUESSFALSE; } else { debug(0,("true...\n")); - return(ELIF); + return ELIF; } } if (ret < 0 || ! parse_it) - return(ret); + return ret; /* * now decide how to parse the directive, and do it. @@ -323,7 +323,7 @@ int deftype (char *line, struct filepointer *filep, struct inclist *file_red, st while (*p && *p != '"' && *p != '<') p++; if (! *p) - return(-2); + return -2; if (*p++ == '"') { ret = INCLUDEDOT; while (*p && *p != '"') @@ -354,7 +354,7 @@ int deftype (char *line, struct filepointer *filep, struct inclist *file_red, st */ break; } - return(ret); + return ret; } /* @@ -375,9 +375,9 @@ int zero_value(char *exp, struct filepointer *filep, struct inclist *file_red, s { global_symbols = symbols; /* HACK! see above */ if (cppsetup(exp, filep, file_red)) - return(IFFALSE); + return IFFALSE; else - return(IF); + return IF; } void define( char *def, struct symhash **symbols ) diff --git a/sot/source/sdstor/stgavl.cxx b/sot/source/sdstor/stgavl.cxx index 93869ac9b042..0b6e20bb3e6a 100644 --- a/sot/source/sdstor/stgavl.cxx +++ b/sot/source/sdstor/stgavl.cxx @@ -80,7 +80,7 @@ short StgAvlNode::Locate } } - return( nRes ); + return nRes; } // adjust balance factors in AVL tree from pivot down. diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx index 6c543ca6d370..19012e1204d1 100644 --- a/starmath/inc/document.hxx +++ b/starmath/inc/document.hxx @@ -185,9 +185,9 @@ public: void UpdateText(); void SetText(const OUString& rBuffer); - OUString GetText() { return (aText); } + OUString GetText() { return aText; } void SetFormat(SmFormat& rFormat); - const SmFormat& GetFormat() { return (aFormat); } + const SmFormat& GetFormat() { return aFormat; } void Parse(); SmParser & GetParser() { return aInterpreter; } diff --git a/stoc/test/testloader.cxx b/stoc/test/testloader.cxx index ff9ff57ea670..3f216df29c4f 100644 --- a/stoc/test/testloader.cxx +++ b/stoc/test/testloader.cxx @@ -113,7 +113,7 @@ SAL_IMPLEMENT_MAIN() printf("Test Dll ComponentLoader, OK!\n"); - return(0); + return 0; } diff --git a/stoc/test/testregistry.cxx b/stoc/test/testregistry.cxx index bf8b0fe4ef3f..763619ae33a4 100644 --- a/stoc/test/testregistry.cxx +++ b/stoc/test/testregistry.cxx @@ -668,7 +668,7 @@ SAL_IMPLEMENT_MAIN() xSimReg->destroy(); xSimReg->open( areg2, sal_False, sal_True ); xSimReg->destroy(); - return(0); + return 0; } diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx index 1fd9a0d0bf09..da6170cfe7d0 100644 --- a/store/source/lockbyte.cxx +++ b/store/source/lockbyte.cxx @@ -347,11 +347,11 @@ storeError FileLockBytes::initialize_Impl (rtl::Reference< PageData::Allocator > { storeError result = initSize_Impl (m_nSize); if (result != store_E_None) - return (result); + return result; result = PageData::Allocator::createInstance (rxAllocator, nPageSize); if (result != store_E_None) - return (result); + return result; // @see readPageAt_Impl(). m_xAllocator = rxAllocator; @@ -844,7 +844,7 @@ FileLockBytes_createInstance ( ResourceHolder<FileHandle> xFile; storeError result = xFile.get().initialize (pFilename, eAccessMode); if (result != store_E_None) - return (result); + return result; if (eAccessMode == store_AccessReadOnly) { diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx index 2cc68bd2864f..eb980a16320c 100644 --- a/store/source/storbase.hxx +++ b/store/source/storbase.hxx @@ -76,11 +76,11 @@ inline sal_uInt16 ntohs (sal_uInt16 n) { return OSL_SWAPWORD(n); } inline sal_uInt32 htonl (sal_uInt32 h) { return OSL_SWAPDWORD(h); } inline sal_uInt32 ntohl (sal_uInt32 n) { return OSL_SWAPDWORD(n); } #else -inline sal_uInt16 htons (sal_uInt16 h) { return (h); } -inline sal_uInt16 ntohs (sal_uInt16 n) { return (n); } +inline sal_uInt16 htons (sal_uInt16 h) { return h; } +inline sal_uInt16 ntohs (sal_uInt16 n) { return n; } -inline sal_uInt32 htonl (sal_uInt32 h) { return (h); } -inline sal_uInt32 ntohl (sal_uInt32 n) { return (n); } +inline sal_uInt32 htonl (sal_uInt32 h) { return h; } +inline sal_uInt32 ntohl (sal_uInt32 n) { return n; } #endif /* OSL_BIGENDIAN */ /** swap. diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx index ed86b3e31d3a..e4c348f29865 100644 --- a/store/source/storcach.cxx +++ b/store/source/storcach.cxx @@ -199,7 +199,7 @@ static int highbit(sal_Size n) int k = 1; if (n == 0) - return (0); + return 0; #if SAL_TYPES_SIZEOFLONG == 8 if (n & 0xffffffff00000000ul) k |= 32, n >>= 32; @@ -215,7 +215,7 @@ static int highbit(sal_Size n) if (n & 0x02) k++; - return (k); + return k; } //PageCache_Impl implementation diff --git a/store/source/stortree.cxx b/store/source/stortree.cxx index a491aff81524..87f731649159 100644 --- a/store/source/stortree.cxx +++ b/store/source/stortree.cxx @@ -68,7 +68,7 @@ sal_uInt16 OStoreBTreeNodeData::find (const T& t) const sal_Int32 const m = ((l + r) >> 1); if (t.m_aKey == m_pData[m].m_aKey) - return ((sal_uInt16)(m)); + return (sal_uInt16)m; if (t.m_aKey < m_pData[m].m_aKey) r = m - 1; else @@ -77,9 +77,9 @@ sal_uInt16 OStoreBTreeNodeData::find (const T& t) const sal_uInt16 const k = ((sal_uInt16)(r)); if ((k < capacityCount()) && (t.m_aKey < m_pData[k].m_aKey)) - return(k - 1); + return k - 1; else - return(k); + return k; } /* diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 60ccf8e18571..45ce17b92747 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -1109,7 +1109,7 @@ AccessibleShape* if( xTunnel.is() ) pReturn = reinterpret_cast< AccessibleShape* >( xTunnel->getSomething( getUnoTunnelImplementationId() ) ); - return( pReturn ); + return pReturn; } @@ -1122,7 +1122,7 @@ sal_Int64 SAL_CALL if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( getUnoTunnelImplementationId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) nReturn = reinterpret_cast< sal_Int64 >( this ); - return( nReturn ); + return nReturn; } // IAccessibleViewForwarderListener diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index c03b68896428..d673e2b8d78d 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -524,7 +524,7 @@ Point SvxRectCtl::GetPointFromRP( RECT_POINT _eRP) const case RP_MB: return aPtMB; case RP_RB: return aPtRB; } - return( aPtMM ); // default + return aPtMM; // default } @@ -1095,7 +1095,7 @@ void SvxPixelCtl::SetXBitmap( const BitmapEx& rBitmapEx ) sal_uInt16 SvxPixelCtl::GetBitmapPixel( const sal_uInt16 nPixel ) { - return( *( pPixel + nPixel ) ); + return *( pPixel + nPixel ); } // Resets to the original state of the control diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 5d36cad714ac..aaea253bf8da 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -175,7 +175,7 @@ SvxGridTabPage::SvxGridTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet SfxTabPage* SvxGridTabPage::Create( vcl::Window* pParent, const SfxItemSet& rAttrSet ) { - return ( new SvxGridTabPage( pParent, rAttrSet ) ); + return new SvxGridTabPage( pParent, rAttrSet ); } @@ -282,7 +282,7 @@ int SvxGridTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); - return( LEAVE_PAGE ); + return LEAVE_PAGE; } IMPL_LINK( SvxGridTabPage, ChangeDrawHdl_Impl, MetricField *, pField ) @@ -306,7 +306,7 @@ IMPL_LINK_NOARG(SvxGridTabPage, ClickRotateHdl_Impl) else pMtrFldAngle->Disable(); - return( 0L ); + return 0L; } diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 947a019428ff..f654679864c9 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -2147,7 +2147,7 @@ IMPL_LINK_NOARG(Svx3DWin, ClickUpdateHdl) // Controls can be disabled during certain circumstances } - return( 0L ); + return 0L; } @@ -2161,7 +2161,7 @@ IMPL_LINK_NOARG(Svx3DWin, ClickAssignHdl) SID_3D_ASSIGN, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L ); } - return( 0L ); + return 0L; } @@ -2271,7 +2271,7 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) m_pBtnTexture->Check( eViewType == VIEWTYPE_TEXTURE ); m_pBtnMaterial->Check( eViewType == VIEWTYPE_MATERIAL ); } - return( 0L ); + return 0L; } @@ -2429,7 +2429,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) else if( bUpdatePreview ) UpdatePreview(); } - return( 0L ); + return 0L; } @@ -2459,7 +2459,7 @@ IMPL_LINK( Svx3DWin, ClickColorHdl, PushButton *, pBtn ) if( LBSelectColor( pLb, aColor ) ) SelectHdl( pLb ); } - return( 0L ); + return 0L; } @@ -2561,7 +2561,7 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p ) if( bUpdatePreview ) UpdatePreview(); } - return( 0L ); + return 0L; } @@ -2592,7 +2592,7 @@ IMPL_LINK( Svx3DWin, ModifyHdl, void*, pField ) if( bUpdatePreview ) UpdatePreview(); } - return( 0L ); + return 0L; } @@ -2627,7 +2627,7 @@ void Svx3DWin::ClickLight(PushButton& rBtn) IMPL_LINK_NOARG(Svx3DWin, ChangeLightCallbackHdl) { - return( 0L ); + return 0L; } @@ -2699,7 +2699,7 @@ IMPL_LINK_NOARG(Svx3DWin, ChangeSelectionCallbackHdl) m_pBtnLightColor->Enable( false ); } - return( 0L ); + return 0L; } @@ -2728,7 +2728,7 @@ bool Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor ) pLb->SelectEntryPos( nPos ); bRet = true; } - return( bRet ); + return bRet; } @@ -2844,7 +2844,7 @@ sal_uInt16 Svx3DWin::GetLightSource( const PushButton* pBtn ) else if( pBtn == m_pBtnLight8 ) nLight = 7; } - return( nLight ); + return nLight; }; @@ -2890,7 +2890,7 @@ ColorLB* Svx3DWin::GetLbByButton( const PushButton* pBtn ) else if( pBtn == m_pBtnLight8 ) pLb = m_pLbLight8; } - return( pLb ); + return pLb; }; // Derivation from SfxChildWindow as "containers" for effects diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx index 66d667b5b9f2..d3414bdb3e18 100644 --- a/svx/source/engine3d/view3d1.cxx +++ b/svx/source/engine3d/view3d1.cxx @@ -148,7 +148,7 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, bool /*bOnly3DAttr*/) co } // return ItemSet - return(aSet); + return aSet; } void E3dView::Set3DAttributes( const SfxItemSet& rAttr, E3dScene* pInScene, bool bReplaceAll) diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 6cbf0521b74d..d6c423020bc6 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1944,12 +1944,12 @@ SfxChildAlignment FmFilterNavigatorWin::CheckAlignment( SfxChildAlignment eActAl case SFX_ALIGN_LEFT: case SFX_ALIGN_RIGHT: case SFX_ALIGN_NOALIGNMENT: - return (eAlign); + return eAlign; default: break; } - return (eActAlign); + return eActAlign; } diff --git a/svx/source/sdr/contact/sdrmediawindow.cxx b/svx/source/sdr/contact/sdrmediawindow.cxx index 9c24087d72d6..09adf9835a88 100644 --- a/svx/source/sdr/contact/sdrmediawindow.cxx +++ b/svx/source/sdr/contact/sdrmediawindow.cxx @@ -140,7 +140,7 @@ sal_Int8 SdrMediaWindow::AcceptDrop( const AcceptDropEvent& rEvt ) } } - return( nRet ); + return nRet; } @@ -160,7 +160,7 @@ sal_Int8 SdrMediaWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) } } - return( nRet ); + return nRet; } diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index 5f0d43236ca6..024ed48b2e33 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -1085,7 +1085,7 @@ IMPL_LINK( AreaPropertyPanel, ClickTrGrHdl_Impl, ToolBox*, pToolBox ) OSL_ASSERT( pToolBox->GetItemCommand(pToolBox->GetCurItemId()) == UNO_SIDEBARGRADIENT); maTrGrPopup.Show(*pToolBox); - return (0L); + return 0L; } @@ -1182,7 +1182,7 @@ IMPL_LINK(AreaPropertyPanel, ChangeTrgrTypeHdl_Impl, void *, EMPTYARG) const XFillFloatTransparenceItem aGradientItem(pPool, aTmpGradient, bGradient); GetBindings()->GetDispatcher()->Execute( SID_ATTR_FILL_FLOATTRANSPARENCE, SfxCallMode::RECORD, &aGradientItem, 0L ); - return( 0L ); + return 0L; } diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx index 400b20d61868..ebe4210ce688 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx @@ -295,7 +295,7 @@ IMPL_LINK_NOARG(AreaTransparencyGradientControl, ModifiedTrgrHdl_Impl) sal_uInt8 nStartCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrStartValue.GetValue() * 255) / 100); sal_uInt8 nEndCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrEndValue.GetValue() * 255) / 100); ExecuteValueModify( nStartCol, nEndCol ); - return( 0L ); + return 0L; } @@ -311,7 +311,7 @@ IMPL_LINK_NOARG(AreaTransparencyGradientControl, Left_Click45_Impl) aTemp += 45; maMtrTrgrAngle.SetValue(aTemp); ExecuteValueModify( nStartCol, nEndCol ); - return( 0L ); + return 0L; } @@ -327,7 +327,7 @@ IMPL_LINK_NOARG(AreaTransparencyGradientControl, Right_Click45_Impl) aTemp -= 45; maMtrTrgrAngle.SetValue(aTemp); ExecuteValueModify( nStartCol, nEndCol ); - return( 0L ); + return 0L; } } } // end of namespace svx::sidebar diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index 1442c40b86a4..3913f24e818f 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -793,7 +793,7 @@ IMPL_LINK( LinePropertyPanel, ChangeTransparentHdl, void *, EMPTYARG ) XLineTransparenceItem aItem( nVal ); GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_STYLE, SfxCallMode::RECORD, &aItem, 0L); - return( 0L ); + return 0L; } diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx index f7e1106d7439..bf87a3d9b193 100644 --- a/svx/source/sidebar/line/LineWidthControl.cxx +++ b/svx/source/sidebar/line/LineWidthControl.cxx @@ -306,7 +306,7 @@ IMPL_LINK(LineWidthControl, VSSelectHdl, void *, pControl) if((iPos >= 1 && iPos <= 8) || (iPos == 9 && mbCustom)) //add mrLinePropertyPanel.EndLineWidthPopupMode(); } - return( 0L ); + return 0L; } @@ -332,7 +332,7 @@ IMPL_LINK(LineWidthControl, MFModifyHdl, void *, pControl) mbCloseByEdit = true; mnTmpCustomWidth = nTmp; } - return( 0L ); + return 0L; } } } // end of namespace svx::sidebar diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index 4cfbca6be7b3..136e2c349964 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -316,7 +316,7 @@ IMPL_LINK(ParaLineSpacingControl, LineSPDistHdl_Impl, ListBox*, /*pBox*/) IMPL_LINK_NOARG( ParaLineSpacingControl, LineSPDistAtHdl_Impl ) { ExecuteLineSpace(); - return (0L); + return 0L; } void ParaLineSpacingControl::ExecuteLineSpace() diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index 9d10e21750e6..5a426d5b5e20 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -343,7 +343,7 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl) SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L); } - return( 0L ); + return 0L; } IMPL_LINK(ParaPropertyPanel, ClickProDemote_Hdl_Impl, ToolBox *, pControl) @@ -368,7 +368,7 @@ IMPL_LINK(ParaPropertyPanel, ClickProDemote_Hdl_Impl, ToolBox *, pControl) GetBindings()->GetDispatcher()->Execute( SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L); } - return( 0L ); + return 0L; } // for Paragraph Spacing diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx index c90ec5407739..61f94f8b48a0 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.cxx +++ b/svx/source/sidebar/text/TextUnderlineControl.cxx @@ -215,7 +215,7 @@ IMPL_LINK(TextUnderlineControl, VSSelectHdl, void *, pControl) mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_UNDERLINE, SfxCallMode::RECORD, &aLineItem, 0L); mrTextPropertyPanel.EndUnderlinePopupMode(); } - return( 0L ); + return 0L; } IMPL_LINK(TextUnderlineControl, PBClickHdl, PushButton *, pPBtn) diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 2b26ac79e56b..689932bda7ad 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -174,7 +174,7 @@ IMPL_STATIC_LINK(SvxColorValueSet_docking, ExecDragHdl, void*, EMPTYARG) // Als Link, damit asynchron ohne ImpMouseMoveMsg auf dem Stack auch die // Farbleiste geloescht werden darf pThis->DoDrag(); - return(0); + return 0; } SvxColorDockingWindow::SvxColorDockingWindow diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index ea288f3a2ccc..a2b6085481ef 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -250,7 +250,7 @@ IMPL_LINK_NOARG(FontWorkGalleryDialog, DoubleClickFavoriteHdl) { insertSelectedFontwork(); EndDialog( RET_OK ); - return( 0L ); + return 0L; } diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx index 9236c25d271c..2e4e0f20156e 100644 --- a/svx/source/tbxctrls/tbxalign.cxx +++ b/svx/source/tbxctrls/tbxalign.cxx @@ -52,7 +52,7 @@ SvxTbxCtlAlign::SvxTbxCtlAlign( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTb SfxPopupWindowType SvxTbxCtlAlign::GetPopupWindowType() const { - return(SFX_POPUPWINDOW_ONCLICK); + return SFX_POPUPWINDOW_ONCLICK; } /* diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 1f837a939a5a..63a64e511779 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -378,7 +378,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo) pInfo->SetRepresentation( aPageNumValue ); - return(0); + return 0; } } } diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 6e40acff516d..b982b8b4ec4b 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -598,7 +598,7 @@ sal_Int32 SAL_CALL SvxUnoDrawPagesAccess::getCount() if( mrModel.mpDoc ) nCount = mrModel.mpDoc->GetPageCount(); - return( nCount ); + return nCount; } uno::Any SAL_CALL SvxUnoDrawPagesAccess::getByIndex( sal_Int32 Index ) diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx index dc17c12ea370..09c17b92bdba 100644 --- a/svx/source/unogallery/unogalthemeprovider.cxx +++ b/svx/source/unogallery/unogalthemeprovider.cxx @@ -180,7 +180,7 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const OUString& rName ) if( mpGallery && mpGallery->HasTheme( rName ) ) bRet = ( mbHiddenThemes || !mpGallery->GetThemeInfo( rName )->IsHidden() ); - return( bRet ); + return bRet; } diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 245884f6abb7..fe93cad652a4 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -98,7 +98,7 @@ XOBitmap& XOBitmap::operator=( const XOBitmap& rXBmp ) *( pPixelArray + i ) = *( rXBmp.pPixelArray + i ); } } - return( *this ); + return *this; } int XOBitmap::operator==( const XOBitmap& rXOBitmap ) const @@ -110,7 +110,7 @@ int XOBitmap::operator==( const XOBitmap& rXOBitmap ) const aBckgrColor != rXOBitmap.aBckgrColor || bGraphicDirty != rXOBitmap.bGraphicDirty ) { - return( sal_False ); + return sal_False; } if( pPixelArray && rXOBitmap.pPixelArray ) @@ -119,10 +119,10 @@ int XOBitmap::operator==( const XOBitmap& rXOBitmap ) const for( sal_uInt16 i = 0; i < nCount; i++ ) { if( *( pPixelArray + i ) != *( rXOBitmap.pPixelArray + i ) ) - return( sal_False ); + return sal_False; } } - return( sal_True ); + return sal_True; } Bitmap XOBitmap::GetBitmap() const @@ -378,7 +378,7 @@ void XFillBitmapItem::SetGraphicObject(const GraphicObject& rGraphicObject) sal_uInt16 XFillBitmapItem::GetVersion(sal_uInt16 /*nFileFormatVersion*/) const { - return(2); + return 2; } bool XFillBitmapItem::GetPresentation( diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx index 7c017eb57547..10e2e6278a98 100644 --- a/sw/source/core/doc/docdraw.cxx +++ b/sw/source/core/doc/docdraw.cxx @@ -591,7 +591,7 @@ IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo) } } - return(0); + return 0; } // #i62875# diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index ba3f731d606e..96110ba9829d 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -198,7 +198,7 @@ long SwEditShell::SplitNode( bool bAutoFormat, bool bCheckTableStart ) ClearTblBoxCntnt(); EndAllAction(); - return(1L); + return 1L; } bool SwEditShell::AppendTxtNode() diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx index 1b45b8a128a0..59f272f08d24 100644 --- a/sw/source/core/text/porlin.hxx +++ b/sw/source/core/text/porlin.hxx @@ -78,7 +78,7 @@ public: virtual ~SwLinePortion(); // Access methods - inline SwLinePortion *GetPortion() const { return( pPortion ); } + inline SwLinePortion *GetPortion() const { return pPortion; } inline SwLinePortion &operator=(const SwLinePortion &rPortion); inline bool operator==( const SwLinePortion &rPortion ) const; inline sal_Int32 GetLen() const { return nLineLength; } diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 5c03e1536c4e..71394d63ff3b 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -2120,7 +2120,7 @@ bool SwWW8ImplReader::ImportFormulaControl(WW8FormulaControl &aFormula, version C. */ pDataStream->Seek( nOldPos ); - return(bRet); + return bRet; } bool SwMSConvertControls::InsertFormula(WW8FormulaControl &rFormula) diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 98bdf99e7757..9856c170a97d 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -214,15 +214,15 @@ SwLabRec* SwLabDlg::GetRecord(const OUString &rRecName, bool bCont) if (!bFound) // User defined pRec = &Recs()[0]; - return(pRec); + return pRec; } Printer *SwLabDlg::GetPrt() { if (pPrtPage) - return (pPrtPage->GetPrt()); + return pPrtPage->GetPrt(); else - return (NULL); + return NULL; } SwLabPage::SwLabPage(vcl::Window* pParent, const SfxItemSet& rSet) diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 67e92d2a705c..90d421cbd2b7 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -63,7 +63,7 @@ public: void FillItem(SwLabItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; - inline Printer* GetPrt() { return (pPrinter); } + inline Printer* GetPrt() { return pPrinter; } }; #endif diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index aa5918d3f446..c7385c017011 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -483,7 +483,7 @@ IMPL_LINK( SwMailMergeDlg, FilenameHdl, CheckBox*, pBox ) IMPL_LINK_NOARG(SwMailMergeDlg, ModifyHdl) { m_pFromRB->Check(); - return (0); + return 0; } bool SwMailMergeDlg::ExecQryShell() diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index 4e8ff489c0c2..d579e479ab8f 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -220,7 +220,7 @@ public: void UpdatePointer(const Point &, sal_uInt16 nButtons = 0); bool IsDrawSelMode(); - bool IsDrawAction() { return (m_bInsDraw); } + bool IsDrawAction() { return m_bInsDraw; } void SetDrawAction(bool bFlag) { m_bInsDraw = bFlag; } void SetObjectSelect( bool bVal ) { m_bObjectSelect = bVal; } @@ -230,7 +230,7 @@ public: inline void SetSdrDrawMode( SdrObjKind eSdrObjectKind ) { m_eDrawMode = eSdrObjectKind; SetObjectSelect( false ); } void StdDrawMode( SdrObjKind eSdrObjectKind, bool bObjSelect ); - bool IsFrmAction() const { return (m_bInsFrm); } + bool IsFrmAction() const { return m_bInsFrm; } sal_uInt16 GetBezierMode() const { return m_eBezierMode; } void SetBezierMode(sal_uInt16 eBezMode) { m_eBezierMode = eBezMode; } void EnterDrawTextMode(const Point& aDocPos); // turn on DrawTextEditMode diff --git a/sw/source/uibase/ribbar/conarc.cxx b/sw/source/uibase/ribbar/conarc.cxx index ad4be6f06465..d10362426d2c 100644 --- a/sw/source/uibase/ribbar/conarc.cxx +++ b/sw/source/uibase/ribbar/conarc.cxx @@ -39,7 +39,7 @@ bool ConstArc::MouseButtonDown( const MouseEvent& rMEvt ) if (!nAnzButUp) aStartPnt = m_pWin->PixelToLogic(rMEvt.GetPosPixel()); } - return (bReturn); + return bReturn; } bool ConstArc::MouseButtonUp( const MouseEvent& rMEvt ) @@ -68,7 +68,7 @@ bool ConstArc::MouseButtonUp( const MouseEvent& rMEvt ) } } - return (bReturn); + return bReturn; } void ConstArc::Activate(const sal_uInt16 nSlotId) diff --git a/sw/source/uibase/ribbar/conform.cxx b/sw/source/uibase/ribbar/conform.cxx index 4326a8040324..1c0441d77ebe 100644 --- a/sw/source/uibase/ribbar/conform.cxx +++ b/sw/source/uibase/ribbar/conform.cxx @@ -76,7 +76,7 @@ bool ConstFormControl::MouseButtonDown(const MouseEvent& rMEvt) else bReturn = SwDrawBase::MouseButtonDown(rMEvt); - return (bReturn); + return bReturn; } void ConstFormControl::Activate(const sal_uInt16 nSlotId) diff --git a/sw/source/uibase/ribbar/conpoly.cxx b/sw/source/uibase/ribbar/conpoly.cxx index 94110be16ec7..52254609aadb 100644 --- a/sw/source/uibase/ribbar/conpoly.cxx +++ b/sw/source/uibase/ribbar/conpoly.cxx @@ -40,7 +40,7 @@ bool ConstPolygon::MouseButtonDown(const MouseEvent& rMEvt) if ((bReturn = SwDrawBase::MouseButtonDown(rMEvt))) aLastPos = rMEvt.GetPosPixel(); - return (bReturn); + return bReturn; } bool ConstPolygon::MouseMove(const MouseEvent& rMEvt) @@ -78,7 +78,7 @@ bool ConstPolygon::MouseButtonUp(const MouseEvent& rMEvt) else bReturn = SwDrawBase::MouseButtonUp(rMEvt); - return (bReturn); + return bReturn; } void ConstPolygon::Activate(const sal_uInt16 nSlotId) diff --git a/sw/source/uibase/ribbar/conrect.cxx b/sw/source/uibase/ribbar/conrect.cxx index a97bd3304c62..841e9ebb0b19 100644 --- a/sw/source/uibase/ribbar/conrect.cxx +++ b/sw/source/uibase/ribbar/conrect.cxx @@ -60,7 +60,7 @@ bool ConstRectangle::MouseButtonDown(const MouseEvent& rMEvt) m_pSh->GetDrawView()->SetFrameDragSingles(m_pView->IsDrawSelMode()); } } - return (bReturn); + return bReturn; } bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt) diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx index e3a044ad1235..cda8945d8492 100644 --- a/sw/source/uibase/ribbar/drawbase.cxx +++ b/sw/source/uibase/ribbar/drawbase.cxx @@ -232,7 +232,7 @@ bool SwDrawBase::MouseMove(const MouseEvent& rMEvt) bRet = true; } - return (bRet); + return bRet; } bool SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt) @@ -417,7 +417,7 @@ bool SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt) if ( bAutoCap ) m_pView->AutoCaption(FRAME_CAP); //Can currently only be FRAME, otherwise convert // to enums - return (bReturn); + return bReturn; } void SwDrawBase::Activate(const sal_uInt16 nSlot) @@ -533,7 +533,7 @@ bool SwDrawBase::KeyInput(const KeyEvent& rKEvt) break; } - return (bReturn); + return bReturn; } // Process keyboard events diff --git a/sw/source/uibase/ribbar/dselect.cxx b/sw/source/uibase/ribbar/dselect.cxx index 5afb6c237899..89914f6527cc 100644 --- a/sw/source/uibase/ribbar/dselect.cxx +++ b/sw/source/uibase/ribbar/dselect.cxx @@ -57,7 +57,7 @@ bool DrawSelection::KeyInput(const KeyEvent& rKEvt) if (!bReturn) bReturn = SwDrawBase::KeyInput(rKEvt); - return (bReturn); + return bReturn; } void DrawSelection::Activate(const sal_uInt16 nSlotId) diff --git a/sw/source/uibase/utlui/initui.cxx b/sw/source/uibase/utlui/initui.cxx index 1d6095f41536..9a8833da456c 100644 --- a/sw/source/uibase/utlui/initui.cxx +++ b/sw/source/uibase/utlui/initui.cxx @@ -260,7 +260,7 @@ SwGlossaries* GetGlossaries() { if (!pGlossaries) pGlossaries = new SwGlossaries; - return (pGlossaries); + return pGlossaries; } bool HasGlossaryList() diff --git a/vcl/generic/fontmanager/parseAFM.cxx b/vcl/generic/fontmanager/parseAFM.cxx index b73ea9b65e29..e3a3170a14ab 100644 --- a/vcl/generic/fontmanager/parseAFM.cxx +++ b/vcl/generic/fontmanager/parseAFM.cxx @@ -274,7 +274,7 @@ static char *token( FileInputStream* stream, int& rLen ) ident[idx] = 0; rLen = idx; - return(ident); /* returns pointer to the token */ + return ident; /* returns pointer to the token */ } /* token */ @@ -302,7 +302,7 @@ static char *linetoken( FileInputStream* stream ) stream->ungetChar(); ident[idx] = 0; - return(ident); /* returns pointer to the token */ + return ident; /* returns pointer to the token */ } /* linetoken */ @@ -535,7 +535,7 @@ static int parseGlobals( FileInputStream* fp, GlobalFontInfo* gfi ) } /* switch */ } /* while */ - return(error); + return error; } /* parseGlobals */ @@ -646,7 +646,7 @@ static int parseCharWidths( FileInputStream* fp, int* cwi) } /* switch */ } /* while */ - return(error); + return error; } /* parseCharWidths */ @@ -847,7 +847,7 @@ static int parseCharMetrics( FileInputStream* fp, FontInfo* fi) if ((error == ok) && (count != fi->numOfChars)) error = parseError; - return(error); + return error; } /* parseCharMetrics */ @@ -953,7 +953,7 @@ static int parseTrackKernData( FileInputStream* fp, FontInfo* fi) if (error == ok && tcount != fi->numOfTracks) error = parseError; - return(error); + return error; } /* parseTrackKernData */ @@ -1078,7 +1078,7 @@ static int parsePairKernData( FileInputStream* fp, FontInfo* fi) if (error == ok && pcount != fi->numOfPairs) error = parseError; - return(error); + return error; } /* parsePairKernData */ @@ -1215,7 +1215,7 @@ static int parseCompCharData( FileInputStream* fp, FontInfo* fi) if (error == ok && ccount != fi->numOfComps) error = parseError; - return(error); + return error; } /* parseCompCharData */ @@ -1253,12 +1253,12 @@ int parseFile( const char* pFilename, FontInfo** fi, FLAGS flags) char *keyword; /* used to store a token */ (*fi) = (FontInfo *) calloc(1, sizeof(FontInfo)); - if ((*fi) == NULL) {error = storageProblem; return(error);} + if ((*fi) == NULL) { error = storageProblem; return error; } if (flags & P_G) { (*fi)->gfi = (GlobalFontInfo *) calloc(1, sizeof(GlobalFontInfo)); - if ((*fi)->gfi == NULL) {error = storageProblem; return(error);} + if ((*fi)->gfi == NULL) { error = storageProblem; return error; } } /* The AFM file begins with Global Font Information. This section */ @@ -1283,7 +1283,7 @@ int parseFile( const char* pFilename, FontInfo** fi, FLAGS flags) { (*fi)->cmi = (CharMetricInfo *) calloc((*fi)->numOfChars, sizeof(CharMetricInfo)); - if ((*fi)->cmi == NULL) {error = storageProblem; return(error);} + if ((*fi)->cmi == NULL) { error = storageProblem; return error; } code = parseCharMetrics(&aFile, *fi); } else @@ -1294,7 +1294,7 @@ int parseFile( const char* pFilename, FontInfo** fi, FLAGS flags) if ((*fi)->cwi == NULL) { error = storageProblem; - return(error); + return error; } } /* parse section regardless */ @@ -1336,7 +1336,7 @@ int parseFile( const char* pFilename, FontInfo** fi, FLAGS flags) if ((*fi)->tkd == NULL) { error = storageProblem; - return(error); + return error; } } /* if */ code = parseTrackKernData(&aFile, *fi); @@ -1351,7 +1351,7 @@ int parseFile( const char* pFilename, FontInfo** fi, FLAGS flags) if ((*fi)->pkd == NULL) { error = storageProblem; - return(error); + return error; } } /* if */ code = parsePairKernData(&aFile, *fi); @@ -1366,7 +1366,7 @@ int parseFile( const char* pFilename, FontInfo** fi, FLAGS flags) if ((*fi)->ccd == NULL) { error = storageProblem; - return(error); + return error; } } /* if */ code = parseCompCharData(&aFile, *fi); @@ -1389,7 +1389,7 @@ int parseFile( const char* pFilename, FontInfo** fi, FLAGS flags) if ((error != earlyEOF) && (code < 0)) error = code; - return(error); + return error; } /* parseFile */ diff --git a/vcl/source/filter/sgfbram.cxx b/vcl/source/filter/sgfbram.cxx index 57faee330d13..8e9d167cd486 100644 --- a/vcl/source/filter/sgfbram.cxx +++ b/vcl/source/filter/sgfbram.cxx @@ -358,7 +358,7 @@ bool SgfBMapFilter(SvStream& rInp, SvStream& rOut) } // while(nNext) } if (rInp.GetError()) bRet=false; - return(bRet); + return bRet; } // for StarDraw embedded SGF vector @@ -474,7 +474,7 @@ bool SgfVectFilter(SvStream& rInp, GDIMetaFile& rMtf) } } // while(nNext) } - return(bRet); + return bRet; } /************************************************************************* diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx index 4e130e5213e2..63526dccecad 100644 --- a/vcl/source/filter/sgvmain.cxx +++ b/vcl/source/filter/sgvmain.cxx @@ -870,7 +870,7 @@ bool SgfSDrwFilter(SvStream& rInp, GDIMetaFile& rMtf, const INetURLObject& _aIni } // while(nNext) } delete pSgfFonts; - return(bRet); + return bRet; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/filter/sgvspln.cxx b/vcl/source/filter/sgvspln.cxx index 0d892b998493..8c9c09be4d2e 100644 --- a/vcl/source/filter/sgvspln.cxx +++ b/vcl/source/filter/sgvspln.cxx @@ -75,7 +75,7 @@ double masch() /* calculate MACH_EPS machine independence */ x = 1.0 + eps; } eps *= 2.0; - return (eps); + return eps; } short basis() /* calculate BASE machine independence */ @@ -85,7 +85,7 @@ short basis() /* calculate BASE machine independence */ while ( (x + one) - x == one ) x *= 2.0; while ( (x + b) == x ) b *= 2.0; - return ( (short) ((x + b) - x) ); + return (short) ((x + b) - x); } #define BASIS basis() /* base of number representation */ @@ -205,7 +205,7 @@ sal_uInt16 TriDiagGS(bool rep, sal_uInt16 n, double* lower, // double fabs(double); - if ( n < 2 ) return(1); /* n at least 2 */ + if ( n < 2 ) return 1; /* n at least 2 */ /* if rep = false, */ /* determine the */ @@ -215,13 +215,13 @@ sal_uInt16 TriDiagGS(bool rep, sal_uInt16 n, double* lower, { for (i = 1; i < n; i++) { if ( fabs(diag[i-1]) < MACH_EPS ) /* do not decompose */ - return(2); /* if one diag[i] = 0 */ + return 2; /* if one diag[i] = 0 */ lower[i] /= diag[i-1]; diag[i] -= lower[i] * upper[i-1]; } } - if ( fabs(diag[n-1]) < MACH_EPS ) return(2); + if ( fabs(diag[n-1]) < MACH_EPS ) return 2; for (i = 1; i < n; i++) /* forward elimination */ b[i] -= lower[i] * b[i-1]; @@ -231,7 +231,7 @@ sal_uInt16 TriDiagGS(bool rep, sal_uInt16 n, double* lower, i=j; b[i] = ( b[i] - upper[i] * b[i+1] ) / diag[i]; } - return(0); + return 0; } /*----------------------- END OF TRIDIAGONAL ------------------------*/ @@ -328,13 +328,13 @@ sal_uInt16 ZyklTriDiagGS(bool rep, sal_uInt16 n, double* lower, double* diag, sal_uInt16 i; short j; - if ( n < 3 ) return(1); + if ( n < 3 ) return 1; if (!rep) /* If rep = false, */ { /* calculate decomposition */ lower[0] = upper[n-1] = 0.0; /* of the matrix. */ - if ( fabs (diag[0]) < MACH_EPS ) return(2); + if ( fabs (diag[0]) < MACH_EPS ) return 2; /* Do not decompose if the */ temp = 1.0 / diag[0]; /* value of a diagonal */ upper[0] *= temp; /* element is smaller then */ @@ -342,14 +342,14 @@ sal_uInt16 ZyklTriDiagGS(bool rep, sal_uInt16 n, double* lower, double* diag, for (i = 1; i < n-2; i++) { diag[i] -= lower[i] * upper[i-1]; - if ( fabs(diag[i]) < MACH_EPS ) return(2); + if ( fabs(diag[i]) < MACH_EPS ) return 2; temp = 1.0 / diag[i]; upper[i] *= temp; ricol[i] = -lower[i] * ricol[i-1] * temp; } diag[n-2] -= lower[n-2] * upper[n-3]; - if ( fabs(diag[n-2]) < MACH_EPS ) return(2); + if ( fabs(diag[n-2]) < MACH_EPS ) return 2; for (i = 1; i < n-2; i++) lowrow[i] = -lowrow[i-1] * upper[i-1]; @@ -361,7 +361,7 @@ sal_uInt16 ZyklTriDiagGS(bool rep, sal_uInt16 n, double* lower, double* diag, temp -= lowrow[i] * ricol[i]; diag[n-1] += temp - lower[n-1] * upper[n-2]; - if ( fabs(diag[n-1]) < MACH_EPS ) return(2); + if ( fabs(diag[n-1]) < MACH_EPS ) return 2; } b[0] /= diag[0]; /* forward elimination */ @@ -378,7 +378,7 @@ sal_uInt16 ZyklTriDiagGS(bool rep, sal_uInt16 n, double* lower, double* diag, i=j; b[i] -= upper[i] * b[i+1] + ricol[i] * b[n-1]; } - return(0); + return 0; } /*------------------ END of CYCLIC TRIDIAGONAL ---------------------*/ @@ -525,7 +525,7 @@ sal_uInt16 PeriodicSpline(sal_uInt16 n, double* x, double* y, Error=ZyklTriDiagGS(false,n,b,d,c,lowrow.get(),ricol.get(),a.get()); if ( Error != 0 ) { - return(Error+4); + return Error+4; } for (i=0;i<=nm1;i++) c[i+1]=a[i]; } @@ -594,14 +594,14 @@ sal_uInt16 ParaSpline(sal_uInt16 n, double* x, double* y, sal_uInt8 MargCond, } // switch MargCond if (MargCond==3) { Error=PeriodicSpline(n,T,x,bx,cx,dx); - if (Error!=0) return(Error+4); + if (Error!=0) return Error+4; Error=PeriodicSpline(n,T,y,by,cy,dy); - if (Error!=0) return(Error+10); + if (Error!=0) return Error+10; } else { Error=NaturalSpline(n,T,x,alphX,betX,MargCond,bx,cx,dx); - if (Error!=0) return(Error+4); + if (Error!=0) return Error+4; Error=NaturalSpline(n,T,y,alphY,betY,MargCond,by,cy,dy); - if (Error!=0) return(Error+9); + if (Error!=0) return Error+9; } return 0; } diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 65b353760563..3193269f3f3a 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -1861,7 +1861,7 @@ BitmapEx GDIMetaFile::ImplBmpConvertFnc( const BitmapEx& rBmpEx, const void* pBm Color GDIMetaFile::ImplColMonoFnc( const Color&, const void* pColParam ) { - return( ( (const ImplColMonoParam*) pColParam )->aColor ); + return ( (const ImplColMonoParam*) pColParam )->aColor; } BitmapEx GDIMetaFile::ImplBmpMonoFnc( const BitmapEx& rBmpEx, const void* pBmpParam ) @@ -1896,7 +1896,7 @@ Color GDIMetaFile::ImplColReplaceFnc( const Color& rColor, const void* pColParam ( ( (const ImplColReplaceParam*) pColParam )->pMinB[ i ] <= nB ) && ( ( (const ImplColReplaceParam*) pColParam )->pMaxB[ i ] >= nB ) ) { - return( ( (const ImplColReplaceParam*) pColParam )->pDstCols[ i ] ); + return ( (const ImplColReplaceParam*) pColParam )->pDstCols[ i ]; } } @@ -2738,7 +2738,7 @@ sal_uLong GDIMetaFile::GetSizeBytes() const } } - return( nSizeBytes ); + return nSizeBytes; } SvStream& ReadGDIMetaFile( SvStream& rIStm, GDIMetaFile& rGDIMetaFile ) diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 457f50b3fa27..98bee4c9bbd1 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -822,7 +822,7 @@ sal_uLong ImpGraphic::ImplGetSizeBytes() const } } - return( mnSizeBytes ); + return mnSizeBytes; } void ImpGraphic::ImplDraw( OutputDevice* pOutDev, const Point& rDestPt ) const diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx index 683f6fc887db..7f00f4e12e29 100644 --- a/vcl/source/gdi/pngwrite.cxx +++ b/vcl/source/gdi/pngwrite.cxx @@ -602,7 +602,7 @@ sal_uLong PNGWriterImpl::ImplGetFilter ( sal_uLong nY, sal_uLong nXStart, sal_uL } else mnDeflateInSize = pDest - mpDeflateInBuf; - return ( mnDeflateInSize ); + return mnDeflateInSize; } void PNGWriterImpl::ImplClearFirstScanline() diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 700308b385f3..27886a131b9c 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -958,7 +958,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, if( xPixmap ) returnVal = NWRenderPixmapToScreen( xPixmap.get(), xMask.get(), aPixmapRect) && returnVal; - return( returnVal ); + return returnVal; } @@ -1333,7 +1333,7 @@ bool GtkSalGraphics::getNativeControlRegion( ControlType nType, returnVal=true; } - return( returnVal ); + return returnVal; } /************************************************************************ @@ -1778,7 +1778,7 @@ static Rectangle NWGetButtonArea( SalX11Screen nScreen, aRect = Rectangle( Point( x, y ), Size( w, h ) ); - return( aRect ); + return aRect; } static Rectangle NWGetTabItemRect( SalX11Screen nScreen, Rectangle aAreaRect ) @@ -2318,7 +2318,7 @@ static Rectangle NWGetScrollButtonRect( SalX11Screen nScreen, ControlPart nPa buttonRect.SetSize( Size( buttonWidth, buttonHeight ) ); - return( buttonRect ); + return buttonRect; } bool GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable, @@ -2379,7 +2379,7 @@ static Rectangle NWGetEditBoxPixmapRect(SalX11Screen nScreen, pixmapRect.GetHeight() + (2*(focusWidth)) ) ); } - return( pixmapRect ); + return pixmapRect; } /* Paint a GTK Entry widget into the specified GdkPixmap. @@ -2493,7 +2493,7 @@ bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart, if ( !pSpinVal ) { std::fprintf( stderr, "Tried to draw CTRL_SPINBUTTONS, but the SpinButtons data structure didn't exist!\n" ); - return( false ); + return false; } pixmapRect = pSpinVal->maUpperRect; pixmapRect.Union( pSpinVal->maLowerRect ); @@ -2594,7 +2594,7 @@ static Rectangle NWGetSpinButtonRect( SalX11Screen nScreen, buttonRect.Bottom() = aAreaRect.Bottom(); } - return( buttonRect ); + return buttonRect; } static void NWPaintOneSpinButton( SalX11Screen nScreen, @@ -2769,7 +2769,7 @@ static Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen, aButtonRect.SetPos( aEditPos ); } - return( aButtonRect ); + return aButtonRect; } bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart, @@ -2801,7 +2801,7 @@ bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart, if ( (nType == CTRL_TAB_ITEM) && (aValue.getType() != CTRL_TAB_ITEM) ) { - return( false ); + return false; } NWEnsureGTKButton( m_nXScreen ); @@ -3726,7 +3726,7 @@ static Rectangle NWGetListBoxButtonRect( SalX11Screen nScreen, if ( pIndicatorSpacing ) gtk_border_free( pIndicatorSpacing ); - return( aPartRect ); + return aPartRect; } static Rectangle NWGetListBoxIndicatorRect( SalX11Screen nScreen, @@ -3776,7 +3776,7 @@ static Rectangle NWGetListBoxIndicatorRect( SalX11Screen nScreen, if ( pIndicatorSpacing ) gtk_border_free( pIndicatorSpacing ); - return( aIndicatorRect ); + return aIndicatorRect; } static Rectangle NWGetToolbarRect( SalX11Screen nScreen, diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index db08c0284951..ac708fc5e1b7 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -157,7 +157,7 @@ Rectangle GtkSalGraphics::NWGetSpinButtonRect( ControlPart nPart, Rectangle aAre gtk_style_context_restore(mpSpinStyle); - return( buttonRect ); + return buttonRect; } Rectangle GtkSalGraphics::NWGetScrollButtonRect( ControlPart nPart, Rectangle aAreaRect ) @@ -242,7 +242,7 @@ Rectangle GtkSalGraphics::NWGetScrollButtonRect( ControlPart nPart, Rectangle aA buttonRect.SetSize( Size( buttonWidth, buttonHeight ) ); - return( buttonRect ); + return buttonRect; } void GtkSalGraphics::PaintScrollbar(GtkStyleContext *context, @@ -688,7 +688,7 @@ Rectangle GtkSalGraphics::NWGetComboBoxButtonRect( ControlType nType, aButtonRect.SetPos( aEditPos ); } - return( aButtonRect ); + return aButtonRect; } void GtkSalGraphics::PaintCombobox( GtkStyleContext *context, diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index 670137992aa8..9b690db4311a 100644 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -1520,7 +1520,7 @@ bool WinSalGraphics::getNativeControlRegion( ControlType nType, } ReleaseDC( mhWnd, hDC ); - return( bRet ); + return bRet; } void WinSalGraphics::updateSettingsNative( AllSettings& rSettings ) diff --git a/wizards/com/sun/star/wizards/common/JavaTools.java b/wizards/com/sun/star/wizards/common/JavaTools.java index 2c0d28c90846..aa8436c850d9 100644 --- a/wizards/com/sun/star/wizards/common/JavaTools.java +++ b/wizards/com/sun/star/wizards/common/JavaTools.java @@ -300,7 +300,7 @@ public class JavaTools retarray = new String[retvector.size()]; retvector.toArray(retarray); } - return (retarray); + return retarray; } public static String[][] removeOutdatedFields(String[][] baselist, String[] _complist, int _compindex) @@ -324,7 +324,7 @@ public class JavaTools retvector.toArray(retarray); } } - return (retarray); + return retarray; } public static String[][] removeOutdatedFields(String[][] baselist, String[] _complist) diff --git a/wizards/com/sun/star/wizards/form/CallFormWizard.java b/wizards/com/sun/star/wizards/form/CallFormWizard.java index 0cfec7b32812..5aedc274dff1 100644 --- a/wizards/com/sun/star/wizards/form/CallFormWizard.java +++ b/wizards/com/sun/star/wizards/form/CallFormWizard.java @@ -107,7 +107,7 @@ public class CallFormWizard { String[] stringSupportedServiceNames = new String[] { __serviceName }; - return (stringSupportedServiceNames); + return stringSupportedServiceNames; } /** This method returns true, if the given service will be @@ -123,7 +123,7 @@ public class CallFormWizard { booleanSupportsService = true; } - return (booleanSupportsService); + return booleanSupportsService; } public byte[] getImplementationId() @@ -136,7 +136,7 @@ public class CallFormWizard */ public java.lang.String getImplementationName() { - return (FormWizardImplementation.class.getName()); + return FormWizardImplementation.class.getName(); } /** Provides a sequence of all types (usually interface types) @@ -162,7 +162,7 @@ public class CallFormWizard System.err.println(exception); } - return (typeReturn); + return typeReturn; } } } diff --git a/wizards/com/sun/star/wizards/query/CallQueryWizard.java b/wizards/com/sun/star/wizards/query/CallQueryWizard.java index 3b5a2a1c271e..6f92ea445e4d 100644 --- a/wizards/com/sun/star/wizards/query/CallQueryWizard.java +++ b/wizards/com/sun/star/wizards/query/CallQueryWizard.java @@ -113,7 +113,7 @@ public class CallQueryWizard { String[] stringSupportedServiceNames = new String[] { __serviceName }; - return (stringSupportedServiceNames); + return stringSupportedServiceNames; } /** This method returns true, if the given service will be @@ -129,7 +129,7 @@ public class CallQueryWizard { booleanSupportsService = true; } - return (booleanSupportsService); + return booleanSupportsService; } @Override @@ -143,7 +143,7 @@ public class CallQueryWizard */ public java.lang.String getImplementationName() { - return (QueryWizardImplementation.class.getName()); + return QueryWizardImplementation.class.getName(); } /** Provides a sequence of all types (usually interface types) @@ -170,7 +170,7 @@ public class CallQueryWizard System.err.println(exception); } - return (typeReturn); + return typeReturn; } } } diff --git a/wizards/com/sun/star/wizards/query/QuerySummary.java b/wizards/com/sun/star/wizards/query/QuerySummary.java index 9e9e4c2f03bb..ea68195c6587 100644 --- a/wizards/com/sun/star/wizards/query/QuerySummary.java +++ b/wizards/com/sun/star/wizards/query/QuerySummary.java @@ -169,7 +169,7 @@ public class QuerySummary extends QueryMetaData sReturn += sSeparator; } } - return (sReturn); + return sReturn; } private String combinePartString(int _InitResID, String[][] _FieldNames, int _AlternativeResID, int _BaseStringID, String[] _ReplaceTags) diff --git a/wizards/com/sun/star/wizards/report/CallReportWizard.java b/wizards/com/sun/star/wizards/report/CallReportWizard.java index 8d86ad92e905..47e2a53b2938 100644 --- a/wizards/com/sun/star/wizards/report/CallReportWizard.java +++ b/wizards/com/sun/star/wizards/report/CallReportWizard.java @@ -139,7 +139,7 @@ public class CallReportWizard { String[] stringSupportedServiceNames = new String[] { __serviceName }; - return (stringSupportedServiceNames); + return stringSupportedServiceNames; } /** This method returns true, if the given service will be @@ -155,7 +155,7 @@ public class CallReportWizard { booleanSupportsService = true; } - return (booleanSupportsService); + return booleanSupportsService; } public byte[] getImplementationId() @@ -168,7 +168,7 @@ public class CallReportWizard */ public java.lang.String getImplementationName() { - return (ReportWizardImplementation.class.getName()); + return ReportWizardImplementation.class.getName(); } /** Provides a sequence of all types (usually interface types) @@ -197,7 +197,7 @@ public class CallReportWizard Logger.getLogger(CallReportWizard.class.getName()).log(Level.SEVERE, null, e); } - return (typeReturn); + return typeReturn; } } } diff --git a/wizards/com/sun/star/wizards/report/ReportFinalizer.java b/wizards/com/sun/star/wizards/report/ReportFinalizer.java index 350ad9b29324..1c1b5ef06e7d 100644 --- a/wizards/com/sun/star/wizards/report/ReportFinalizer.java +++ b/wizards/com/sun/star/wizards/report/ReportFinalizer.java @@ -201,7 +201,7 @@ public class ReportFinalizer StoreName = LocStoreName; } } - return (StoreName); + return StoreName; } private void changeReportTitle() diff --git a/wizards/com/sun/star/wizards/table/CallTableWizard.java b/wizards/com/sun/star/wizards/table/CallTableWizard.java index 2d126a340adb..365f70e3eb44 100644 --- a/wizards/com/sun/star/wizards/table/CallTableWizard.java +++ b/wizards/com/sun/star/wizards/table/CallTableWizard.java @@ -112,7 +112,7 @@ public class CallTableWizard { String[] stringSupportedServiceNames = new String[] { __serviceName }; - return (stringSupportedServiceNames); + return stringSupportedServiceNames; } /** This method returns true, if the given service will be @@ -128,7 +128,7 @@ public class CallTableWizard { booleanSupportsService = true; } - return (booleanSupportsService); + return booleanSupportsService; } public byte[] getImplementationId() @@ -141,7 +141,7 @@ public class CallTableWizard */ public java.lang.String getImplementationName() { - return (TableWizardImplementation.class.getName()); + return TableWizardImplementation.class.getName(); } /** Provides a sequence of all types (usually interface types) @@ -167,7 +167,7 @@ public class CallTableWizard System.err.println(exception); } - return (typeReturn); + return typeReturn; } } } diff --git a/xmerge/source/bridge/java/XMergeBridge.java b/xmerge/source/bridge/java/XMergeBridge.java index 414fe37f7351..dab0ecee30ac 100644 --- a/xmerge/source/bridge/java/XMergeBridge.java +++ b/xmerge/source/bridge/java/XMergeBridge.java @@ -111,7 +111,7 @@ public class XMergeBridge { } - return( typeReturn ); + return typeReturn; } private String getFileName(String origName) @@ -538,21 +538,21 @@ public class XMergeBridge { // Implement method from interface XServiceName public String getServiceName() { - return( __serviceName ); + return __serviceName; } // Implement methods from interface XServiceInfo public boolean supportsService(String stringServiceName) { - return( stringServiceName.equals( __serviceName ) ); + return stringServiceName.equals( __serviceName ); } public String getImplementationName() { - return( _XMergeBridge.class.getName() ); + return _XMergeBridge.class.getName(); } public String[] getSupportedServiceNames() { String[] stringSupportedServiceNames = { __serviceName }; - return( stringSupportedServiceNames ); + return stringSupportedServiceNames; } } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java index 8641417b1cf7..d8f276bc3610 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java @@ -87,7 +87,7 @@ public class ConvertData { */ public Iterator<Object> getDocumentEnumeration() { Iterator<Object> enumerate = v.iterator(); - return (enumerate); + return enumerate; } /** @@ -96,6 +96,6 @@ public class ConvertData { * @return The number of {@code Document} objects currently stored. */ public int getNumDocuments() { - return (v.size()); + return v.size(); } -}
\ No newline at end of file +} |