diff options
24 files changed, 61 insertions, 63 deletions
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index edc27c6d5975..e511a3f9302b 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -505,7 +505,7 @@ void SvxFontSubstCheckListBox::SetCheckButtonState( SvTreeListEntry* pEntry, sal SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1)); DBG_ASSERT(pItem,"SetCheckButton:Item not found"); - if (((SvLBoxItem*)pItem)->IsA() == SV_ITEM_ID_LBOXBUTTON) + if (pItem->GetType() == SV_ITEM_ID_LBOXBUTTON) { switch( eState ) { @@ -531,7 +531,7 @@ SvButtonState SvxFontSubstCheckListBox::GetCheckButtonState( SvTreeListEntry* pE SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1)); DBG_ASSERT(pItem,"GetChButnState:Item not found"); - if (((SvLBoxItem*)pItem)->IsA() == SV_ITEM_ID_LBOXBUTTON) + if (pItem->GetType() == SV_ITEM_ID_LBOXBUTTON) { sal_uInt16 nButtonFlags = pItem->GetButtonFlags(); eState = pCheckButtonData->ConvertToButtonState( nButtonFlags ); diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index eddd6573151e..a6d12f7f024b 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -209,7 +209,7 @@ sal_Bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& ) if( pEntry ) { SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem( nCol )); - if( pItem && ((SvLBoxItem*)pItem)->IsA() == SV_ITEM_ID_LBOXBUTTON ) + if (pItem && pItem->GetType() == SV_ITEM_ID_LBOXBUTTON) { sal_uInt16 nButtonFlags = pItem->GetButtonFlags(); bCheck = SV_BUTTON_CHECKED == @@ -267,7 +267,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet& ) if( pEntry ) { SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem( nCol )); - if( pItem && ((SvLBoxItem*)pItem)->IsA() == SV_ITEM_ID_LBOXBUTTON ) + if (pItem && pItem->GetType() == SV_ITEM_ID_LBOXBUTTON) { if( (rOpt.*pArr->FnIs)() ) pItem->SetStateChecked(); @@ -340,7 +340,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::SetCheckButtonState( SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1)); DBG_ASSERT(pItem,"SetCheckButton:Item not found"); - if (((SvLBoxItem*)pItem)->IsA() == SV_ITEM_ID_LBOXBUTTON) + if (pItem->GetType() == SV_ITEM_ID_LBOXBUTTON) { switch( eState ) { @@ -367,7 +367,7 @@ SvButtonState OfaMSFilterTabPage2::MSFltrSimpleTable::GetCheckButtonState( SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1)); DBG_ASSERT(pItem,"GetChButnState:Item not found"); - if (((SvLBoxItem*)pItem)->IsA() == SV_ITEM_ID_LBOXBUTTON) + if (pItem->GetType() == SV_ITEM_ID_LBOXBUTTON) { sal_uInt16 nButtonFlags = pItem->GetButtonFlags(); eState = pCheckButtonData->ConvertToButtonState( nButtonFlags ); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 705bf0c7e04e..a81c354bec96 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -268,7 +268,7 @@ static void lcl_SetCheckButton( SvTreeListEntry* pEntry, sal_Bool bCheck ) SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXBUTTON)); DBG_ASSERT(pItem,"SetCheckButton:Item not found"); - if (((SvLBoxItem*)pItem)->IsA() == SV_ITEM_ID_LBOXBUTTON) + if (pItem->GetType() == SV_ITEM_ID_LBOXBUTTON) { if (bCheck) pItem->SetStateChecked(); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index bec34f57d92c..5fd699a2d286 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -794,7 +794,7 @@ void OfaACorrCheckListBox::SetCheckButtonState( SvTreeListEntry* pEntry, sal_uIn SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1)); DBG_ASSERT(pItem,"SetCheckButton:Item not found"); - if (((SvLBoxItem*)pItem)->IsA() == SV_ITEM_ID_LBOXBUTTON) + if (pItem->GetType() == SV_ITEM_ID_LBOXBUTTON) { switch( eState ) { @@ -820,7 +820,7 @@ SvButtonState OfaACorrCheckListBox::GetCheckButtonState( SvTreeListEntry* pEntry SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1)); DBG_ASSERT(pItem,"GetChButnState:Item not found"); - if (((SvLBoxItem*)pItem)->IsA() == SV_ITEM_ID_LBOXBUTTON) + if (pItem->GetType() == SV_ITEM_ID_LBOXBUTTON) { sal_uInt16 nButtonFlags = pItem->GetButtonFlags(); eState = pCheckButtonData->ConvertToButtonState( nButtonFlags ); diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 576f390ef123..513f43695ddd 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -424,7 +424,7 @@ void _SfxMacroTabPage::FillEvents() if( pE ) { SvLBoxString* pLItem = ( SvLBoxString* ) pE->GetItem( LB_MACROS_ITEMPOS ); - DBG_ASSERT( pLItem && SV_ITEM_ID_LBOXSTRING == pLItem->IsA(), "_SfxMacroTabPage::FillEvents(): no LBoxString" ); + DBG_ASSERT( pLItem && SV_ITEM_ID_LBOXSTRING == pLItem->GetType(), "_SfxMacroTabPage::FillEvents(): no LBoxString" ); String sOld( pLItem->GetText() ); String sNew; diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx index e425c557dfdc..275b90e4f931 100644 --- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx +++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx @@ -236,7 +236,7 @@ void SbaTableQueryBrowser::notifyHiContrastChanged() for (sal_uInt16 i=0;i<nCount;++i) { SvLBoxItem* pItem = pEntryLoop->GetItem(i); - if ( !pItem || ( pItem->IsA() != SV_ITEM_ID_LBOXCONTEXTBMP ) ) + if (!pItem || pItem->GetType() != SV_ITEM_ID_LBOXCONTEXTBMP) continue; SvLBoxContextBmp* pContextBitmapItem = static_cast< SvLBoxContextBmp* >( pItem ); diff --git a/dbaccess/source/ui/control/listviewitems.cxx b/dbaccess/source/ui/control/listviewitems.cxx index 07b2b0aab880..1d2cc2d61a4c 100644 --- a/dbaccess/source/ui/control/listviewitems.cxx +++ b/dbaccess/source/ui/control/listviewitems.cxx @@ -43,13 +43,11 @@ namespace dbaui pView->Pop(); } - //------------------------------------------------------------------------ - sal_uInt16 OBoldListboxString::IsA() + sal_uInt16 OBoldListboxString::GetType() const { return SV_ITEM_ID_BOLDLBSTRING; } - //------------------------------------------------------------------------ void OBoldListboxString::Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvTreeListEntry* pEntry ) { if (m_bEmphasized) diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index a2d41151c00e..05c9856cc5e2 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -124,7 +124,7 @@ void OTableTreeListBox::notifyHiContrastChanged() for (sal_uInt16 i=0;i<nCount;++i) { SvLBoxItem* pItem = pEntryLoop->GetItem(i); - if ( pItem && pItem->IsA() == SV_ITEM_ID_LBOXCONTEXTBMP) + if (pItem && pItem->GetType() == SV_ITEM_ID_LBOXCONTEXTBMP) { SvLBoxContextBmp* pContextBitmapItem = static_cast< SvLBoxContextBmp* >( pItem ); diff --git a/dbaccess/source/ui/inc/listviewitems.hxx b/dbaccess/source/ui/inc/listviewitems.hxx index c9d076cc9ca4..e14b421bb470 100644 --- a/dbaccess/source/ui/inc/listviewitems.hxx +++ b/dbaccess/source/ui/inc/listviewitems.hxx @@ -43,7 +43,7 @@ namespace dbaui { } - virtual sal_uInt16 IsA(); + virtual sal_uInt16 GetType() const; virtual void Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvTreeListEntry* pEntry); virtual void InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* _pViewData); diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 8a7c09268219..33ce9dcef840 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -1995,8 +1995,8 @@ IMPL_LINK( ScAcceptChgDlg, ColCompareHdl, SvSortData*, pSortData ) if(pLeftItem != NULL && pRightItem != NULL) { - sal_uInt16 nLeftKind=pLeftItem->IsA(); - sal_uInt16 nRightKind=pRightItem->IsA(); + sal_uInt16 nLeftKind = pLeftItem->GetType(); + sal_uInt16 nRightKind = pRightItem->GetType(); if(nRightKind == SV_ITEM_ID_LBOXSTRING && nLeftKind == SV_ITEM_ID_LBOXSTRING ) diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index f86808b00766..816085682577 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -398,8 +398,8 @@ IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsSelHdl) if (pEntry) { SvLBoxItem* pItem = pEntry->GetFirstItem(SV_ITEM_ID_LBOXBUTTON); - if ( pItem && pItem->IsA() == SV_ITEM_ID_LBOXBUTTON ) - bCheckbox = sal_True; + if (pItem && pItem->GetType() == SV_ITEM_ID_LBOXBUTTON) + bCheckbox = true; } maBtnEdit.Enable( !bCheckbox ); diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx index a4e1d400c1e3..4b1ea591ca5d 100644 --- a/svtools/inc/svtools/svlbitm.hxx +++ b/svtools/inc/svtools/svlbitm.hxx @@ -122,7 +122,7 @@ public: SvLBoxString(SvTreeListEntry*, sal_uInt16 nFlags, const rtl::OUString& rStr); SvLBoxString(); virtual ~SvLBoxString(); - virtual sal_uInt16 IsA(); + virtual sal_uInt16 GetType() const; virtual void InitViewData(SvTreeListBox*, SvTreeListEntry*, SvViewDataItem*); rtl::OUString GetText() const { return maText; } void SetText( const rtl::OUString& rText ) { maText = rText; } @@ -137,7 +137,7 @@ class SvLBoxBmp : public SvLBoxItem public: SvLBoxBmp(); virtual ~SvLBoxBmp(); - virtual sal_uInt16 IsA(); + virtual sal_uInt16 GetType() const; virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ); virtual void Paint( const Point&, SvTreeListBox& rView, sal_uInt16 nFlags,SvTreeListEntry* ); virtual SvLBoxItem* Create() const; @@ -171,7 +171,7 @@ public: SvLBoxButton(); virtual ~SvLBoxButton(); virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ); - virtual sal_uInt16 IsA(); + virtual sal_uInt16 GetType() const; virtual sal_Bool ClickHdl(SvTreeListBox* pView, SvTreeListEntry* ); virtual void Paint( const Point&, SvTreeListBox& rView, sal_uInt16 nFlags,SvTreeListEntry* ); virtual SvLBoxItem* Create() const; @@ -229,7 +229,7 @@ public: sal_uInt16 nEntryFlagsBmp1); SvLBoxContextBmp(); virtual ~SvLBoxContextBmp(); - virtual sal_uInt16 IsA(); + virtual sal_uInt16 GetType() const; virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ); virtual void Paint( const Point&, SvTreeListBox& rView, sal_uInt16 nFlags,SvTreeListEntry* ); virtual SvLBoxItem* Create() const; diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx index 4ce8c418de26..ce4bba1b170f 100644 --- a/svtools/inc/svtools/treelistbox.hxx +++ b/svtools/inc/svtools/treelistbox.hxx @@ -173,7 +173,7 @@ public: SvLBoxItem( SvTreeListEntry*, sal_uInt16 nFlags ); SvLBoxItem(); virtual ~SvLBoxItem(); - virtual sal_uInt16 IsA() = 0; + virtual sal_uInt16 GetType() const = 0; const Size& GetSize( SvTreeListBox* pView, SvTreeListEntry* pEntry ); const Size& GetSize( SvViewDataEntry* pData, sal_uInt16 nItemPos ) { @@ -211,7 +211,7 @@ public: // The DropTarget is 0 in that case #define SV_DRAGDROP_ENABLE_TOP (DragDropMode)0x0020 -#define SVLISTBOX_ID_LBOX 0 // for SvTreeListBox::IsA() +#define SVLISTBOX_ID_LBOX 0 // for SvTreeListBox::GetType() #define SVLBOX_IN_EDT 0x0001 #define SVLBOX_EDT_ENABLED 0x0002 diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index e0d874d23e9e..5f90b8fd7c7f 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -1885,7 +1885,7 @@ bool SvImpLBox::ButtonDownCheckCtrl( const MouseEvent& rMEvt, SvTreeListEntry* pEntry, long nY) { SvLBoxItem* pItem = pView->GetItem(pEntry,rMEvt.GetPosPixel().X(),&pActiveTab); - if( pItem && (pItem->IsA()==SV_ITEM_ID_LBOXBUTTON)) + if (pItem && pItem->GetType() == SV_ITEM_ID_LBOXBUTTON) { pActiveButton = (SvLBoxButton*)pItem; pActiveEntry = pEntry; @@ -3160,7 +3160,7 @@ bool SvImpLBox::RequestHelp( const HelpEvent& rHEvt ) // recalculate text rectangle SvLBoxTab* pTab; SvLBoxString* pItem = (SvLBoxString*)(pView->GetItem( pEntry, aPos.X(), &pTab )); - if( !pItem || pItem->IsA() != SV_ITEM_ID_LBOXSTRING ) + if (!pItem || pItem->GetType() != SV_ITEM_ID_LBOXSTRING) return false; aPos = GetEntryPosition( pEntry ); diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index b1214111215b..314bc310a822 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -213,7 +213,7 @@ SvLBoxString::~SvLBoxString() DBG_DTOR(SvLBoxString,0); } -sal_uInt16 SvLBoxString::IsA() +sal_uInt16 SvLBoxString::GetType() const { DBG_CHKTHIS(SvLBoxString,0); return SV_ITEM_ID_LBOXSTRING; @@ -272,7 +272,7 @@ SvLBoxBmp::~SvLBoxBmp() DBG_DTOR(SvLBoxBmp,0); } -sal_uInt16 SvLBoxBmp::IsA() +sal_uInt16 SvLBoxBmp::GetType() const { DBG_CHKTHIS(SvLBoxBmp,0); return SV_ITEM_ID_LBOXBMP; @@ -338,7 +338,7 @@ SvLBoxButton::~SvLBoxButton() DBG_DTOR(SvLBoxButton,0); } -sal_uInt16 SvLBoxButton::IsA() +sal_uInt16 SvLBoxButton::GetType() const { DBG_CHKTHIS(SvLBoxButton,0); return SV_ITEM_ID_LBOXBUTTON; @@ -503,7 +503,7 @@ SvLBoxContextBmp::~SvLBoxContextBmp() DBG_DTOR(SvLBoxContextBmp,0); } -sal_uInt16 SvLBoxContextBmp::IsA() +sal_uInt16 SvLBoxContextBmp::GetType() const { DBG_CHKTHIS(SvLBoxContextBmp,0); return SV_ITEM_ID_LBOXCONTEXTBMP; diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index ab3bf5cb101d..8938104c8937 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -279,19 +279,19 @@ String SvTabListBox::GetEntryText( SvTreeListEntry* pEntry, sal_uInt16 nCol ) co sal_uInt16 nCur = 0; while( nCur < nCount ) { - SvLBoxItem* pStr = pEntry->GetItem( nCur ); - if( pStr->IsA() == SV_ITEM_ID_LBOXSTRING ) + const SvLBoxItem* pStr = pEntry->GetItem( nCur ); + if (pStr->GetType() == SV_ITEM_ID_LBOXSTRING) { if( nCol == 0xffff ) { if( aResult.Len() ) aResult += '\t'; - aResult += static_cast<SvLBoxString*>( pStr )->GetText(); + aResult += static_cast<const SvLBoxString*>(pStr)->GetText(); } else { if( nCol == 0 ) - return static_cast<SvLBoxString*>( pStr )->GetText(); + return static_cast<const SvLBoxString*>(pStr)->GetText(); nCol--; } } @@ -334,7 +334,7 @@ void SvTabListBox::SetEntryText( const XubString& rStr, SvTreeListEntry* pEntry, while( nCur < nCount ) { SvLBoxItem* pStr = pEntry->GetItem( nCur ); - if( pStr && pStr->IsA() == SV_ITEM_ID_LBOXSTRING ) + if (pStr && pStr->GetType() == SV_ITEM_ID_LBOXSTRING) { if( nCol == 0xffff ) { @@ -377,9 +377,9 @@ String SvTabListBox::GetCellText( sal_uLong nPos, sal_uInt16 nCol ) const XubString aResult; if ( pEntry && pEntry->ItemCount() > ( nCol + 1 ) ) { - SvLBoxItem* pStr = pEntry->GetItem( nCol + 1 ); - if ( pStr && pStr->IsA() == SV_ITEM_ID_LBOXSTRING ) - aResult = static_cast< SvLBoxString* >( pStr )->GetText(); + const SvLBoxItem* pStr = pEntry->GetItem( nCol + 1 ); + if (pStr && pStr->GetType() == SV_ITEM_ID_LBOXSTRING) + aResult = static_cast<const SvLBoxString*>(pStr)->GetText(); } return aResult; } @@ -453,20 +453,20 @@ String SvTabListBox::GetTabEntryText( sal_uLong nPos, sal_uInt16 nCol ) const sal_uInt16 nCur = ( 0 == nCol && IsCellFocusEnabled() ) ? GetCurrentTabPos() : 0; while( nCur < nCount ) { - SvLBoxItem* pStr = pEntry->GetItem( nCur ); - if ( pStr->IsA() == SV_ITEM_ID_LBOXSTRING ) + const SvLBoxItem* pStr = pEntry->GetItem( nCur ); + if (pStr->GetType() == SV_ITEM_ID_LBOXSTRING) { if ( nCol == 0xffff ) { if ( aResult.Len() ) aResult += '\t'; - aResult += static_cast<SvLBoxString*>( pStr )->GetText(); + aResult += static_cast<const SvLBoxString*>(pStr)->GetText(); } else { if ( nCol == 0 ) { - String sRet = static_cast<SvLBoxString*>( pStr )->GetText(); + String sRet = static_cast<const SvLBoxString*>(pStr)->GetText(); if ( sRet.Len() == 0 ) sRet = SVT_RESSTR( STR_SVT_ACC_EMPTY_FIELD ); return sRet; @@ -621,7 +621,7 @@ sal_Bool SvHeaderTabListBox::IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 SvButtonState eState = SV_BUTTON_UNCHECKED; SvLBoxButton* pItem = (SvLBoxButton*)( pEntry->GetItem( nCol + 1 ) ); - if ( pItem && ( (SvLBoxItem*)pItem )->IsA() == SV_ITEM_ID_LBOXBUTTON ) + if (pItem && pItem->GetType() == SV_ITEM_ID_LBOXBUTTON) { sal_uInt16 nButtonFlags = pItem->GetButtonFlags(); eState = pCheckButtonData->ConvertToButtonState( nButtonFlags ); @@ -744,7 +744,7 @@ void SvHeaderTabListBox::RecalculateAccessibleChildren() sal_Bool SvHeaderTabListBox::IsCellCheckBox( long _nRow, sal_uInt16 _nColumn, TriState& _rState ) { - sal_Bool bRet = sal_False; + bool bRet = false; SvTreeListEntry* pEntry = GetEntry( _nRow ); if ( pEntry ) { @@ -752,9 +752,9 @@ sal_Bool SvHeaderTabListBox::IsCellCheckBox( long _nRow, sal_uInt16 _nColumn, Tr if ( nItemCount > ( _nColumn + 1 ) ) { SvLBoxButton* pItem = (SvLBoxButton*)( pEntry->GetItem( _nColumn + 1 ) ); - if ( pItem && ( (SvLBoxItem*)pItem )->IsA() == SV_ITEM_ID_LBOXBUTTON ) + if (pItem && pItem->GetType() == SV_ITEM_ID_LBOXBUTTON) { - bRet = sal_True; + bRet = true; _rState = ( ( pItem->GetButtonFlags() & SV_ITEMSTATE_UNCHECKED ) == 0 ) ? STATE_CHECK : STATE_NOCHECK; } diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 5a2fea7b3fcc..5cdff0c52401 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -1790,9 +1790,9 @@ String SvTreeListBox::SearchEntryText( SvTreeListEntry* pEntry ) const while( nCur < nCount ) { pItem = pEntry->GetItem( nCur ); - if ( pItem->IsA() == SV_ITEM_ID_LBOXSTRING && !static_cast<SvLBoxString*>( pItem )->GetText().isEmpty() ) + if (pItem->GetType() == SV_ITEM_ID_LBOXSTRING && !static_cast<const SvLBoxString*>(pItem)->GetText().isEmpty()) { - sRet = static_cast<SvLBoxString*>( pItem )->GetText(); + sRet = static_cast<const SvLBoxString*>(pItem)->GetText(); break; } nCur++; @@ -2757,7 +2757,7 @@ void SvTreeListBox::ImplEditEntry( SvTreeListEntry* pEntry ) for( sal_uInt16 i = 0 ; i < nCount ; i++ ) { SvLBoxItem* pTmpItem = pEntry->GetItem( i ); - if( pTmpItem->IsA() != SV_ITEM_ID_LBOXSTRING ) + if (pTmpItem->GetType() != SV_ITEM_ID_LBOXSTRING) continue; SvLBoxTab* pTab = GetTab( pEntry, pTmpItem ); @@ -3017,7 +3017,7 @@ long SvTreeListBox::PaintEntry1(SvTreeListEntry* pEntry,long nLine,sal_uInt16 nT Wallpaper aWallpaper = GetBackground(); int bSelTab = nFlags & SV_LBOXTAB_SHOW_SELECTION; - sal_uInt16 nItemType = pItem->IsA(); + sal_uInt16 nItemType = pItem->GetType(); if ( pViewDataEntry->IsSelected() && bSelTab && !pViewDataEntry->IsCursored() ) { @@ -3097,9 +3097,9 @@ long SvTreeListBox::PaintEntry1(SvTreeListEntry* pEntry,long nLine,sal_uInt16 nT pItem->Paint( aEntryPos, *this, pViewDataEntry->GetFlags(), pEntry ); // division line between tabs - if( pNextTab && pItem->IsA() == SV_ITEM_ID_LBOXSTRING && + if (pNextTab && pItem->GetType() == SV_ITEM_ID_LBOXSTRING && // not at the right edge of the window! - aRect.Right() < nMaxRight ) + aRect.Right() < nMaxRight) { aRect.Left() = aRect.Right() - SV_TAB_BORDER; DrawRect( aRect ); diff --git a/svtools/source/contnr/treelistentry.cxx b/svtools/source/contnr/treelistentry.cxx index df6b5b7dd92e..b6a5977fe553 100644 --- a/svtools/source/contnr/treelistentry.cxx +++ b/svtools/source/contnr/treelistentry.cxx @@ -189,7 +189,7 @@ SvLBoxItem* SvTreeListEntry::GetFirstItem( sal_uInt16 nId ) const while( nCur < nCount ) { pItem = GetItem( nCur ); - if( pItem->IsA() == nId ) + if (pItem->GetType() == nId) return pItem; nCur++; } diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx index 92f46498a434..edbf96d40814 100644 --- a/svx/source/dialog/checklbx.cxx +++ b/svx/source/dialog/checklbx.cxx @@ -215,7 +215,7 @@ void SvxCheckListBox::MouseButtonDown( const MouseEvent& rMEvt ) sal_Bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ); SvLBoxItem* pItem = GetItem( pEntry, aPnt.X() ); - if ( pItem && pItem->IsA() == SV_ITEM_ID_LBOXBUTTON ) + if (pItem && pItem->GetType() == SV_ITEM_ID_LBOXBUTTON) { SvTreeListBox::MouseButtonDown( rMEvt ); Select( pEntry, sal_True ); diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx index bee99c2f23cc..e99b1ff76ecd 100644 --- a/svx/source/dialog/simptabl.cxx +++ b/svx/source/dialog/simptabl.cxx @@ -451,8 +451,8 @@ StringCompare SvxSimpleTable::ColCompare(SvTreeListEntry* pLeft,SvTreeListEntry* if(pLeftItem != NULL && pRightItem != NULL) { - sal_uInt16 nLeftKind=pLeftItem->IsA(); - sal_uInt16 nRightKind=pRightItem->IsA(); + sal_uInt16 nLeftKind = pLeftItem->GetType(); + sal_uInt16 nRightKind = pRightItem->GetType(); if(nRightKind == SV_ITEM_ID_LBOXSTRING && nLeftKind == SV_ITEM_ID_LBOXSTRING ) diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 41580525a169..557b754de54a 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -389,8 +389,8 @@ StringCompare DictionaryList::ColumnCompare( SvTreeListEntry* pLeft, SvTreeListE if(pLeftItem != NULL && pRightItem != NULL) { - sal_uInt16 nLeftKind=pLeftItem->IsA(); - sal_uInt16 nRightKind=pRightItem->IsA(); + sal_uInt16 nLeftKind = pLeftItem->GetType(); + sal_uInt16 nRightKind = pRightItem->GetType(); if(nRightKind == SV_ITEM_ID_LBOXSTRING && nLeftKind == SV_ITEM_ID_LBOXSTRING ) diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 383a80515ddb..aaffcb78fecc 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1813,7 +1813,7 @@ void SwIdxTreeListBox::RequestHelp( const HelpEvent& rHEvt ) { SvLBoxTab* pTab; SvLBoxItem* pItem = GetItem( pEntry, aPos.X(), &pTab ); - if( pItem && SV_ITEM_ID_LBOXSTRING == pItem->IsA()) + if (pItem && SV_ITEM_ID_LBOXSTRING == pItem->GetType()) { aPos = GetEntryPosition( pEntry ); diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 78a749db98f1..034393d6d503 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -2540,7 +2540,7 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt ) { SvLBoxTab* pTab; SvLBoxItem* pItem = GetItem( pEntry, aPos.X(), &pTab ); - if( pItem && SV_ITEM_ID_LBOXSTRING == pItem->IsA()) + if (pItem && SV_ITEM_ID_LBOXSTRING == pItem->GetType()) { aPos = GetEntryPosition( pEntry ); diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index 9985c4290127..7742a9afdff0 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -475,7 +475,7 @@ void SwGlobalTree::RequestHelp( const HelpEvent& rHEvt ) bParent = sal_False; SvLBoxTab* pTab; SvLBoxItem* pItem = GetItem( pEntry, aPos.X(), &pTab ); - if(pItem && SV_ITEM_ID_LBOXSTRING == pItem->IsA()) + if (pItem && SV_ITEM_ID_LBOXSTRING == pItem->GetType()) { const SwSection* pSect = pCont->GetSection(); String sEntry = pSect->GetLinkFileName().GetToken(0, sfx2::cTokenSeperator); |