Kaydet (Commit) 0451615f authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl

remove maHighImage from toolbox as it is unused (no setter)

Change-Id: I5feaae01fd22252654caba34097d77f75134e045
üst 986a0709
......@@ -40,7 +40,6 @@ struct ImplToolItem
vcl::Window* mpWindow;
void* mpUserData;
Image maImage;
Image maHighImage;
long mnImageAngle;
bool mbMirrorMode;
OUString maText;
......
......@@ -3114,12 +3114,7 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint,
if ( bImage && ! bLayout )
{
const Image* pImage;
if ( (nHighlight != 0) && !!(pItem->maHighImage) )
pImage = &(pItem->maHighImage);
else
pImage = &(pItem->maImage);
const Image* pImage = &(pItem->maImage);
aImageSize = pImage->GetSizePixel();
// determine drawing flags
......
......@@ -135,7 +135,6 @@ ImplToolItem::ImplToolItem( const ImplToolItem& rItem ) :
mpWindow ( rItem.mpWindow ),
mpUserData ( rItem.mpUserData ),
maImage ( rItem.maImage ),
maHighImage ( rItem.maHighImage ),
mnImageAngle ( rItem.mnImageAngle ),
mbMirrorMode ( rItem.mbMirrorMode ),
maText ( rItem.maText ),
......@@ -173,7 +172,6 @@ ImplToolItem& ImplToolItem::operator=( const ImplToolItem& rItem )
mpWindow = rItem.mpWindow;
mpUserData = rItem.mpUserData;
maImage = rItem.maImage;
maHighImage = rItem.maHighImage;
mnImageAngle = rItem.mnImageAngle;
mbMirrorMode = rItem.mbMirrorMode;
maText = rItem.maText;
......@@ -1198,8 +1196,6 @@ void ToolBox::SetItemImageAngle( sal_uInt16 nItemId, long nAngle10 )
if( nDeltaAngle && !!pItem->maImage )
{
pItem->maImage = ImplRotImage( pItem->maImage, nDeltaAngle );
if( !!pItem->maHighImage )
pItem->maHighImage = ImplRotImage( pItem->maHighImage, nDeltaAngle );
}
if ( !mbCalc )
......@@ -1238,8 +1234,6 @@ void ToolBox::SetItemImageMirrorMode( sal_uInt16 nItemId, bool bMirror )
if( !!pItem->maImage )
{
pItem->maImage = ImplMirrorImage( pItem->maImage );
if( !!pItem->maHighImage )
pItem->maHighImage = ImplMirrorImage( pItem->maHighImage );
}
if ( !mbCalc )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment