diff options
Diffstat (limited to 'extensions/source')
-rw-r--r-- | extensions/source/bibliography/toolbar.cxx | 16 | ||||
-rw-r--r-- | extensions/source/bibliography/toolbar.hxx | 2 | ||||
-rw-r--r-- | extensions/source/update/ui/updatecheckui.cxx | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 3cf37e486b03..65e4010aab6a 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -383,21 +383,21 @@ void BibToolBar::Click() void BibToolBar::ClearFilterMenu() { - aPopupMenu.Clear(); + pPopupMenu->Clear(); nMenuId=0; } sal_uInt16 BibToolBar::InsertFilterItem(const OUString& aMenuEntry) { nMenuId++; - aPopupMenu.InsertItem(nMenuId,aMenuEntry); + pPopupMenu->InsertItem(nMenuId,aMenuEntry); return nMenuId; } void BibToolBar::SelectFilterItem(sal_uInt16 nId) { - aPopupMenu.CheckItem(nId); + pPopupMenu->CheckItem(nId); nSelMenuItem=nId; - aQueryField = MnemonicGenerator::EraseAllMnemonicChars( aPopupMenu.GetItemText(nId) ); + aQueryField = MnemonicGenerator::EraseAllMnemonicChars( pPopupMenu->GetItemText(nId) ); } void BibToolBar::EnableSourceList(bool bFlag) @@ -490,15 +490,15 @@ IMPL_LINK_NOARG_TYPED( BibToolBar, MenuHdl, ToolBox*, void) EndSelection(); // vor SetDropMode (SetDropMode ruft SetItemImage) SetItemDown(nTBC_BT_AUTOFILTER, true); - nId = aPopupMenu.Execute(this, GetItemRect(nTBC_BT_AUTOFILTER)); + nId = pPopupMenu->Execute(this, GetItemRect(nTBC_BT_AUTOFILTER)); if(nId>0) { - aPopupMenu.CheckItem(nSelMenuItem,false); - aPopupMenu.CheckItem(nId); + pPopupMenu->CheckItem(nSelMenuItem,false); + pPopupMenu->CheckItem(nId); nSelMenuItem=nId; - aQueryField = MnemonicGenerator::EraseAllMnemonicChars( aPopupMenu.GetItemText(nId) ); + aQueryField = MnemonicGenerator::EraseAllMnemonicChars( pPopupMenu->GetItemText(nId) ); Sequence<PropertyValue> aPropVal(2); PropertyValue* pPropertyVal = const_cast<PropertyValue*>(aPropVal.getConstArray()); pPropertyVal[0].Name = "QueryText"; diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index 9743e2848cd5..97f189cc0618 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -116,7 +116,7 @@ class BibToolBar: public ToolBox VclPtr<ListBox> aLBSource; VclPtr<FixedText> aFtQuery; VclPtr<Edit> aEdQuery; - PopupMenu aPopupMenu; + ScopedVclPtr<PopupMenu> pPopupMenu; sal_uInt16 nMenuId; sal_uInt16 nSelMenuItem; OUString aQueryField; diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index f8f9e9f00a10..25f56553dd0c 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -126,7 +126,7 @@ class UpdateCheckUI : public ::cppu::WeakImplHelper Image maBubbleImage; VclPtr<BubbleWindow> mpBubbleWin; VclPtr<SystemWindow> mpIconSysWin; - MenuBar* mpIconMBar; + VclPtr<MenuBar> mpIconMBar; ResMgr* mpUpdResMgr; ResMgr* mpSfxResMgr; Idle maWaitIdle; |