#87762#

Sorting of keywords now uses XCollator.
New style stl-header includes.

2 files changed, 20 insertions, 27 deletions

diff --git a/xmlhelp/source/cxxhelp/util/Decompressor.cxx b/xmlhelp/source/cxxhelp/util/Decompressor.cxx
index d422450baa90..62cf1f76a6b4 100644
--- a/xmlhelp/source/cxxhelp/util/Decompressor.cxx
+++ b/xmlhelp/source/cxxhelp/util/Decompressor.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Decompressor.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: abi $ $Date: 2001-05-08 12:05:06 $
+ *  last change: $Author: abi $ $Date: 2001-06-18 12:10:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -58,9 +58,17 @@
  *
  *
  ************************************************************************/
+#ifndef _XMLSEARCH_DB_BLOCK_HXX_
+#include <db/Block.hxx>
+#endif
 #ifndef _XMLSEARCH_UTIL_DECOMPRESSOR_HXX_
 #include <util/Decompressor.hxx>
 #endif
+#ifndef _XMLSEARCH_UTIL_COMPRESSORITERATOR_HXX_
+#include <util/CompressorIterator.hxx>
+#endif
+
+
 
 using namespace xmlsearch;
 using namespace xmlsearch::util;
@@ -200,11 +208,6 @@ sal_Int32 Decompressor::countZeroes() throw( excep::XmlSearchException )
 }
 
 
-#ifndef _XMLSEARCH_UTIL_COMPRESSORITERATOR_HXX_
-#include <util/CompressorIterator.hxx>
-#endif
-
-
 bool Decompressor::readNext( sal_Int32 k,CompressorIterator* it) throw( excep::XmlSearchException )
 {
   if( read() != 0 )
@@ -232,16 +235,6 @@ bool Decompressor::readNext( sal_Int32 k,CompressorIterator* it) throw( excep::X
 }
 
 
-
-
-// extern sal_Int32 getInteger_( const sal_Int8* );
-
-
-#ifndef _XMLSEARCH_DB_BLOCK_HXX_
-#include <db/Block.hxx>
-#endif
-
-
 sal_Int32 StreamDecompressor::getNextByte()
 {
   sal_Int8 a[4];
diff --git a/xmlhelp/source/cxxhelp/util/IndexAccessor.cxx b/xmlhelp/source/cxxhelp/util/IndexAccessor.cxx
index 6d82293be023..c8aff0d65913 100644
--- a/xmlhelp/source/cxxhelp/util/IndexAccessor.cxx
+++ b/xmlhelp/source/cxxhelp/util/IndexAccessor.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: IndexAccessor.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: abi $ $Date: 2001-05-22 14:57:13 $
+ *  last change: $Author: abi $ $Date: 2001-06-18 12:10:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -58,19 +58,20 @@
  *
  *
  ************************************************************************/
-#ifdef ABIDEBUG
-#include <abidebug.hxx>
-#endif
-#ifndef _XMLSEARCH_UTIL_INDEXACCESSOR_HXX_
-#include <util/IndexAccessor.hxx>
+#ifndef _OSL_DIAGNOSE_H_
+#include <osl/diagnose.h>
 #endif
 #ifndef _OSL_FILE_HXX_
 #include <osl/file.hxx>
 #endif
+#ifndef _XMLSEARCH_UTIL_INDEXACCESSOR_HXX_
+#include <util/IndexAccessor.hxx>
+#endif
 #ifndef _XMLEARCH_UTIL_RANDOMACCESSSTREAM_HXX_
 #include <util/RandomAccessStream.hxx>
 #endif
 
+
 using namespace xmlsearch::util;
 
 
@@ -96,8 +97,7 @@ public:
         sal_uInt64 nbytesread;
         osl::FileBase::RC err = file_.read( (void*)(data), sal_uInt64(num),nbytesread );
 
-        if( err != osl::FileBase::E_None )
-            printf( "Bytes requested = %d, Bytes read = %d\n",num,sal_Int32( nbytesread ) );
+        OSL_ASSERT( err == osl::FileBase::E_None );
 
         return sal_Int32( nbytesread );
     }
@@ -148,8 +148,8 @@ RandomAccessStreamImpl::RandomAccessStreamImpl( const rtl::OUString& aPath,const
 
     if( file_.open( flags ) != osl::FileBase::E_None )
     {
-        printf( "RandomAccessStreamImpl closed" );
         file_.close();
+        OSL_ASSERT( false );
     }
 }