improve the returnbyref loplugin

Change-Id: I1b510a6194282dfa4a9001d473127c5ebc8b44eb
Reviewed-on: https://gerrit.libreoffice.org/16731
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

7 files changed, 69 insertions, 70 deletions

diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx
index bdbac957da3e..dccfb017a79b 100644
--- a/svtools/source/contnr/simptabl.cxx
+++ b/svtools/source/contnr/simptabl.cxx
@@ -454,7 +454,7 @@ SvLBoxItem* SvSimpleTable::GetEntryAtPos( SvTreeListEntry* pEntry, sal_uInt16 nP
 
         if( nPos < nCount )
         {
-            pItem = pEntry->GetItem( nPos);
+            pItem = &pEntry->GetItem( nPos);
         }
     }
     return pItem;
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index f4a1deebd2e2..f6aa81e1a842 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -225,13 +225,13 @@ void SvImpLBox::CalcCellFocusRect( SvTreeListEntry* pEntry, Rectangle& rRect )
     {
         if ( nCurTabPos > FIRST_ENTRY_TAB )
         {
-            SvLBoxItem* pItem = pCursor->GetItem( nCurTabPos );
-            rRect.Left() = pView->GetTab( pCursor, pItem )->GetPos();
+            SvLBoxItem& rItem = pCursor->GetItem( nCurTabPos );
+            rRect.Left() = pView->GetTab( pCursor, &rItem )->GetPos();
         }
         if (pCursor->ItemCount() > static_cast<size_t>(nCurTabPos+1))
         {
-            SvLBoxItem* pNextItem = pCursor->GetItem( nCurTabPos + 1 );
-            long nRight = pView->GetTab( pCursor, pNextItem )->GetPos() - 1;
+            SvLBoxItem& rNextItem = pCursor->GetItem( nCurTabPos + 1 );
+            long nRight = pView->GetTab( pCursor, &rNextItem )->GetPos() - 1;
             if ( nRight < rRect.Right() )
                 rRect.Right() = nRight;
         }
@@ -3259,7 +3259,7 @@ bool SvImpLBox::SetMostRight( SvTreeListEntry* pEntry )
             nLastTab = nLastItem;
 
         SvLBoxTab* pTab = pView->aTabs[ nLastTab ];
-        SvLBoxItem* pItem = pEntry->GetItem( nLastTab );
+        SvLBoxItem& rItem = pEntry->GetItem( nLastTab );
 
         long nTabPos = pView->GetTabPos( pEntry, pTab );
 
@@ -3270,7 +3270,7 @@ bool SvImpLBox::SetMostRight( SvTreeListEntry* pEntry )
 
         long nNextTab = nTabPos < nMaxRight ? nMaxRight : nMaxRight + 50;
         long nTabWidth = nNextTab - nTabPos + 1;
-        long nItemSize = pItem->GetSize(pView,pEntry).Width();
+        long nItemSize = rItem.GetSize(pView,pEntry).Width();
         long nOffset = pTab->CalcOffset( nItemSize, nTabWidth );
 
         long nRight = nTabPos + nOffset + nItemSize;
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 562cf20258fc..034eb57be27a 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -263,19 +263,19 @@ OUString SvTabListBox::GetEntryText( SvTreeListEntry* pEntry, sal_uInt16 nCol )
         sal_uInt16 nCur = 0;
         while( nCur < nCount )
         {
-            const SvLBoxItem* pStr = pEntry->GetItem( nCur );
-            if (pStr->GetType() == SV_ITEM_ID_LBOXSTRING)
+            const SvLBoxItem& rStr = pEntry->GetItem( nCur );
+            if (rStr.GetType() == SV_ITEM_ID_LBOXSTRING)
             {
                 if( nCol == 0xffff )
                 {
                     if (!aResult.isEmpty())
                         aResult += "\t";
-                    aResult += static_cast<const SvLBoxString*>(pStr)->GetText();
+                    aResult += static_cast<const SvLBoxString&>(rStr).GetText();
                 }
                 else
                 {
                     if( nCol == 0 )
-                        return static_cast<const SvLBoxString*>(pStr)->GetText();
+                        return static_cast<const SvLBoxString&>(rStr).GetText();
                     nCol--;
                 }
             }
@@ -312,13 +312,13 @@ void SvTabListBox::SetEntryText(const OUString& rStr, SvTreeListEntry* pEntry, s
     const sal_uInt16 nCount = pEntry->ItemCount();
     for (sal_uInt16 nCur = 0; nCur < nCount; ++nCur)
     {
-        SvLBoxItem* pStr = pEntry->GetItem( nCur );
-        if (pStr && pStr->GetType() == SV_ITEM_ID_LBOXSTRING)
+        SvLBoxItem& rBoxItem = pEntry->GetItem( nCur );
+        if (rBoxItem.GetType() == SV_ITEM_ID_LBOXSTRING)
         {
             if (!nCol || nCol==0xFFFF)
             {
                 const OUString aTemp(GetToken(rStr, nIndex));
-                static_cast<SvLBoxString*>(pStr)->SetText( aTemp );
+                static_cast<SvLBoxString&>(rBoxItem).SetText( aTemp );
                 if (!nCol && nIndex<0)
                     break;
             }
@@ -342,9 +342,9 @@ OUString SvTabListBox::GetCellText( sal_uLong nPos, sal_uInt16 nCol ) const
     OUString aResult;
     if (pEntry && pEntry->ItemCount() > static_cast<size_t>(nCol+1))
     {
-        const SvLBoxItem* pStr = pEntry->GetItem( nCol + 1 );
-        if (pStr && pStr->GetType() == SV_ITEM_ID_LBOXSTRING)
-            aResult = static_cast<const SvLBoxString*>(pStr)->GetText();
+        const SvLBoxItem& rStr = pEntry->GetItem( nCol + 1 );
+        if (rStr.GetType() == SV_ITEM_ID_LBOXSTRING)
+            aResult = static_cast<const SvLBoxString&>(rStr).GetText();
     }
     return aResult;
 }
@@ -400,20 +400,20 @@ OUString SvTabListBox::GetTabEntryText( sal_uLong nPos, sal_uInt16 nCol ) const
         sal_uInt16 nCur = ( 0 == nCol && IsCellFocusEnabled() ) ? GetCurrentTabPos() : 0;
         while( nCur < nCount )
         {
-            const SvLBoxItem* pStr = pEntry->GetItem( nCur );
-            if (pStr->GetType() == SV_ITEM_ID_LBOXSTRING)
+            const SvLBoxItem& rBoxItem = pEntry->GetItem( nCur );
+            if (rBoxItem.GetType() == SV_ITEM_ID_LBOXSTRING)
             {
                 if ( nCol == 0xffff )
                 {
                     if (!aResult.isEmpty())
                         aResult += "\t";
-                    aResult += static_cast<const SvLBoxString*>(pStr)->GetText();
+                    aResult += static_cast<const SvLBoxString&>(rBoxItem).GetText();
                 }
                 else
                 {
                     if ( nCol == 0 )
                     {
-                        OUString sRet = static_cast<const SvLBoxString*>(pStr)->GetText();
+                        OUString sRet = static_cast<const SvLBoxString&>(rBoxItem).GetText();
                         if ( sRet.isEmpty() )
                             sRet = SVT_RESSTR( STR_SVT_ACC_EMPTY_FIELD );
                         return sRet;
@@ -545,11 +545,11 @@ void SvHeaderTabListBox::InitHeaderBar( HeaderBar* pHeaderBar )
 bool SvHeaderTabListBox::IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol )
 {
     SvButtonState eState = SV_BUTTON_UNCHECKED;
-    SvLBoxButton* pItem = static_cast<SvLBoxButton*>( pEntry->GetItem( nCol + 1 ) );
+    SvLBoxButton& rItem = static_cast<SvLBoxButton&>( pEntry->GetItem( nCol + 1 ) );
 
-    if (pItem && pItem->GetType() == SV_ITEM_ID_LBOXBUTTON)
+    if (rItem.GetType() == SV_ITEM_ID_LBOXBUTTON)
     {
-        SvItemStateFlags nButtonFlags = pItem->GetButtonFlags();
+        SvItemStateFlags nButtonFlags = rItem.GetButtonFlags();
         eState = SvLBoxButtonData::ConvertToButtonState( nButtonFlags );
     }
 
@@ -655,11 +655,11 @@ bool SvHeaderTabListBox::IsCellCheckBox( long _nRow, sal_uInt16 _nColumn, TriSta
         sal_uInt16 nItemCount = pEntry->ItemCount();
         if ( nItemCount > ( _nColumn + 1 ) )
         {
-            SvLBoxItem* pItem = pEntry->GetItem( _nColumn + 1 );
-            if (pItem && pItem->GetType() == SV_ITEM_ID_LBOXBUTTON)
+            SvLBoxItem& rItem = pEntry->GetItem( _nColumn + 1 );
+            if (rItem.GetType() == SV_ITEM_ID_LBOXBUTTON)
             {
                 bRet = true;
-                _rState = ( ( static_cast<SvLBoxButton*>(pItem)->GetButtonFlags() & SvItemStateFlags::UNCHECKED ) == SvItemStateFlags::NONE )
+                _rState = ( ( static_cast<SvLBoxButton&>(rItem).GetButtonFlags() & SvItemStateFlags::UNCHECKED ) == SvItemStateFlags::NONE )
                             ? TRISTATE_TRUE : TRISTATE_FALSE;
             }
         }
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 6114df96723e..c3d531a6550e 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -349,8 +349,8 @@ const Size& SvLBoxItem::GetSize(const SvTreeListBox* pView, const SvTreeListEntr
 
 const Size& SvLBoxItem::GetSize(const SvViewDataEntry* pData, sal_uInt16 nItemPos)
 {
-    const SvViewDataItem* pIData = pData->GetItem(nItemPos);
-    return pIData->maSize;
+    const SvViewDataItem& rIData = pData->GetItem(nItemPos);
+    return rIData.maSize;
 }
 
 struct SvTreeListBoxImpl
@@ -800,8 +800,8 @@ void SvTreeListBox::RecalcViewData()
         sal_uInt16 nCurPos = 0;
         while ( nCurPos < nCount )
         {
-            SvLBoxItem* pItem = pEntry->GetItem( nCurPos );
-            pItem->InitViewData( this, pEntry );
+            SvLBoxItem& rItem = pEntry->GetItem( nCurPos );
+            rItem.InitViewData( this, pEntry );
             nCurPos++;
         }
         pEntry = Next( pEntry );
@@ -934,7 +934,7 @@ const SvViewDataItem* SvTreeListBox::GetViewDataItem(const SvTreeListEntry* pEnt
     const SvViewDataEntry* pEntryData = SvListView::GetViewData(pEntry);
     DBG_ASSERT(pEntryData,"Entry not in View");
     sal_uInt16 nItemPos = pEntry->GetPos(pItem);
-    return pEntryData->GetItem(nItemPos);
+    return &pEntryData->GetItem(nItemPos);
 }
 
 SvViewDataEntry* SvTreeListBox::CreateViewData( SvTreeListEntry* )
@@ -953,10 +953,9 @@ void SvTreeListBox::InitViewData( SvViewDataEntry* pData, SvTreeListEntry* pEntr
     sal_uInt16 nCurPos = 0;
     while( nCurPos < nCount )
     {
-        SvLBoxItem* pItem = pInhEntry->GetItem( nCurPos );
-        SvViewDataItem* pItemData = pEntryData->GetItem(nCurPos);
-        pItem->InitViewData( this, pInhEntry, pItemData );
-        pItemData++;
+        SvLBoxItem& rItem = pInhEntry->GetItem( nCurPos );
+        SvViewDataItem& rItemData = pEntryData->GetItem(nCurPos);
+        rItem.InitViewData( this, pInhEntry, &rItemData );
         nCurPos++;
     }
 }
@@ -1479,9 +1478,9 @@ OUString SvTreeListBox::SearchEntryTextWithHeadTitle( SvTreeListEntry* pEntry )
     while( nCur < nCount )
     {
         // MT: SV_ITEM_ID_EXTENDRLBOXSTRING / GetExtendText() was in use in IA2 cws, but only used in sc: ScSolverOptionsString. Needed?
-        SvLBoxItem* pItem = pEntry->GetItem( nCur );
-        if ( (pItem->GetType() == SV_ITEM_ID_LBOXSTRING ) &&
-             !static_cast<SvLBoxString*>( pItem )->GetText().isEmpty() )
+        SvLBoxItem& rItem = pEntry->GetItem( nCur );
+        if ( (rItem.GetType() == SV_ITEM_ID_LBOXSTRING ) &&
+             !static_cast<SvLBoxString&>( rItem ).GetText().isEmpty() )
         {
             //want the column header
             if (!headString.isEmpty())
@@ -1513,11 +1512,11 @@ OUString SvTreeListBox::SearchEntryTextWithHeadTitle( SvTreeListEntry* pEntry )
                     }
                     nHeaderCur++;
                 }
-                sRet += static_cast<SvLBoxString*>( pItem )->GetText();
+                sRet += static_cast<SvLBoxString&>( rItem ).GetText();
             }
             else
             {
-                sRet += static_cast<SvLBoxString*>( pItem )->GetText();
+                sRet += static_cast<SvLBoxString&>( rItem ).GetText();
                 sRet += ",";
             }
             //end want to the column header
@@ -2658,8 +2657,8 @@ void SvTreeListBox::ModelHasEntryInvalidated( SvTreeListEntry* pEntry )
     sal_uInt16 nCount = pEntry->ItemCount();
     for( sal_uInt16 nIdx = 0; nIdx < nCount; nIdx++ )
     {
-        SvLBoxItem* pItem = pEntry->GetItem( nIdx );
-        pItem->InitViewData( this, pEntry, 0 );
+        SvLBoxItem& rItem = pEntry->GetItem( nIdx );
+        rItem.InitViewData( this, pEntry, 0 );
     }
 
     // repaint
@@ -2725,16 +2724,16 @@ void SvTreeListBox::ImplEditEntry( SvTreeListEntry* pEntry )
         long nTabPos, nNextTabPos = 0;
         for( sal_uInt16 i = 0 ; i < nCount ; i++ )
         {
-            SvLBoxItem* pTmpItem = pEntry->GetItem( i );
-            if (pTmpItem->GetType() != SV_ITEM_ID_LBOXSTRING)
+            SvLBoxItem& rTmpItem = pEntry->GetItem( i );
+            if (rTmpItem.GetType() != SV_ITEM_ID_LBOXSTRING)
                 continue;
 
-            SvLBoxTab* pTab = GetTab( pEntry, pTmpItem );
+            SvLBoxTab* pTab = GetTab( pEntry, &rTmpItem );
             nNextTabPos = -1;
             if( i < nCount - 1 )
             {
-                SvLBoxItem* pNextItem = pEntry->GetItem( i + 1 );
-                SvLBoxTab* pNextTab = GetTab( pEntry, pNextItem );
+                SvLBoxItem& rNextItem = pEntry->GetItem( i + 1 );
+                SvLBoxTab* pNextTab = GetTab( pEntry, &rNextItem );
                 nNextTabPos = pNextTab->GetPos();
             }
 
@@ -2743,7 +2742,7 @@ void SvTreeListBox::ImplEditEntry( SvTreeListEntry* pEntry )
                 nTabPos = pTab->GetPos();
                 if( !bIsMouseTriggered || (nClickX > nTabPos && (nNextTabPos == -1 || nClickX < nNextTabPos ) ) )
                 {
-                    pItem = static_cast<SvLBoxString*>( pTmpItem );
+                    pItem = &static_cast<SvLBoxString&>( rTmpItem );
                     break;
                 }
             }
@@ -2924,7 +2923,7 @@ long SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, long nLine, vcl::Render
         SvLBoxTab* pTab = aTabs[nCurTab];
         sal_uInt16 nNextTab = nCurTab + 1;
         SvLBoxTab* pNextTab = nNextTab < nTabCount ? aTabs[nNextTab] : 0;
-        SvLBoxItem* pItem = nCurItem < nItemCount ? rEntry.GetItem(nCurItem) : 0;
+        SvLBoxItem* pItem = nCurItem < nItemCount ? &rEntry.GetItem(nCurItem) : 0;
 
         SvLBoxTabFlags nFlags = pTab->nFlags;
         Size aSize(SvLBoxItem::GetSize(pViewDataEntry, nCurItem));
@@ -3223,8 +3222,8 @@ Rectangle SvTreeListBox::GetFocusRect( SvTreeListEntry* pEntry, long nLine )
     {
         if( pTab && nCurTab < pEntry->ItemCount() )
         {
-            SvLBoxItem* pItem = pEntry->GetItem( nCurTab );
-            aSize.Width() = pItem->GetSize( this, pEntry ).Width();
+            SvLBoxItem& rItem = pEntry->GetItem( nCurTab );
+            aSize.Width() = rItem.GetSize( this, pEntry ).Width();
             if( !aSize.Width() )
                 aSize.Width() = 15;
             long nX = nTabPos; //GetTabPos( pEntry, pTab );
@@ -3305,7 +3304,7 @@ SvLBoxItem* SvTreeListBox::GetItem_Impl( SvTreeListEntry* pEntry, long nX,
     sal_uInt16 nTabCount = aTabs.size();
     sal_uInt16 nItemCount = pEntry->ItemCount();
     SvLBoxTab* pTab = aTabs.front();
-    SvLBoxItem* pItem = pEntry->GetItem(0);
+    SvLBoxItem& rItem = pEntry->GetItem(0);
     sal_uInt16 nNextItem = 1;
     nX -= GetMapMode().GetOrigin().X();
     long nRealWidth = pImp->GetOutputSize().Width();
@@ -3326,7 +3325,7 @@ SvLBoxItem* SvTreeListBox::GetItem_Impl( SvTreeListEntry* pEntry, long nX,
                 nNextTabPos += 50;
         }
 
-        Size aItemSize( pItem->GetSize(this, pEntry));
+        Size aItemSize( rItem.GetSize(this, pEntry));
         nStart += pTab->CalcOffset( aItemSize.Width(), nNextTabPos - nStart );
         long nLen = aItemSize.Width();
         if( pNextTab )
@@ -3341,7 +3340,7 @@ SvLBoxItem* SvTreeListBox::GetItem_Impl( SvTreeListEntry* pEntry, long nX,
 
         if( nX >= nStart && nX < (nStart+nLen ) )
         {
-            pItemClicked = pItem;
+            pItemClicked = &rItem;
             if( ppTab )
             {
                 *ppTab = pTab;
@@ -3351,7 +3350,7 @@ SvLBoxItem* SvTreeListBox::GetItem_Impl( SvTreeListEntry* pEntry, long nX,
         if( nNextItem >= nItemCount || nNextItem >= nTabCount)
             break;
         pTab = aTabs[ nNextItem ];
-        pItem = pEntry->GetItem( nNextItem );
+        rItem = pEntry->GetItem( nNextItem );
         nNextItem++;
     }
     return pItemClicked;
@@ -3370,8 +3369,8 @@ long SvTreeListBox::getPreferredDimensions(std::vector<long> &rWidths) const
             rWidths.resize(nCount);
         while (nCurPos < nCount)
         {
-            SvLBoxItem* pItem = pEntry->GetItem( nCurPos );
-            long nWidth = pItem->GetSize(this, pEntry).Width();
+            SvLBoxItem& rItem = pEntry->GetItem( nCurPos );
+            long nWidth = rItem.GetSize(this, pEntry).Width();
             if (nWidth)
             {
                 nWidth += SV_TAB_BORDER * 2;
diff --git a/svtools/source/contnr/treelistentry.cxx b/svtools/source/contnr/treelistentry.cxx
index a80752cdd1ed..a78b3632f455 100644
--- a/svtools/source/contnr/treelistentry.cxx
+++ b/svtools/source/contnr/treelistentry.cxx
@@ -158,14 +158,14 @@ void SvTreeListEntry::ReplaceItem( SvLBoxItem* pNewItem, size_t nPos )
     maItems.insert(maItems.begin()+nPos, pNewItem);
 }
 
-const SvLBoxItem* SvTreeListEntry::GetItem( size_t nPos ) const
+const SvLBoxItem& SvTreeListEntry::GetItem( size_t nPos ) const
 {
-    return &maItems[nPos];
+    return maItems[nPos];
 }
 
-SvLBoxItem* SvTreeListEntry::GetItem( size_t nPos )
+SvLBoxItem& SvTreeListEntry::GetItem( size_t nPos )
 {
-    return &maItems[nPos];
+    return maItems[nPos];
 }
 
 namespace {
diff --git a/svtools/source/contnr/viewdataentry.cxx b/svtools/source/contnr/viewdataentry.cxx
index 98c0035b982f..f7fe1e1abff4 100644
--- a/svtools/source/contnr/viewdataentry.cxx
+++ b/svtools/source/contnr/viewdataentry.cxx
@@ -81,14 +81,14 @@ void SvViewDataEntry::Init(size_t nSize)
     maItems.resize(nSize);
 }
 
-const SvViewDataItem* SvViewDataEntry::GetItem(size_t nPos) const
+const SvViewDataItem& SvViewDataEntry::GetItem(size_t nPos) const
 {
-    return &maItems[nPos];
+    return maItems[nPos];
 }
 
-SvViewDataItem* SvViewDataEntry::GetItem(size_t nPos)
+SvViewDataItem& SvViewDataEntry::GetItem(size_t nPos)
 {
-    return &maItems[nPos];
+    return maItems[nPos];
 }
 
 void SvViewDataEntry::SetPaintRectangle(Rectangle aRectangle)
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index 864cc56f5469..6ec90e45713a 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -275,7 +275,7 @@ bool TreeControlPeer::updateEntry( UnoTreeListEntry* pEntry )
     if( pEntry && pEntry->mxNode.is() && mpTreeImpl )
     {
         const OUString aValue( getEntryString( pEntry->mxNode->getDisplayValue() ) );
-        UnoTreeListItem* pUnoItem = dynamic_cast< UnoTreeListItem* >( pEntry->GetItem( 1 ) );
+        UnoTreeListItem* pUnoItem = dynamic_cast< UnoTreeListItem* >( &pEntry->GetItem( 1 ) );
         if( pUnoItem )
         {
             if( aValue != pUnoItem->GetText() )
@@ -303,7 +303,7 @@ bool TreeControlPeer::updateEntry( UnoTreeListEntry* pEntry )
             bChanged = true;
         }
 
-        ImplContextGraphicItem* pContextGraphicItem = dynamic_cast< ImplContextGraphicItem* >( pEntry->GetItem( 0 ) );
+        ImplContextGraphicItem* pContextGraphicItem = dynamic_cast< ImplContextGraphicItem* >( &pEntry->GetItem( 0 ) );
         if( pContextGraphicItem )
         {
             if( pContextGraphicItem->msExpandedGraphicURL != pEntry->mxNode->getExpandedGraphicURL() )
@@ -719,7 +719,7 @@ void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const OUString& sDe
         SvTreeListEntry* pEntry = rTree.First();
         while( pEntry )
         {
-            ImplContextGraphicItem* pContextGraphicItem = dynamic_cast< ImplContextGraphicItem* >( pEntry->GetItem( 0 ) );
+            ImplContextGraphicItem* pContextGraphicItem = dynamic_cast< ImplContextGraphicItem* >( &pEntry->GetItem( 0 ) );
             if( pContextGraphicItem )
             {
                 if( pContextGraphicItem->msExpandedGraphicURL.isEmpty() )
@@ -757,7 +757,7 @@ void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const OUString& sD
         SvTreeListEntry* pEntry = rTree.First();
         while( pEntry )
         {
-            ImplContextGraphicItem* pContextGraphicItem = dynamic_cast< ImplContextGraphicItem* >( pEntry->GetItem( 0 ) );
+            ImplContextGraphicItem* pContextGraphicItem = dynamic_cast< ImplContextGraphicItem* >( &pEntry->GetItem( 0 ) );
             if( pContextGraphicItem )
             {
                 if( pContextGraphicItem->msCollapsedGraphicURL.isEmpty() )