diff options
| author | Matteo Casalin <matteo.casalin@gmx.com> | 2013-01-03 10:36:59 +0100 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@gmx.com> | 2013-01-03 11:01:49 +0100 |
| commit | 95fc4bdb8ee6cefa3514895ba2f12789e2879956 (patch) | |
| tree | e90942758140681b7390522ba98eb9b9b76c3fc8 /sd | |
| parent | 52ad6005d3350127234667384266ae7a368fe067 (diff) | |
Remove unneeded 'else' and fix 'else if' style
Change-Id: I774af9ca0631e931ddc8c5025981dabca557e325
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/annotations/annotationmanager.cxx | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 89d69aa8385c..3ddcd33a8717 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -127,8 +127,8 @@ static SfxBindings* getBindings( ViewShellBase& rBase ) { if( rBase.GetMainViewShell().get() && rBase.GetMainViewShell()->GetViewFrame() ) return &rBase.GetMainViewShell()->GetViewFrame()->GetBindings(); - else - return 0; + + return 0; } // -------------------------------------------------------------------- @@ -137,8 +137,8 @@ static SfxDispatcher* getDispatcher( ViewShellBase& rBase ) { if( rBase.GetMainViewShell().get() && rBase.GetMainViewShell()->GetViewFrame() ) return rBase.GetMainViewShell()->GetViewFrame()->GetDispatcher(); - else - return 0; + + return 0; } com::sun::star::util::DateTime getCurrentDateTime() @@ -161,11 +161,9 @@ OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotatio Date aDate = Date( aDateTime.Day, aDateTime.Month, aDateTime.Year ); if (aDate==aSysDate) sRet = sRet + String(SdResId(STR_ANNOTATION_TODAY)); - else - if (aDate == Date(aSysDate-1)) + else if (aDate == Date(aSysDate-1)) sRet = sRet + String(SdResId(STR_ANNOTATION_YESTERDAY)); - else - if (aDate.IsValidAndGregorian() ) + else if (aDate.IsValidAndGregorian() ) sRet = sRet + rLocalData.getDate(aDate); Time aTime( aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.HundredthSeconds ); @@ -1101,8 +1099,8 @@ Color AnnotationManagerImpl::GetColor(sal_uInt16 aAuthorIndex) return Color( aArrayNormal[ aAuthorIndex % (sizeof( aArrayNormal )/ sizeof( aArrayNormal[0] ))]); } - else - return Color(COL_WHITE); + + return Color(COL_WHITE); } Color AnnotationManagerImpl::GetColorLight(sal_uInt16 aAuthorIndex) @@ -1116,8 +1114,8 @@ Color AnnotationManagerImpl::GetColorLight(sal_uInt16 aAuthorIndex) return Color( aArrayLight[ aAuthorIndex % (sizeof( aArrayLight )/ sizeof( aArrayLight[0] ))]); } - else - return Color(COL_WHITE); + + return Color(COL_WHITE); } Color AnnotationManagerImpl::GetColorDark(sal_uInt16 aAuthorIndex) @@ -1131,8 +1129,8 @@ Color AnnotationManagerImpl::GetColorDark(sal_uInt16 aAuthorIndex) return Color( aArrayAnkor[ aAuthorIndex % (sizeof( aArrayAnkor ) / sizeof( aArrayAnkor[0] ))]); } - else - return Color(COL_WHITE); + + return Color(COL_WHITE); } SdPage* AnnotationManagerImpl::GetNextPage( SdPage* pPage, bool bForeward ) |