INTEGRATION: CWS ab52 (1.8.6); FILE MERGED

2008/06/18 10:34:16 ab 1.8.6.1: #i83625# Migration to Lucene

1 files changed, 19 insertions, 2 deletions

diff --git a/xmlhelp/source/com/sun/star/help/HelpCompiler.cxx b/xmlhelp/source/com/sun/star/help/HelpCompiler.cxx
index 787f9e99b2..b26d512703 100644
--- a/xmlhelp/source/com/sun/star/help/HelpCompiler.cxx
+++ b/xmlhelp/source/com/sun/star/help/HelpCompiler.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: HelpCompiler.cxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -95,7 +95,7 @@ xmlDocPtr HelpCompiler::getSourceDocument(const fs::path &filePath)
             doc = xmlParseFile(filePath.native_file_string().c_str());
         }
 
-        res = xmlParseFile(filePath.native_file_string().c_str());
+        //???res = xmlParseFile(filePath.native_file_string().c_str());
 
         res = xsltApplyStylesheet(cur, doc, params);
         xmlFreeDoc(doc);
@@ -507,6 +507,18 @@ bool HelpCompiler::compile( void ) throw( HelpProcessingException )
 
 namespace fs
 {
+    rtl_TextEncoding getThreadTextEncoding( void )
+    {
+        static bool bNeedsInit = true;
+        static rtl_TextEncoding nThreadTextEncoding;
+        if( bNeedsInit )
+        {
+            bNeedsInit = false;
+            nThreadTextEncoding = osl_getThreadTextEncoding();
+        }
+        return nThreadTextEncoding;
+    }
+
     void create_directory(const fs::path indexDirName)
     {
         HCDBG(
@@ -522,6 +534,11 @@ namespace fs
         osl::File::move(src.data, dest.data);
     }
 
+    void copy(const fs::path &src, const fs::path &dest)
+    {
+        osl::File::copy(src.data, dest.data);
+    }
+
     bool exists(const fs::path &in)
     {
         osl::File tmp(in.data);