diff options
| -rw-r--r-- | accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx | 12 | ||||
| -rw-r--r-- | accessibility/source/extended/accessiblelistboxentry.cxx | 11 | ||||
| -rw-r--r-- | extensions/source/plugin/base/plcom.cxx | 5 | ||||
| -rw-r--r-- | extensions/source/plugin/inc/plugin/plcom.hxx | 2 | ||||
| -rw-r--r-- | extensions/source/plugin/unx/npwrap.cxx | 14 | ||||
| -rw-r--r-- | extensions/source/plugin/unx/sysplug.cxx | 2 |
6 files changed, 19 insertions, 27 deletions
diff --git a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx b/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx index df352ddacf0e..6ffd0fa1d5ba 100644 --- a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx +++ b/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx @@ -97,18 +97,6 @@ namespace accessibility m_aParent; private: - /** notifies all listeners that this object has changed - @param _nEventId - is the event id - @param _aOldValue - is the old value - @param _aNewValue - is the new value - */ - void NotifyAccessibleEvent( sal_Int16 _nEventId, - const ::com::sun::star::uno::Any& _aOldValue, - const ::com::sun::star::uno::Any& _aNewValue ); - Rectangle GetBoundingBox_Impl() const; Rectangle GetBoundingBoxOnScreen_Impl() const; sal_Bool IsAlive_Impl() const; diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index ecaed921b06f..a18d828ffb0f 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -118,17 +118,6 @@ namespace accessibility } // ----------------------------------------------------------------------------- - void AccessibleListBoxEntry::NotifyAccessibleEvent( sal_Int16 _nEventId, - const ::com::sun::star::uno::Any& _aOldValue, - const ::com::sun::star::uno::Any& _aNewValue ) - { - Reference< uno::XInterface > xSource( *this ); - AccessibleEventObject aEventObj( xSource, _nEventId, _aNewValue, _aOldValue ); - - if (m_nClientId) - comphelper::AccessibleEventNotifier::addEvent( m_nClientId, aEventObj ); - } - // ----------------------------------------------------------------------------- Rectangle AccessibleListBoxEntry::GetBoundingBox_Impl() const { Rectangle aRect; diff --git a/extensions/source/plugin/base/plcom.cxx b/extensions/source/plugin/base/plcom.cxx index 1d3566bd2873..b19a7e58d249 100644 --- a/extensions/source/plugin/base/plcom.cxx +++ b/extensions/source/plugin/base/plcom.cxx @@ -42,11 +42,12 @@ #include <tools/fsys.hxx> #include <plugin/impl.hxx> -PluginComm::PluginComm( const ::rtl::OString& rLibName ) : +PluginComm::PluginComm( const ::rtl::OString& rLibName, bool bReusable ) : m_nRefCount( 0 ), m_aLibName( rLibName ) { - PluginManager::get().getPluginComms().push_back( this ); + if( bReusable ) + PluginManager::get().getPluginComms().push_back( this ); } PluginComm::~PluginComm() diff --git a/extensions/source/plugin/inc/plugin/plcom.hxx b/extensions/source/plugin/inc/plugin/plcom.hxx index 1ea42d933467..0c5845667887 100644 --- a/extensions/source/plugin/inc/plugin/plcom.hxx +++ b/extensions/source/plugin/inc/plugin/plcom.hxx @@ -42,7 +42,7 @@ protected: ::rtl::OString m_aLibName; std::list< String > m_aFilesToDelete; public: - PluginComm( const ::rtl::OString& rLibName ); + PluginComm( const ::rtl::OString& rLibName, bool bReusable = true ); virtual ~PluginComm(); int getRefCount() { return m_nRefCount; } diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx index f9a333c77dda..f121342874d8 100644 --- a/extensions/source/plugin/unx/npwrap.cxx +++ b/extensions/source/plugin/unx/npwrap.cxx @@ -262,6 +262,17 @@ static GSourceFuncs aXtEventFuncs = NULL }; +static gboolean pollXtTimerCallback(gpointer) +{ + for(int i = 0; i < 5; i++) + { + if( (XtAppPending(app_context) & (XtIMAll & ~XtIMXEvent)) == 0 ) + break; + XtAppProcessEvent(app_context, XtIMAll & ~XtIMXEvent); + } + return TRUE; +} + static gboolean prepareWakeupEvent( GSource*, gint* ) { struct pollfd aPoll = { wakeup_fd[0], POLLIN, 0 }; @@ -411,6 +422,7 @@ int main( int argc, char **argv) aXtPollDesc.revents = 0; g_source_add_poll( pXTSource, &aXtPollDesc ); + gint xt_polling_timer_id = g_timeout_add( 25, pollXtTimerCallback, NULL); // Initialize wakeup events listener GSource *pWakeupSource = g_source_new( &aWakeupEventFuncs, sizeof(GSource) ); if ( pWakeupSource == NULL ) @@ -473,6 +485,8 @@ int main( int argc, char **argv) medDebug( 1, "left plugin app main loop\n" ); + g_source_remove(xt_polling_timer_id); + pNP_Shutdown(); medDebug( 1, "NP_Shutdown done\n" ); osl_unloadModule( pPluginLib ); diff --git a/extensions/source/plugin/unx/sysplug.cxx b/extensions/source/plugin/unx/sysplug.cxx index 4b8e0454c893..573e79d22cb2 100644 --- a/extensions/source/plugin/unx/sysplug.cxx +++ b/extensions/source/plugin/unx/sysplug.cxx @@ -50,7 +50,7 @@ UnxPluginComm::UnxPluginComm( int nDescriptor1, int nDescriptor2 ) : - PluginComm( ::rtl::OUStringToOString( library, osl_getThreadTextEncoding() ) ), + PluginComm( ::rtl::OUStringToOString( library, osl_getThreadTextEncoding() ), false ), PluginConnector( nDescriptor2 ) { char pDesc[32]; |