diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-12-15 12:01:46 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-12-15 12:01:46 +0000 |
| commit | bd14d6bc197144d99ab8339f7d018d2a4678f610 (patch) | |
| tree | eaef7aee129df80b32e6e61cb385a5a5ad7fb4b7 /scripting | |
| parent | 095c77393155dfac5bbf3a62a5fdcabc6f0f93f2 (diff) | |
CWS-TOOLING: integrate CWS tl56_DEV300
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/source/dlgprov/dlgprov.cxx | 12 | ||||
| -rw-r--r-- | scripting/source/dlgprov/dlgprov.hxx | 1 |
2 files changed, 5 insertions, 8 deletions
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index a683245e7bea..1bb78ded543e 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -549,14 +549,12 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs // also add the dialog control itself to the sequence pObjects[nControlCount] = Reference< XInterface >( rxControl, UNO_QUERY ); - if ( !m_xScriptEventsAttacher.is() ) - m_xScriptEventsAttacher = new DialogEventsAttacherImpl( m_xContext, m_xModel, rxControl, rxHandler, rxIntrospectionAccess, bDialogProviderMode, ( m_BasicInfo.get() ? m_BasicInfo->mxBasicRTLListener : NULL ) ); + Reference< XScriptEventsAttacher > xScriptEventsAttacher = new DialogEventsAttacherImpl + ( m_xContext, m_xModel, rxControl, rxHandler, rxIntrospectionAccess, + bDialogProviderMode, ( m_BasicInfo.get() ? m_BasicInfo->mxBasicRTLListener : NULL ) ); - if ( m_xScriptEventsAttacher.is() ) - { - Any aHelper; - m_xScriptEventsAttacher->attachEvents( aObjects, Reference< XScriptListener >(), aHelper ); - } + Any aHelper; + xScriptEventsAttacher->attachEvents( aObjects, Reference< XScriptListener >(), aHelper ); } } } diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx index 521aba8fd8ec..46b629597dab 100644 --- a/scripting/source/dlgprov/dlgprov.hxx +++ b/scripting/source/dlgprov/dlgprov.hxx @@ -83,7 +83,6 @@ namespace dlgprov std::auto_ptr< BasicRTLParams > m_BasicInfo; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; - ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsAttacher > m_xScriptEventsAttacher; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > createDialogModel( const ::rtl::OUString& sURL ); |