CWS-TOOLING: integrate CWS vcl105

2009-09-07 Philipp Lohmann fix path issues
2009-09-07 hdu #i104525# Aqua: workaround OSX problem in RecentlyUsed list
2009-09-07 Philipp Lohmann add missing dollar sign
2009-09-07 Philipp Lohmann remove warnings
2009-09-07 hdu #i104011# need to use real-vals in cff-subsetter for some fonts
2009-09-05 Philipp Lohmann #i103674# less noise
2009-09-05 Philipp Lohmann #i103674# add garmin communicator to list of crashing plugins
2009-09-05 Philipp Lohmann #i103674# confiuration option to disable plugin support
2009-09-05 Philipp Lohmann merge #i102735#
2009-09-05 Philipp Lohmann #i88802# enable transparency resolution for PDF/A
2009-09-04 Philipp Lohmann rebase to DEV300m57
2009-09-03 Philipp Lohmann #i90083# fix a typo
2009-09-03 Philipp Lohmann merge
2009-09-03 Philipp Lohmann #i90083# workaround for application frame switching
2009-09-03 hdu #i104720# better description for --without-fonts configure option
2009-09-02 hdu #i104723# update third-party fonts
2009-09-02 hdu #i104723# update default-installed Liberation fonts from 1.04->1.05.1.20090721
2009-09-02 hdu #i104720# update default-installed DejaVu fonts from 2.21->2.30
2009-09-02 hdu #i89682# add Gentium fonts to default installation
2009-09-02 hdu #i89682# add Gentium fonts to default installation
2009-09-01 hdu #i104011# fix vertical offset in PDF-export of USP-layouted text
2009-08-27 Philipp Lohmann #i102033# ignore transients
2009-08-27 Philipp Lohmann merge
2009-08-27 Philipp Lohmann fix warning, remove crappy early exits
2009-08-26 Philipp Lohmann #i63494# user event time for generic plugin always regotten to work around metacity
2009-08-26 Philipp Lohmann merge
2009-08-26 Philipp Lohmann #i104526# fix string conversion
2009-08-25 Philipp Lohmann #b6855541# show newly added driver, repair remove driver
2009-08-25 Philipp Lohmann #i104469# maximizing issue (thanks haggai)

extensions/source/plugin/aqua/macmgr.cxx

@@ -413,6 +413,7 @@ static bool checkBlackList( CFBundleRef i_xBundle )
     if( bundleversion && CFGetTypeID(bundleversion) == CFStringGetTypeID() )
         aBundleVersion = getString( static_cast<CFStringRef>(bundleversion) );
 
+    bool bReject = false;
     // #i102735# VLC plugin prior to 1.0 tends to crash
     if( aBundleName.equalsAscii( "VLC Plug-in" ) )
     {
@@ -420,17 +421,24 @@ static bool checkBlackList( CFBundleRef i_xBundle )
         rtl::OUString aMajor( aBundleVersion.getToken( 0, '.', nIndex ) );
         if( aMajor.toInt32() < 1 )
         {
-            #if OSL_DEBUG_LEVEL > 1
+            bReject = true;
-            fprintf( stderr, "rejecting VCL plugin (%s %s)\n",
-                     rtl::OUStringToOString( aBundleName, RTL_TEXTENCODING_UTF8 ).getStr(),
-                     rtl::OUStringToOString( aBundleVersion, RTL_TEXTENCODING_UTF8 ).getStr()
-                     );
-            #endif
-            return true;
         }
     }
+    // #i103674# Garmin Communicator Plugin crashes
+    else if( aBundleName.equalsAscii( "Garmin Communicator Plugin" ) )
+    {
+        bReject = true;
+    }
 
-    return false;
+    #if OSL_DEBUG_LEVEL > 1
+    if( bReject )
+        fprintf( stderr, "rejecting plugin \"%s\" version %s\n",
+                 rtl::OUStringToOString( aBundleName, RTL_TEXTENCODING_UTF8 ).getStr(),
+                 rtl::OUStringToOString( aBundleVersion, RTL_TEXTENCODING_UTF8 ).getStr()
+                 );
+    #endif
+
+    return bReject;
 }
 
 static int getPluginDescriptions( CFBundleRef i_xBundle , list< PluginDescription* >& io_rDescriptions )
@@ -572,7 +580,7 @@ static rtl::OUString FindFolderURL(  FSVolumeRefNum vRefNum, OSType folderType )
     return aRet;
 }
 
