diff options
Diffstat (limited to 'framework/source/uielement/recentfilesmenucontroller.cxx')
| -rw-r--r-- | framework/source/uielement/recentfilesmenucontroller.cxx | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 7ab450d59c..5bf8611801 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ #include <vcl/i18nhelp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> -#include <svtools/historyoptions.hxx> +#include <unotools/historyoptions.hxx> #include <cppuhelper/implbase1.hxx> #include <osl/file.hxx> //#include <tools/solar.hrc> @@ -135,7 +135,7 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > Reference< XStringWidth > xStringLength( new RecentFilesStringLength ); int nPickListMenuItems = ( aHistoryList.getLength() > 99 ) ? 99 : aHistoryList.getLength(); - + // New vnd.sun.star.popup: command URL to support direct dispatches const rtl::OUString aCmdPrefix( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.popup:RecentFileList?entry=" )); @@ -253,11 +253,11 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex ) xDispatchProvider = Reference< XDispatchProvider >( m_xFrame, UNO_QUERY ); xServiceManager = m_xServiceManager; aLock.unlock(); - + css::util::URL aTargetURL; Sequence< PropertyValue > aArgsList; - - if (( nIndex >= 0 ) && + + if (( nIndex >= 0 ) && ( nIndex < sal::static_int_cast<sal_Int32>( m_aRecentFilesItems.size() ))) { const RecentFile& rRecentFile = m_aRecentFilesItems[ nIndex ]; @@ -353,7 +353,7 @@ void SAL_CALL RecentFilesMenuController::select( const css::awt::MenuEvent& rEve VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( xPopupMenu ); if ( pPopupMenu ) executeEntry( rEvent.MenuId-1 ); - } + } } void SAL_CALL RecentFilesMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException) @@ -372,7 +372,7 @@ void RecentFilesMenuController::impl_setPopupMenu() void SAL_CALL RecentFilesMenuController::updatePopupMenu() throw (RuntimeException) { ResetableGuard aLock( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); @@ -392,17 +392,17 @@ void SAL_CALL RecentFilesMenuController::updatePopupMenu() throw (RuntimeExcepti } // XDispatchProvider -Reference< XDispatch > SAL_CALL RecentFilesMenuController::queryDispatch( - const URL& aURL, - const ::rtl::OUString& /*sTarget*/, - sal_Int32 /*nFlags*/ ) +Reference< XDispatch > SAL_CALL RecentFilesMenuController::queryDispatch( + const URL& aURL, + const ::rtl::OUString& /*sTarget*/, + sal_Int32 /*nFlags*/ ) throw( RuntimeException ) { ResetableGuard aLock( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + if ( aURL.Complete.indexOf( m_aBaseURL ) == 0 ) return Reference< XDispatch >( static_cast< OWeakObject* >( this ), UNO_QUERY ); else @@ -410,13 +410,13 @@ throw( RuntimeException ) } // XDispatch -void SAL_CALL RecentFilesMenuController::dispatch( - const URL& aURL, - const Sequence< PropertyValue >& /*seqProperties*/ ) +void SAL_CALL RecentFilesMenuController::dispatch( + const URL& aURL, + const Sequence< PropertyValue >& /*seqProperties*/ ) throw( RuntimeException ) { ResetableGuard aLock( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); @@ -433,7 +433,7 @@ throw( RuntimeException ) { sal_Int32 nAddArgs = aURL.Complete.indexOf( '&', nEntryPos ); rtl::OUString aEntryArg; - + if ( nAddArgs < 0 ) aEntryArg = aURL.Complete.copy( nEntryPos ); else @@ -446,22 +446,22 @@ throw( RuntimeException ) } } -void SAL_CALL RecentFilesMenuController::addStatusListener( - const Reference< XStatusListener >& xControl, - const URL& aURL ) +void SAL_CALL RecentFilesMenuController::addStatusListener( + const Reference< XStatusListener >& xControl, + const URL& aURL ) throw( RuntimeException ) { ResetableGuard aLock( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + PopupMenuControllerBase::addStatusListener( xControl, aURL ); } void SAL_CALL RecentFilesMenuController::removeStatusListener( - const Reference< XStatusListener >& xControl, - const URL& aURL ) + const Reference< XStatusListener >& xControl, + const URL& aURL ) throw( RuntimeException ) { PopupMenuControllerBase::removeStatusListener( xControl, aURL ); |