summaryrefslogtreecommitdiff
path: root/svx/source/tbxctrls
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/tbxctrls')
-rw-r--r--svx/source/tbxctrls/fillctrl.cxx16
-rw-r--r--svx/source/tbxctrls/itemwin.cxx2
-rw-r--r--svx/source/tbxctrls/linectrl.cxx2
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx2
4 files changed, 11 insertions, 11 deletions
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())
generated by cgit (git 2.34.1) at 2025-01-17 08:40:36 +0000