svx/source/items/pageitem.cxx | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
New commits: commit ce9deff347ebdb1ab6faced894e8de9979eabb0e Author: Werner Koerner <wk66...@gmail.com> Date: Sat Dec 29 12:56:02 2012 +0100 Change if-statements to switch The bit-values do overlap, 3rd and 4th case were never reached. Change-Id: Iaaf39a11811c4e28c34260a7eab7fa0476165d1b Reviewed-on: https://gerrit.libreoffice.org/1497 Reviewed-by: Tomáš Chvátal <tchva...@suse.cz> Tested-by: Tomáš Chvátal <tchva...@suse.cz> diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index e7062ee..67d491d 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -84,15 +84,14 @@ int SvxPageItem::operator==( const SfxPoolItem& rAttr ) const inline XubString GetUsageText( const sal_uInt16 eU ) { - if ( eU & SVX_PAGE_LEFT ) - return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_LEFT); - if ( eU & SVX_PAGE_RIGHT ) - return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_RIGHT); - if ( eU & SVX_PAGE_ALL ) - return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_ALL); - if ( eU & SVX_PAGE_MIRROR ) - return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_MIRROR); - return String(); + switch( eU & 0x000f ) + { + case SVX_PAGE_LEFT : return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_LEFT); + case SVX_PAGE_RIGHT : return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_RIGHT); + case SVX_PAGE_ALL : return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_ALL); + case SVX_PAGE_MIRROR: return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_MIRROR); + default: return String(); + } } //------------------------------------------------------------------------
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits