Kaydet (Commit) b7388a74 authored tarafından Noel Grandin's avatar Noel Grandin

use rtl::Reference in RequestFilterOptions

Change-Id: I5d8aef57734e18d944b8e6dba0f69c5411f71062
üst 0c326db8
......@@ -1680,12 +1680,8 @@ RequestFilterOptions::RequestFilterOptions( uno::Reference< frame::XModel > cons
m_aRequest <<= aOptionsRequest;
m_pAbort = new comphelper::OInteractionAbort;
m_pOptions = new FilterOptionsContinuation;
m_lContinuations.realloc( 2 );
m_lContinuations[0].set( m_pAbort );
m_lContinuations[1].set( m_pOptions );
m_xAbort = new comphelper::OInteractionAbort;
m_xOptions = new FilterOptionsContinuation;
}
uno::Any SAL_CALL RequestFilterOptions::getRequest()
......@@ -1698,7 +1694,7 @@ uno::Sequence< uno::Reference< task::XInteractionContinuation > >
SAL_CALL RequestFilterOptions::getContinuations()
throw( uno::RuntimeException, std::exception )
{
return m_lContinuations;
return { m_xAbort.get(), m_xOptions.get() };
}
......
......@@ -23,6 +23,7 @@
#include <com/sun/star/frame/XModel.hpp>
#include <comphelper/interaction.hxx>
#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
class FilterOptionsContinuation : public comphelper::OInteraction< css::document::XInteractionFilterOptions >
{
......@@ -37,22 +38,18 @@ class RequestFilterOptions : public ::cppu::WeakImplHelper< css::task::XInteract
{
css::uno::Any m_aRequest;
css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > >
m_lContinuations;
comphelper::OInteractionAbort* m_pAbort;
FilterOptionsContinuation* m_pOptions;
rtl::Reference<comphelper::OInteractionAbort> m_xAbort;
rtl::Reference<FilterOptionsContinuation> m_xOptions;
public:
RequestFilterOptions( css::uno::Reference< css::frame::XModel > const & rModel,
const css::uno::Sequence< css::beans::PropertyValue >& rProperties );
bool isAbort() { return m_pAbort->wasSelected(); }
bool isAbort() { return m_xAbort->wasSelected(); }
css::uno::Sequence< css::beans::PropertyValue > getFilterOptions()
{
return m_pOptions->getFilterOptions();
return m_xOptions->getFilterOptions();
}
virtual css::uno::Any SAL_CALL getRequest()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment