remove unnecessary parenthesis in return statements

found with
$ git grep -lP 'return\s*\(\s*\w+\s*\)\s*;'

Change-Id: Ic51606877a9edcadeb647c5bf17bc928b69ab60e
This commit is contained in:
Noel Grandin 2015-02-11 13:20:49 +02:00
parent a2fa9e2468
commit ba233e87ef
274 changed files with 1137 additions and 1144 deletions

View File

@ -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

View File

@ -83,7 +83,7 @@ bool FrameGrabber::create( const ::rtl::OUString& rURL )
[pool release];
return( bRet );
return bRet;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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 );
}

View File

@ -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);

View File

@ -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;

View File

@ -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();

View File

@ -145,7 +145,7 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows(
}
}
}
return( aRows );
return aRows;
}
OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( )

View File

@ -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;
}

View File

@ -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();

View File

@ -150,7 +150,7 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows(
}
}
}
return( aRows );
return aRows;
}
OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( )

View File

@ -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)
{

View File

@ -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();
}

View File

@ -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;
}

View File

@ -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;
}
/*************************************************************************

View File

@ -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: */

View File

@ -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;
}
/*************************************************************************

View File

@ -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()

View File

@ -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;
}

View File

@ -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: */

View File

@ -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()

View File

@ -1133,7 +1133,7 @@ int SvxColorOptionsTabPage::DeactivatePage( SfxItemSet* pSet_ )
{
if ( pSet_ )
FillItemSet( pSet_ );
return( LEAVE_PAGE );
return LEAVE_PAGE;
}
void SvxColorOptionsTabPage::UpdateColorConfig()

View File

@ -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()

View File

@ -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;
}

View File

@ -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()

View File

@ -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)

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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 )

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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: */

View File

@ -788,7 +788,7 @@ unsigned int WINAPI CMtaOleClipboard::clipboardChangedNotifierThreadProc( LPVOID
CoUninitialize( );
return ( 0 );
return 0;
}
bool CMtaOleClipboard::WaitForThreadReady( ) const

View File

@ -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;
}
/*****************************************************************************

View File

@ -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: */

View File

@ -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 (

View File

@ -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;
}

View File

@ -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 )

View File

@ -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: */

View File

@ -88,7 +88,7 @@ int hstrlen(const hchar * s)
while (*s++)
n++;
return (n);
return n;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -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

View File

@ -375,7 +375,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
else
collator->setStrength(Collator::TERTIARY);
return(0);
return 0;
}

View File

@ -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)

View File

@ -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

View File

@ -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;
}

View File

@ -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,

View File

@ -207,7 +207,7 @@ sal_uLong SvTokenStream::GetNumber()
}
}
return( l );
return l;
}
bool SvTokenStream::MakeToken( SvToken & rToken )

View File

@ -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;

View File

@ -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()

View File

@ -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

View File

@ -719,7 +719,7 @@ inline RegError RegistryKeyArray::closeKeyHandles()
m_phKeys = NULL;
return ret;
} else
return(REG_INVALID_KEY);
return REG_INVALID_KEY;
}

View File

@ -54,7 +54,7 @@ public:
}
static void* operator new (size_t, void* p)
{
return (p);
return p;
}
static void operator delete (void*, void*)
{}

View File

@ -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

View File

@ -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);
};

View File

@ -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; }

View File

@ -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()

View File

@ -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);

View File

@ -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;
}
}

View File

@ -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;
}
/**

View File

@ -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
{

View File

@ -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: */

View File

@ -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

View File

@ -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)

View File

@ -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()

View File

@ -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)

View File

@ -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());
}
/*

View File

@ -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) {

View File

@ -98,7 +98,7 @@ public class sdbcx
xMSF = UnoRuntime.queryInterface( XMultiServiceFactory.class, rXsmgr );
}
return ( xMSF );
return xMSF;
}

View File

@ -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: */

View File

@ -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;
}
/*****************************************************************************

View File

@ -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)

View File

@ -190,7 +190,7 @@ public class UnoMethodNode extends UnoNode{
if ( paramMode == ParamMode.INOUT ) {
toReturn = "INOUT";
}
return( toReturn );
return toReturn;
}
public TypeClass getTypeClass(){

View File

@ -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;
}
}

View File

@ -264,7 +264,7 @@ public class EuroAdaption {
e.printStackTrace(System.err);
}
return( nRetKey );
return nRetKey;
}

View File

@ -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;
}

View File

@ -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)

View File

@ -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);

View File

@ -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: */

View File

@ -98,7 +98,7 @@ int __cdecl main( int argc, char * argv[] )
exit(1);
}
return(0);
return 0;
}

View File

@ -250,7 +250,7 @@ int _cdecl main( int argc, char * argv[] )
cout << "\t41. closing registry \"test.reg\" failed\n";
}
return(0);
return 0;
}

View File

@ -324,7 +324,7 @@ int _cdecl main()
else
cout << "47.a). registry \"test4.rdb\" is closed\n";
return(0);
return 0;
}

View File

@ -38,7 +38,7 @@ int _cdecl main()
test_generateMerge2();
test_merge();
return(0);
return 0;
}

View File

@ -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;
}
};

View File

@ -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;}

View File

@ -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;

View File

@ -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()
{

View File

@ -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

View File

@ -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()

View File

@ -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: */

View File

@ -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: */

View File

@ -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();

View File

@ -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;
}
}

View File

@ -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 ) );

View File

@ -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;
}

Some files were not shown because too many files have changed in this diff Show More