From a9f357fa2064bc145318dcb0ee1c92c9a2016055 Mon Sep 17 00:00:00 2001 From: Martin Blapp Date: Thu, 8 Aug 2002 17:29:21 +0000 Subject: Fix another namespace collision which made the debug build segfaulting in setup. Submitted by: kan --- .../files/patch-scptools+source+linker+searchcache | 34 ++++++++++++++++++++++ .../patch-scptools::source::linker::searchcache | 34 ++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 editors/openoffice-1.0/files/patch-scptools+source+linker+searchcache create mode 100644 editors/openoffice-1.0/files/patch-scptools::source::linker::searchcache (limited to 'editors/openoffice-1.0/files') diff --git a/editors/openoffice-1.0/files/patch-scptools+source+linker+searchcache b/editors/openoffice-1.0/files/patch-scptools+source+linker+searchcache new file mode 100644 index 000000000000..593e9eabf5bc --- /dev/null +++ b/editors/openoffice-1.0/files/patch-scptools+source+linker+searchcache @@ -0,0 +1,34 @@ +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 ) diff --git a/editors/openoffice-1.0/files/patch-scptools::source::linker::searchcache b/editors/openoffice-1.0/files/patch-scptools::source::linker::searchcache new file mode 100644 index 000000000000..593e9eabf5bc --- /dev/null +++ b/editors/openoffice-1.0/files/patch-scptools::source::linker::searchcache @@ -0,0 +1,34 @@ +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 ) -- cgit v1.2.3