SbTextPortions, etc can completely go

basic/inc/basic/sbdef.hxx

@@ -64,48 +64,6 @@ struct SbTextPortion
     SbTextType eType;        // Type of the portion
 };
 
-typedef sal_Bool (*FnForEach_SbTextPortions)( const SbTextPortion &, void* );
-class BASIC_DLLPUBLIC SbTextPortions
-{
-protected:
-    SbTextPortion *pData;
-    sal_uInt16 nFree;
-    sal_uInt16 nA;
-
-    void _resize(size_t n);
-
-public:
-    SbTextPortions( sal_uInt16= 16, sal_uInt8= 16 );
-    ~SbTextPortions() { rtl_freeMemory( pData ); }
-
-    _SVVARARR_DEF_GET_OP_INLINE(SbTextPortions, SbTextPortion )
-    SbTextPortion & GetObject(sal_uInt16 nP) const { return (*this)[nP]; }
-
-    void Insert( const SbTextPortion & aE, sal_uInt16 nP );
-    void Insert( const SbTextPortion *pE, sal_uInt16 nL, sal_uInt16 nP );
-    void Remove( sal_uInt16 nP, sal_uInt16 nL = 1 );
-    void Replace( const SbTextPortion & aE, sal_uInt16 nP );
-    void Replace( const SbTextPortion *pE, sal_uInt16 nL, sal_uInt16 nP );
-    sal_uInt16 Count() const { return nA; }
-    const SbTextPortion* GetData() const { return (const SbTextPortion*)pData; }
-
-    void ForEach( CONCAT( FnForEach_, SbTextPortions ) fnForEach, void* pArgs = 0 )
-    {
-        _ForEach( 0, nA, fnForEach, pArgs );
-    }
-    void ForEach( sal_uInt16 nS, sal_uInt16 nE,
-                    CONCAT( FnForEach_, SbTextPortions ) fnForEach, void* pArgs = 0 )
-    {
-        _ForEach( nS, nE, fnForEach, pArgs );
-    }
-
-    void _ForEach( sal_uInt16 nStt, sal_uInt16 nE,
-            CONCAT( FnForEach_, SbTextPortions ) fnCall, void* pArgs = 0 );
-private:
-    BASIC_DLLPRIVATE SbTextPortions( const SbTextPortions& );
-    BASIC_DLLPRIVATE SbTextPortions& operator=( const SbTextPortions& );
-};
-
 // Returns type name for Basic type, array flag is ignored
 // implementation: basic/source/runtime/methods.cxx
 BASIC_DLLPUBLIC String getBasicTypeName( SbxDataType eType );

basic/source/classes/sb.cxx

@@ -63,8 +63,6 @@
 #include <com/sun/star/script/ModuleInfo.hpp>
 using namespace ::com::sun::star::script;
 
-SV_IMPL_VARARR(SbTextPortions,SbTextPortion)
-
 TYPEINIT1(StarBASIC,SbxObject)
 
 #define RTLNAME "@SBRTL"

svtools/source/dialogs/filedlg2.cxx

@@ -1168,29 +1168,6 @@ void ImpFileDialog::SetPath( Edit const& rEdit )
         SetPath( aPresetText );
 }
 
-void ImpFileDialog::SetCurFilter( const UniString& rFilter )
-{
-    if( !pTypeList )
-        return;
-
-    for ( size_t i = 0, n = aFilterList.size(); i < n; ++i ) {
-        if ( aFilterList[ i ]->aName == rFilter ) {
-            pTypeList->SelectEntryPos( sal_uInt16( i ) );
-            return;
-        }
-    }
-
-    pTypeList->SetNoSelection();
-}
-
-UniString ImpFileDialog::GetCurFilter() const
-{
-    UniString aFilter;
-    if ( pTypeList )
-        aFilter = pTypeList->GetSelectEntry();
-    return aFilter;
-}
-
 void ImpFileDialog::PreExecute()
 {
     // ListBoxen erst unmittelbar vor Execute fuellen

svtools/source/dialogs/filedlg2.hxx

@@ -158,9 +158,6 @@ public:
                         ImpFileDialog( PathDialog* pDlg, WinBits nStyle, RESOURCE_TYPE nType );
     virtual             ~ImpFileDialog();
 
-    void                SetCurFilter( const String& rFilter );
-    String              GetCurFilter() const;
-
     size_t              GetFilterCount() const  { return aFilterList.size(); }
     inline String       GetFilterName( size_t nPos ) const;
     inline String       GetFilterType( size_t nPos ) const;

unusedcode.easy

@@ -277,12 +277,6 @@ SalI18N_InputContext::SetPreeditState(int)
 SanExtensionImpl::extractCertExt()
 SanExtensionImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
 SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char)
