diff options
Diffstat (limited to 'sd')
56 files changed, 172 insertions, 172 deletions
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index 758578b8dbaa..c4fca2c14cfa 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -103,7 +103,7 @@ public: bool GetWaterCan() const { return bWaterCan; } void SetWaterCan( bool bWC ) { bWaterCan = bWC; } - SvxSearchItem* GetSearchItem() { return (pSearchItem); } + SvxSearchItem* GetSearchItem() { return pSearchItem; } void SetSearchItem(SvxSearchItem* pItem) { pSearchItem = pItem; } /** Return the virtual device that can be used for printer independent diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index 522791559aff..96df5f8d4827 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -292,7 +292,7 @@ public: void SetBackgroundFullSize( bool bIn ); bool IsBackgroundFullSize() const { return mbBackgroundFullSize; } - rtl_TextEncoding GetCharSet() { return(meCharSet); } + rtl_TextEncoding GetCharSet() { return meCharSet; } void SetPaperBin(sal_uInt16 nBin) { mnPaperBin = nBin; } sal_uInt16 GetPaperBin() const { return mnPaperBin; } diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index d80b5fbf93c2..d926354848a5 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -789,7 +789,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool mpOutliner->SetStyleSheetPool(static_cast<SfxStyleSheetPool*>(GetStyleSheetPool())); } - return(mpOutliner); + return mpOutliner; } // Internal outliner that is used to create text objects. We don't insert any diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index f762e9cc5c68..354942cee9a4 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -132,7 +132,7 @@ SdrObject* SdDrawDocument::GetObj(const OUString& rObjName) const nPage++; } - return (pObjFound); + return pObjFound; } // Find SdPage by name @@ -679,7 +679,7 @@ bool SdDrawDocument::CreateMissingNotesAndHandoutPages() SetChanged(false); } - return(bOK); + return bOK; } // + Move selected pages after said page diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 8052e7ee7d91..ee8739610b64 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -253,7 +253,7 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium& rMedium) pBookmarkDoc = mxBookmarkDocShRef->GetDoc(); } - return(pBookmarkDoc); + return pBookmarkDoc; } // Opens a bookmark document @@ -271,7 +271,7 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(const OUString& rBookmarkFile) pBookmarkDoc = mxBookmarkDocShRef->GetDoc(); } - return(pBookmarkDoc); + return pBookmarkDoc; } // Inserts a bookmark (page or object) @@ -417,7 +417,7 @@ bool SdDrawDocument::InsertBookmarkAsPage( if (nSdPageCount==0 || nBMSdPageCount==0 || nMPageCount==0) { bContinue = bOK = false; - return(bContinue); + return bContinue; } // Store the size and some other properties of the first page and notes @@ -468,7 +468,7 @@ bool SdDrawDocument::InsertBookmarkAsPage( if (!bContinue) { - return(bContinue); + return bContinue; } } } diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 2741cf2c56c4..f8e1f9db185c 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -873,7 +873,7 @@ IMPL_LINK_NOARG(SdDrawDocument, OnlineSpellingHdl) mpOnlineSearchItem = NULL; } - return(0); + return 0; } // Spell object (for OnlineSpelling) @@ -962,7 +962,7 @@ IMPL_LINK(SdDrawDocument, OnlineSpellEventHdl, EditStatus*, pEditStat) sal_uLong nStat = pEditStat->GetStatusWord(); mbHasOnlineSpellErrors = (nStat & EE_STAT_WRONGWORDCHANGED) != 0; - return(0); + return 0; } // Callback for ExecuteSpellPopup() diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 8cfeff17e452..7ceb101b14a2 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -558,7 +558,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, bool bVertical, const Rec pSdrObj->RecalcBoundRect(); } - return(pSdrObj); + return pSdrObj; } /************************************************************************* diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 240c06213fad..b3866bc14e20 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -708,7 +708,7 @@ void AccessibleDocumentViewBase::SetAccessibleOLEObject ( ::osl::Mutex& AccessibleDocumentViewBase::implGetMutex() { - return( maMutex ); + return maMutex; } // return ourself as context in default case @@ -716,7 +716,7 @@ uno::Reference< XAccessibleContext > AccessibleDocumentViewBase::implGetAccessibleContext() throw (uno::RuntimeException) { - return( this ); + return this; } // return sal_False in default case @@ -724,7 +724,7 @@ bool AccessibleDocumentViewBase::implIsSelected( sal_Int32 ) throw (uno::RuntimeException) { - return( false ); + return false; } // return nothing in default case diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 26210719b73b..fffc50cec5fe 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -693,7 +693,7 @@ bool } } - return( bRet ); + return bRet; } /** Select or delselect the specified shapes. The corresponding accessible diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index 8f0f06cda1eb..3821bcc56d33 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -170,7 +170,7 @@ SdOptions* SdModule::GetSdOptions(DocumentType eDocType) PutItem( SfxUInt16Item( SID_ATTR_METRIC, nMetric ) ); } - return(pOptions); + return pOptions; } /** diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index f30c937ffbb7..4613aae4248b 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -396,7 +396,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo) } } - return(0); + return 0; } /** diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx index 565498183fca..526a338df8ca 100644 --- a/sd/source/ui/app/sdpopup.cxx +++ b/sd/source/ui/app/sdpopup.cxx @@ -302,7 +302,7 @@ SvxFieldData* SdFieldPopup::GetField() static_cast<SvxAuthorField*>( pNewField )->SetFormat( eFormat ); } } - return( pNewField ); + return pNewField; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx index 1a80e8b18ea4..e2e3d7bf95c6 100644 --- a/sd/source/ui/app/tbxww.cxx +++ b/sd/source/ui/app/tbxww.cxx @@ -53,7 +53,7 @@ SdTbxControl::SdTbxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) SfxPopupWindowType SdTbxControl::GetPopupWindowType() const { - return( SFX_POPUPWINDOW_ONTIMEOUT ); + return SFX_POPUPWINDOW_ONTIMEOUT; } /** @@ -122,7 +122,7 @@ SfxPopupWindow* SdTbxControl::CreatePopupWindow() if ( !aToolBarResStr.isEmpty() ) createAndPositionSubToolBar( aToolBarResStr ); - return( pWin ); + return pWin; } /*-------------------------------------------------------------------------*/ diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 75043dc27b41..2881e392c239 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -227,13 +227,13 @@ IMPL_LINK_NOARG(AnimationWindow, ClickFirstHdl) m_nCurrentFrame = (m_FrameList.empty()) ? EMPTY_FRAMELIST : 0; UpdateControl(); - return( 0L ); + return 0L; } IMPL_LINK_NOARG(AnimationWindow, ClickStopHdl) { bMovie = false; - return( 0L ); + return 0L; } IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) @@ -352,7 +352,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) m_pBtnGetAllObjects->Enable( bBtnGetAllObjectsEnabled ); m_pBtnGetOneObject->Enable( bBtnGetOneObjectEnabled ); - return( 0L ); + return 0L; } IMPL_LINK_NOARG(AnimationWindow, ClickLastHdl) @@ -361,7 +361,7 @@ IMPL_LINK_NOARG(AnimationWindow, ClickLastHdl) (m_FrameList.empty()) ? EMPTY_FRAMELIST : m_FrameList.size() - 1 ; UpdateControl(); - return( 0L ); + return 0L; } IMPL_LINK( AnimationWindow, ClickRbtHdl, void *, p ) @@ -385,7 +385,7 @@ IMPL_LINK( AnimationWindow, ClickRbtHdl, void *, p ) m_pLbLoopCount->Enable(); } - return( 0L ); + return 0L; } IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn ) @@ -397,7 +397,7 @@ IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn ) GetBindings().GetDispatcher()->Execute( SID_ANIMATOR_ADD, SfxCallMode::SLOT | SfxCallMode::RECORD, &aItem, 0L ); - return( 0L ); + return 0L; } IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn ) @@ -472,7 +472,7 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn ) UpdateControl(); - return( 0L ); + return 0L; } IMPL_LINK_NOARG(AnimationWindow, ClickCreateGroupHdl) @@ -482,7 +482,7 @@ IMPL_LINK_NOARG(AnimationWindow, ClickCreateGroupHdl) GetBindings().GetDispatcher()->Execute( SID_ANIMATOR_CREATE, SfxCallMode::SLOT | SfxCallMode::RECORD, &aItem, 0L ); - return( 0L ); + return 0L; } IMPL_LINK_NOARG(AnimationWindow, ModifyBitmapHdl) @@ -498,7 +498,7 @@ IMPL_LINK_NOARG(AnimationWindow, ModifyBitmapHdl) UpdateControl(); - return( 0L ); + return 0L; } IMPL_LINK_NOARG(AnimationWindow, ModifyTimeHdl) @@ -509,7 +509,7 @@ IMPL_LINK_NOARG(AnimationWindow, ModifyTimeHdl) *pTime = m_pTimeField->GetTime(); - return( 0L ); + return 0L; } void AnimationWindow::UpdateControl(bool const bDisableCtrls) diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx index f79002fb3df4..8c2a255e567a 100644 --- a/sd/source/ui/dlg/brkdlg.cxx +++ b/sd/source/ui/dlg/brkdlg.cxx @@ -76,7 +76,7 @@ IMPL_LINK_NOARG(BreakDlg, CancelButtonHdl) { bCancel = true; m_pBtnCancel->Disable(); - return( 0L ); + return 0L; } /** diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index 94e0e876e67c..91e46b5fd039 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -243,7 +243,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) CheckState(); - return( 0L ); + return 0L; } // StartShow-Hdl @@ -399,7 +399,7 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p ) CheckState(); - return( 0L ); + return 0L; } /** diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index 17181cd62237..64e4d476baa7 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -149,7 +149,7 @@ SvxFieldData* SdModifyFieldDlg::GetField() } } - return( pNewField ); + return pNewField; } void SdModifyFieldDlg::FillFormatList() diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index c2791e10f83d..047d3c6f30bb 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -191,7 +191,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl) } } - return( 0L ); + return 0L; } // check whether to disable the "selection" checkbox diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx index 79c6ebe63374..b21f7104b53c 100644 --- a/sd/source/ui/dlg/gluectrl.cxx +++ b/sd/source/ui/dlg/gluectrl.cxx @@ -164,10 +164,10 @@ vcl::Window* SdTbxCtlGlueEscDir::CreateItemWindow( vcl::Window *pParent ) { if( GetSlotId() == SID_GLUE_ESCDIR ) { - return( new GlueEscDirLB( pParent, m_xFrame ) ); + return new GlueEscDirLB( pParent, m_xFrame ); } - return( NULL ); + return NULL; } /** @@ -178,9 +178,9 @@ sal_uInt16 SdTbxCtlGlueEscDir::GetEscDirPos( sal_uInt16 nEscDir ) for( sal_uInt16 i = 0; i < ESCDIR_COUNT; i++ ) { if( aEscDirArray[ i ] == nEscDir ) - return( i ); + return i; } - return( 99 ); + return 99; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index a78812f516df..473c9d4018de 100644 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -126,7 +126,7 @@ IMPL_LINK_NOARG(SdInsertPagesObjsDlg, SelectObjectHdl) else m_pCbxLink->Disable(); - return( 0 ); + return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 035d568896de..0f12f3018010 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -238,7 +238,7 @@ NavigatorDragType SdNavigatorWin::GetNavigatorDragType() if( ( eDT == NAVIGATOR_DRAGTYPE_LINK ) && ( ( pInfo && !pInfo->HasName() ) || !maTlbObjects.IsLinkableSelected() ) ) eDT = NAVIGATOR_DRAGTYPE_NONE; - return( eDT ); + return eDT; } //Get SdDrawDocShell @@ -414,7 +414,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl) } } } - return( 0L ); + return 0L; } IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl) @@ -458,7 +458,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl) SetDragImage(); } - return( 0L ); + return 0L; } /** @@ -493,7 +493,7 @@ IMPL_LINK( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu ) maTlbObjects.SetSelectionMode( MULTIPLE_SELECTION ); } } - return( 0 ); + return 0; } IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu ) @@ -736,7 +736,7 @@ sal_uInt16 SdNavigatorWin::GetDragTypeSdResId( NavigatorDragType eDT, bool bImag return( bImage ? TBI_LINK : STR_DRAGTYPE_LINK ); default: OSL_FAIL( "No resource for DragType available!" ); } - return( 0 ); + return 0; } NavDocInfo* SdNavigatorWin::GetDocInfo() @@ -747,7 +747,7 @@ NavDocInfo* SdNavigatorWin::GetDocInfo() { if( nPos == 0 ) { - return( NULL ); + return NULL; } nPos--; } @@ -791,7 +791,7 @@ bool SdNavigatorWin::Notify(NotifyEvent& rNEvt) if( !nOK ) nOK = Window::Notify( rNEvt ); - return( nOK ); + return nOK; } /** diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index d462faf8b8ce..c4b95a9d2458 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -294,7 +294,7 @@ IMPL_LINK_NOARG(SdStartPresentationDlg, ChangeRangeHdl) aLbDias->Enable( aRbtAtDia->IsChecked() ); aLbCustomshow->Enable( aRbtCustomshow->IsChecked() ); - return( 0L ); + return 0L; } /** @@ -321,7 +321,7 @@ IMPL_LINK_NOARG(SdStartPresentationDlg, ClickWindowPresentationHdl) else aCbxAlwaysOnTop->Enable(); - return( 0L ); + return 0L; } /** @@ -330,7 +330,7 @@ IMPL_LINK_NOARG(SdStartPresentationDlg, ClickWindowPresentationHdl) IMPL_LINK_NOARG(SdStartPresentationDlg, ChangePauseHdl) { aCbxAutoLogo->Enable( aRbtAuto->IsChecked() && ( aTmfPause->GetTime().GetMSFromTime() > 0 ) ); - return( 0L ); + return 0L; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index b6e89c44f153..21d8a89afb6f 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -274,7 +274,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl) } } - return( 0 ); + return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 0d9635b03db3..efe298eeb481 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -448,7 +448,7 @@ bool SdPageObjsTLB::SelectEntry( const OUString& rName ) } } } - return( bFound ); + return bFound; } /** @@ -477,7 +477,7 @@ bool SdPageObjsTLB::HasSelectedChildren( const OUString& rName ) } } } - return( bChildren ); + return bChildren; } /** @@ -857,7 +857,7 @@ bool SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc ) } // If there are still entries in the listbox, // then objects (with names) or pages were deleted - return( !pEntry ); + return !pEntry; } /** @@ -865,7 +865,7 @@ bool SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc ) */ OUString SdPageObjsTLB::GetSelectEntry() { - return( GetEntryText( GetCurEntry() ) ); + return GetEntryText( GetCurEntry() ); } std::vector<OUString> SdPageObjsTLB::GetSelectEntryList( const sal_uInt16 nDepth ) const @@ -1010,7 +1010,7 @@ SdDrawDocument* SdPageObjsTLB::GetBookmarkDoc(SfxMedium* pMed) } } - return( mpBookmarkDoc ); + return mpBookmarkDoc; } /** diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index a7e414754a1b..e281738b6a25 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -297,7 +297,7 @@ bool SdTPAction::FillItemSet( SfxItemSet* rAttrs ) } } - return( bModified ); + return bModified; } void SdTPAction::Reset( const SfxItemSet* rAttrs ) @@ -356,13 +356,13 @@ int SdTPAction::DeactivatePage( SfxItemSet* pPageSet ) if( pPageSet ) FillItemSet( pPageSet ); - return( LEAVE_PAGE ); + return LEAVE_PAGE; } SfxTabPage* SdTPAction::Create( vcl::Window* pWindow, const SfxItemSet& rAttrs ) { - return( new SdTPAction( pWindow, rAttrs ) ); + return new SdTPAction( pWindow, rAttrs ); } void SdTPAction::UpdateTree() @@ -457,7 +457,7 @@ IMPL_LINK_NOARG(SdTPAction, ClickSearchHdl) { OpenFileDialog(); - return( 0L ); + return 0L; } IMPL_LINK_NOARG(SdTPAction, ClickActionHdl) @@ -631,13 +631,13 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl) break; } - return( 0L ); + return 0L; } IMPL_LINK_NOARG(SdTPAction, SelectTreeHdl) { m_pEdtBookmark->SetText( m_pLbTree->GetSelectEntry() ); - return( 0L ); + return 0L; } IMPL_LINK_NOARG(SdTPAction, CheckFileHdl) @@ -685,7 +685,7 @@ IMPL_LINK_NOARG(SdTPAction, CheckFileHdl) m_pLbTreeDocument->Hide(); } - return( 0L ); + return 0L; } presentation::ClickAction SdTPAction::GetActualClickAction() @@ -695,7 +695,7 @@ presentation::ClickAction SdTPAction::GetActualClickAction() if (nPos != LISTBOX_ENTRY_NOTFOUND && static_cast<size_t>(nPos) < maCurrentActions.size()) eCA = maCurrentActions[ nPos ]; - return( eCA ); + return eCA; } void SdTPAction::SetActualClickAction( presentation::ClickAction eCA ) @@ -799,7 +799,7 @@ OUString SdTPAction::GetEditText( bool bFullDocDestination ) } case presentation::ClickAction_BOOKMARK: - return( m_pEdtBookmark->GetText() ); + return m_pEdtBookmark->GetText(); default: break; @@ -830,7 +830,7 @@ OUString SdTPAction::GetEditText( bool bFullDocDestination ) } } - return( aStr ); + return aStr; } sal_uInt16 SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA ) @@ -851,7 +851,7 @@ sal_uInt16 SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA ) case presentation::ClickAction_STOPPRESENTATION: return STR_CLICK_ACTION_STOPPRESENTATION; default: OSL_FAIL( "No StringResource for ClickAction available!" ); } - return( 0 ); + return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 15dbfe6c3179..9065e1ebe922 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -102,7 +102,7 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs ) SfxTabPage* SdTpOptionsSnap::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { - return( new SdTpOptionsSnap( pWindow, *rAttrs ) ); + return new SdTpOptionsSnap( pWindow, *rAttrs ); } /************************************************************************* @@ -143,7 +143,7 @@ bool SdTpOptionsContents::FillItemSet( SfxItemSet* rAttrs ) rAttrs->Put( aOptsItem ); bModified = true; } - return( bModified ); + return bModified; } void SdTpOptionsContents::Reset( const SfxItemSet* rAttrs ) @@ -168,7 +168,7 @@ void SdTpOptionsContents::Reset( const SfxItemSet* rAttrs ) SfxTabPage* SdTpOptionsContents::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { - return( new SdTpOptionsContents( pWindow, *rAttrs ) ); + return new SdTpOptionsContents( pWindow, *rAttrs ); } /************************************************************************* @@ -329,18 +329,18 @@ int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet ) { if( pActiveSet ) FillItemSet( pActiveSet ); - return( LEAVE_PAGE ); + return LEAVE_PAGE; } WarningBox aWarnBox( GetParent(), WB_YES_NO, SD_RESSTR( STR_WARN_SCALE_FAIL ) ); short nReturn = aWarnBox.Execute(); if( nReturn == RET_YES ) - return( KEEP_PAGE ); + return KEEP_PAGE; if( pActiveSet ) FillItemSet( pActiveSet ); - return( LEAVE_PAGE ); + return LEAVE_PAGE; } bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs ) @@ -407,7 +407,7 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs ) bModified = true; } - return( bModified ); + return bModified; } void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs ) @@ -491,7 +491,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs ) SfxTabPage* SdTpOptionsMisc::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { - return( new SdTpOptionsMisc( pWindow, *rAttrs ) ); + return new SdTpOptionsMisc( pWindow, *rAttrs ); } IMPL_LINK_NOARG(SdTpOptionsMisc, SelectMetricHdl_Impl) diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index 54ba78f37496..1646ed348244 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -152,7 +152,7 @@ Rectangle DrawDocShell::GetVisArea(sal_uInt16 nAspect) const } } - return (aVisArea); + return aVisArea; } void DrawDocShell::Connect(ViewShell* pViewSh) @@ -177,7 +177,7 @@ FrameView* DrawDocShell::GetFrameView() pFrameView = mpViewShell->GetFrameView(); } - return(pFrameView); + return pFrameView; } Size DrawDocShell::GetFirstPageSize() @@ -311,7 +311,7 @@ bool DrawDocShell::CheckPageName (vcl::Window* pWin, OUString& rName ) } } - return ( bIsNameValid ? sal_True : sal_False ); + return bIsNameValid; } bool DrawDocShell::IsNewPageNameValid( OUString & rInOutPageName, bool bResetStringIfStandardName /* = false */ ) diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 1709b193567c..cd9043858ba5 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -667,7 +667,7 @@ bool DrawDocShell::SaveCompleted( const ::com::sun::star::uno::Reference< ::com: SfxStyleSheetBasePool* DrawDocShell::GetStyleSheetPool() { - return( (SfxStyleSheetBasePool*) mpDoc->GetStyleSheetPool() ); + return (SfxStyleSheetBasePool*) mpDoc->GetStyleSheetPool(); } bool DrawDocShell::GotoBookmark(const OUString& rBookmark) diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index b20911cc0697..ebe60de7acb2 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -433,7 +433,7 @@ IMPL_LINK(DrawDocShell, OnlineSpellCallback, SpellCallbackInfo*, pInfo) } mpDoc->ImpOnlineSpellCallback(pInfo, pObj, pOutl); - return(0); + return 0; } void DrawDocShell::ClearUndoBuffer() diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index 76c70d2f5537..974b49e9d323 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -130,7 +130,7 @@ bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt) } } - return(bReturn); + return bReturn; } bool FuConstructBezierPolygon::MouseMove(const MouseEvent& rMEvt) @@ -213,7 +213,7 @@ bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); } - return(bReturn); + return bReturn; } /** diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index e615e9475bbe..9edd9bc866a2 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -229,7 +229,7 @@ bool FuConstruct::KeyInput(const KeyEvent& rKEvt) if ( !bReturn ) bReturn = FuDraw::KeyInput(rKEvt); - return(bReturn); + return bReturn; } void FuConstruct::Activate() diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx index ae6ee9706997..74dac4c7f3d9 100644 --- a/sd/source/ui/func/fuconuno.cxx +++ b/sd/source/ui/func/fuconuno.cxx @@ -115,7 +115,7 @@ bool FuConstructUnoControl::MouseButtonUp(const MouseEvent& rMEvt) if (!bPermanent) mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); - return (bReturn); + return bReturn; } /** diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index ce1662921501..d8a05860d1e6 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -465,7 +465,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt) mpWindow->ReleaseMouse(); } - return (bReturn); + return bReturn; } void FuDraw::Activate() @@ -790,7 +790,7 @@ bool FuDraw::RequestHelp(const HelpEvent& rHEvt) bReturn = FuPoor::RequestHelp(rHEvt); } - return(bReturn); + return bReturn; } bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewEvent& rVEvt) diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 71cf119c3620..f0b172faa67d 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -403,7 +403,7 @@ bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) mpDoc->RemoveUnnecessaryMasterPages(); } - return (bOK); + return bOK; } void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium) diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx index f68d033c7442..c35371644ac5 100644 --- a/sd/source/ui/func/fuoltext.cxx +++ b/sd/source/ui/func/fuoltext.cxx @@ -111,7 +111,7 @@ bool FuOutlineText::MouseButtonDown(const MouseEvent& rMEvt) bReturn = FuOutline::MouseButtonDown(rMEvt); } - return (bReturn); + return bReturn; } bool FuOutlineText::MouseMove(const MouseEvent& rMEvt) @@ -123,7 +123,7 @@ bool FuOutlineText::MouseMove(const MouseEvent& rMEvt) bReturn = FuOutline::MouseMove(rMEvt); } - return (bReturn); + return bReturn; } bool FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt) @@ -171,7 +171,7 @@ bool FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt) if( !bReturn ) bReturn = FuOutline::MouseButtonUp(rMEvt); - return (bReturn); + return bReturn; } /** @@ -203,7 +203,7 @@ bool FuOutlineText::KeyInput(const KeyEvent& rKEvt) } } - return (bReturn); + return bReturn; } void FuOutlineText::UpdateForKeyPress (const KeyEvent& rEvent) diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 523f5b50e59f..6097b3b41b0a 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -886,7 +886,7 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt) } } - return(bReturn); + return bReturn; } bool FuPoor::MouseMove(const MouseEvent& ) @@ -974,7 +974,7 @@ IMPL_LINK_NOARG(FuPoor, DragHdl) bool FuPoor::Command(const CommandEvent& rCEvt) { - return( mpView->Command(rCEvt,mpWindow) ); + return mpView->Command(rCEvt,mpWindow); } /** @@ -1035,7 +1035,7 @@ bool FuPoor::RequestHelp(const HelpEvent& rHEvt) } } - return(bReturn); + return bReturn; } void FuPoor::Paint(const Rectangle&, ::sd::Window* ) diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 0c1512560aec..cba210466715 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -598,7 +598,7 @@ bool FuSelection::MouseMove(const MouseEvent& rMEvt) ForcePointer(&rMEvt); - return (bReturn); + return bReturn; } bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) @@ -890,7 +890,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) FuDraw::MouseButtonUp(rMEvt); } - return (bReturn); + return bReturn; } /** @@ -996,7 +996,7 @@ bool FuSelection::KeyInput(const KeyEvent& rKEvt) } } - return(bReturn); + return bReturn; } diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index ace31a3954b3..5e9bf1ebe331 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -441,7 +441,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt) mpViewShell->GetViewFrame()->GetBindings().Invalidate(SidArray); } - return (bReturn); + return bReturn; } bool FuText::MouseMove(const MouseEvent& rMEvt) @@ -467,7 +467,7 @@ bool FuText::MouseMove(const MouseEvent& rMEvt) ForcePointer(&rMEvt); - return (bReturn); + return bReturn; } void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj) @@ -658,7 +658,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt) { mpView->UnmarkAllObj(); mpView->MarkObj(pObj,pPV,false,false); - return (bReturn); + return bReturn; } } } @@ -883,7 +883,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt) } bMBDown = false; FuConstruct::MouseButtonUp(rMEvt); - return (bReturn); + return bReturn; } /** @@ -960,7 +960,7 @@ bool FuText::KeyInput(const KeyEvent& rKEvt) bReturn = FuDraw::KeyInput(aKEvt); } - return (bReturn); + return bReturn; } void FuText::Activate() @@ -1153,7 +1153,7 @@ bool FuText::DeleteDefaultText() } } - return(bDeleted); + return bDeleted; } bool FuText::Command(const CommandEvent& rCEvt) @@ -1201,7 +1201,7 @@ bool FuText::RequestHelp(const HelpEvent& rHEvt) bReturn = FuConstruct::RequestHelp(rHEvt); } - return(bReturn); + return bReturn; } void FuText::ReceiveRequest(SfxRequest& rReq) diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index 7a16bf6150ff..54f1cfe6b73b 100644 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -58,7 +58,7 @@ public: SdCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc ); virtual ~SdCustomShowDlg(); - bool IsModified() const { return( bModified ); } + bool IsModified() const { return bModified; } bool IsCustomShow() const; }; @@ -91,7 +91,7 @@ public: SdDrawDocument& rDrawDoc, SdCustomShow*& rpCS ); virtual ~SdDefineCustomShowDlg(); - bool IsModified() const { return( bModified ); } + bool IsModified() const { return bModified; } }; #endif // INCLUDED_SD_SOURCE_UI_INC_CUSTSDLG_HXX diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index 5c66103fb8c3..e784c91f8a8c 100644 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -85,8 +85,8 @@ public: virtual void SelectionHasChanged(); - sal_uInt16 GetSlotID() const { return( nSlotId ); } - sal_uInt16 GetSlotValue() const { return( nSlotValue ); } + sal_uInt16 GetSlotID() const { return nSlotId; } + sal_uInt16 GetSlotValue() const { return nSlotValue; } void SetNoScrollUntilInside(bool bNoScroll = true) { bNoScrollUntilInside = bNoScroll; } diff --git a/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c b/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c index 35b5e90277f2..7f57d88705aa 100644 --- a/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c +++ b/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c @@ -367,7 +367,7 @@ DEBUG_EXPORT OSStatus DebugInitialize( DebugOutputType inType, ... ) exit: va_end( args ); - return( err ); + return err; } @@ -419,7 +419,7 @@ DEBUG_EXPORT OSStatus DebugGetProperty( DebugPropertyTag inTag, ... ) break; } va_end( args ); - return( err ); + return err; } @@ -456,7 +456,7 @@ DEBUG_EXPORT OSStatus DebugSetProperty( DebugPropertyTag inTag, ... ) break; } va_end( args ); - return( err ); + return err; } #if 0 @@ -484,7 +484,7 @@ DEBUG_EXPORT size_t DebugPrintF( DebugLevel inLevel, const char *inFormat, ... ) va_end( args ); exit: - return( n ); + return n; } @@ -506,7 +506,7 @@ DEBUG_EXPORT size_t DebugPrintFVAList( DebugLevel inLevel, const char *inFormat, DebugPrint( inLevel, buffer, (size_t) n ); exit: - return( n ); + return n; } @@ -604,7 +604,7 @@ static OSStatus DebugPrint( DebugLevel inLevel, char *inData, size_t inSize ) err = kNoErr; exit: - return( err ); + return err; } @@ -713,7 +713,7 @@ static OSStatus DebugFPrintFInit( DebugOutputTypeFlags inFlags, const char *inFi err = kNoErr; exit: - return( err ); + return err; } @@ -774,7 +774,7 @@ exit: #endif - return( err ); + return err; } @@ -870,7 +870,7 @@ exit: { CFRelease( bundle ); } - return( err ); + return err; } // DebugMacOSXLogPrint @@ -977,7 +977,7 @@ exit: { RegCloseKey( key ); } - return( err ); + return err; } @@ -1097,7 +1097,7 @@ DEBUG_EXPORT size_t DebugSNPrintF(char *sbuffer, size_t buflen, const char *fmt, length = DebugSNPrintFVAList(sbuffer, buflen, fmt, ptr); va_end(ptr); - return(length); + return length; } @@ -1120,7 +1120,7 @@ DEBUG_EXPORT size_t DebugSNPrintFVAList(char *sbuffer, size_t buflen, const char size_t nwritten = 0; int c; - if (buflen == 0) return(0); + if (buflen == 0) return 0; buflen--; // Pre-reserve one space in the buffer for the terminating nul if (buflen == 0) goto exit; @@ -1521,7 +1521,7 @@ number: if (!F.havePrecision) } exit: *sbuffer++ = 0; - return(nwritten); + return nwritten; } @@ -1926,7 +1926,7 @@ DEBUG_EXPORT const char * DebugGetErrorString( int_least32_t inErrorCode, char *dst = '\0'; s = inBuffer; } - return( s ); + return s; } @@ -2285,7 +2285,7 @@ DebugHexDump( // Note: The "dst - outBuffer" size calculation works even if "outBuffer" is NULL because it's all relative. - return( (size_t)( dst - outBuffer ) ); + return (size_t)( dst - outBuffer ); } @@ -2348,7 +2348,7 @@ static char * DebugNumVersionToString( uint32_t inVersion, char *inString ) dlog( kDebugLevelError, "invalid NumVersion stage (0x%02X)\n", stage ); break; } - return( inString ); + return inString; } @@ -2366,7 +2366,7 @@ DEBUG_EXPORT uint32_t DebugTaskLevel( void ) } #endif - return( level ); + return level; } #if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE ) @@ -2493,7 +2493,7 @@ DebugWinCharToTCharString( { *outTCharCount = (size_t)( dst - outTCharString ); } - return( outTCharString ); + return outTCharString; } #endif @@ -2972,7 +2972,7 @@ exit: { DebugPrintF( kDebugLevelMax, "\n\n### TEST FAILED ###\n\n" ); } - return( err ); + return err; } #endif // DEBUG diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dllmain.c b/sd/source/ui/remotecontrol/mDNSResponder/dllmain.c index ce3fce554037..49fd854c96c8 100644 --- a/sd/source/ui/remotecontrol/mDNSResponder/dllmain.c +++ b/sd/source/ui/remotecontrol/mDNSResponder/dllmain.c @@ -32,7 +32,7 @@ BOOL APIENTRY DllMain( HANDLE inModule, DWORD inReason, LPVOID inReserved ) case DLL_PROCESS_DETACH: break; } - return( TRUE ); + return TRUE; } diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientlib.c b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientlib.c index cca58853338c..a2c0dc6ad949 100644 --- a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientlib.c +++ b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientlib.c @@ -84,9 +84,9 @@ static uint8_t *InternalTXTRecordSearch uint8_t *x = p; p += 1 + p[0]; if (p <= e && *keylen <= x[0] && !strncasecmp(key, (char*)x+1, *keylen)) - if (*keylen == x[0] || x[1+*keylen] == '=') return(x); + if (*keylen == x[0] || x[1+*keylen] == '=') return x; } - return(NULL); + return NULL; } /********************************************************************************************* @@ -210,18 +210,18 @@ DNSServiceErrorType DNSSD_API TXTRecordSetValue const char *k; unsigned long keysize, keyvalsize; - for (k = key; *k; k++) if (*k < 0x20 || *k > 0x7E || *k == '=') return(kDNSServiceErr_Invalid); + for (k = key; *k; k++) if (*k < 0x20 || *k > 0x7E || *k == '=') return kDNSServiceErr_Invalid; keysize = (unsigned long)(k - key); keyvalsize = 1 + keysize + (value ? (1 + valueSize) : 0); - if (keysize < 1 || keyvalsize > 255) return(kDNSServiceErr_Invalid); + if (keysize < 1 || keyvalsize > 255) return kDNSServiceErr_Invalid; (void)TXTRecordRemoveValue(txtRecord, key); if (txtRec->datalen + keyvalsize > txtRec->buflen) { unsigned char *newbuf; unsigned long newlen = txtRec->datalen + keyvalsize; - if (newlen > 0xFFFF) return(kDNSServiceErr_Invalid); + if (newlen > 0xFFFF) return kDNSServiceErr_Invalid; newbuf = malloc((size_t)newlen); - if (!newbuf) return(kDNSServiceErr_NoMemory); + if (!newbuf) return kDNSServiceErr_NoMemory; memcpy(newbuf, txtRec->buffer, txtRec->datalen); if (txtRec->malloced) free(txtRec->buffer); txtRec->buffer = newbuf; @@ -240,7 +240,7 @@ DNSServiceErrorType DNSSD_API TXTRecordSetValue } *start = (uint8_t)(p - start - 1); txtRec->datalen += p - start; - return(kDNSServiceErr_NoError); + return kDNSServiceErr_NoError; } DNSServiceErrorType DNSSD_API TXTRecordRemoveValue @@ -251,17 +251,17 @@ DNSServiceErrorType DNSSD_API TXTRecordRemoveValue { unsigned long keylen, itemlen, remainder; uint8_t *item = InternalTXTRecordSearch(txtRec->datalen, txtRec->buffer, key, &keylen); - if (!item) return(kDNSServiceErr_NoSuchKey); + if (!item) return kDNSServiceErr_NoSuchKey; itemlen = (unsigned long)(1 + item[0]); remainder = (unsigned long)((txtRec->buffer + txtRec->datalen) - (item + itemlen)); // Use memmove because memcpy behaviour is undefined for overlapping regions memmove(item, item + itemlen, remainder); txtRec->datalen -= itemlen; - return(kDNSServiceErr_NoError); + return kDNSServiceErr_NoError; } -uint16_t DNSSD_API TXTRecordGetLength (const TXTRecordRef *txtRecord) { return(txtRec->datalen); } -const void * DNSSD_API TXTRecordGetBytesPtr(const TXTRecordRef *txtRecord) { return(txtRec->buffer); } +uint16_t DNSSD_API TXTRecordGetLength (const TXTRecordRef *txtRecord) { return txtRec->datalen; } +const void * DNSSD_API TXTRecordGetBytesPtr(const TXTRecordRef *txtRecord) { return txtRec->buffer; } /********************************************************************************************* * @@ -290,7 +290,7 @@ const void * DNSSD_API TXTRecordGetValuePtr { unsigned long keylen; uint8_t *item = InternalTXTRecordSearch(txtLen, txtRecord, key, &keylen); - if (!item || item[0] <= keylen) return(NULL); // If key not found, or found with no value, return NULL + if (!item || item[0] <= keylen) return NULL; // If key not found, or found with no value, return NULL *valueLen = (uint8_t)(item[0] - (keylen + 1)); return (item + 1 + keylen + 1); } @@ -305,7 +305,7 @@ uint16_t DNSSD_API TXTRecordGetCount uint8_t *p = (uint8_t*)txtRecord; uint8_t *e = p + txtLen; while (p<e) { p += 1 + p[0]; count++; } - return((p>e) ? (uint16_t)0 : count); + return ((p>e) ? (uint16_t)0 : count); } DNSServiceErrorType DNSSD_API TXTRecordGetItemAtIndex @@ -329,7 +329,7 @@ DNSServiceErrorType DNSSD_API TXTRecordGetItemAtIndex unsigned long len = 0; e = p + 1 + p[0]; while (x+len<e && x[len] != '=') len++; - if (len >= keyBufLen) return(kDNSServiceErr_NoMemory); + if (len >= keyBufLen) return kDNSServiceErr_NoMemory; memcpy(key, x, len); key[len] = 0; if (x+len<e) // If we found '=' @@ -342,9 +342,9 @@ DNSServiceErrorType DNSSD_API TXTRecordGetItemAtIndex *value = NULL; *valueLen = 0; } - return(kDNSServiceErr_NoError); + return kDNSServiceErr_NoError; } - return(kDNSServiceErr_Invalid); + return kDNSServiceErr_Invalid; } /********************************************************************************************* diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.c b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.c index 6059eb392c73..a538f4709001 100644 --- a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.c +++ b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.c @@ -68,7 +68,7 @@ uint32_t get_uint32(const char **ptr, const char *end) if (!*ptr || *ptr + sizeof(uint32_t) > end) { *ptr = NULL; - return(0); + return 0; } else { @@ -90,7 +90,7 @@ uint16_t get_uint16(const char **ptr, const char *end) if (!*ptr || *ptr + sizeof(uint16_t) > end) { *ptr = NULL; - return(0); + return 0; } else { @@ -121,7 +121,7 @@ int get_string(const char **ptr, const char *const end, char *buffer, int buflen while (*ptr < end && buffer < lim) { char c = *buffer++ = *(*ptr)++; - if (c == 0) return(0); // Success + if (c == 0) return 0; // Success } if (buffer == lim) buffer--; *buffer = 0; // Failed, so terminate string, @@ -141,7 +141,7 @@ const char *get_rdata(const char **ptr, const char *end, int rdlen) if (!*ptr || *ptr + rdlen > end) { *ptr = NULL; - return(0); + return 0; } else { diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 431e4c69078e..b3c8c5cfe5d2 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -557,7 +557,7 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, bool bDuplicate ) SetModified(); - return( pStandardPage ); + return pStandardPage; } void SdXImpressDocument::SetModified( bool bModified /* = sal_True */ ) throw() @@ -2909,7 +2909,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn mpModel->SetModified(); } - return( xDrawPage ); + return xDrawPage; } /** diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index b2b2d7822a02..a5ebc69bb11c 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -364,7 +364,7 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet, bOk = ::sd::View::SetAttributes(rSet, bReplaceAll); } - return (bOk); + return bOk; } /** diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 14149761ebf7..606fae612bfe 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -745,7 +745,7 @@ bool DrawViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) pClient->SetSdrGrafObj(NULL); } - return(bActivated); + return bActivated; } /** @@ -1097,7 +1097,7 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) mpDrawView->AdjustMarkHdl(); } - return (bOK); + return bOK; } /** diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx index 84a1a2e86ffe..6a3a269c0ade 100644 --- a/sd/source/ui/view/drviewsc.cxx +++ b/sd/source/ui/view/drviewsc.cxx @@ -245,7 +245,7 @@ sal_uInt16 DrawViewShell::GetIdBySubId( sal_uInt16 nSId ) nMappedSId = SID_DRAWTBX_CONNECTORS; } } - return( nMappedSId ); + return nMappedSId; } /** @@ -301,9 +301,9 @@ sal_uInt16 DrawViewShell::GetMappedSlot( sal_uInt16 nSId ) would be executed over and over again. The slot is initial available in the array in order to show the image correct. */ if( nSId == nSlot ) - return( 0 ); + return 0; - return( nSlot ); + return nSlot; } /** @@ -314,10 +314,10 @@ sal_uInt16 DrawViewShell::GetArrayId( sal_uInt16 nSId ) for( sal_uInt16 i = 0; i < SLOTARRAY_COUNT; i += 2 ) { if( mpSlotArray[ i ] == nSId ) - return( i ); + return i; } OSL_FAIL( "Slot in array not found!" ); - return( USHRT_MAX ); + return USHRT_MAX; } void DrawViewShell::UpdateIMapDlg( SdrObject* pObj ) diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 665e830e095a..56d7a88b9083 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -767,7 +767,7 @@ OUString DrawViewShell::GetSelectionText(bool bCompleteWords) } } - return (aStrSelection); + return aStrSelection; } bool DrawViewShell::HasSelection(bool bText) const diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index 11573dab6d37..fd009b74814d 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -353,7 +353,7 @@ EditMode FrameView::GetViewShEditMode(PageKind eKind) eMode = meHandoutEditMode; } - return (eMode); + return eMode; } void FrameView::SetViewShEditModeOnLoad (EditMode eMode) diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 3bee96e7e24e..1dbcd7b7e62f 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -1441,7 +1441,7 @@ bool OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) Invalidate( SID_PREVIEW_STATE ); } - return(bReturn); + return bReturn; } /** @@ -1832,7 +1832,7 @@ sal_uLong OutlineViewShell::Read(SvStream& rInput, const OUString& rBaseURL, sal rOutl.GetUndoManager().Clear(); - return( bRet ); + return bRet; } void OutlineViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, bool bBrowse ) diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 86fb77d7c753..3315364bd7ac 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -320,7 +320,7 @@ OutlinerView* OutlineView::GetViewByWindow (vcl::Window* pWin) const } } } - return (pOlView); + return pOlView; } /** @@ -1072,7 +1072,7 @@ bool OutlineView::SetAttributes(const SfxItemSet& rSet, bool ) mrOutlineViewShell.Invalidate (SID_PREVIEW_STATE); - return (bOk); + return bOk; } /** diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index ff3c6668e2ae..8224d7cc4ebc 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -525,12 +525,12 @@ void View::MarkListHasChanged() bool View::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) { bool bOk = FmFormView::SetAttributes(rSet, bReplaceAll); - return (bOk); + return bOk; } bool View::GetAttributes( SfxItemSet& rTargetSet, bool bOnlyHardAttr ) const { - return( FmFormView::GetAttributes( rTargetSet, bOnlyHardAttr ) ); + return FmFormView::GetAttributes( rTargetSet, bOnlyHardAttr ); } /** @@ -597,7 +597,7 @@ bool View::IsPresObjSelected(bool bOnPage, bool bOnMasterPage, bool bCheckPresOb delete pMarkList; } - return (bSelected); + return bSelected; } void View::SelectAll() @@ -806,7 +806,7 @@ SdrEndTextEditKind View::SdrEndTextEdit(bool bDontDeleteReally) pPage->onEndTextEdit( xObj.get() ); } - return(eKind); + return eKind; } /** restores the default text if the given text object is currently in edit mode and diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 5f5061b72aeb..466477e59d4f 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -497,7 +497,7 @@ long Window::SetZoomRect (const Rectangle& rZoomRect) } } - return(nNewZoom); + return nNewZoom; } void Window::SetMinZoomAutoCalc (bool bAuto) diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 933714044c2c..71d26c58ddb9 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -679,7 +679,7 @@ bool ViewShell::RequestHelp(const HelpEvent& rHEvt, ::sd::Window*) } } - return(bReturn); + return bReturn; } void ViewShell::SetFrameView (FrameView* pNewFrameView) diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 83dc9ca199bc..0581a7cb4238 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -460,7 +460,7 @@ bool ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) } } - return(bReturn); + return bReturn; } void ViewShell::MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin) |