diff options
Diffstat (limited to 'svtools/source/contnr')
| -rw-r--r-- | svtools/source/contnr/imivctl1.cxx | 10 | ||||
| -rw-r--r-- | svtools/source/contnr/ivctrl.cxx | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 21b0b1fc8a57..133e378502a8 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -1635,7 +1635,7 @@ void SvxIconChoiceCtrl_Impl::PaintEntry(SvxIconChoiceCtrlEntry* pEntry, const Po } } - bool bLargeIconMode = WB_ICON == ( nWinBits & (VIEWMODE_MASK) ); + bool bLargeIconMode = WB_ICON == ( nWinBits & VIEWMODE_MASK ); sal_uInt16 nBmpPaintFlags = PAINTFLAG_VER_CENTERED; if (bLargeIconMode) nBmpPaintFlags |= PAINTFLAG_HOR_CENTERED; @@ -1772,7 +1772,7 @@ tools::Rectangle SvxIconChoiceCtrl_Impl::CalcBmpRect( SvxIconChoiceCtrlEntry* pE aBound.SetPos( *pPos ); Point aPos( aBound.TopLeft() ); - switch( nWinBits & (VIEWMODE_MASK) ) + switch( nWinBits & VIEWMODE_MASK ) { case WB_ICON: { @@ -1816,7 +1816,7 @@ tools::Rectangle SvxIconChoiceCtrl_Impl::CalcTextRect( SvxIconChoiceCtrlEntry* p long nBoundWidth = aBound.GetWidth(); long nBoundHeight = aBound.GetHeight(); - switch( nWinBits & (VIEWMODE_MASK) ) + switch( nWinBits & VIEWMODE_MASK ) { case WB_ICON: aPos.Y() += aImageSize.Height(); @@ -1857,7 +1857,7 @@ long SvxIconChoiceCtrl_Impl::CalcBoundingWidth() const long nStringWidth = GetItemSize( IcnViewFieldType::Text ).Width(); long nWidth = 0; - switch( nWinBits & (VIEWMODE_MASK) ) + switch( nWinBits & VIEWMODE_MASK ) { case WB_ICON: nWidth = std::max( nStringWidth, aImageSize.Width() ); @@ -1878,7 +1878,7 @@ long SvxIconChoiceCtrl_Impl::CalcBoundingHeight() const long nStringHeight = GetItemSize(IcnViewFieldType::Text).Height(); long nHeight = 0; - switch( nWinBits & (VIEWMODE_MASK) ) + switch( nWinBits & VIEWMODE_MASK ) { case WB_ICON: nHeight = aImageSize.Height(); diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 4bc2175cc6c2..5eef13d45aa5 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -349,10 +349,10 @@ void SvtIconChoiceCtrl::SetBackground( const Wallpaper& rPaper ) WallpaperStyle eStyle = aBackground.GetStyle(); Color aBack( aBackground.GetColor()); Color aTrans( COL_TRANSPARENT ); - if( aBack == aTrans && ( + if( aBack == aTrans && (!aBackground.IsBitmap() || - aBackground.GetBitmap().IsTransparent() || - (eStyle != WallpaperStyle::Tile && eStyle != WallpaperStyle::Scale)))) + aBackground.GetBitmap().IsTransparent() || + (eStyle != WallpaperStyle::Tile && eStyle != WallpaperStyle::Scale)) ) { aBackground.SetColor( rStyleSettings.GetFieldColor() ); } |