-Sequence<PluginDescription> XPluginManager_Impl::getPluginDescriptions() throw()
+Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() throw()
 {
     static Sequence<PluginDescription> aDescriptions;
     static BOOL bHavePlugins = FALSE;

extensions/source/plugin/base/manager.cxx

@@ -35,19 +35,19 @@
 #include <cstdarg>
 #endif
 
-#include <plugin/impl.hxx>
+#include "plugin/impl.hxx"
 
-#ifndef _OSL_MUTEX_HXX
+#include "osl/mutex.hxx"
-#include <osl/mutex.hxx>
+#include "svtools/pathoptions.hxx"
-#endif
+#include "vcl/configsettings.hxx"
-#include <svtools/pathoptions.hxx>
+
-#include <com/sun/star/container/XEnumerationAccess.hpp>
+#include "com/sun/star/container/XEnumerationAccess.hpp"
-#include <com/sun/star/container/XNameAccess.hpp>
+#include "com/sun/star/container/XNameAccess.hpp"
-#include <com/sun/star/container/XEnumeration.hpp>
+#include "com/sun/star/container/XEnumeration.hpp"
-#include <com/sun/star/container/XElementAccess.hpp>
+#include "com/sun/star/container/XElementAccess.hpp"
-#include <com/sun/star/container/XIndexAccess.hpp>
+#include "com/sun/star/container/XIndexAccess.hpp"
-#include <com/sun/star/loader/XImplementationLoader.hpp>
+#include "com/sun/star/loader/XImplementationLoader.hpp"
-#include <com/sun/star/loader/CannotActivateFactoryException.hpp>
+#include "com/sun/star/loader/CannotActivateFactoryException.hpp"
 
 PluginManager* PluginManager::pManager = NULL;
 
@@ -165,6 +165,20 @@ XPlugin_Impl* XPluginManager_Impl::getPluginImplementation( const Reference< ::c
     return NULL;
 }
 
+Sequence<com::sun::star::plugin::PluginDescription> XPluginManager_Impl::getPluginDescriptions() throw()
+{
+    Sequence<com::sun::star::plugin::PluginDescription> aRet;
+
+    vcl::SettingsConfigItem* pCfg = vcl::SettingsConfigItem::get();
+    rtl::OUString aVal( pCfg->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BrowserPlugins" ) ),
+                                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Disabled" ) ) ) );
+    if( ! aVal.toBoolean() )
+    {
+        aRet = impl_getPluginDescriptions();
+    }
+    return aRet;
+}
+
 Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPlugin( const Reference< ::com::sun::star::plugin::XPluginContext >& acontext, INT16 mode, const Sequence< ::rtl::OUString >& argn, const Sequence< ::rtl::OUString >& argv, const ::com::sun::star::plugin::PluginDescription& plugintype)
     throw( RuntimeException,::com::sun::star::plugin::PluginException )
 {

extensions/source/plugin/inc/plugin/impl.hxx

@@ -293,6 +293,9 @@ public:
     virtual Reference< com::sun::star::plugin::XPluginContext > SAL_CALL createPluginContext() throw();
 
     // has to be implemented per system
+    virtual Sequence< com::sun::star::plugin::PluginDescription > SAL_CALL impl_getPluginDescriptions(void) throw();
+    // calls system specific impl_getPluginDescriptions
+    // checks whether plugins are disabled
     virtual Sequence< com::sun::star::plugin::PluginDescription > SAL_CALL getPluginDescriptions(void) throw();
 
     virtual Reference< com::sun::star::plugin::XPlugin > SAL_CALL createPlugin( const Reference< com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< rtl::OUString >& argn, const Sequence< rtl::OUString >& argv, const com::sun::star::plugin::PluginDescription& plugintype) throw( RuntimeException,::com::sun::star::plugin::PluginException );

extensions/source/plugin/unx/unxmgr.cxx

@@ -226,7 +226,7 @@ static void CheckPluginRegistryFiles( const rtl::OString& rPath, list< PluginDes
         closedir( pDIR );
 }
 
-Sequence<PluginDescription> XPluginManager_Impl::getPluginDescriptions() throw()
+Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() throw()
 {
     static Sequence<PluginDescription> aDescriptions;
     static BOOL bHavePlugins = FALSE;

extensions/source/plugin/win/winmgr.cxx

@@ -325,7 +325,7 @@ static void add_SO_Plugins( PluginLocationMap & rPlugins )
 }
 
 //__________________________________________________________________________________________________
-Sequence< PluginDescription > XPluginManager_Impl::getPluginDescriptions(void) throw()
+Sequence< PluginDescription > XPluginManager_Impl::impl_getPluginDescriptions(void) throw()
 {
     Guard< Mutex > aGuard( Mutex::getGlobalMutex() );
     static Sequence<PluginDescription > s_aDescriptions( 0 );