ooo-build r11981 - in trunk: . patches/src680

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Fri Mar 21 18:23:08 2008
New Revision: 11981
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11981&view=rev

Log:
2008-03-21  Jan Holesovsky  <kendy suse cz>

        * patches/src680/webdav-locking-stream-can-save.diff,
          patches/src680/webdav-locking-unlock-on-crash.diff,
          patches/src680/webdav-locking.diff: Query for process factory
          instead of creating (a new) one.


Modified:
   trunk/ChangeLog
   trunk/patches/src680/webdav-locking-stream-can-save.diff
   trunk/patches/src680/webdav-locking-unlock-on-crash.diff
   trunk/patches/src680/webdav-locking.diff

Modified: trunk/patches/src680/webdav-locking-stream-can-save.diff
==============================================================================
--- trunk/patches/src680/webdav-locking-stream-can-save.diff	(original)
+++ trunk/patches/src680/webdav-locking-stream-can-save.diff	Fri Mar 21 18:23:08 2008
@@ -107,7 +107,7 @@
 +        // FIXME It's really hacky to create the new session
 +        // But so far it seems I have no other chance...
 +        // see also NeonInputStream::Unlock()
-+        uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
++        uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
 +        rtl::Reference< DAVSessionFactory > rDAVFactory( new DAVSessionFactory() );
 +        
 +        DAVResourceAccess aResourceAccess( xFactory, rDAVFactory, m_aURL );
@@ -137,7 +137,7 @@
 -        // the unlock?  But so far it seems I have no other chance...
 +        // FIXME It's really hacky to create the new session
 +        // But so far it seems I have no other chance...
-         uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
+         uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
          rtl::Reference< DAVSessionFactory > rDAVFactory( new DAVSessionFactory() );
          
 diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx

Modified: trunk/patches/src680/webdav-locking-unlock-on-crash.diff
==============================================================================
--- trunk/patches/src680/webdav-locking-unlock-on-crash.diff	(original)
+++ trunk/patches/src680/webdav-locking-unlock-on-crash.diff	Fri Mar 21 18:23:08 2008
@@ -6,7 +6,7 @@
  using namespace com::sun::star;
  using namespace webdav_ucp;
  
-+oslSignalAction NeonInputStream::UnlockOnSignal( void* pData, oslSignalInfo* pInfo )
++oslSignalAction NeonInputStream::UnlockOnSignal( void* pData, oslSignalInfo* )
 +{
 +    NeonInputStream *pStream = static_cast< NeonInputStream *>( pData );
 +

Modified: trunk/patches/src680/webdav-locking.diff
==============================================================================
--- trunk/patches/src680/webdav-locking.diff	(original)
+++ trunk/patches/src680/webdav-locking.diff	Fri Mar 21 18:23:08 2008
@@ -6,7 +6,7 @@
 #     throw(::com::sun::star::uno::RuntimeException)
 # {
 #     // prepare the environment
-#+	css::uno::Reference< css::lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
+#+	css::uno::Reference< css::lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
 # 	css::uno::Reference< css::task::XInteractionHandler > xOrgInteraction = getUnpackedValueOrDefault(
 # 		MediaDescriptor::PROP_INTERACTIONHANDLER(),
 #-		css::uno::Reference< css::task::XInteractionHandler >());
@@ -248,7 +248,7 @@
 +// static
 +com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > DAVResourceAccess::createCommandEnvironment( void )
 +{
-+    uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
++    uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
 +    uno::Reference< task::XInteractionHandler > xInteractionHandler = uno::Reference< task::XInteractionHandler > (
 +            xFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uui.InteractionHandler") ) ), uno::UNO_QUERY );
 +    ucbhelper::CommandEnvironment* pCommandEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler, uno::Reference< ucb::XProgressHandler >() );
@@ -354,7 +354,7 @@
 index 334e457..720bd65 100644
 --- ucb/source/ucp/webdav/NeonInputStream.cxx
 +++ ucb/source/ucp/webdav/NeonInputStream.cxx
-@@ -36,24 +36,32 @@
+@@ -36,24 +36,31 @@
  // MARKER(update_precomp.py): autogen include statement, do not remove
  #include "precompiled_ucb.hxx"
  #include "NeonInputStream.hxx"
@@ -364,9 +364,8 @@
  #include <rtl/memory.h>
  #endif
  
-+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
 +#include <comphelper/processfactory.hxx>
-+#endif
++#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 +
 +#include <cstdio>
 +
@@ -641,7 +640,7 @@
 +    {
 +        // FIXME I guess it is a bit hacky to create the new session just for
 +        // the unlock?  But so far it seems I have no other chance...
-+        uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
++        uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
 +        rtl::Reference< DAVSessionFactory > rDAVFactory( new DAVSessionFactory() );
 +        
 +        DAVResourceAccess aResourceAccess( xFactory, rDAVFactory, m_aURL );