diff options
author | Michael Meeks <michael.meeks@suse.com> | 2012-06-01 14:46:37 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-06-01 14:47:01 +0100 |
commit | 2c4fd87a5a15fbe04fafdbf205ff2737a1ce6a82 (patch) | |
tree | 6f14b1c3a82840eacc1eb18446b619e13d94ae58 /sd/source | |
parent | d369d4fac79ceea879c626df4d4ee3e290dfe8fa (diff) |
targetted reversion of minor SAL_N_ELEMENTS tweak
Change-Id: I4f907aecd72f55091184aa1509506a46010f1061
Diffstat (limited to 'sd/source')
-rw-r--r-- | sd/source/ui/annotations/annotationmanager.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index f4831f3c593f..0561ddb9cda1 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -1108,7 +1108,7 @@ Color AnnotationManagerImpl::GetColor(sal_uInt16 aAuthorIndex) COL_AUTHOR4_NORMAL, COL_AUTHOR5_NORMAL, COL_AUTHOR6_NORMAL, COL_AUTHOR7_NORMAL, COL_AUTHOR8_NORMAL, COL_AUTHOR9_NORMAL }; - return Color( aArrayNormal[ aAuthorIndex % (SAL_N_ELEMENTS(aArrayNormal))]); + return Color( aArrayNormal[ aAuthorIndex % (sizeof( aArrayNormal )/ sizeof( aArrayNormal[0] ))]); } else return Color(COL_WHITE); @@ -1123,7 +1123,7 @@ Color AnnotationManagerImpl::GetColorLight(sal_uInt16 aAuthorIndex) COL_AUTHOR4_LIGHT, COL_AUTHOR5_LIGHT, COL_AUTHOR6_LIGHT, COL_AUTHOR7_LIGHT, COL_AUTHOR8_LIGHT, COL_AUTHOR9_LIGHT }; - return Color( aArrayLight[ aAuthorIndex % (SAL_N_ELEMENTS(aArrayLight))]); + return Color( aArrayLight[ aAuthorIndex % (sizeof( aArrayLight )/ sizeof( aArrayLight[0] ))]); } else return Color(COL_WHITE); @@ -1138,7 +1138,7 @@ Color AnnotationManagerImpl::GetColorDark(sal_uInt16 aAuthorIndex) COL_AUTHOR4_DARK, COL_AUTHOR5_DARK, COL_AUTHOR6_DARK, COL_AUTHOR7_DARK, COL_AUTHOR8_DARK, COL_AUTHOR9_DARK }; - return Color( aArrayAnkor[ aAuthorIndex % (SAL_N_ELEMENTS(aArrayAnkor))]); + return Color( aArrayAnkor[ aAuthorIndex % (sizeof( aArrayAnkor ) / sizeof( aArrayAnkor[0] ))]); } else return Color(COL_WHITE); |