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

[tml svn gnome org]

Author: tml
Date: Wed Nov 26 16:39:03 2008
New Revision: 14611
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14611&view=rev

Log:
2008-11-26  Tor Lillqvist  <tml novell com>

	* patches/dev300/speed-configmgr.diff: Minor fixes to
	make the diff apply and compile with dev300-m35.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/speed-configmgr.diff

Modified: trunk/patches/dev300/speed-configmgr.diff
==============================================================================
--- trunk/patches/dev300/speed-configmgr.diff	(original)
+++ trunk/patches/dev300/speed-configmgr.diff	Wed Nov 26 16:39:03 2008
@@ -13,9 +13,9 @@
 +		// achieve so, so little of any usefulness.
 +		return true;
 +
-         DirectoryItem aDirItem;
+         osl::DirectoryItem aDirItem;
          
-         DirectoryItem::RC rc = DirectoryItem::get(_sURL, aDirItem);
+         osl::DirectoryItem::RC rc = DirectoryItem::get(_sURL, aDirItem);
 Index: configmgr/source/localbe/localmultistratum.cxx
 ===================================================================
 RCS file: /cvs/util/configmgr/source/localbe/localmultistratum.cxx,v
@@ -24,13 +24,13 @@
 --- configmgr/source/localbe/localmultistratum.cxx	8 Sep 2005 04:04:46 -0000	1.5
 +++ configmgr/source/localbe/localmultistratum.cxx	27 Oct 2005 11:21:18 -0000
 @@ -107,7 +107,7 @@ uno::Sequence< rtl::OUString > SAL_CALL 
+     rtl::OUString const aLayerUrl   = impl_getLayerDataDirectory(getBaseUrl());
      rtl::OUString const aComponentUrl = aLayerUrl + componentToPath(aComponent);
      
-     using namespace osl;
 -    const sal_uInt32 k_STATUS_FIELDS =  FileStatusMask_Type | FileStatusMask_FileName; 
 +    const sal_uInt32 k_STATUS_FIELDS = FileStatusMask_FileName; 
-     Directory aComponentDirectory(aComponentUrl);
-     DirectoryItem aItem;
+     osl::Directory aComponentDirectory(aComponentUrl);
+     osl::DirectoryItem aItem;
      std::vector< rtl::OUString > aResult;
 @@ -132,13 +132,12 @@ uno::Sequence< rtl::OUString > SAL_CALL 
                  OSL_TRACE("Reading Component Directory - Error (%u) getting status of directory item.\n", unsigned(errcode));
@@ -38,11 +38,11 @@
              }
 -
 -            OSL_ENSURE( aItemDescriptor.isValid(FileStatusMask_Type), "Could not get type of directory item");
--            if (aItemDescriptor.getFileType() != FileStatus::Regular)
+-            if (aItemDescriptor.getFileType() != osl::FileStatus::Regular)
 -                continue;
                      
-             OSL_ENSURE( aItemDescriptor.isValid(FileStatusMask_FileName), "Could not get Name of component found");
-             OUString const aFileName = aItemDescriptor.getFileName();
+             OSL_ENSURE( aItemDescriptor.isValid(FileStatusMask_FileName), "Could not get name of component found");
+             rtl::OUString const aFileName = aItemDescriptor.getFileName();
 +
 +			// It is reasonable to assume a .xcu file is not a directory & =>
 +			// not stat each directory entry at considerable cost.