Kaydet (Commit) 517e5d1e authored tarafından Noel Grandin's avatar Noel Grandin

fix tdf#92861, AutoCorrect Options checkboxes do not work

caused by commit e9c3583c
"improve the returnbyref loplugin"

Change-Id: Ib8703e06e2f150538cdffcd08deca9c841e824b4
üst 025fb3c6
...@@ -2719,7 +2719,7 @@ void SvTreeListBox::ImplEditEntry( SvTreeListEntry* pEntry ) ...@@ -2719,7 +2719,7 @@ void SvTreeListBox::ImplEditEntry( SvTreeListEntry* pEntry )
nTabPos = pTab->GetPos(); nTabPos = pTab->GetPos();
if( !bIsMouseTriggered || (nClickX > nTabPos && (nNextTabPos == -1 || nClickX < nNextTabPos ) ) ) if( !bIsMouseTriggered || (nClickX > nTabPos && (nNextTabPos == -1 || nClickX < nNextTabPos ) ) )
{ {
pItem = &static_cast<SvLBoxString&>( rTmpItem ); pItem = static_cast<SvLBoxString*>( &rTmpItem );
break; break;
} }
} }
...@@ -3281,7 +3281,7 @@ SvLBoxItem* SvTreeListBox::GetItem_Impl( SvTreeListEntry* pEntry, long nX, ...@@ -3281,7 +3281,7 @@ SvLBoxItem* SvTreeListBox::GetItem_Impl( SvTreeListEntry* pEntry, long nX,
sal_uInt16 nTabCount = aTabs.size(); sal_uInt16 nTabCount = aTabs.size();
sal_uInt16 nItemCount = pEntry->ItemCount(); sal_uInt16 nItemCount = pEntry->ItemCount();
SvLBoxTab* pTab = aTabs.front(); SvLBoxTab* pTab = aTabs.front();
SvLBoxItem& rItem = pEntry->GetItem(0); SvLBoxItem* pItem = &pEntry->GetItem(0);
sal_uInt16 nNextItem = 1; sal_uInt16 nNextItem = 1;
nX -= GetMapMode().GetOrigin().X(); nX -= GetMapMode().GetOrigin().X();
long nRealWidth = pImp->GetOutputSize().Width(); long nRealWidth = pImp->GetOutputSize().Width();
...@@ -3302,7 +3302,7 @@ SvLBoxItem* SvTreeListBox::GetItem_Impl( SvTreeListEntry* pEntry, long nX, ...@@ -3302,7 +3302,7 @@ SvLBoxItem* SvTreeListBox::GetItem_Impl( SvTreeListEntry* pEntry, long nX,
nNextTabPos += 50; nNextTabPos += 50;
} }
Size aItemSize( rItem.GetSize(this, pEntry)); Size aItemSize( pItem->GetSize(this, pEntry));
nStart += pTab->CalcOffset( aItemSize.Width(), nNextTabPos - nStart ); nStart += pTab->CalcOffset( aItemSize.Width(), nNextTabPos - nStart );
long nLen = aItemSize.Width(); long nLen = aItemSize.Width();
if( pNextTab ) if( pNextTab )
...@@ -3317,7 +3317,7 @@ SvLBoxItem* SvTreeListBox::GetItem_Impl( SvTreeListEntry* pEntry, long nX, ...@@ -3317,7 +3317,7 @@ SvLBoxItem* SvTreeListBox::GetItem_Impl( SvTreeListEntry* pEntry, long nX,
if( nX >= nStart && nX < (nStart+nLen ) ) if( nX >= nStart && nX < (nStart+nLen ) )
{ {
pItemClicked = &rItem; pItemClicked = pItem;
if( ppTab ) if( ppTab )
{ {
*ppTab = pTab; *ppTab = pTab;
...@@ -3327,7 +3327,7 @@ SvLBoxItem* SvTreeListBox::GetItem_Impl( SvTreeListEntry* pEntry, long nX, ...@@ -3327,7 +3327,7 @@ SvLBoxItem* SvTreeListBox::GetItem_Impl( SvTreeListEntry* pEntry, long nX,
if( nNextItem >= nItemCount || nNextItem >= nTabCount) if( nNextItem >= nItemCount || nNextItem >= nTabCount)
break; break;
pTab = aTabs[ nNextItem ]; pTab = aTabs[ nNextItem ];
rItem = pEntry->GetItem( nNextItem ); pItem = &pEntry->GetItem( nNextItem );
nNextItem++; nNextItem++;
} }
return pItemClicked; return pItemClicked;
......
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