#87754# do not use the webtop plugin

This commit is contained in:
Philipp Lohmann
2001-06-07 08:56:27 +00:00
parent 6843db5f4a
commit 652aca6588

View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: unxmgr.cxx,v $ * $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 * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -159,15 +159,17 @@ Sequence< ::com::sun::star::plugin::PluginDescription > XPluginManager_Impl::get
struct dirent* pEntry; struct dirent* pEntry;
while( pDIR && readdir_r( pDIR, &aEntry, &pEntry ) ) while( pDIR && readdir_r( pDIR, &aEntry, &pEntry ) )
{
if( strncmp( aEntry.d_name, "libnullplugin", 13 ) &&
strcmp( aEntry.d_name, "npnrvp.so" ) &&
strcmp( aEntry.d_name, "libnprvp.so" ) )
{ {
struct stat aStat; struct stat aStat;
ByteString aFile( aPath ); ByteString aFile( aPath );
aFile += '/'; aFile += '/';
aFile += aEntry.d_name; aFile += aEntry.d_name;
if( ! stat( aFile.GetBuffer(), &aStat ) && if( ! stat( aFile.GetBuffer(), &aStat ) &&
S_ISREG( aStat.st_mode ) && S_ISREG( aStat.st_mode ) )
! strncmp( aEntry.d_name, "libnullplugin", 13 )
)
{ {
int nStructs; int nStructs;
::com::sun::star::plugin::PluginDescription** pStructs = ::com::sun::star::plugin::PluginDescription** pStructs =
@@ -182,6 +184,7 @@ Sequence< ::com::sun::star::plugin::PluginDescription > XPluginManager_Impl::get
} }
} }
} }
}
aDescriptions = Sequence< ::com::sun::star::plugin::PluginDescription >( aPlugins.size() ); aDescriptions = Sequence< ::com::sun::star::plugin::PluginDescription >( aPlugins.size() );
NAMESPACE_STD(list)< ::com::sun::star::plugin::PluginDescription* >::iterator iter; NAMESPACE_STD(list)< ::com::sun::star::plugin::PluginDescription* >::iterator iter;
for( iter = aPlugins.begin(), i=0; iter != aPlugins.end(); ++iter ,i++ ) for( iter = aPlugins.begin(), i=0; iter != aPlugins.end(); ++iter ,i++ )