diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-09-14 16:50:25 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-09-21 12:44:00 +0200 |
commit | b649e5bf1d3f0a11fb0c2fdf6fa08329529ce6fb (patch) | |
tree | bd6937a0ece320c9545774dd5c9a68c68d04769e /svx | |
parent | 06ce312f79cb0871c0b110ba4bff16f5aaa0f538 (diff) |
Rename GetSelectEntry -> GetSelectedEntry
Change-Id: Ibb7d8c59c0e61b0e87455bd78f241d8691dd9dce
Reviewed-on: https://gerrit.libreoffice.org/42282
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/dialog/compressgraphicdialog.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/ctredlin.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/rubydialog.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/srchdlg.cxx | 12 | ||||
-rw-r--r-- | svx/source/fmcomp/gridcell.cxx | 8 | ||||
-rw-r--r-- | svx/source/form/datanavi.cxx | 12 | ||||
-rw-r--r-- | svx/source/gallery2/galbrws1.cxx | 2 | ||||
-rw-r--r-- | svx/source/gallery2/galbrws1.hxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 14 | ||||
-rw-r--r-- | svx/source/sidebar/line/LinePropertyPanelBase.cxx | 4 | ||||
-rw-r--r-- | svx/source/tbxctrls/fillctrl.cxx | 16 | ||||
-rw-r--r-- | svx/source/tbxctrls/itemwin.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/linectrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 2 |
14 files changed, 41 insertions, 41 deletions
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index d83e5e67e055..f17266966875 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -255,7 +255,7 @@ double CompressGraphicsDialog::GetViewHeightInch() BmpScaleFlag CompressGraphicsDialog::GetSelectedInterpolationType() { - OUString aSelectionText = m_pInterpolationCombo->GetSelectEntry(); + OUString aSelectionText = m_pInterpolationCombo->GetSelectedEntry(); if( aSelectionText == "Lanczos" ) { return BmpScaleFlag::Lanczos; diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 253e3b43e32f..8e56390c7984 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -728,7 +728,7 @@ void SvxTPFilter::InsertAuthor( const OUString& rString) OUString SvxTPFilter::GetSelectedAuthor() const { - return m_pLbAuthor->GetSelectEntry(); + return m_pLbAuthor->GetSelectedEntry(); } void SvxTPFilter::SelectedAuthorPos(sal_Int32 nPos) diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 55b7d562bdcb..73371cb0c588 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -334,7 +334,7 @@ void SvxRubyDialog::Activate() if (xRubySel.is()) { Reference< XModel > xModel = m_pImpl->GetModel(); - const OUString sCharStyleSelect = m_pCharStyleLB->GetSelectEntry(); + const OUString sCharStyleSelect = m_pCharStyleLB->GetSelectedEntry(); ClearCharStyleList(); Reference<XStyleFamiliesSupplier> xSupplier(xModel, UNO_QUERY); if (xSupplier.is()) diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 47c409718971..e0ee16f9e3d0 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -1277,8 +1277,8 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void ) { if ( m_pLayoutBtn->IsChecked() && !bInclusive ) { - pSearchItem->SetSearchString ( m_pSearchTmplLB->GetSelectEntry() ); - pSearchItem->SetReplaceString( m_pReplaceTmplLB->GetSelectEntry() ); + pSearchItem->SetSearchString ( m_pSearchTmplLB->GetSelectedEntry() ); + pSearchItem->SetReplaceString( m_pReplaceTmplLB->GetSelectedEntry() ); } else { @@ -1615,8 +1615,8 @@ void SvxSearchDialog::Remember_Impl( const OUString &rStr, bool _bSearch ) void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ) { - OUString aOldSrch( m_pSearchTmplLB->GetSelectEntry() ); - OUString aOldRepl( m_pReplaceTmplLB->GetSelectEntry() ); + OUString aOldSrch( m_pSearchTmplLB->GetSelectedEntry() ); + OUString aOldRepl( m_pReplaceTmplLB->GetSelectedEntry() ); m_pSearchTmplLB->Clear(); m_pReplaceTmplLB->Clear(); rPool.SetSearchMask( pSearchItem->GetFamily() ); @@ -2259,8 +2259,8 @@ void SvxSearchDialog::SaveToModule_Impl() if ( m_pLayoutBtn->IsChecked() ) { - pSearchItem->SetSearchString ( m_pSearchTmplLB->GetSelectEntry() ); - pSearchItem->SetReplaceString( m_pReplaceTmplLB->GetSelectEntry() ); + pSearchItem->SetSearchString ( m_pSearchTmplLB->GetSelectedEntry() ); + pSearchItem->SetReplaceString( m_pReplaceTmplLB->GetSelectedEntry() ); } else { diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 9c16503bd11e..7b5ca399335d 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -2677,7 +2677,7 @@ void DbFilterField::PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect) DbCellControl::PaintCell( rDev, rRect ); break; case FormComponentType::LISTBOX: - rDev.DrawText(rRect, static_cast<ListBox*>(m_pWindow.get())->GetSelectEntry(), nStyle); + rDev.DrawText(rRect, static_cast<ListBox*>(m_pWindow.get())->GetSelectedEntry(), nStyle); break; default: rDev.DrawText(rRect, m_aText, nStyle); @@ -4171,7 +4171,7 @@ OUString SAL_CALL FmXListBoxCell::getSelectedItem() if (m_pBox) { UpdateFromColumn(); - aItem = m_pBox->GetSelectEntry(); + aItem = m_pBox->GetSelectedEntry(); } return aItem; @@ -4190,7 +4190,7 @@ css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getSelectedItems() const sal_Int32 nSelEntries = m_pBox->GetSelectEntryCount(); aSeq = css::uno::Sequence<OUString>( nSelEntries ); for ( sal_Int32 n = 0; n < nSelEntries; ++n ) - aSeq.getArray()[n] = m_pBox->GetSelectEntry( n ); + aSeq.getArray()[n] = m_pBox->GetSelectedEntry( n ); } return aSeq; } @@ -4308,7 +4308,7 @@ IMPL_LINK_NOARG(FmXListBoxCell, OnDoubleClick, ListBox&, void) css::awt::ActionEvent aEvent; aEvent.Source = *this; - aEvent.ActionCommand = m_pBox->GetSelectEntry(); + aEvent.ActionCommand = m_pBox->GetSelectedEntry(); while( aIt.hasMoreElements() ) static_cast< css::awt::XActionListener *>(aIt.next())->actionPerformed( aEvent ); diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index ee6c7b12ed83..796def0b73c5 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -1898,7 +1898,7 @@ namespace svxform void DataNavigatorWindow::SetPageModel() { - OUString sModel( m_pModelsBox->GetSelectEntry() ); + OUString sModel( m_pModelsBox->GetSelectedEntry() ); try { Any aAny = m_xDataContainer->getByName( sModel ); @@ -1931,7 +1931,7 @@ namespace svxform void DataNavigatorWindow::InitPages() { - OUString sModel( m_pModelsBox->GetSelectEntry() ); + OUString sModel( m_pModelsBox->GetSelectedEntry() ); try { Any aAny = m_xDataContainer->getByName( sModel ); @@ -2447,7 +2447,7 @@ namespace svxform return; } - OUString sDataType( m_pDataTypeLB->GetSelectEntry() ); + OUString sDataType( m_pDataTypeLB->GetSelectedEntry() ); m_xTempBinding->setPropertyValue( PN_BINDING_TYPE, makeAny( sDataType ) ); if ( bIsHandleBinding ) @@ -3183,17 +3183,17 @@ namespace svxform m_xSubmission->setPropertyValue( PN_SUBMISSION_ID, makeAny( sTemp ) ); sTemp = m_pActionED->GetText(); m_xSubmission->setPropertyValue( PN_SUBMISSION_ACTION, makeAny( sTemp ) ); - sTemp = m_aMethodString.toAPI( m_pMethodLB->GetSelectEntry() ); + sTemp = m_aMethodString.toAPI( m_pMethodLB->GetSelectedEntry() ); m_xSubmission->setPropertyValue( PN_SUBMISSION_METHOD, makeAny( sTemp ) ); sTemp = m_pRefED->GetText(); m_xSubmission->setPropertyValue( PN_SUBMISSION_REF, makeAny( sTemp ) ); - OUString sEntry = m_pBindLB->GetSelectEntry(); + OUString sEntry = m_pBindLB->GetSelectedEntry(); sal_Int32 nColonIdx = sEntry.indexOf(':'); if (nColonIdx != -1) sEntry = sEntry.copy(0, nColonIdx); sTemp = sEntry; m_xSubmission->setPropertyValue( PN_SUBMISSION_BIND, makeAny( sTemp ) ); - sTemp = m_aReplaceString.toAPI( m_pReplaceLB->GetSelectEntry() ); + sTemp = m_aReplaceString.toAPI( m_pReplaceLB->GetSelectedEntry() ); m_xSubmission->setPropertyValue( PN_SUBMISSION_REPLACE, makeAny( sTemp ) ); } catch ( Exception& ) diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index ee4324146464..d6c1361f8523 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -359,7 +359,7 @@ void GalleryBrowser1::ImplExecute(const OString &rIdent) else if (rIdent == "delete") { if( ScopedVclPtrInstance<MessageDialog>(nullptr, "QueryDeleteThemeDialog","svx/ui/querydeletethemedialog.ui")->Execute() == RET_YES ) - mpGallery->RemoveTheme( mpThemes->GetSelectEntry() ); + mpGallery->RemoveTheme( mpThemes->GetSelectedEntry() ); } else if (rIdent == "rename") { diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index 3abd35c509e9..531e92edc472 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -124,7 +124,7 @@ public: virtual void dispose() override; void SelectTheme( sal_uInt16 nThemePos ) { mpThemes->SelectEntryPos( nThemePos ); SelectThemeHdl( *mpThemes ); } - OUString GetSelectedTheme() { return mpThemes->GetEntryCount() ? mpThemes->GetSelectEntry() : OUString(); } + OUString GetSelectedTheme() { return mpThemes->GetEntryCount() ? mpThemes->GetSelectedEntry() : OUString(); } void ShowContextMenu(); bool KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow ); diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index eb2980a0b195..bdced73f824f 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -348,7 +348,7 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillTypeHdl, ListBox&, void) if(mnLastPosHatch < pXHatchList->Count()) { const XHatch aHatch = pXHatchList->GetHatch(mnLastPosHatch)->GetHatch(); - const XFillHatchItem aXFillHatchItem(mpLbFillAttr->GetSelectEntry(), aHatch); + const XFillHatchItem aXFillHatchItem(mpLbFillAttr->GetSelectedEntry(), aHatch); // #i122676# change FillStyle and Hatch in one call XFillStyleItem aXFillStyleItem(drawing::FillStyle_HATCH); @@ -394,7 +394,7 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillTypeHdl, ListBox&, void) { const XBitmapEntry* pXBitmapEntry = pXBitmapList->GetBitmap(mnLastPosBitmap); aBitmap = pXBitmapEntry->GetGraphicObject(); - aName = mpLbFillAttr->GetSelectEntry(); + aName = mpLbFillAttr->GetSelectedEntry(); mpLbFillAttr->SelectEntryPos(mnLastPosBitmap); } } @@ -420,7 +420,7 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillTypeHdl, ListBox&, void) { const XBitmapEntry* pXPatternEntry = pXPatternList->GetBitmap(mnLastPosPattern); aBitmap = pXPatternEntry->GetGraphicObject(); - aName = mpLbFillAttr->GetSelectEntry(); + aName = mpLbFillAttr->GetSelectedEntry(); mpLbFillAttr->SelectEntryPos(mnLastPosPattern); } } @@ -506,7 +506,7 @@ void AreaPropertyPanelBase::SelectFillAttrHdl_Impl() aGradient.SetStartColor(mpLbFillGradFrom->GetSelectEntryColor()); aGradient.SetEndColor(mpLbFillGradTo->GetSelectEntryColor()); - const XFillGradientItem aXFillGradientItem(mpLbFillAttr->GetSelectEntry(), aGradient); + const XFillGradientItem aXFillGradientItem(mpLbFillAttr->GetSelectedEntry(), aGradient); // #i122676# Change FillStyle and Gradinet in one call XFillStyleItem aXFillStyleItem(drawing::FillStyle_GRADIENT); @@ -530,7 +530,7 @@ void AreaPropertyPanelBase::SelectFillAttrHdl_Impl() if(nPos < aItem.GetHatchList()->Count()) { const XHatch aHatch = aItem.GetHatchList()->GetHatch(nPos)->GetHatch(); - const XFillHatchItem aXFillHatchItem( mpLbFillAttr->GetSelectEntry(), aHatch); + const XFillHatchItem aXFillHatchItem( mpLbFillAttr->GetSelectedEntry(), aHatch); // #i122676# Change FillStyle and Hatch in one call XFillStyleItem aXFillStyleItem(drawing::FillStyle_HATCH); @@ -560,7 +560,7 @@ void AreaPropertyPanelBase::SelectFillAttrHdl_Impl() if(nPos < aItem.GetBitmapList()->Count()) { const XBitmapEntry* pXBitmapEntry = aItem.GetBitmapList()->GetBitmap(nPos); - const XFillBitmapItem aXFillBitmapItem(mpLbFillAttr->GetSelectEntry(), pXBitmapEntry->GetGraphicObject()); + const XFillBitmapItem aXFillBitmapItem(mpLbFillAttr->GetSelectedEntry(), pXBitmapEntry->GetGraphicObject()); // #i122676# Change FillStyle and Bitmap in one call XFillStyleItem aXFillStyleItem(drawing::FillStyle_BITMAP); @@ -590,7 +590,7 @@ void AreaPropertyPanelBase::SelectFillAttrHdl_Impl() if(nPos < aItem.GetPatternList()->Count()) { const XBitmapEntry* pXPatternEntry = aItem.GetPatternList()->GetBitmap(nPos); - const XFillBitmapItem aXFillBitmapItem(mpLbFillAttr->GetSelectEntry(), pXPatternEntry->GetGraphicObject()); + const XFillBitmapItem aXFillBitmapItem(mpLbFillAttr->GetSelectedEntry(), pXPatternEntry->GetGraphicObject()); // #i122676# Change FillStyle and Bitmap in one call XFillStyleItem aXFillStyleItem(drawing::FillStyle_BITMAP); diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index 3f15d5e85402..3e6e52ac3975 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -586,7 +586,7 @@ IMPL_LINK_NOARG(LinePropertyPanelBase, ChangeStartHdl, ListBox&, void) if( nPos == 0 ) pItem.reset(new XLineStartItem()); else if( mxLineEndList.is() && mxLineEndList->Count() > (long) ( nPos - 1 ) ) - pItem.reset(new XLineStartItem( mpLBStart->GetSelectEntry(),mxLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() )); + pItem.reset(new XLineStartItem( mpLBStart->GetSelectedEntry(),mxLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() )); setLineStartStyle(pItem.get()); } } @@ -600,7 +600,7 @@ IMPL_LINK_NOARG(LinePropertyPanelBase, ChangeEndHdl, ListBox&, void) if( nPos == 0 ) pItem.reset(new XLineEndItem()); else if( mxLineEndList.is() && mxLineEndList->Count() > (long) ( nPos - 1 ) ) - pItem.reset(new XLineEndItem( mpLBEnd->GetSelectEntry(), mxLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() )); + pItem.reset(new XLineEndItem( mpLBEnd->GetSelectedEntry(), mxLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() )); setLineEndStyle(pItem.get()); } } diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 0e3ebade9ff9..dd5c761a0ba0 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -362,7 +362,7 @@ void SvxFillToolBoxControl::Update() mpLbFillAttr->SelectEntry(aString); // Check if the entry is not in the list - if (mpLbFillAttr->GetSelectEntry() != aString) + if (mpLbFillAttr->GetSelectedEntry() != aString) { sal_Int32 nCount = mpLbFillAttr->GetEntryCount(); OUString aTmpStr; @@ -421,7 +421,7 @@ void SvxFillToolBoxControl::Update() mpLbFillAttr->SelectEntry( aString ); // Check if the entry is not in the list - if( mpLbFillAttr->GetSelectEntry() != aString ) + if( mpLbFillAttr->GetSelectedEntry() != aString ) { const sal_Int32 nCount = mpLbFillAttr->GetEntryCount(); OUString aTmpStr; @@ -480,7 +480,7 @@ void SvxFillToolBoxControl::Update() mpLbFillAttr->SelectEntry(aString); // Check if the entry is not in the list - if (mpLbFillAttr->GetSelectEntry() != aString) + if (mpLbFillAttr->GetSelectedEntry() != aString) { sal_Int32 nCount = mpLbFillAttr->GetEntryCount(); OUString aTmpStr; @@ -676,7 +676,7 @@ IMPL_LINK_NOARG(SvxFillToolBoxControl, SelectFillTypeHdl, ListBox&, void) if(mnLastPosHatch < aItem.GetHatchList()->Count()) { const XHatch aHatch = aItem.GetHatchList()->GetHatch(mnLastPosHatch)->GetHatch(); - const XFillHatchItem aXFillHatchItem(mpLbFillAttr->GetSelectEntry(), aHatch); + const XFillHatchItem aXFillHatchItem(mpLbFillAttr->GetSelectedEntry(), aHatch); // #i122676# change FillStyle and Hatch in one call SfxViewFrame::Current()->GetDispatcher()->ExecuteList( @@ -716,7 +716,7 @@ IMPL_LINK_NOARG(SvxFillToolBoxControl, SelectFillTypeHdl, ListBox&, void) if(mnLastPosBitmap < aItem.GetBitmapList()->Count()) { const XBitmapEntry* pXBitmapEntry = aItem.GetBitmapList()->GetBitmap(mnLastPosBitmap); - const XFillBitmapItem aXFillBitmapItem(mpLbFillAttr->GetSelectEntry(), pXBitmapEntry->GetGraphicObject()); + const XFillBitmapItem aXFillBitmapItem(mpLbFillAttr->GetSelectedEntry(), pXBitmapEntry->GetGraphicObject()); // #i122676# change FillStyle and Bitmap in one call SfxViewFrame::Current()->GetDispatcher()->ExecuteList( @@ -782,7 +782,7 @@ IMPL_LINK_NOARG(SvxFillToolBoxControl, SelectFillAttrHdl, ListBox&, void) if(nPos < aItem.GetGradientList()->Count()) { const XGradient aGradient = aItem.GetGradientList()->GetGradient(nPos)->GetGradient(); - const XFillGradientItem aXFillGradientItem(mpLbFillAttr->GetSelectEntry(), aGradient); + const XFillGradientItem aXFillGradientItem(mpLbFillAttr->GetSelectedEntry(), aGradient); // #i122676# Change FillStyle and Gradinet in one call SfxViewFrame::Current()->GetDispatcher()->ExecuteList( @@ -815,7 +815,7 @@ IMPL_LINK_NOARG(SvxFillToolBoxControl, SelectFillAttrHdl, ListBox&, void) if(nPos < aItem.GetHatchList()->Count()) { const XHatch aHatch = aItem.GetHatchList()->GetHatch(nPos)->GetHatch(); - const XFillHatchItem aXFillHatchItem( mpLbFillAttr->GetSelectEntry(), aHatch); + const XFillHatchItem aXFillHatchItem( mpLbFillAttr->GetSelectedEntry(), aHatch); // #i122676# Change FillStyle and Hatch in one call SfxViewFrame::Current()->GetDispatcher()->ExecuteList( @@ -848,7 +848,7 @@ IMPL_LINK_NOARG(SvxFillToolBoxControl, SelectFillAttrHdl, ListBox&, void) if(nPos < aItem.GetBitmapList()->Count()) { const XBitmapEntry* pXBitmapEntry = aItem.GetBitmapList()->GetBitmap(nPos); - const XFillBitmapItem aXFillBitmapItem(mpLbFillAttr->GetSelectEntry(), pXBitmapEntry->GetGraphicObject()); + const XFillBitmapItem aXFillBitmapItem(mpLbFillAttr->GetSelectedEntry(), pXBitmapEntry->GetGraphicObject()); // #i122676# Change FillStyle and Bitmap in one call SfxViewFrame::Current()->GetDispatcher()->ExecuteList( diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index cd71cb296302..e43f0375c5e1 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -112,7 +112,7 @@ void SvxLineBox::Select() // Notify cares! SvxDashListItem aItem( *static_cast<const SvxDashListItem*>( SfxObjectShell::Current()->GetItem( SID_DASH_LIST ) ) ); - XLineDashItem aLineDashItem( GetSelectEntry(), + XLineDashItem aLineDashItem( GetSelectedEntry(), aItem.GetDashList()->GetDash( nPos - 2 )->GetDash() ); Any a; diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 7a35ddf3a502..59a36954c913 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -173,7 +173,7 @@ void SvxLineStyleToolBoxControl::Update( const SfxPoolItem* pState ) SvxLineBox* pBox = static_cast<SvxLineBox*>(GetToolBox().GetItemWindow( GetId() )); DBG_ASSERT( pBox, "Window not found!" ); - OUString aString( pBox->GetSelectEntry() ); + OUString aString( pBox->GetSelectedEntry() ); pBox->Clear(); pBox->InsertEntry( SvxResId(RID_SVXSTR_INVISIBLE) ); pBox->InsertEntry( SvxResId(RID_SVXSTR_SOLID) ); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index cbd1c7c1d056..453042bbdc0d 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -403,7 +403,7 @@ void SvxStyleBox_Impl::ReleaseFocus() IMPL_LINK( SvxStyleBox_Impl, MenuSelectHdl, Menu*, pMenu, bool) { - OUString sEntry = GetSelectEntry(); + OUString sEntry = GetSelectedEntry(); OString sMenuIdent = pMenu->GetCurItemIdent(); ReleaseFocus(); // It must be after getting entry pos! if (IsInDropDown()) |