-SbTextPortions::Insert(SbTextPortions const*, unsigned short, unsigned short, unsigned short)
-SbTextPortions::Remove(unsigned short, unsigned short)
-SbTextPortions::Replace(SbTextPortion const&, unsigned short)
-SbTextPortions::Replace(SbTextPortion const*, unsigned short, unsigned short)
-SbTextPortions::SbTextPortions(unsigned short, unsigned char)
-SbTextPortions::_ForEach(unsigned short, unsigned short, unsigned char (*)(SbTextPortion const&, void*), void*)
 SbiExprNode::IsString()
 SbiExpression::SbiExpression(SbiParser*, SbiToken)
 SbiExpression::SbiExpression(SbiParser*, String const&)

vcl/inc/vcl/status.hxx

@@ -140,7 +140,6 @@ public:
                                     StatusBarItemBits nBits = SIB_CENTER | SIB_IN,
                                     long nOffset = STATUSBAR_OFFSET,
                                     sal_uInt16 nPos = STATUSBAR_APPEND );
-    void                RemoveItem( sal_uInt16 nItemId );
 
     sal_Bool                IsItemVisible( sal_uInt16 nItemId ) const;
     sal_Bool                AreItemsVisible() const { return mbVisibleItems; }
@@ -155,8 +154,6 @@ public:
     Point               GetItemTextPos( sal_uInt16 nItemId ) const;
     sal_uInt16              GetCurItemId() const { return mnCurItemId; }
 
-    long                GetItemOffset( sal_uInt16 nItemId ) const;
-
     void                SetItemText( sal_uInt16 nItemId, const XubString& rText );
     const XubString&    GetItemText( sal_uInt16 nItemId ) const;
 

vcl/source/window/status.cxx

@@ -1018,24 +1018,6 @@ void StatusBar::InsertItem( sal_uInt16 nItemId, sal_uLong nWidth,
 
 // -----------------------------------------------------------------------
 
-void StatusBar::RemoveItem( sal_uInt16 nItemId )
-{
-    sal_uInt16 nPos = GetItemPos( nItemId );
-    if ( nPos != STATUSBAR_ITEM_NOTFOUND )
-    {
-        delete (*mpItemList)[ nPos ];
-        mpItemList->erase( mpItemList->begin() + nPos );
-
-        mbFormat = sal_True;
-        if ( ImplIsItemUpdate() )
-            Invalidate();
-
-        ImplCallEventListeners( VCLEVENT_STATUSBAR_ITEMREMOVED, (void*) sal_IntPtr(nItemId) );
-    }
-}
-
-// -----------------------------------------------------------------------
-
 sal_Bool StatusBar::IsItemVisible( sal_uInt16 nItemId ) const
 {
     sal_uInt16 nPos = GetItemPos( nItemId );
@@ -1169,18 +1151,6 @@ Point StatusBar::GetItemTextPos( sal_uInt16 nItemId ) const
 
 // -----------------------------------------------------------------------
 
-long StatusBar::GetItemOffset( sal_uInt16 nItemId ) const
-{
-    sal_uInt16 nPos = GetItemPos( nItemId );
-
-    if ( nPos != STATUSBAR_ITEM_NOTFOUND )
-        return (*mpItemList)[ nPos ]->mnOffset;
-
-    return 0;
-}
-
-// -----------------------------------------------------------------------
-
 void StatusBar::SetItemText( sal_uInt16 nItemId, const XubString& rText )
 {
     sal_uInt16 nPos = GetItemPos( nItemId );