From 03eb15938e04a8a28fc08ca7528b2f7068fe1c7a Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 7 Aug 2013 22:09:06 +0200 Subject: vcl, sw: fix the inheritance of SwComboBox from ComboBox a bit Remove the silly overloading, and introduce virtual methods. Change-Id: If54a6a3fb7464283f80d3387ae23db234690f8a3 --- basctl/source/basicide/brkdlg.cxx | 2 +- cui/source/dialogs/cuifmsearch.cxx | 2 +- cui/source/tabpages/tabstpge.cxx | 2 +- dbaccess/source/ui/querydesign/LimitBox.cxx | 2 +- .../source/uielement/comboboxtoolbarcontroller.cxx | 2 +- include/vcl/combobox.hxx | 6 +++--- sc/source/ui/dbgui/filtdlg.cxx | 2 +- sfx2/source/appl/newhelp.cxx | 2 +- sfx2/source/dialog/srchdlg.cxx | 2 +- svx/source/dialog/srchdlg.cxx | 2 +- svx/source/fmcomp/gridcell.cxx | 2 +- svx/source/tbxctrls/tbunosearchcontrollers.cxx | 2 +- sw/source/ui/cctrl/swlbox.cxx | 16 ++++++++++----- sw/source/ui/config/optload.cxx | 14 ++++++------- sw/source/ui/inc/swlbox.hxx | 23 ++++++++++------------ sw/source/ui/misc/bookmark.cxx | 10 +++++++--- sw/source/ui/uiview/view.cxx | 2 +- toolkit/source/awt/vclxwindows.cxx | 13 ++++++------ vcl/source/control/combobox.cxx | 10 +++++----- vcl/source/control/field.cxx | 8 ++++---- vcl/source/control/field2.cxx | 6 +++--- vcl/source/control/longcurr.cxx | 2 +- 22 files changed, 70 insertions(+), 62 deletions(-) diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx index bb32586a1525..7acaa5b1025a 100644 --- a/basctl/source/basicide/brkdlg.cxx +++ b/basctl/source/basicide/brkdlg.cxx @@ -217,7 +217,7 @@ IMPL_LINK( BreakPointDialog, ButtonHdl, Button *, pButton ) if ( pBrk ) { delete m_aModifiedBreakPointList.remove( pBrk ); - aComboBox.RemoveEntry( nEntry ); + aComboBox.RemoveEntryAt(nEntry); if ( nEntry && !( nEntry < aComboBox.GetEntryCount() ) ) nEntry--; aComboBox.SetText( aComboBox.GetEntry( nEntry ) ); diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index a1c3e1fd7b1b..ff177e17c835 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -344,7 +344,7 @@ IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain) // the remove/insert makes sure that a) the OUString does not appear twice and // that b) the last searched strings are at the beginning and limit the list length while (m_cmbSearchText.GetEntryCount() > MAX_HISTORY_ENTRIES) - m_cmbSearchText.RemoveEntry(m_cmbSearchText.GetEntryCount()-1); + m_cmbSearchText.RemoveEntryAt(m_cmbSearchText.GetEntryCount()-1); // take out the 'overflow' hint m_ftHint.SetText(OUString()); diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index ba44cf2fbe39..31410815bce8 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -542,7 +542,7 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, DelHdl_Impl) } // Delete Tab - m_pTabBox->RemoveEntry( nPos ); + m_pTabBox->RemoveEntryAt(nPos); aNewTabs.Remove( nPos ); // Reset aAktTab diff --git a/dbaccess/source/ui/querydesign/LimitBox.cxx b/dbaccess/source/ui/querydesign/LimitBox.cxx index 52f436e0c773..688758f87423 100644 --- a/dbaccess/source/ui/querydesign/LimitBox.cxx +++ b/dbaccess/source/ui/querydesign/LimitBox.cxx @@ -84,7 +84,7 @@ void LimitBox::ReformatAll() ///First entry is All, which do not need numeric reformat if ( GetEntryCount() > 0 ) { - RemoveEntry( 0 ); + RemoveEntryAt( 0 ); NumericBox::ReformatAll(); InsertValue( ALL_INT, 0); } diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index de69836e1b8f..cf3d22834272 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -350,7 +350,7 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f if ( rControlCommand.Arguments[i].Value >>= nPos ) { if ( nPos < sal_Int32( m_pComboBox->GetEntryCount() )) - m_pComboBox->RemoveEntry( sal_uInt16( nPos )); + m_pComboBox->RemoveEntryAt(sal_uInt16(nPos)); } break; } diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index aa19e9c035ee..a4aed8d0a2e6 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -128,11 +128,11 @@ public: virtual void SetText( const OUString& rStr ); virtual void SetText( const OUString& rStr, const Selection& rNewSelection ); - sal_uInt16 InsertEntry( const OUString& rStr, sal_uInt16 nPos = COMBOBOX_APPEND ); - sal_uInt16 InsertEntry( const OUString& rStr, const Image& rImage, sal_uInt16 nPos = COMBOBOX_APPEND ); + virtual sal_uInt16 InsertEntry(const OUString& rStr, sal_uInt16 nPos = COMBOBOX_APPEND); + void InsertEntryWithImage( const OUString& rStr, const Image& rImage, sal_uInt16 nPos = COMBOBOX_APPEND ); void RemoveEntry( const OUString& rStr ); - void RemoveEntry( sal_uInt16 nPos ); + virtual void RemoveEntryAt(sal_uInt16 nPos); void Clear(); diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 74b5199c13a0..0b7b8f07b587 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -611,7 +611,7 @@ void ScFilterDlg::UpdateHdrInValueList( size_t nList ) else // Omit entry { if (bWasThere) - pValList->RemoveEntry(nListPos); + pValList->RemoveEntryAt(nListPos); } } diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index ac78943fa607..425bf57d603a 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -1043,7 +1043,7 @@ void SearchTabPage_Impl::RememberSearchText( const String& rSearchText ) { if ( rSearchText == aSearchED.GetEntry(i) ) { - aSearchED.RemoveEntry(i); + aSearchED.RemoveEntryAt(i); break; } } diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index 7ed252816258..66fb596cd10d 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -136,7 +136,7 @@ IMPL_LINK_NOARG(SearchDialog, FindHdl) String sSrchTxt = m_aSearchEdit.GetText(); sal_uInt16 nPos = m_aSearchEdit.GetEntryPos( sSrchTxt ); if ( nPos > 0 && nPos != COMBOBOX_ENTRY_NOTFOUND ) - m_aSearchEdit.RemoveEntry( nPos ); + m_aSearchEdit.RemoveEntryAt(nPos); if ( nPos > 0 ) m_aSearchEdit.InsertEntry( sSrchTxt, 0 ); m_aFindHdl.Call( this ); diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 11d235e57870..6d7cf6cb48d3 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -1547,7 +1547,7 @@ void SvxSearchDialog::Remember_Impl( const String &rStr,sal_Bool _bSearch ) // delete oldest entry at maximum occupancy (ListBox and Array) if(REMEMBER_SIZE < pArr->size()) { - pListBox->RemoveEntry( sal_uInt16(REMEMBER_SIZE - 1) ); + pListBox->RemoveEntryAt(static_cast(REMEMBER_SIZE - 1)); (*pArr)[REMEMBER_SIZE - 1] = rStr; pArr->erase(pArr->begin() + REMEMBER_SIZE - 1); } diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index ffca6817ff23..577e3e13cee6 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -4550,7 +4550,7 @@ void SAL_CALL FmXComboBoxCell::removeItems( sal_Int16 _Pos, sal_Int16 _Count ) t if ( m_pComboBox ) { for ( sal_uInt16 n = _Count; n; ) - m_pComboBox->RemoveEntry( _Pos + (--n) ); + m_pComboBox->RemoveEntryAt( _Pos + (--n) ); } } diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 74a2abfbb2f3..07cedc30b064 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -147,7 +147,7 @@ void FindTextFieldControl::Remember_Impl(const String& rStr) } if (nCount == REMEMBER_SIZE) - RemoveEntry(REMEMBER_SIZE-1); + RemoveEntryAt(REMEMBER_SIZE-1); InsertEntry(rStr, 0); } diff --git a/sw/source/ui/cctrl/swlbox.cxx b/sw/source/ui/cctrl/swlbox.cxx index c3694efcfaa3..d66cebcf3645 100644 --- a/sw/source/ui/cctrl/swlbox.cxx +++ b/sw/source/ui/cctrl/swlbox.cxx @@ -79,19 +79,25 @@ SwComboBox::~SwComboBox() { } -void SwComboBox::InsertEntry(const SwBoxEntry& rEntry) +void SwComboBox::InsertSwEntry(const SwBoxEntry& rEntry) { InsertSorted(new SwBoxEntry(rEntry)); } -void SwComboBox::RemoveEntry(sal_uInt16 nPos) +sal_uInt16 SwComboBox::InsertEntry(const OUString& rStr, sal_uInt16) +{ + InsertSwEntry(SwBoxEntry(rStr)); + return 0; +} + +void SwComboBox::RemoveEntryAt(sal_uInt16 const nPos) { if(nPos >= aEntryLst.size()) return; // Remove old element SwBoxEntry* pEntry = &aEntryLst[nPos]; - ComboBox::RemoveEntry(nPos); + ComboBox::RemoveEntryAt(nPos); // Don't add new entries to the list if(pEntry->bNew) @@ -106,12 +112,12 @@ void SwComboBox::RemoveEntry(sal_uInt16 nPos) } } -sal_uInt16 SwComboBox::GetEntryPos(const SwBoxEntry& rEntry) const +sal_uInt16 SwComboBox::GetSwEntryPos(const SwBoxEntry& rEntry) const { return ComboBox::GetEntryPos(rEntry.aName); } -const SwBoxEntry& SwComboBox::GetEntry(sal_uInt16 nPos) const +const SwBoxEntry& SwComboBox::GetSwEntry(sal_uInt16 const nPos) const { if(nPos < aEntryLst.size()) return aEntryLst[nPos]; diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 2b19c92ec50a..d3bc1a6ea31f 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -641,7 +641,7 @@ IMPL_LINK_NOARG(SwCaptionOptPage, ShowEntryHdl) InsCaptionOpt* pOpt = (InsCaptionOpt*)pSelEntry->GetUserData(); aCategoryBox.Clear(); - aCategoryBox.InsertEntry(String(m_sNone)); //FIXME + aCategoryBox.InsertEntry(m_sNone); if (pSh) { sal_uInt16 nCount = pMgr->GetFldTypeCount(); @@ -651,15 +651,15 @@ IMPL_LINK_NOARG(SwCaptionOptPage, ShowEntryHdl) SwFieldType *pType = pMgr->GetFldType( USHRT_MAX, i ); if( pType->Which() == RES_SETEXPFLD && ((SwSetExpFieldType *) pType)->GetType() & nsSwGetSetExpType::GSE_SEQ ) - aCategoryBox.InsertEntry(SwBoxEntry(pType->GetName())); + aCategoryBox.InsertSwEntry(SwBoxEntry(pType->GetName())); } } else { - aCategoryBox.InsertEntry(SwBoxEntry(m_sIllustration)); - aCategoryBox.InsertEntry(SwBoxEntry(m_sTable)); - aCategoryBox.InsertEntry(SwBoxEntry(m_sText)); - aCategoryBox.InsertEntry(SwBoxEntry(m_sDrawing)); + aCategoryBox.InsertSwEntry(SwBoxEntry(m_sIllustration)); + aCategoryBox.InsertSwEntry(SwBoxEntry(m_sTable)); + aCategoryBox.InsertSwEntry(SwBoxEntry(m_sText)); + aCategoryBox.InsertSwEntry(SwBoxEntry(m_sDrawing)); } if(pOpt->GetCategory().Len()) @@ -679,7 +679,7 @@ IMPL_LINK_NOARG(SwCaptionOptPage, ShowEntryHdl) case TABLE_CAP: nPos = 2; break; case FRAME_CAP: nPos = 3; break; } - aCategoryBox.SetText(aCategoryBox.GetEntry(nPos).GetName()); + aCategoryBox.SetText(aCategoryBox.GetSwEntry(nPos).GetName()); } for (sal_uInt16 i = 0; i < aFormatBox.GetEntryCount(); i++) diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/ui/inc/swlbox.hxx index 26b8e917a630..fe0b9af96ac4 100644 --- a/sw/source/ui/inc/swlbox.hxx +++ b/sw/source/ui/inc/swlbox.hxx @@ -75,36 +75,33 @@ class SW_DLLPUBLIC SwComboBox : public ComboBox SW_DLLPRIVATE void InsertSorted(SwBoxEntry* pEntry); SW_DLLPRIVATE void Init(); - using ComboBox::InsertEntry; - using ComboBox::RemoveEntry; + using Window::GetStyle; using Window::SetStyle; public: - using ComboBox::GetEntryPos; - SwComboBox(Window* pParent, sal_uInt16 nStyleBits = nsSwComboBoxStyle::CBS_ALL); SwComboBox(Window* pParent, const ResId& rId, sal_uInt16 nStyleBits = nsSwComboBoxStyle::CBS_ALL); ~SwComboBox(); - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - void InsertEntry(const SwBoxEntry&); - sal_uInt16 InsertEntry( const XubString& rStr, sal_uInt16 = 0) - { InsertEntry( SwBoxEntry( rStr ) ); return 0; } + void InsertSwEntry(const SwBoxEntry&); + virtual sal_uInt16 InsertEntry(const OUString& rStr, sal_uInt16 = 0) SAL_OVERRIDE; - void RemoveEntry(sal_uInt16 nPos); + virtual void RemoveEntryAt(sal_uInt16 nPos) SAL_OVERRIDE; - sal_uInt16 GetEntryPos(const SwBoxEntry& rEntry) const; - const SwBoxEntry& GetEntry(sal_uInt16) const; + sal_uInt16 GetSwEntryPos(const SwBoxEntry& rEntry) const; + const SwBoxEntry& GetSwEntry(sal_uInt16) const; sal_uInt16 GetRemovedCount() const; const SwBoxEntry& GetRemovedEntry(sal_uInt16 nPos) const; - sal_uInt16 GetStyle() const { return nStyle; } - void SetStyle(const sal_uInt16 nSt) { nStyle = nSt; } + // FIXME ??? what is this + sal_uInt16 GetSwStyle() const { return nStyle; } + void SetSwStyle(const sal_uInt16 nSt) { nStyle = nSt; } OUString GetText() const; }; diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 1a520f7537cc..245d164f048e 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -75,7 +75,7 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, DeleteHdl) // remove text marks from the ComboBox for (sal_uInt16 i = m_pBookmarkBox->GetSelectEntryCount(); i; i-- ) - m_pBookmarkBox->RemoveEntry(m_pBookmarkBox->GetSelectEntryPos(i - 1)); + m_pBookmarkBox->RemoveEntryAt(m_pBookmarkBox->GetSelectEntryPos(i - 1)); m_pBookmarkBox->SetText(aEmptyStr); m_pDeleteBtn->Enable(sal_False); // no further entries there @@ -105,7 +105,8 @@ void SwInsertBookmarkDlg::Apply() // insert text mark SwBoxEntry aTmpEntry(m_pBookmarkBox->GetText(), 0 ); - if ( !m_pBookmarkBox->GetText().isEmpty() && (m_pBookmarkBox->GetEntryPos(aTmpEntry) == COMBOBOX_ENTRY_NOTFOUND) ) + if (!m_pBookmarkBox->GetText().isEmpty() && + (m_pBookmarkBox->GetSwEntryPos(aTmpEntry) == COMBOBOX_ENTRY_NOTFOUND)) { String sEntry(comphelper::string::remove(m_pBookmarkBox->GetText(), m_pBookmarkBox->GetMultiSelectionSeparator())); @@ -143,7 +144,10 @@ SwInsertBookmarkDlg::SwInsertBookmarkDlg( Window *pParent, SwWrtShell &rS, SfxRe ++ppBookmark) { if(IDocumentMarkAccess::BOOKMARK == IDocumentMarkAccess::GetType(**ppBookmark)) - m_pBookmarkBox->InsertEntry( SwBoxEntry( ppBookmark->get()->GetName(), nId++ ) ); + { + m_pBookmarkBox->InsertSwEntry( + SwBoxEntry(ppBookmark->get()->GetName(), nId++)); + } } sRemoveWarning = String(SW_RES(STR_REMOVE_WARNING)); diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index aeff407a3546..0323f6d87b73 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -239,7 +239,7 @@ void SwView::SelectShell() } m_pLastTableFormat = pCurTableFmt; - //SEL_TBL and SEL_TBL_CELLS can be changed! + //SEL_TBL and SEL_TBL_CELLS can be ORed! int nNewSelectionType = (m_pWrtShell->GetSelectionType() & ~nsSelectionType::SEL_TBL_CELLS); diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 079b994e689b..3f72467606a3 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -4283,7 +4283,7 @@ void VCLXComboBox::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com:: if ( pBox ) { for ( sal_uInt16 n = nCount; n; ) - pBox->RemoveEntry( nPos + (--n) ); + pBox->RemoveEntryAt( nPos + (--n) ); } } @@ -4553,7 +4553,7 @@ void SAL_CALL VCLXComboBox::listItemInserted( const ItemListEvent& i_rEvent ) th ENSURE_OR_RETURN_VOID( pComboBox, "VCLXComboBox::listItemInserted: no ComboBox?!" ); ENSURE_OR_RETURN_VOID( ( i_rEvent.ItemPosition >= 0 ) && ( i_rEvent.ItemPosition <= sal_Int32( pComboBox->GetEntryCount() ) ), "VCLXComboBox::listItemInserted: illegal (inconsistent) item position!" ); - pComboBox->InsertEntry( + pComboBox->InsertEntryWithImage( i_rEvent.ItemText.IsPresent ? i_rEvent.ItemText.Value : OUString(), i_rEvent.ItemImageURL.IsPresent ? lcl_getImageFromURL( i_rEvent.ItemImageURL.Value ) : Image(), i_rEvent.ItemPosition ); @@ -4569,7 +4569,7 @@ void SAL_CALL VCLXComboBox::listItemRemoved( const ItemListEvent& i_rEvent ) thr ENSURE_OR_RETURN_VOID( ( i_rEvent.ItemPosition >= 0 ) && ( i_rEvent.ItemPosition < sal_Int32( pComboBox->GetEntryCount() ) ), "VCLXComboBox::listItemRemoved: illegal (inconsistent) item position!" ); - pComboBox->RemoveEntry( i_rEvent.ItemPosition ); + pComboBox->RemoveEntryAt( i_rEvent.ItemPosition ); } void SAL_CALL VCLXComboBox::listItemModified( const ItemListEvent& i_rEvent ) throw (RuntimeException) @@ -4587,8 +4587,8 @@ void SAL_CALL VCLXComboBox::listItemModified( const ItemListEvent& i_rEvent ) th const OUString sNewText = i_rEvent.ItemText.IsPresent ? i_rEvent.ItemText.Value : OUString( pComboBox->GetEntry( i_rEvent.ItemPosition ) ); const Image aNewImage( i_rEvent.ItemImageURL.IsPresent ? lcl_getImageFromURL( i_rEvent.ItemImageURL.Value ) : pComboBox->GetEntryImage( i_rEvent.ItemPosition ) ); - pComboBox->RemoveEntry( i_rEvent.ItemPosition ); - pComboBox->InsertEntry( sNewText, aNewImage, i_rEvent.ItemPosition ); + pComboBox->RemoveEntryAt( i_rEvent.ItemPosition ); + pComboBox->InsertEntryWithImage(sNewText, aNewImage, i_rEvent.ItemPosition); } void SAL_CALL VCLXComboBox::allItemsRemoved( const EventObject& i_rEvent ) throw (RuntimeException) @@ -4634,7 +4634,8 @@ void SAL_CALL VCLXComboBox::itemListChanged( const EventObject& i_rEvent ) throw { aLocalizationKey = xStringResourceResolver->resolveString(aLocalizationKey.copy( 1 )); } - pComboBox->InsertEntry( aLocalizationKey, lcl_getImageFromURL( aItems[i].Second ) ); + pComboBox->InsertEntryWithImage(aLocalizationKey, + lcl_getImageFromURL(aItems[i].Second)); } } void SAL_CALL VCLXComboBox::disposing( const EventObject& i_rEvent ) throw (RuntimeException) diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 77735c83bf48..b46213d0f1ec 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -921,7 +921,7 @@ void ComboBox::ImplUpdateFloatSelection() // ----------------------------------------------------------------------- -sal_uInt16 ComboBox::InsertEntry( const OUString& rStr, sal_uInt16 nPos ) +sal_uInt16 ComboBox::InsertEntry(const OUString& rStr, sal_uInt16 const nPos) { sal_uInt16 nRealPos = mpImplLB->InsertEntry( nPos + mpImplLB->GetEntryList()->GetMRUCount(), rStr ); nRealPos = sal::static_int_cast(nRealPos - mpImplLB->GetEntryList()->GetMRUCount()); @@ -931,24 +931,24 @@ sal_uInt16 ComboBox::InsertEntry( const OUString& rStr, sal_uInt16 nPos ) // ----------------------------------------------------------------------- -sal_uInt16 ComboBox::InsertEntry( const OUString& rStr, const Image& rImage, sal_uInt16 nPos ) +void ComboBox::InsertEntryWithImage( + const OUString& rStr, const Image& rImage, sal_uInt16 const nPos) { sal_uInt16 nRealPos = mpImplLB->InsertEntry( nPos + mpImplLB->GetEntryList()->GetMRUCount(), rStr, rImage ); nRealPos = sal::static_int_cast(nRealPos - mpImplLB->GetEntryList()->GetMRUCount()); CallEventListeners( VCLEVENT_COMBOBOX_ITEMADDED, (void*) sal_IntPtr(nRealPos) ); - return nRealPos; } // ----------------------------------------------------------------------- void ComboBox::RemoveEntry( const OUString& rStr ) { - RemoveEntry( GetEntryPos( rStr ) ); + RemoveEntryAt(GetEntryPos(rStr)); } // ----------------------------------------------------------------------- -void ComboBox::RemoveEntry( sal_uInt16 nPos ) +void ComboBox::RemoveEntryAt(sal_uInt16 const nPos) { mpImplLB->RemoveEntry( nPos + mpImplLB->GetEntryList()->GetMRUCount() ); CallEventListeners( VCLEVENT_COMBOBOX_ITEMREMOVED, (void*) sal_IntPtr(nPos) ); diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 32fda191be43..d7f35318fe48 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -283,7 +283,7 @@ static void ImplUpdateSeparators( const String& rOldDecSep, const String& rNewDe aText = pCombo->GetEntry( i ); void* pEntryData = pCombo->GetEntryData( i ); ImplUpdateSeparatorString( aText, rOldDecSep, rNewDecSep, rOldThSep, rNewThSep ); - pCombo->RemoveEntry( i ); + pCombo->RemoveEntryAt(i); pCombo->InsertEntry( aText, i ); pCombo->SetEntryData( i, pEntryData ); } @@ -1089,7 +1089,7 @@ void NumericBox::ReformatAll() for ( sal_uInt16 i=0; i < nEntryCount; i++ ) { ImplNumericReformat( GetEntry( i ), nValue, aStr ); - RemoveEntry( i ); + RemoveEntryAt(i); InsertEntry( aStr, i ); } NumericFormatter::Reformat(); @@ -2026,7 +2026,7 @@ void MetricBox::ReformatAll() for ( sal_uInt16 i=0; i < nEntryCount; i++ ) { ImplMetricReformat( GetEntry( i ), nValue, aStr ); - RemoveEntry( i ); + RemoveEntryAt(i); InsertEntry( aStr, i ); } MetricFormatter::Reformat(); @@ -2409,7 +2409,7 @@ void CurrencyBox::ReformatAll() for ( sal_uInt16 i=0; i < nEntryCount; i++ ) { ImplCurrencyReformat( GetEntry( i ), aStr ); - RemoveEntry( i ); + RemoveEntryAt(i); InsertEntry( aStr, i ); } CurrencyFormatter::Reformat(); diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index a7f2c444a3fe..7891e63f5917 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -983,7 +983,7 @@ void PatternBox::ReformatAll() for ( sal_uInt16 i=0; i < nEntryCount; i++ ) { aStr = ImplPatternReformat( GetEntry( i ), GetEditMask(), GetLiteralMask(), GetFormatFlags() ); - RemoveEntry( i ); + RemoveEntryAt(i); InsertEntry( aStr, i ); } PatternFormatter::Reformat(); @@ -2157,7 +2157,7 @@ void DateBox::ReformatAll() for ( sal_uInt16 i=0; i < nEntryCount; i++ ) { ImplDateReformat( GetEntry( i ), aStr, GetFieldSettings() ); - RemoveEntry( i ); + RemoveEntryAt(i); InsertEntry( aStr, i ); } DateFormatter::Reformat(); @@ -3155,7 +3155,7 @@ void TimeBox::ReformatAll() for ( sal_uInt16 i=0; i < nEntryCount; i++ ) { ImplTimeReformat( GetEntry( i ), aStr ); - RemoveEntry( i ); + RemoveEntryAt(i); InsertEntry( aStr, i ); } TimeFormatter::Reformat(); diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index 14ace596fd02..f944fb2b5ec7 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -598,7 +598,7 @@ void LongCurrencyBox::ReformatAll() ImplLongCurrencyReformat( GetEntry( i ), mnMin, mnMax, GetDecimalDigits(), GetLocaleDataWrapper(), aStr, *this ); - RemoveEntry( i ); + RemoveEntryAt(i); InsertEntry( aStr, i ); } LongCurrencyFormatter::Reformat(); -- cgit