diff options
| author | Philipp Lohmann <pl@openoffice.org> | 2001-06-07 08:56:27 +0000 |
|---|---|---|
| committer | Philipp Lohmann <pl@openoffice.org> | 2001-06-07 08:56:27 +0000 |
| commit | 652aca658803bfaa79c1ee5acc4fe087ab30e944 (patch) | |
| tree | 59c6ed0c61b78ea4936fa223032c4fe80a287a76 /extensions/source | |
| parent | 6843db5f4acf52f6e01d4e9d329fb9b56a5f84ac (diff) | |
#87754# do not use the webtop plugin
Diffstat (limited to 'extensions/source')
| -rw-r--r-- | extensions/source/plugin/unx/unxmgr.cxx | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx index cd70ecd37d27..a8414ca872f0 100644 --- a/extensions/source/plugin/unx/unxmgr.cxx +++ b/extensions/source/plugin/unx/unxmgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unxmgr.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:16:51 $ + * last change: $Author: pl $ $Date: 2001-06-07 09:56:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -160,23 +160,26 @@ Sequence< ::com::sun::star::plugin::PluginDescription > XPluginManager_Impl::get while( pDIR && readdir_r( pDIR, &aEntry, &pEntry ) ) { - struct stat aStat; - ByteString aFile( aPath ); - aFile += '/'; - aFile += aEntry.d_name; - if( ! stat( aFile.GetBuffer(), &aStat ) && - S_ISREG( aStat.st_mode ) && - ! strncmp( aEntry.d_name, "libnullplugin", 13 ) - ) + if( strncmp( aEntry.d_name, "libnullplugin", 13 ) && + strcmp( aEntry.d_name, "npnrvp.so" ) && + strcmp( aEntry.d_name, "libnprvp.so" ) ) { - int nStructs; - ::com::sun::star::plugin::PluginDescription** pStructs = - CheckPlugin( aFile, nStructs ); - if( pStructs ) + struct stat aStat; + ByteString aFile( aPath ); + aFile += '/'; + aFile += aEntry.d_name; + if( ! stat( aFile.GetBuffer(), &aStat ) && + S_ISREG( aStat.st_mode ) ) { - for( int i = 0; i < nStructs; i++ ) - aPlugins.push_back( pStructs[i] ); - delete pStructs; + int nStructs; + ::com::sun::star::plugin::PluginDescription** pStructs = + CheckPlugin( aFile, nStructs ); + if( pStructs ) + { + for( int i = 0; i < nStructs; i++ ) + aPlugins.push_back( pStructs[i] ); + delete pStructs; + } } } } |