diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 586a9af7dcf0..3866355ff578 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -281,7 +281,12 @@ void SAL_CALL RecentFilesMenuController::itemSelected( const css::awt::MenuEvent OUStringToOString( aCommand, RTL_TEXTENCODING_UTF8 ).getStr() ); if ( aCommand.startsWith( CMD_CLEAR_LIST ) ) + { SvtHistoryOptions().Clear( ePICKLIST ); + dispatchCommand( + "vnd.org.libreoffice.recentdocs:ClearRecentFileList", + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >() ); + } else executeEntry( rEvent.MenuId-1 ); } diff --git a/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu b/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu index 8bb848aebd10..62f7566875e6 100644 --- a/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu +++ b/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu @@ -70,5 +70,10 @@ vnd.com.sun.star.comp.PresentationMinimizer:* + + + vnd.org.libreoffice.recentdocs:* + + diff --git a/sfx2/inc/backingcomp.hxx b/sfx2/inc/backingcomp.hxx index d4d86fe784a6..7d1b38e46949 100644 --- a/sfx2/inc/backingcomp.hxx +++ b/sfx2/inc/backingcomp.hxx @@ -30,6 +30,8 @@ #include #include +#include +#include #include #include @@ -57,6 +59,8 @@ class BackingComp : public css::lang::XTypeProvider , public css::lang::XInitialization , public css::frame::XController // => XComponent , public css::awt::XKeyListener // => XEventListener + , public css::frame::XDispatchProvider + , public css::frame::XDispatch , public ::cppu::OWeakObject { //______________________________________ @@ -119,6 +123,15 @@ class BackingComp : public css::lang::XTypeProvider virtual void SAL_CALL addEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException); virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException); + // XDispatchProvider + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions ) throw( css::uno::RuntimeException ); + + // XDispatch + virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw( css::uno::RuntimeException ); + //______________________________________ // helper diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx index c34e6dc7f39c..5e357e3fd333 100644 --- a/sfx2/source/dialog/backingcomp.cxx +++ b/sfx2/source/dialog/backingcomp.cxx @@ -102,7 +102,9 @@ css::uno::Any SAL_CALL BackingComp::queryInterface( /*IN*/ const css::uno::Type& static_cast< css::frame::XController* >(this), static_cast< css::lang::XComponent* >(this), static_cast< css::lang::XEventListener* >(this), - static_cast< css::awt::XKeyListener* >(static_cast< css::lang::XEventListener* >(this))); + static_cast< css::awt::XKeyListener* >(static_cast< css::lang::XEventListener* >(this)), + static_cast< css::frame::XDispatchProvider* >(this), + static_cast< css::frame::XDispatch* >(this) ); // then look for supported window interfaces // Note: They exist only, if this instance was initialized @@ -183,6 +185,8 @@ css::uno::Sequence< css::uno::Type > SAL_CALL BackingComp::getTypes() ::getCppuType((const ::com::sun::star::uno::Reference< css::lang::XServiceInfo >*)NULL ), ::getCppuType((const ::com::sun::star::uno::Reference< css::frame::XController >*)NULL ), ::getCppuType((const ::com::sun::star::uno::Reference< css::lang::XComponent >*)NULL ), + ::getCppuType((const ::com::sun::star::uno::Reference< css::frame::XDispatchProvider >*)NULL ), + ::getCppuType((const ::com::sun::star::uno::Reference< css::frame::XDispatch >*)NULL ), lWindowTypes); pTypeCollection = &aTypeCollection; @@ -261,7 +265,8 @@ sal_Bool SAL_CALL BackingComp::supportsService( /*IN*/ const OUString& sServiceN { return ( sServiceName.equals("com.sun.star.frame.StartModule") || - sServiceName.equals(SERVICENAME_FRAMECONTROLLER) + sServiceName.equals(SERVICENAME_FRAMECONTROLLER) || + sServiceName.equals("com.sun.star.frame.ProtocolHandler") ); } @@ -317,8 +322,9 @@ OUString BackingComp::impl_getStaticImplementationName() css::uno::Sequence< OUString > BackingComp::impl_getStaticSupportedServiceNames() { - css::uno::Sequence< OUString > lNames(1); + css::uno::Sequence< OUString > lNames(2); lNames[0] = "com.sun.star.frame.StartModule"; + lNames[1] = "com.sun.star.frame.ProtocolHandler"; return lNames; } @@ -800,4 +806,46 @@ void SAL_CALL BackingComp::keyReleased( /*IN*/ const css::awt::KeyEvent& ) */ } +// XDispatchProvider +css::uno::Reference< css::frame::XDispatch > SAL_CALL BackingComp::queryDispatch( const css::util::URL& aURL, const OUString& /*sTargetFrameName*/, sal_Int32 /*nSearchFlags*/ ) throw( css::uno::RuntimeException ) +{ + css::uno::Reference< css::frame::XDispatch > xDispatch; + if ( aURL.Protocol == "vnd.org.libreoffice.recentdocs:" ) + xDispatch = this; + + return xDispatch; +} + +css::uno::Sequence < css::uno::Reference< css::frame::XDispatch > > SAL_CALL BackingComp::queryDispatches( const css::uno::Sequence < css::frame::DispatchDescriptor >& seqDescripts ) throw( css::uno::RuntimeException ) +{ + sal_Int32 nCount = seqDescripts.getLength(); + css::uno::Sequence < css::uno::Reference < XDispatch > > lDispatcher( nCount ); + + for( sal_Int32 i=0; i& /*lArgs*/ ) throw( css::uno::RuntimeException ) +{ + // vnd.org.libreoffice.recentdocs:ClearRecentFileList - clear recent files + if ( aURL.Path == "ClearRecentFileList" ) + { + Window* pWindow = VCLUnoHelper::GetWindow(m_xWindow); + BackingWindow* pBack = dynamic_cast(pWindow ); + if( pBack ) + pBack->clearRecentFileList(); + } +} + +void SAL_CALL BackingComp::addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xControl*/, const css::util::URL& /*aURL*/ ) throw ( css::uno::RuntimeException ) +{ +} + +void SAL_CALL BackingComp::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xControl*/, const css::util::URL& /*aURL*/ ) throw ( css::uno::RuntimeException ) +{ +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index f7a66fb869e0..ea3dd216c9fd 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -547,4 +547,9 @@ Size BackingWindow::GetOptimalSize() const return Window::GetOptimalSize(); } +void BackingWindow::clearRecentFileList() +{ + mpAllRecentThumbnails->Clear(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab:*/ diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index 8afb203ba3ea..948265fa96b6 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -112,6 +112,8 @@ public: virtual Size GetOptimalSize() const; void setOwningFrame( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& xFrame ); + + void clearRecentFileList(); }; #endif diff --git a/sfx2/util/sfx.component b/sfx2/util/sfx.component index 71f60218ec92..c5f25150de5e 100644 --- a/sfx2/util/sfx.component +++ b/sfx2/util/sfx.component @@ -21,6 +21,7 @@ prefix="sfx" xmlns="http://openoffice.org/2010/uno-components"> +