summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-02-11 13:20:49 +0200
committerNoel Grandin <noel@peralex.com>2015-02-23 09:26:58 +0200
commitba233e87efddf0a6751b35784dca1c805364ff3b (patch)
tree9d7c8a4256e688c2d47cb6ecf580ac196c4da2c0 /svx
parenta2fa9e2468aa5c4fd4b610c5d0ebc8959e87a072 (diff)
remove unnecessary parenthesis in return statements
found with $ git grep -lP 'return\s*\(\s*\w+\s*\)\s*;' Change-Id: Ic51606877a9edcadeb647c5bf17bc928b69ab60e
Diffstat (limited to 'svx')
-rw-r--r--svx/source/accessibility/AccessibleShape.cxx4
-rw-r--r--svx/source/dialog/dlgctrl.cxx4
-rw-r--r--svx/source/dialog/optgrid.cxx6
-rw-r--r--svx/source/engine3d/float3d.cxx24
-rw-r--r--svx/source/engine3d/view3d1.cxx2
-rw-r--r--svx/source/form/filtnav.cxx4
-rw-r--r--svx/source/sdr/contact/sdrmediawindow.cxx4
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.cxx4
-rw-r--r--svx/source/sidebar/area/AreaTransparencyGradientControl.cxx6
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.cxx2
-rw-r--r--svx/source/sidebar/line/LineWidthControl.cxx4
-rw-r--r--svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaPropertyPanel.cxx4
-rw-r--r--svx/source/sidebar/text/TextUnderlineControl.cxx2
-rw-r--r--svx/source/tbxctrls/colrctrl.cxx2
-rw-r--r--svx/source/tbxctrls/fontworkgallery.cxx2
-rw-r--r--svx/source/tbxctrls/tbxalign.cxx2
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx2
-rw-r--r--svx/source/unodraw/unomod.cxx2
-rw-r--r--svx/source/unogallery/unogalthemeprovider.cxx2
-rw-r--r--svx/source/xoutdev/xattrbmp.cxx10
21 files changed, 47 insertions, 47 deletions
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(