summaryrefslogtreecommitdiffstats
path: root/sd/source/ui/dlg
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/dlg')
-rw-r--r--sd/source/ui/dlg/animobjs.cxx20
-rw-r--r--sd/source/ui/dlg/brkdlg.cxx2
-rw-r--r--sd/source/ui/dlg/custsdlg.cxx4
-rw-r--r--sd/source/ui/dlg/dlgfield.cxx2
-rw-r--r--sd/source/ui/dlg/filedlg.cxx2
-rw-r--r--sd/source/ui/dlg/gluectrl.cxx8
-rw-r--r--sd/source/ui/dlg/inspagob.cxx2
-rw-r--r--sd/source/ui/dlg/navigatr.cxx14
-rw-r--r--sd/source/ui/dlg/present.cxx6
-rw-r--r--sd/source/ui/dlg/sdpreslt.cxx2
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx10
-rw-r--r--sd/source/ui/dlg/tpaction.cxx22
-rw-r--r--sd/source/ui/dlg/tpoption.cxx16
13 files changed, 55 insertions, 55 deletions
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)
generated by cgit (git 2.34.1) at 2024-07-23 02:45:55 +0000