[Libreoffice] [PATCH] Removed LineListBox methods listed in unusedcode.easy

[Mariusz Dykierek]

Hi,

Attached patch removes:
 - LineListBox::GetEntryLine1
 - LineListBox::GetEntryLine2
 - LineListBox::GetEntryDistance
 - LineListBox::GetSelectEntryLine1
 - LineListBox::GetSelectEntryLine2
 - LineListBox::GetSelectEntryDistance
and corresponding entries in unusedcode.easy.

-- 
Pozdrawiam,
Mariusz Dykerek


diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx
index 5815719..a4d9eff 100644
--- a/svtools/inc/svtools/ctrlbox.hxx
+++ b/svtools/inc/svtools/ctrlbox.hxx
@@ -352,16 +352,10 @@ public:
 
     using ListBox::GetEntryPos;
     virtual sal_uInt16  GetEntryPos( sal_uInt16 nStyle = STYLE_SOLID ) const;
-    long            GetEntryLine1( sal_uInt16 nPos ) const;
-    long            GetEntryLine2( sal_uInt16 nPos ) const;
-    long            GetEntryDistance( sal_uInt16 nPos ) const;
     sal_uInt16          GetEntryStyle( sal_uInt16 nPos ) const;
 
     void            SelectEntry( const XubString& rStr, sal_Bool bSelect = sal_True ) { ListBox::SelectEntry( rStr, bSelect ); }
     void            SelectEntry( sal_uInt16 nStyle = STYLE_SOLID, sal_Bool bSelect = sal_True );
-    long            GetSelectEntryLine1( sal_uInt16 nSelIndex = 0 ) const;
-    long            GetSelectEntryLine2( sal_uInt16 nSelIndex = 0 ) const;
-    long            GetSelectEntryDistance( sal_uInt16 nSelIndex = 0 ) const;
     sal_uInt16          GetSelectEntryStyle( sal_uInt16 nSelIndex = 0 ) const;
     inline sal_Bool     IsEntrySelected( const XubString& rStr ) const { return ListBox::IsEntrySelected( rStr ); }
     sal_Bool            IsEntrySelected( sal_uInt16 nStyle1 = STYLE_SOLID ) const;
@@ -389,33 +383,6 @@ private:
     void*           GetEntryData( sal_uInt16 nPos ) const;
 };
 
-inline long LineListBox::GetSelectEntryLine1( sal_uInt16 nSelIndex ) const
-{
-    sal_uInt16 nPos = GetSelectEntryPos( nSelIndex );
-    if ( nPos != LISTBOX_ENTRY_NOTFOUND )
-        return GetEntryLine1( nPos );
-    else
-        return 0;
-}
-
-inline long LineListBox::GetSelectEntryLine2( sal_uInt16 nSelIndex ) const
-{
-    sal_uInt16 nPos = GetSelectEntryPos( nSelIndex );
-    if ( nPos != LISTBOX_ENTRY_NOTFOUND )
-        return GetEntryLine2( nPos );
-    else
-        return 0;
-}
-
-inline long LineListBox::GetSelectEntryDistance( sal_uInt16 nSelIndex ) const
-{
-    sal_uInt16 nPos = GetSelectEntryPos( nSelIndex );
-    if ( nPos != LISTBOX_ENTRY_NOTFOUND )
-        return GetEntryDistance( nPos );
-    else
-        return 0;
-}
-
 inline sal_Bool LineListBox::IsEntrySelected( sal_uInt16 nStyle ) const
 {
     sal_uInt16 nPos = GetEntryPos( nStyle );
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index d4959ec..ce72cdc 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -851,30 +851,6 @@ sal_uInt16 LineListBox::GetEntryPos( sal_uInt16 nStyle ) const
 
 // -----------------------------------------------------------------------
 
-long LineListBox::GetEntryLine1( sal_uInt16 nPos ) const
-{
-    ImpLineListData* pData = (nPos < pLineList->size()) ? (*pLineList)[ nPos ] : NULL;
-    return ( pData ) ? pData->GetLine1ForWidth( m_nWidth ) : 0;
-}
-
-// -----------------------------------------------------------------------
-
-long LineListBox::GetEntryLine2( sal_uInt16 nPos ) const
-{
-    ImpLineListData* pData = (nPos < pLineList->size()) ? (*pLineList)[ nPos ] : NULL;
-    return ( pData ) ? pData->GetLine2ForWidth( m_nWidth ) : 0;
-}
-
-// -----------------------------------------------------------------------
-
-long LineListBox::GetEntryDistance( sal_uInt16 nPos ) const
-{
-    ImpLineListData* pData = (nPos < pLineList->size()) ? (*pLineList)[ nPos ] : NULL;
-    return ( pData ) ? pData->GetDistForWidth( m_nWidth ) : 0;
-}
-
-// -----------------------------------------------------------------------
-
 sal_uInt16 LineListBox::GetEntryStyle( sal_uInt16 nPos ) const
 {
     ImpLineListData* pData = (nPos < pLineList->size()) ? (*pLineList)[ nPos ] : NULL;
diff --git a/unusedcode.easy b/unusedcode.easy
index f613cb4..b427d5b 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -80,9 +80,6 @@ InsCapOptArr::Remove(InsCaptionOpt* const&, unsigned short)
 InsCapOptArr::Remove(unsigned short, unsigned short)
 ItemList::FindAttrib(unsigned short)
 KeyboardSettings::CopyData()
-LineListBox::GetEntryDistance(unsigned short) const
-LineListBox::GetEntryLine1(unsigned short) const
-LineListBox::GetEntryLine2(unsigned short) const
 LinkStructArr::DeleteAndDestroy(unsigned short, unsigned short)
 LngSvcMgr::RemoveLngSvcEvtBroadcaster(com::sun::star::uno::Reference<com::sun::star::linguistic2::XLinguServiceEventBroadcaster> const&)
 LocaleDataWrapper::getCollatorImplementations() const

_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice