diff options
| author | Mathias Bauer <mba@openoffice.org> | 2001-05-14 10:26:31 +0000 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2001-05-14 10:26:31 +0000 |
| commit | 762f0ddd2c00ddb59dc2db68fcd8ef24fdb8cccf (patch) | |
| tree | 1c34c11ccbbe3fc9e906659b1ac565f148e538a6 /sfx2/source/appl/appmisc.cxx | |
| parent | 2cd0bcafc10cf4ed560d822532e0ebda8a8d64f7 (diff) | |
use frame from currentviewframe for creation of Popup
Diffstat (limited to 'sfx2/source/appl/appmisc.cxx')
| -rw-r--r-- | sfx2/source/appl/appmisc.cxx | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 0dec12682688..2e63ed186fee 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appmisc.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: mba $ $Date: 2001-05-14 10:56:55 $ + * last change: $Author: mba $ $Date: 2001-05-14 11:26:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1174,20 +1174,17 @@ ISfxTemplateCommon* SfxApplication::GetCurrentTemplateCommon( SfxBindings& rBind PopupMenu* SfxAppData_Impl::GetPopupMenu( sal_uInt16 nSID, sal_Bool bBig, sal_Bool bNew ) { -// String aPath; PopupMenu** ppMenu; String sKey; switch( nSID ) { case SID_NEWDOCDIRECT: ppMenu = &pNewMenu; -// sKey = SvtPathOptions().GetNewMenuPath(); sKey = BOOKMARK_NEWMENU; break; case SID_AUTOPILOTMENU: ppMenu = &pAutoPilotMenu; sKey = BOOKMARK_WIZARDMENU; -// sKey = SvtPathOptions().GetAutoPilotPath(); break; default: ppMenu = 0; @@ -1195,21 +1192,18 @@ PopupMenu* SfxAppData_Impl::GetPopupMenu( sal_uInt16 nSID, sal_Bool bBig, sal_Bo break; } -// ::utl::LocalFileHelper::ConvertPhysicalNameToURL( sKey, sKey ); if( ppMenu && ( !*ppMenu || bNew ) ) { -// INetURLObject aObj( sKey ); -// String aURL = aObj.GetMainURL(); if ( *ppMenu ) delete *ppMenu; - ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > xDesktop( - ::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")), ::com::sun::star::uno::UNO_QUERY ); + SfxViewFrame* pViewFrame = SfxViewFrame::Current(); + if ( !pViewFrame ) + pViewFrame = pViewFrame->GetFirst(); + ::framework::MenuConfiguration aConf( ::comphelper::getProcessServiceFactory() ); - *ppMenu = aConf.CreateBookmarkMenu( xDesktop, sKey ); -// new SfxBmkMenu( aURL, aURL ); -// (*ppMenu)->Initialize(); + *ppMenu = aConf.CreateBookmarkMenu( pViewFrame->GetFrame()->GetFrameInterface(), sKey ); } + return ppMenu ? *ppMenu : NULL; } |