[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Tor Lillqvist]

 patches/dev300/speed-sal-fewer-lstats.diff |   16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

New commits:
commit be0fc1dac680097a84852c4a7e9bb323fd8510ab
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 14:28:12 2011 +0300

    Make speed-sal-fewer-lstats.diff apply again

diff --git a/patches/dev300/speed-sal-fewer-lstats.diff b/patches/dev300/speed-sal-fewer-lstats.diff
index cebfcd4..4814819 100644
--- a/patches/dev300/speed-sal-fewer-lstats.diff
+++ b/patches/dev300/speed-sal-fewer-lstats.diff
@@ -1,12 +1,6 @@
----
- sal/osl/unx/file_url.cxx |  260 ++++-----------------------------------------
- 1 files changed, 24 insertions(+), 236 deletions(-)
-
-diff --git sal/osl/unx/file_url.cxx sal/osl/unx/file_url.cxx
-index 53f27b3..e5b4cca 100644
 --- sal/osl/unx/file_url.cxx
 +++ sal/osl/unx/file_url.cxx
-@@ -439,250 +439,38 @@ oslFileError osl_getSystemPathFromFileURL_Ex(
+@@ -439,245 +439,38 @@ oslFileError osl_getSystemPathFromFileURL_Ex(
      return osl_error;
  }
  
@@ -101,7 +95,6 @@ index 53f27b3..e5b4cca 100644
 - 
 -    oslFileError _osl_resolvepath(
 -        /*inout*/ sal_Unicode* path, 
--        /*inout*/ sal_Unicode* current_pos, 
 -        /*inout*/ bool* failed)
 -    {
 -        oslFileError ferr = osl_File_E_None;
@@ -118,7 +111,6 @@ index 53f27b3..e5b4cca 100644
 -                if (!TextToUnicode(resolved_path, strlen(resolved_path), path, PATH_MAX))		
 -                    return oslTranslateFileError(OSL_FET_ERROR, ENAMETOOLONG);
 -                    
--                current_pos = ustrtoend(path) - 1;	    					
 -            }
 -            else
 -            {
@@ -203,7 +195,6 @@ index 53f27b3..e5b4cca 100644
 -                    {
 -                        ferr = _osl_resolvepath(
 -                            path_resolved_so_far, 
--                            presolvedsf, 
 -                            &realpath_failed);
 -                    
 -                        if (osl_File_E_None != ferr)
@@ -222,7 +213,6 @@ index 53f27b3..e5b4cca 100644
 -                {                
 -                    ferr = _osl_resolvepath(
 -                        path_resolved_so_far, 
--                        presolvedsf, 
 -                        &realpath_failed);
 -            
 -                    if (osl_File_E_None != ferr)
@@ -248,7 +238,6 @@ index 53f27b3..e5b4cca 100644
 -                {            
 -                    ferr = _osl_resolvepath(
 -                        path_resolved_so_far, 
--                        presolvedsf, 
 -                        &realpath_failed);
 -            
 -                    if (osl_File_E_None != ferr)
@@ -281,6 +270,3 @@ index 53f27b3..e5b4cca 100644
  
  /******************************************************
   * osl_getAbsoluteFileURL
--- 
-1.7.0.1
-