mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

default assignment and ctor are fine here

Browse Source 
Change-Id: I50edc71ee8bb4398764f2e15180a0269aac233ce
This commit is contained in:
Caolán McNamara
2016-08-30 13:01:06 +01:00
parent 04311182b6
commit a2dbaac6a8
2 changed files with 1 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vcl/inc/toolbox.h
View File

@@ -34,7 +34,7 @@ namespace vcl { class Window; }
struct ImplToolItem
{
VclPtr<vcl::Window> mpWindow;
VclPtr<vcl::Window> mpWindow; //don't dispose mpWindow - we get copied around
void* mpUserData;
Image maImage;
Image maImageOriginal;
@@ -75,10 +75,6 @@ struct ImplToolItem
ImplToolItem( sal_uInt16 nItemId, const Image& rImage,
const OUString& rTxt,
ToolBoxItemBits nItemBits );
~ImplToolItem();
ImplToolItem( const ImplToolItem& );
ImplToolItem& operator=(const ImplToolItem&);
// returns the size of a item, taking toolbox orientation into account
// the default size is the precomputed size for standard items

72
vcl/source/window/toolbox2.cxx
View File

@@ -127,78 +127,6 @@ ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const Image& rImage,
init(nItemId, nItemBits, false);
}
ImplToolItem::ImplToolItem( const ImplToolItem& rItem ) :
mpWindow ( rItem.mpWindow ),
mpUserData ( rItem.mpUserData ),
maImage ( rItem.maImage ),
maImageOriginal ( rItem.maImageOriginal ),
mnImageAngle ( rItem.mnImageAngle ),
mbMirrorMode ( rItem.mbMirrorMode ),
maText ( rItem.maText ),
maQuickHelpText ( rItem.maQuickHelpText ),
maHelpText ( rItem.maHelpText ),
maCommandStr ( rItem.maCommandStr ),
maHelpId ( rItem.maHelpId ),
maRect ( rItem.maRect ),
maCalcRect ( rItem.maCalcRect ),
maMinimalItemSize ( rItem.maMinimalItemSize ),
maItemSize ( rItem.maItemSize ),
mnSepSize ( rItem.mnSepSize ),
mnDropDownArrowWidth ( rItem.mnDropDownArrowWidth ),
maContentSize ( rItem.maContentSize ),
meType ( rItem.meType ),
mnBits ( rItem.mnBits ),
meState ( rItem.meState ),
mnId ( rItem.mnId ),
mbEnabled ( rItem.mbEnabled ),
mbVisible ( rItem.mbVisible ),
mbEmptyBtn ( rItem.mbEmptyBtn ),
mbShowWindow ( rItem.mbShowWindow ),
mbBreak ( rItem.mbBreak ),
mbVisibleText ( rItem.mbVisibleText ),
mbExpand ( rItem.mbExpand )
{
}
ImplToolItem::~ImplToolItem()
{
// don't dispose mpWindow - we get copied around.
}
ImplToolItem& ImplToolItem::operator=( const ImplToolItem& rItem )
{
mpWindow = rItem.mpWindow;
mpUserData = rItem.mpUserData;
maImage = rItem.maImage;
maImageOriginal = rItem.maImageOriginal;
mnImageAngle = rItem.mnImageAngle;
mbMirrorMode = rItem.mbMirrorMode;
maText = rItem.maText;
maQuickHelpText = rItem.maQuickHelpText;
maHelpText = rItem.maHelpText;
maCommandStr = rItem.maCommandStr;
maHelpId = rItem.maHelpId;
maRect = rItem.maRect;
maCalcRect = rItem.maCalcRect;
mnSepSize = rItem.mnSepSize;
mnDropDownArrowWidth = rItem.mnDropDownArrowWidth;
maContentSize = rItem.maContentSize;
maMinimalItemSize = rItem.maMinimalItemSize;
maItemSize = rItem.maItemSize;
mbVisibleText = rItem.mbVisibleText;
mbExpand = rItem.mbExpand;
meType = rItem.meType;
mnBits = rItem.mnBits;
meState = rItem.meState;
mnId = rItem.mnId;
mbEnabled = rItem.mbEnabled;
mbVisible = rItem.mbVisible;
mbEmptyBtn = rItem.mbEmptyBtn;
mbShowWindow = rItem.mbShowWindow;
mbBreak = rItem.mbBreak;
return *this;
}
Size ImplToolItem::GetSize( bool bHorz, bool bCheckMaxWidth, long maxWidth, const Size& rDefaultSize )
{
Size aSize( rDefaultSize ); // the size of 'standard' toolbox items