ooo-build r12425 - in trunk: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Fri May  2 11:52:38 2008
New Revision: 12425
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12425&view=rev

Log:
2008-05-02  Tor Lillqvist  <tml novell com>

	* patches/dev300/novell-win32-odma.diff
	(ucb/source/ucp/odma/odma_services.cxx): Remove superfluous 'using
	namespace rtl' that upstream had added for some unknown reason. It
	caused ambiguity in the use of 'Reference'.



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

Modified: trunk/patches/dev300/novell-win32-odma.diff
==============================================================================
--- trunk/patches/dev300/novell-win32-odma.diff	(original)
+++ trunk/patches/dev300/novell-win32-odma.diff	Fri May  2 11:52:38 2008
@@ -495,13 +495,13 @@
 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,21 +52,20 @@
+@@ -52,21 +52,19 @@
  #include <com/sun/star/registry/XRegistryKey.hpp>
  #include "odma_contentprops.hxx"
  #include "odma_provider.hxx"
 -#include "odma_lib.hxx"
  
- using namespace rtl;
+-using namespace rtl;
  using namespace com::sun::star::uno;
  using namespace com::sun::star::lang;
  using namespace com::sun::star::registry;