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

[thorstenb svn gnome org]

Author: thorstenb
Date: Mon Mar  3 15:04:15 2008
New Revision: 11781
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11781&view=rev

Log:
 * patches/src680/novell-win32-odma.diff: fixed ambiguity

Modified:
   trunk/ChangeLog
   trunk/patches/src680/novell-win32-odma.diff

Modified: trunk/patches/src680/novell-win32-odma.diff
==============================================================================
--- trunk/patches/src680/novell-win32-odma.diff	(original)
+++ trunk/patches/src680/novell-win32-odma.diff	Mon Mar  3 15:04:15 2008
@@ -504,7 +504,7 @@
 diff -p -u -r1.5 odma_services.cxx
 --- ucb/source/ucp/odma/odma_services.cxx	17 Sep 2006 13:59:05 -0000	1.5
 +++ ucb/source/ucp/odma/odma_services.cxx	6 Nov 2006 00:12:09 -0000
-@@ -52,9 +52,6 @@
+@@ -52,23 +52,19 @@
  #ifndef ODMA_PROVIDER_HXX
  #include "odma_provider.hxx"
  #endif
@@ -512,9 +512,27 @@
 -#include "odma_lib.hxx"
 -#endif
  
- using namespace rtl;
+-using namespace rtl;
  using namespace com::sun::star::uno;
-@@ -141,10 +138,8 @@ extern "C" void * SAL_CALL component_get
+ using namespace com::sun::star::lang;
+ using namespace com::sun::star::registry;
+ 
+ //=========================================================================
+ static sal_Bool writeInfo( void * pRegistryKey,
+-						   const OUString & rImplementationName,
+-   						   Sequence< OUString > const & rServiceNames )
++						   const rtl::OUString & rImplementationName,
++   						   Sequence< rtl::OUString > const & rServiceNames )
+ {
+-	OUString aKeyName( OUString::createFromAscii( "/" ) );
++	rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) );
+ 	aKeyName += rImplementationName;
+-	aKeyName += OUString::createFromAscii( "/UNO/SERVICES" );
++	aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" );
+ 
+ 	Reference< XRegistryKey > xKey;
+ 	try
+@@ -141,10 +137,8 @@ extern "C" void * SAL_CALL component_get
  	if ( ::odma::ContentProvider::getImplementationName_Static().
  				compareToAscii( pImplName ) == 0 )
  	{