diff options
| -rw-r--r-- | include/vcl/toolbox.hxx | 1 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbxcolorupdate.cxx | 2 | ||||
| -rw-r--r-- | vcl/inc/toolbox.h | 1 | ||||
| -rw-r--r-- | vcl/source/window/toolbox2.cxx | 21 |
4 files changed, 5 insertions, 20 deletions
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index d7b6af8e92b9..797462ff0f85 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -374,7 +374,6 @@ public: void* GetItemData( sal_uInt16 nItemId ) const; void SetItemImage( sal_uInt16 nItemId, const Image& rImage ); Image GetItemImage( sal_uInt16 nItemId ) const; - Image GetItemImageOriginal( sal_uInt16 nItemId ) const; void SetItemImageAngle( sal_uInt16 nItemId, long nAngle10 ); void SetItemImageMirrorMode( sal_uInt16 nItemId, bool bMirror ); void SetItemText( sal_uInt16 nItemId, const OUString& rText ); diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx index f41b91369571..e452bc1aaedf 100644 --- a/svx/source/tbxctrls/tbxcolorupdate.cxx +++ b/svx/source/tbxctrls/tbxcolorupdate.cxx @@ -68,7 +68,7 @@ namespace svx void ToolboxButtonColorUpdater::Update(const Color& rColor, bool bForceUpdate) { - Image aImage(mpTbx->GetItemImageOriginal(mnBtnId)); + Image aImage(mpTbx->GetItemImage(mnBtnId)); Size aItemSize(mpTbx->GetItemContentSize(mnBtnId)); const bool bSizeChanged = (maBmpSize != aItemSize); diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h index e45c394e8658..7be02bf73cab 100644 --- a/vcl/inc/toolbox.h +++ b/vcl/inc/toolbox.h @@ -37,7 +37,6 @@ struct ImplToolItem VclPtr<vcl::Window> mpWindow; //don't dispose mpWindow - we get copied around void* mpUserData; Image maImage; - Image maImageOriginal; long mnImageAngle; bool mbMirrorMode; OUString maText; diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 983fa1fbddf9..f5c801625417 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -105,8 +105,7 @@ ImplToolItem::ImplToolItem() ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const Image& rImage, ToolBoxItemBits nItemBits ) : - maImage( rImage ), - maImageOriginal( rImage ) + maImage( rImage ) { init(nItemId, nItemBits, false); } @@ -121,7 +120,6 @@ ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const OUString& rText, ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const Image& rImage, const OUString& rText, ToolBoxItemBits nItemBits ) : maImage( rImage ), - maImageOriginal( rImage ), maText( rText ) { init(nItemId, nItemBits, false); @@ -953,13 +951,10 @@ void ToolBox::SetItemImage( sal_uInt16 nItemId, const Image& rImage ) if ( nPos != TOOLBOX_ITEM_NOTFOUND ) { - Image aImage(rImage); - ImplToolItem* pItem = &mpData->m_aItems[nPos]; Size aOldSize = pItem->maImage.GetSizePixel(); - pItem->maImageOriginal = aImage; - pItem->maImage = aImage; + pItem->maImage = rImage; // only once all is calculated, do extra work if (!mbCalc) @@ -1014,7 +1009,6 @@ void ToolBox::SetItemImageAngle( sal_uInt16 nItemId, long nAngle10 ) if( nDeltaAngle && !!pItem->maImage ) { pItem->maImage = ImplRotImage( pItem->maImage, nDeltaAngle ); - pItem->maImageOriginal = ImplRotImage( pItem->maImageOriginal, nDeltaAngle ); } if (!mbCalc) @@ -1052,7 +1046,6 @@ void ToolBox::SetItemImageMirrorMode( sal_uInt16 nItemId, bool bMirror ) if (!!pItem->maImage) { pItem->maImage = ImplMirrorImage(pItem->maImage); - pItem->maImageOriginal = ImplMirrorImage(pItem->maImageOriginal); } if (!mbCalc) @@ -1067,12 +1060,6 @@ Image ToolBox::GetItemImage(sal_uInt16 nItemId) const return pItem ? pItem->maImage : Image(); } -Image ToolBox::GetItemImageOriginal(sal_uInt16 nItemId) const -{ - ImplToolItem* pItem = ImplGetItem(nItemId); - return pItem ? pItem->maImageOriginal : Image(); -} - void ToolBox::SetItemText( sal_uInt16 nItemId, const OUString& rText ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1660,7 +1647,7 @@ void ToolBox::UpdateCustomMenu() { sal_uInt16 id = it->mnId + TOOLBOX_MENUITEM_START; MenuItemBits nMenuItemBits = ConvertBitsFromToolBoxToMenu(it->mnBits); - pMenu->InsertItem( id, it->maText, it->maImageOriginal, nMenuItemBits); + pMenu->InsertItem( id, it->maText, it->maImage, nMenuItemBits); pMenu->SetItemCommand( id, it->maCommandStr ); pMenu->EnableItem( id, it->mbEnabled ); pMenu->CheckItem ( id, it->meState == TRISTATE_TRUE ); @@ -1678,7 +1665,7 @@ void ToolBox::UpdateCustomMenu() { sal_uInt16 id = it->mnId + TOOLBOX_MENUITEM_START; MenuItemBits nMenuItemBits = ConvertBitsFromToolBoxToMenu(it->mnBits); - pMenu->InsertItem( id, it->maText, it->maImageOriginal, nMenuItemBits ); + pMenu->InsertItem( id, it->maText, it->maImage, nMenuItemBits ); pMenu->SetItemCommand( id, it->maCommandStr ); pMenu->EnableItem( id, it->mbEnabled ); pMenu->CheckItem( id, it->meState == TRISTATE_TRUE ); |