diff options
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/cuihyperdlg.cxx | 6 | ||||
-rw-r--r-- | cui/source/dialogs/hldocntp.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/hldoctp.cxx | 14 | ||||
-rw-r--r-- | cui/source/dialogs/hlinettp.cxx | 16 | ||||
-rw-r--r-- | cui/source/dialogs/hlmailtp.cxx | 8 | ||||
-rw-r--r-- | cui/source/dialogs/hlmarkwn.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/hltpbase.cxx | 6 | ||||
-rw-r--r-- | cui/source/options/optcolor.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/connect.cxx | 8 | ||||
-rw-r--r-- | cui/source/tabpages/labdlg.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/measure.cxx | 10 | ||||
-rw-r--r-- | cui/source/tabpages/swpossizetabpage.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/textanim.cxx | 18 | ||||
-rw-r--r-- | cui/source/tabpages/textattr.cxx | 8 | ||||
-rw-r--r-- | cui/source/tabpages/tparea.cxx | 42 | ||||
-rw-r--r-- | cui/source/tabpages/tpcolor.cxx | 10 | ||||
-rw-r--r-- | cui/source/tabpages/tpline.cxx | 20 | ||||
-rw-r--r-- | cui/source/tabpages/tplnedef.cxx | 26 | ||||
-rw-r--r-- | cui/source/tabpages/tplneend.cxx | 22 | ||||
-rw-r--r-- | cui/source/tabpages/tpshadow.cxx | 12 | ||||
-rw-r--r-- | cui/source/tabpages/transfrm.cxx | 26 |
21 files changed, 134 insertions, 134 deletions
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index afcfc3a332d2..d1107873e9e9 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -260,7 +260,7 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickOkHdl_Impl) Apply(); Close(); - return ( 0L ); + return 0L; } /************************************************************************* @@ -273,7 +273,7 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl) { Apply(); - return( 0L ); + return 0L; } /************************************************************************* @@ -286,7 +286,7 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickCloseHdl_Impl) { Close(); - return( 0L ); + return 0L; } /************************************************************************* diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 7f988851836b..996cb810c1b8 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -234,7 +234,7 @@ void SvxHyperlinkNewDocTp::GetCurentItemData ( OUString& rStrURL, OUString& aStr IconChoicePage* SvxHyperlinkNewDocTp::Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ) { - return( new SvxHyperlinkNewDocTp( pWindow, pDlg, rItemSet ) ); + return new SvxHyperlinkNewDocTp( pWindow, pDlg, rItemSet ); } /************************************************************************* @@ -453,7 +453,7 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl) m_pCbbPath->SetText ( aStrTmp ); } - return( 0L ); + return 0L; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 80cc05b8f036..2f5b8f7efb1a 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -159,7 +159,7 @@ void SvxHyperlinkDocTp::GetCurentItemData ( OUString& rStrURL, OUString& aStrNam IconChoicePage* SvxHyperlinkDocTp::Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ) { - return( new SvxHyperlinkDocTp( pWindow, pDlg, rItemSet ) ); + return new SvxHyperlinkDocTp( pWindow, pDlg, rItemSet ); } /************************************************************************* @@ -209,7 +209,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl) ModifiedPathHdl_Impl (NULL); } - return( 0L ); + return 0L; } /************************************************************************* @@ -241,7 +241,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickTargetHdl_Impl) ShowMarkWnd (); - return( 0L ); + return 0L; } /************************************************************************* @@ -259,7 +259,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedPathHdl_Impl) m_pFtFullURL->SetText( maStrURL ); - return( 0L ); + return 0L; } /************************************************************************* @@ -284,7 +284,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, TimeoutHdl_Impl) LeaveWait(); } - return( 0L ); + return 0L; } /************************************************************************* @@ -302,7 +302,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedTargetHdl_Impl) m_pFtFullURL->SetText( maStrURL ); - return( 0L ); + return 0L; } /************************************************************************* @@ -317,7 +317,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, LostFocusPathHdl_Impl) m_pFtFullURL->SetText( maStrURL ); - return (0L); + return 0L; } /************************************************************************* diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 7b198b62f8b5..76088ba157d9 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -189,7 +189,7 @@ OUString SvxHyperlinkInternetTp::CreateAbsoluteURL() const IconChoicePage* SvxHyperlinkInternetTp::Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ) { - return( new SvxHyperlinkInternetTp( pWindow, pDlg, rItemSet ) ); + return new SvxHyperlinkInternetTp( pWindow, pDlg, rItemSet ); } /************************************************************************* @@ -219,7 +219,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl) maTimer.SetTimeout( 2500 ); maTimer.Start(); - return( 0L ); + return 0L; } /************************************************************************* @@ -231,7 +231,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl) IMPL_LINK_NOARG(SvxHyperlinkInternetTp, TimeoutHdl_Impl) { RefreshMarkWindow(); - return( 0L ); + return 0L; } /************************************************************************* @@ -249,7 +249,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl) ClickAnonymousHdl_Impl(NULL); } - return( 0L ); + return 0L; } /************************************************************************* @@ -336,7 +336,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl) { OUString aScheme = GetSchemeFromButtons(); SetScheme(aScheme); - return( 0L ); + return 0L; } /************************************************************************* @@ -366,7 +366,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl) else setFTPUser(maStrOldUser, maStrOldPassword); - return( 0L ); + return 0L; } /************************************************************************* @@ -378,7 +378,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl) IMPL_LINK_NOARG(SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl) { RefreshMarkWindow(); - return (0L); + return 0L; } /************************************************************************* @@ -403,7 +403,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl) const SfxPoolItem *ppItems[] = { &aName, &aNewView, &aSilent, &aReadOnly, &aRefererItem, &aBrowse, NULL }; static_cast<SvxHpLinkDlg*>(mpDialog)->GetBindings()->Execute( SID_OPENDOC, ppItems, 0, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); - return( 0L ); + return 0L; } void SvxHyperlinkInternetTp::RefreshMarkWindow() diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index cf7d9573869f..de79f64a3d12 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -170,7 +170,7 @@ OUString SvxHyperlinkMailTp::CreateAbsoluteURL() const IconChoicePage* SvxHyperlinkMailTp::Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ) { - return( new SvxHyperlinkMailTp( pWindow, pDlg, rItemSet ) ); + return new SvxHyperlinkMailTp( pWindow, pDlg, rItemSet ); } /************************************************************************* @@ -253,7 +253,7 @@ IMPL_LINK_NOARG(SvxHyperlinkMailTp, Click_SmartProtocol_Impl) { OUString aScheme = GetSchemeFromButtons(); SetScheme( aScheme ); - return( 0L ); + return 0L; } /************************************************************************* @@ -268,7 +268,7 @@ IMPL_LINK_NOARG(SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl) if(!aScheme.isEmpty()) SetScheme( aScheme ); - return( 0L ); + return 0L; } /************************************************************************* @@ -288,7 +288,7 @@ IMPL_LINK_NOARG(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl) } - return( 0L ); + return 0L; } diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 9bfb83412ca7..4892f0edc956 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -555,7 +555,7 @@ IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl) } } - return( 0L ); + return 0L; } /************************************************************************* @@ -599,7 +599,7 @@ IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl) Close(); - return( 0L ); + return 0L; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index de10149a9e00..ec4a270b9e2a 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -48,7 +48,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxHyperURLBox(vcl::Wi sal_Int8 SvxHyperURLBox::AcceptDrop( const AcceptDropEvent& /* rEvt */ ) { - return( IsDropFormatSupported( FORMAT_STRING ) ? DND_ACTION_COPY : DND_ACTION_NONE ); + return IsDropFormatSupported( FORMAT_STRING ) ? DND_ACTION_COPY : DND_ACTION_NONE; } sal_Int8 SvxHyperURLBox::ExecuteDrop( const ExecuteDropEvent& rEvt ) @@ -352,7 +352,7 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl) delete pItemSet; } - return( 0L ); + return 0L; } // Get Macro-Infos @@ -536,7 +536,7 @@ int SvxHyperlinkTabPageBase::DeactivatePage( SfxItemSet* _pSet) _pSet->Put( aItem ); } - return( LEAVE_PAGE ); + return LEAVE_PAGE; } bool SvxHyperlinkTabPageBase::ShouldOpenMarkWnd() diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index bed354282be4..0d9cdafb4df4 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1133,7 +1133,7 @@ int SvxColorOptionsTabPage::DeactivatePage( SfxItemSet* pSet_ ) { if ( pSet_ ) FillItemSet( pSet_ ); - return( LEAVE_PAGE ); + return LEAVE_PAGE; } void SvxColorOptionsTabPage::UpdateColorConfig() diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index 35cb0d2a777d..439737e2f295 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -371,7 +371,7 @@ bool SvxConnectionPage::FillItemSet( SfxItemSet* rAttrs) } } - return( bModified ); + return bModified; } void SvxConnectionPage::Construct() @@ -391,12 +391,12 @@ void SvxConnectionPage::Construct() SfxTabPage* SvxConnectionPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { - return( new SvxConnectionPage( pWindow, *rAttrs ) ); + return new SvxConnectionPage( pWindow, *rAttrs ); } const sal_uInt16* SvxConnectionPage::GetRanges() { - return( pRanges ); + return pRanges; } IMPL_LINK( SvxConnectionPage, ChangeAttrHdl_Impl, void *, p ) @@ -483,7 +483,7 @@ IMPL_LINK( SvxConnectionPage, ChangeAttrHdl_Impl, void *, p ) } - return( 0L ); + return 0L; } void SvxConnectionPage::FillTypeLB() diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index ebe7526d3a8f..b9b02ebc29e1 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -339,14 +339,14 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* ) SfxTabPage* SvxCaptionTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { - return( new SvxCaptionTabPage( pWindow, *rOutAttrs ) ); + return new SvxCaptionTabPage( pWindow, *rOutAttrs ); } const sal_uInt16* SvxCaptionTabPage::GetRanges() { - return( pCaptionRanges ); + return pCaptionRanges; } diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 27d88fefe2cb..eace738617a1 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -569,7 +569,7 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet* rAttrs) } } - return( bModified ); + return bModified; } /************************************************************************* @@ -596,12 +596,12 @@ void SvxMeasurePage::Construct() SfxTabPage* SvxMeasurePage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { - return( new SvxMeasurePage( pWindow, *rAttrs ) ); + return new SvxMeasurePage( pWindow, *rAttrs ); } const sal_uInt16* SvxMeasurePage::GetRanges() { - return( pRanges ); + return pRanges; } void SvxMeasurePage::PointChanged( vcl::Window* pWindow, RECT_POINT /*eRP*/ ) @@ -655,7 +655,7 @@ IMPL_LINK( SvxMeasurePage, ClickAutoPosHdl_Impl, void *, p ) } ChangeAttrHdl_Impl( p ); - return( 0L ); + return 0L; } IMPL_LINK( SvxMeasurePage, ChangeAttrHdl_Impl, void *, p ) @@ -786,7 +786,7 @@ IMPL_LINK( SvxMeasurePage, ChangeAttrHdl_Impl, void *, p ) m_pCtlPreview->SetAttributes( aAttrSet ); m_pCtlPreview->Invalidate(); - return( 0L ); + return 0L; } void SvxMeasurePage::FillUnitLB() diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index bb26490ee9fb..401cc6b4b537 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -1051,7 +1051,7 @@ int SvxSwPosSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) FillItemSet( _pSet ); - return( LEAVE_PAGE ); + return LEAVE_PAGE; } void SvxSwPosSizeTabPage::EnableAnchorTypes(sal_uInt16 nAnchorEnable) diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 43588c46aae2..1df37c42d6cc 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -436,12 +436,12 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet* rAttrs) bModified = true; } - return( bModified ); + return bModified; } const sal_uInt16* SvxTextAnimationPage::GetRanges() { - return( pRanges ); + return pRanges; } /************************************************************************* @@ -453,7 +453,7 @@ const sal_uInt16* SvxTextAnimationPage::GetRanges() SfxTabPage* SvxTextAnimationPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { - return( new SvxTextAnimationPage( pWindow, *rAttrs ) ); + return new SvxTextAnimationPage( pWindow, *rAttrs ); } IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl) @@ -511,7 +511,7 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl) } } - return( 0L ); + return 0L; } IMPL_LINK_NOARG(SvxTextAnimationPage, ClickEndlessHdl_Impl) @@ -531,7 +531,7 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, ClickEndlessHdl_Impl) m_pNumFldCount->SetValue( m_pNumFldCount->GetValue() ); } } - return( 0L ); + return 0L; } IMPL_LINK_NOARG(SvxTextAnimationPage, ClickAutoHdl_Impl) @@ -548,7 +548,7 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, ClickAutoHdl_Impl) m_pMtrFldDelay->SetValue( m_pMtrFldDelay->GetValue() ); } - return( 0L ); + return 0L; } IMPL_LINK_NOARG(SvxTextAnimationPage, ClickPixelHdl_Impl) @@ -587,7 +587,7 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, ClickPixelHdl_Impl) m_pMtrFldAmount->SetValue( nValue ); } - return( 0L ); + return 0L; } IMPL_LINK( SvxTextAnimationPage, ClickDirectionHdl_Impl, ImageButton *, pBtn ) @@ -597,7 +597,7 @@ IMPL_LINK( SvxTextAnimationPage, ClickDirectionHdl_Impl, ImageButton *, pBtn ) m_pBtnRight->Check( pBtn == m_pBtnRight ); m_pBtnDown->Check( pBtn == m_pBtnDown ); - return( 0L ); + return 0L; } void SvxTextAnimationPage::SelectDirection( SdrTextAniDirection nValue ) @@ -621,7 +621,7 @@ sal_uInt16 SvxTextAnimationPage::GetSelectedDirection() else if( m_pBtnDown->IsChecked() ) nValue = SDRTEXTANI_DOWN; - return( nValue ); + return nValue; } diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 6dfe0033e27c..3237928499eb 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -523,12 +523,12 @@ void SvxTextAttrPage::Construct() SfxTabPage* SvxTextAttrPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { - return( new SvxTextAttrPage( pWindow, *rAttrs ) ); + return new SvxTextAttrPage( pWindow, *rAttrs ); } const sal_uInt16* SvxTextAttrPage::GetRanges() { - return( pRanges ); + return pRanges; } /** Check whether we have to uncheck the "Full width" check box. @@ -627,7 +627,7 @@ IMPL_LINK_NOARG(SvxTextAttrPage, ClickFullWidthHdl_Impl) } } } - return( 0L ); + return 0L; } /************************************************************************* @@ -678,7 +678,7 @@ IMPL_LINK_NOARG(SvxTextAttrPage, ClickHdl_Impl) // #83698# enable/disable text anchoring dependent of contour m_pFlPosition->Enable(!bContour && !bHorAndVer); - return( 0L ); + return 0L; } diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index efb9ec3c92b2..1ff5a81bdca6 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -89,7 +89,7 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransOffHdl_Impl) InvalidatePreview( false ); - return( 0L ); + return 0L; } IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransLinearHdl_Impl) @@ -102,7 +102,7 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransLinearHdl_Impl) rXFSet.ClearItem (XATTR_FILLFLOATTRANSPARENCE); ModifyTransparentHdl_Impl (NULL); - return( 0L ); + return 0L; } IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransGradientHdl_Impl) @@ -115,7 +115,7 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransGradientHdl_Impl) rXFSet.ClearItem (XATTR_FILLTRANSPARENCE); ModifiedTrgrHdl_Impl (NULL); - return( 0L ); + return 0L; } void SvxTransparenceTabPage::ActivateLinear(bool bActivate) @@ -161,7 +161,7 @@ IMPL_LINK(SvxTransparenceTabPage, ModifiedTrgrHdl_Impl, void *, pControl) InvalidatePreview(); - return( 0L ); + return 0L; } void SvxTransparenceTabPage::ActivateGradient(bool bActivate) @@ -177,7 +177,7 @@ void SvxTransparenceTabPage::ActivateGradient(bool bActivate) IMPL_LINK_NOARG(SvxTransparenceTabPage, ChangeTrgrTypeHdl_Impl) { - return( 0L ); + return 0L; } void SvxTransparenceTabPage::SetControlState_Impl(css::awt::GradientStyle eXGS) @@ -293,12 +293,12 @@ void SvxTransparenceTabPage::Construct() SfxTabPage* SvxTransparenceTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rAttrs) { - return(new SvxTransparenceTabPage(pWindow, *rAttrs)); + return new SvxTransparenceTabPage(pWindow, *rAttrs); } const sal_uInt16* SvxTransparenceTabPage::GetRanges() { - return(pTransparenceRanges); + return pTransparenceRanges; } bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs) @@ -485,7 +485,7 @@ int SvxTransparenceTabPage::DeactivatePage(SfxItemSet* _pSet) { if( _pSet ) FillItemSet( _pSet ); - return(LEAVE_PAGE); + return LEAVE_PAGE; } void SvxTransparenceTabPage::PointChanged(vcl::Window* , RECT_POINT eRcPt) @@ -988,7 +988,7 @@ int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) if( _pSet ) FillItemSet( _pSet ); - return( LEAVE_PAGE ); + return LEAVE_PAGE; } @@ -1434,7 +1434,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs ) rAttrs->Put (SfxUInt16Item(SID_TABPAGE_POS,nPos)); } - return( bModified ); + return bModified; } @@ -1761,14 +1761,14 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs ) SfxTabPage* SvxAreaTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { - return( new SvxAreaTabPage( pWindow, *rAttrs ) ); + return new SvxAreaTabPage( pWindow, *rAttrs ); } const sal_uInt16* SvxAreaTabPage::GetRanges() { - return( pAreaRanges ); + return pAreaRanges; } @@ -1858,7 +1858,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyColorHdl_Impl) m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() ); m_pCtlXRectPreview->Invalidate(); - return( 0L ); + return 0L; } @@ -1914,7 +1914,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyGradientHdl_Impl) m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() ); m_pCtlXRectPreview->Invalidate(); - return( 0L ); + return 0L; } @@ -1970,7 +1970,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchingHdl_Impl) m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() ); m_pCtlXRectPreview->Invalidate(); - return( 0L ); + return 0L; } @@ -1995,7 +1995,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchBckgrdColorHdl_Impl) m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() ); m_pCtlXRectPreview->Invalidate(); - return( 0L ); + return 0L; } @@ -2020,7 +2020,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ToggleHatchBckgrdColorHdl_Impl) } } - return( 0L ); + return 0L; } @@ -2100,7 +2100,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyBitmapHdl_Impl) m_pCtlBitmapPreview->SetAttributes( aXFillAttr.GetItemSet() ); m_pCtlBitmapPreview->Invalidate(); - return( 0L ); + return 0L; } @@ -2131,7 +2131,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p ) m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() ); m_pCtlXRectPreview->Invalidate(); - return( 0L ); + return 0L; } IMPL_LINK_NOARG( SvxAreaTabPage, ClickImportHdl_Impl ) @@ -2324,7 +2324,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl) m_pCtlBitmapPreview->SetAttributes( aXFillAttr.GetItemSet() ); m_pCtlBitmapPreview->Invalidate(); - return( 0L ); + return 0L; } @@ -2362,7 +2362,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ClickScaleHdl_Impl) ModifyTileHdl_Impl( NULL ); - return( 0L ); + return 0L; } diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index ff47c806dbb2..ed3668b8ab25 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -481,12 +481,12 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& ) int SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( CheckChanges_Impl() == -1L ) - return( KEEP_PAGE ); + return KEEP_PAGE; if( _pSet ) FillItemSet( _pSet ); - return( LEAVE_PAGE ); + return LEAVE_PAGE; } @@ -621,7 +621,7 @@ void SvxColorTabPage::Reset( const SfxItemSet* rSet ) SfxTabPage* SvxColorTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { - return( new SvxColorTabPage( pWindow, *rOutAttrs ) ); + return new SvxColorTabPage( pWindow, *rOutAttrs ); } // is called when the content of the MtrFields is changed for color values @@ -1085,7 +1085,7 @@ sal_uInt16 SvxColorTabPage::ColorToPercent_Impl( sal_uInt16 nColor ) break; } - return ( nWert ); + return nWert; } @@ -1105,7 +1105,7 @@ sal_uInt16 SvxColorTabPage::PercentToColor_Impl( sal_uInt16 nPercent ) break; } - return ( nWert ); + return nWert; } diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index df15d595ce4a..baf14b5188ba 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -668,7 +668,7 @@ int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) if( _pSet ) FillItemSet( _pSet ); - return( LEAVE_PAGE ); + return LEAVE_PAGE; } @@ -954,7 +954,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) } } rAttrs->Put (CntUInt16Item(SID_PAGE_TYPE,nPageType)); - return( bModified ); + return bModified; } @@ -1491,7 +1491,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) SfxTabPage* SvxLineTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { - return( new SvxLineTabPage( pWindow, *rAttrs ) ); + return new SvxLineTabPage( pWindow, *rAttrs ); } @@ -1561,7 +1561,7 @@ IMPL_LINK( SvxLineTabPage, ChangePreviewHdl_Impl, void *, pCntrl ) m_pBoxEnd->Enable(bHasLineEnd && bHasLineStyle); - return( 0L ); + return 0L; } @@ -1580,7 +1580,7 @@ IMPL_LINK( SvxLineTabPage, ChangeStartHdl_Impl, void *, p ) ChangePreviewHdl_Impl( this ); - return( 0L ); + return 0L; } @@ -1590,7 +1590,7 @@ IMPL_LINK_NOARG(SvxLineTabPage, ChangeEdgeStyleHdl_Impl) { ChangePreviewHdl_Impl( this ); - return( 0L ); + return 0L; } @@ -1600,7 +1600,7 @@ IMPL_LINK( SvxLineTabPage, ChangeCapStyleHdl_Impl, void *, EMPTYARG ) { ChangePreviewHdl_Impl( this ); - return( 0L ); + return 0L; } @@ -1637,7 +1637,7 @@ IMPL_LINK_NOARG(SvxLineTabPage, ClickInvisibleHdl_Impl) } ChangePreviewHdl_Impl( NULL ); - return( 0L ); + return 0L; } @@ -1656,7 +1656,7 @@ IMPL_LINK( SvxLineTabPage, ChangeEndHdl_Impl, void *, p ) ChangePreviewHdl_Impl( this ); - return( 0L ); + return 0L; } @@ -1673,7 +1673,7 @@ IMPL_LINK_NOARG(SvxLineTabPage, ChangeTransparentHdl_Impl) m_pCtlPreview->Invalidate(); - return( 0L ); + return 0L; } diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 8cafbc8669b3..bfc053efafcb 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -201,7 +201,7 @@ int SvxLineDefTabPage::DeactivatePage( SfxItemSet* _pSet ) if( _pSet ) FillItemSet( _pSet ); - return( LEAVE_PAGE ); + return LEAVE_PAGE; } @@ -327,7 +327,7 @@ void SvxLineDefTabPage::Reset( const SfxItemSet* rAttrs ) SfxTabPage* SvxLineDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { - return( new SvxLineDefTabPage( pWindow, *rOutAttrs ) ); + return new SvxLineDefTabPage( pWindow, *rOutAttrs ); } @@ -361,7 +361,7 @@ IMPL_LINK( SvxLineDefTabPage, SelectLinestyleHdl_Impl, void *, p ) if( p ) *pPageType = 2; } - return( 0L ); + return 0L; } @@ -371,7 +371,7 @@ IMPL_LINK_NOARG_INLINE_START(SvxLineDefTabPage, ChangePreviewHdl_Impl) FillDash_Impl(); m_pCtlPreview->Invalidate(); - return( 0L ); + return 0L; } IMPL_LINK_NOARG_INLINE_END(SvxLineDefTabPage, ChangePreviewHdl_Impl) @@ -392,7 +392,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber1Hdl_Impl) ChangePreviewHdl_Impl( this ); - return( 0L ); + return 0L; } @@ -412,7 +412,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber2Hdl_Impl) ChangePreviewHdl_Impl( this ); - return( 0L ); + return 0L; } @@ -483,7 +483,7 @@ IMPL_LINK( SvxLineDefTabPage, ChangeMetricHdl_Impl, void *, p ) } SelectTypeHdl_Impl( NULL ); - return( 0L ); + return 0L; } @@ -518,7 +518,7 @@ IMPL_LINK( SvxLineDefTabPage, SelectTypeHdl_Impl, void *, p ) } } ChangePreviewHdl_Impl( p ); - return( 0L ); + return 0L; } @@ -609,7 +609,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl) m_pBtnDelete->Enable(); m_pBtnSave->Enable(); } - return( 0L ); + return 0L; } @@ -679,7 +679,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl) } } } - return( 0L ); + return 0L; } @@ -716,7 +716,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl) m_pBtnDelete->Disable(); m_pBtnSave->Disable(); } - return( 0L ); + return 0L; } @@ -789,7 +789,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl) m_pBtnDelete->Disable(); m_pBtnSave->Disable(); } - return( 0L ); + return 0L; } @@ -836,7 +836,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl) } } - return( 0L ); + return 0L; } diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index a4cafe54584c..b69f9d9e0b34 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -179,7 +179,7 @@ int SvxLineEndDefTabPage::DeactivatePage( SfxItemSet* _pSet ) if( _pSet ) FillItemSet( _pSet ); - return( LEAVE_PAGE ); + return LEAVE_PAGE; } @@ -271,7 +271,7 @@ void SvxLineEndDefTabPage::Reset( const SfxItemSet* ) SfxTabPage* SvxLineEndDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet ) { - return( new SvxLineEndDefTabPage( pWindow, *rSet ) ); + return new SvxLineEndDefTabPage( pWindow, *rSet ); } @@ -298,7 +298,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, SelectLineEndHdl_Impl) // if there is an entry selected in the ListBox *pPageType = 3; } - return( 0L ); + return 0L; } @@ -306,7 +306,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, SelectLineEndHdl_Impl) long SvxLineEndDefTabPage::ChangePreviewHdl_Impl( void* ) { m_pCtlPreview->Invalidate(); - return( 0L ); + return 0L; } @@ -387,7 +387,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl) } } } - return( 0L ); + return 0L; } @@ -413,10 +413,10 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl) pNewObj = pConvPolyObj = pPolyObj->ConvertToPolyObj( true, false ); if( !pNewObj || !pNewObj->ISA( SdrPathObj ) ) - return( 0L ); // cancel, additional safety, which + return 0L; // cancel, additional safety, which // has no use for group objects though. } - else return( 0L ); // cancel + else return 0L; // cancel } basegfx::B2DPolyPolygon aNewPolyPolygon(static_cast<const SdrPathObj*>(pNewObj)->GetPathPoly()); @@ -502,7 +502,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl) m_pBtnDelete->Enable(); m_pBtnSave->Enable(); } - return( 0L ); + return 0L; } @@ -538,7 +538,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickDeleteHdl_Impl) m_pBtnDelete->Disable(); m_pBtnSave->Disable(); } - return( 0L ); + return 0L; } @@ -611,7 +611,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl) m_pBtnDelete->Disable(); m_pBtnSave->Disable(); } - return( 0L ); + return 0L; } @@ -657,7 +657,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl) ,"cui/ui/querynosavefiledialog.ui").Execute(); } } - return( 0L ); + return 0L; } void SvxLineEndDefTabPage::DataChanged( const DataChangedEvent& rDCEvt ) diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 15d00d19de19..3f09743cd55a 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -237,7 +237,7 @@ int SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet ) if( _pSet ) FillItemSet( _pSet ); - return( LEAVE_PAGE ); + return LEAVE_PAGE; } @@ -347,7 +347,7 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet* rAttrs ) rAttrs->Put (CntUInt16Item(SID_PAGE_TYPE,nPageType)); - return( bModified ); + return bModified; } @@ -458,14 +458,14 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs ) SfxTabPage* SvxShadowTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { - return( new SvxShadowTabPage( pWindow, *rAttrs ) ); + return new SvxShadowTabPage( pWindow, *rAttrs ); } const sal_uInt16* SvxShadowTabPage::GetRanges() { - return( pShadowRanges ); + return pShadowRanges; } @@ -484,7 +484,7 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ClickShadowHdl_Impl) ModifyShadowHdl_Impl( NULL ); - return( 0L ); + return 0L; } @@ -527,7 +527,7 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ModifyShadowHdl_Impl) //aCtlXRectPreview.SetFillAttr( aXFillAttr ); m_pCtlXRectPreview->Invalidate(); - return( 0L ); + return 0L; } diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 9a4b72b97acb..b6792aef93f7 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -315,14 +315,14 @@ void SvxAngleTabPage::Reset(const SfxItemSet* rAttrs) SfxTabPage* SvxAngleTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet) { - return(new SvxAngleTabPage(pWindow, *rSet)); + return new SvxAngleTabPage(pWindow, *rSet); } const sal_uInt16* SvxAngleTabPage::GetRanges() { - return(pAngleRanges); + return pAngleRanges; } @@ -488,7 +488,7 @@ bool SvxSlantTabPage::FillItemSet(SfxItemSet* rAttrs) rAttrs->Put( SfxBoolItem( SID_ATTR_TRANSFORM_SHEAR_VERTICAL, false ) ); } - return( bModified ); + return bModified; } @@ -549,14 +549,14 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs) SfxTabPage* SvxSlantTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { - return( new SvxSlantTabPage( pWindow, *rOutAttrs ) ); + return new SvxSlantTabPage( pWindow, *rOutAttrs ); } const sal_uInt16* SvxSlantTabPage::GetRanges() { - return( pSlantRanges ); + return pSlantRanges; } @@ -988,14 +988,14 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* ) SfxTabPage* SvxPositionSizeTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { - return( new SvxPositionSizeTabPage( pWindow, *rOutAttrs ) ); + return new SvxPositionSizeTabPage( pWindow, *rOutAttrs ); } const sal_uInt16* SvxPositionSizeTabPage::GetRanges() { - return( pPosSizeRanges ); + return pPosSizeRanges; } @@ -1043,7 +1043,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangePosProtectHdl) // #106572# Remember user's last choice m_pTsbSizeProtect->SetState( m_pTsbPosProtect->GetState() == TRISTATE_TRUE ? TRISTATE_TRUE : mnProtectSizeState ); UpdateControlStates(); - return( 0L ); + return 0L; } @@ -1099,7 +1099,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeSizeProtectHdl) UpdateControlStates(); - return( 0L ); + return 0L; } @@ -1438,7 +1438,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeWidthHdl) } } - return( 0L ); + return 0L; } @@ -1463,7 +1463,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeHeightHdl) } } - return( 0L ); + return 0L; } @@ -1471,7 +1471,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeHeightHdl) IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickSizeProtectHdl) { UpdateControlStates(); - return( 0L ); + return 0L; } @@ -1484,7 +1484,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickAutoHdl) mfOldHeight = std::max( (double)GetCoreValue( *m_pMtrHeight, mePoolUnit ), 1.0 ); } - return( 0L ); + return 0L; } |