diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2012-06-07 23:02:48 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2012-06-07 23:03:11 +0900 |
commit | eb0497307bf381e7e065fc4b0b0d7b23f6ceeca9 (patch) | |
tree | f8408dea01957f913c4cd748ad38111805244a92 /framework | |
parent | 9af0eb7e998c7bbf514e324919b710a0ff601244 (diff) |
nuke dead code
Change-Id: Id9920ea7b82ea178e904f78bbd41ffc434813e0b
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/dispatch/popupmenudispatcher.hxx | 6 | ||||
-rw-r--r-- | framework/inc/framework/interaction.hxx | 30 | ||||
-rw-r--r-- | framework/source/fwe/dispatch/interaction.cxx | 114 |
3 files changed, 0 insertions, 150 deletions
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx index 33651c59cca4..083d66fab67c 100644 --- a/framework/inc/dispatch/popupmenudispatcher.hxx +++ b/framework/inc/dispatch/popupmenudispatcher.hxx @@ -34,15 +34,9 @@ //_________________________________________________________________________________________________________________ #include <services/frame.hxx> -/* -#include <macros/generic.hxx> -*/ #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> -/* -#include <macros/debug.hxx> -*/ #include <threadhelp/threadhelpbase.hxx> #include <general.h> #include <stdtypes.h> diff --git a/framework/inc/framework/interaction.hxx b/framework/inc/framework/interaction.hxx index caef8e8ff35a..70dd2cf9e809 100644 --- a/framework/inc/framework/interaction.hxx +++ b/framework/inc/framework/interaction.hxx @@ -107,36 +107,6 @@ public: const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > lContinuations ); }; -/*-************************************************************************************************************//** - @short special request for interaction - @descr User must decide between a preselected and another detected filter. - It capsulate communication with any interaction handler and supports an easy - access on interaction results for user of these class. - - @implements XInteractionRequest - - @base WeakImplHelper1 - - @devstatus ready to use - @threadsafe no (used on once position only!) -*//*-*************************************************************************************************************/ -/* -class RequestAmbigousFilter_Impl; -class RequestAmbigousFilter // seems to be unused currently -{ - RequestAmbigousFilter_Impl* pImp; - - // c++ interface -public: - RequestAmbigousFilter( const ::rtl::OUString& sURL, - const ::rtl::OUString& sSelectedFilter , - const ::rtl::OUString& sDetectedFilter ); - ~RequestAmbigousFilter(); - sal_Bool isAbort () const; - ::rtl::OUString getFilter() const; - com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest(); -}; - */ } // namespace framework diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx index 08e82537ab1f..27ae856f4f9f 100644 --- a/framework/source/fwe/dispatch/interaction.cxx +++ b/framework/source/fwe/dispatch/interaction.cxx @@ -213,120 +213,6 @@ uno::Reference < task::XInteractionRequest > RequestFilterSelect::GetRequest() return uno::Reference < task::XInteractionRequest > (pImp); } -/* -class RequestAmbigousFilter_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest > -{ -public: - RequestAmbigousFilter_Impl( const ::rtl::OUString& sURL , - const ::rtl::OUString& sSelectedFilter , - const ::rtl::OUString& sDetectedFilter ); - sal_Bool isAbort () const; - ::rtl::OUString getFilter() const; - - virtual ::com::sun::star::uno::Any SAL_CALL getRequest () throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException ); - - ::com::sun::star::uno::Any m_aRequest ; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > m_lContinuations; - ContinuationAbort* m_pAbort ; - ContinuationFilterSelect* m_pFilter ; -}; - -RequestAmbigousFilter::RequestAmbigousFilter( const ::rtl::OUString& sURL, const ::rtl::OUString& sSelectedFilter, - const ::rtl::OUString& sDetectedFilter ) -{ - pImp = new RequestAmbigousFilter_Impl( sURL, sSelectedFilter, sDetectedFilter ); - pImp->acquire(); -} - -RequestAmbigousFilter::~RequestAmbigousFilter() -{ - pImp->release(); -} - -sal_Bool RequestAmbigousFilter::isAbort() const -{ - return pImp->isAbort(); -} - -//--------------------------------------------------------------------------------------------------------- -// return user selected filter -// Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony! -//--------------------------------------------------------------------------------------------------------- -::rtl::OUString RequestAmbigousFilter::getFilter() const -{ - return pImp->getFilter(); -} - -uno::Reference < task::XInteractionRequest > RequestAmbigousFilter::GetRequest() -{ - return uno::Reference < task::XInteractionRequest > (pImp); -} - -//--------------------------------------------------------------------------------------------------------- -// initialize instance with all neccessary informations -// We use it without any further checks on our member then ...! -//--------------------------------------------------------------------------------------------------------- -RequestAmbigousFilter_Impl::RequestAmbigousFilter_Impl( const ::rtl::OUString& sURL , - const ::rtl::OUString& sSelectedFilter , - const ::rtl::OUString& sDetectedFilter ) -{ - ::rtl::OUString temp; - css::uno::Reference< css::uno::XInterface > temp2; - css::document::AmbigousFilterRequest aFilterRequest( temp , - temp2 , - sURL , - sSelectedFilter , - sDetectedFilter ); - m_aRequest <<= aFilterRequest; - - m_pAbort = new ContinuationAbort ; - m_pFilter = new ContinuationFilterSelect; - - m_lContinuations.realloc( 2 ); - m_lContinuations[0] = css::uno::Reference< css::task::XInteractionContinuation >( m_pAbort ); - m_lContinuations[1] = css::uno::Reference< css::task::XInteractionContinuation >( m_pFilter ); -} - -//--------------------------------------------------------------------------------------------------------- -// return abort state of interaction -// If it is true, return value of method "getFilter()" will be unspecified then! -//--------------------------------------------------------------------------------------------------------- -sal_Bool RequestAmbigousFilter_Impl::isAbort() const -{ - return m_pAbort->isSelected(); -} - -//--------------------------------------------------------------------------------------------------------- -// return user selected filter -// Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony! -//--------------------------------------------------------------------------------------------------------- -::rtl::OUString RequestAmbigousFilter_Impl::getFilter() const -{ - return m_pFilter->getFilter(); -} - -//--------------------------------------------------------------------------------------------------------- -// handler call it to get type of request -// Is hard coded to "please select filter" here. see ctor for further informations. -//--------------------------------------------------------------------------------------------------------- -css::uno::Any SAL_CALL RequestAmbigousFilter_Impl::getRequest() throw( css::uno::RuntimeException ) -{ - return m_aRequest; -} - -//--------------------------------------------------------------------------------------------------------- -// handler call it to get possible continuations -// We support "abort/select_filter" only here. -// After interaction we support read access on these continuations on our c++ interface to -// return user decision. -//--------------------------------------------------------------------------------------------------------- -css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestAmbigousFilter_Impl::getContinuations() throw( css::uno::RuntimeException ) -{ - return m_lContinuations; -} -*/ - class InteractionRequest_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest > { uno::Any m_aRequest; |