diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2003-03-27 23:05:23 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2003-03-27 23:05:23 +0000 |
| commit | 71330591d0d993afc7a6b671a013d06b8247d886 (patch) | |
| tree | bc8d97aadb13e653d9bf8f6a2e38da9beafdce3b /editors/openoffice-1.0/files | |
| parent | Upgrade to 5.04.3. (diff) | |
Fix patch which was apllied to the wrong dir.
Notes
Notes:
svn path=/head/; revision=77559
Diffstat (limited to 'editors/openoffice-1.0/files')
| -rw-r--r-- | editors/openoffice-1.0/files/patch-scptools+source+linker+searchcache | 61 |
1 files changed, 27 insertions, 34 deletions
diff --git a/editors/openoffice-1.0/files/patch-scptools+source+linker+searchcache b/editors/openoffice-1.0/files/patch-scptools+source+linker+searchcache index 593e9eabf5bc..05bc20264122 100644 --- a/editors/openoffice-1.0/files/patch-scptools+source+linker+searchcache +++ b/editors/openoffice-1.0/files/patch-scptools+source+linker+searchcache @@ -1,34 +1,27 @@ -Index: files/patch-scptools::source::linker::searchcache -=================================================================== -RCS file: files/patch-scptools::source::linker::searchcache -diff -N files/patch-scptools::source::linker::searchcache ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ files/patch-scptools::source::linker::searchcache 4 Aug 2002 15:28:04 -0000 -@@ -0,0 +1,27 @@ -+--- ../scptools/source/linker/searchcache.hxx.orig Fri Aug 2 22:53:46 2002 -++++ ../scptools/source/linker/searchcache.hxx Fri Aug 2 22:54:50 2002 -+@@ -72,11 +72,11 @@ -+ // types -+ /////////////////////////////////////////////////////////////////////////////// -+ -+-DECLARE_LIST( FileList, ByteString* ) -++DECLARE_LIST( SCacheFileList, ByteString* ) -+ struct Include -+ { -+ ByteString aBaseDir; -+- FileList aFileLst; -++ SCacheFileList aFileLst; -+ }; -+ DECLARE_LIST( IncludeList, Include* ) -+ -+--- ../scptools/source/linker/searchcache.cxx.orig Fri Aug 2 22:53:35 2002 -++++ ../scptools/source/linker/searchcache.cxx Fri Aug 2 22:55:14 2002 -+@@ -218,7 +218,7 @@ -+ rPath += aDelim; -+ } -+ -+-void ScanFileList( const ByteString& rPath, FileList& rLst ) -++void ScanFileList( const ByteString& rPath, SCacheFileList& rLst ) -+ { -+ Dir aFiles( rPath, FSYS_KIND_FILE ); -+ for( USHORT i = 0; i < aFiles.Count(); ++i ) +--- ../scptools/source/linker/searchcache.hxx.orig Thu Mar 27 23:21:09 2003 ++++ ../scptools/source/linker/searchcache.hxx Thu Mar 27 23:21:40 2003 +@@ -72,11 +72,11 @@ + // types + /////////////////////////////////////////////////////////////////////////////// + +-DECLARE_LIST( FileList, ByteString* ) ++DECLARE_LIST( SCacheFileList, ByteString* ) + struct Include + { + ByteString aBaseDir; +- FileList aFileLst; ++ SCacheFileList aFileLst; + }; + DECLARE_LIST( IncludeList, Include* ) + +--- ../scptools/source/linker/searchcache.cxx.orig Thu Mar 27 23:23:04 2003 ++++ ../scptools/source/linker/searchcache.cxx Thu Mar 27 23:23:51 2003 +@@ -218,7 +218,7 @@ + rPath += aDelim; + } + +-void ScanFileList( const ByteString& rPath, FileList& rLst ) ++void ScanFileList( const ByteString& rPath, ScanFileList& rLst ) + { + Dir aFiles( rPath, FSYS_KIND_FILE ); + for( USHORT i = 0; i < aFiles.Count(); ++i ) |