summaryrefslogtreecommitdiff
path: root/xmlhelp
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-02-11 07:51:53 +0000
committerOliver Bolte <obo@openoffice.org>2009-02-11 07:51:53 +0000
commit326696598621c5883d7c28f491ca8192e8cfb21c (patch)
treea13e97abcc5cbd4c25d2ff53df419680c6d644f0 /xmlhelp
parent2413df68be6cd44374da1a3afcfa6a2d36e4ba4b (diff)
CWS-TOOLING: integrate CWS ab61
2009-01-29 09:39:19 +0100 jsk r267096 : #i97038 2009-01-20 12:35:31 +0100 ab r266568 : #i94994# Applied patch 2009-01-19 17:50:55 +0100 ab r266514 : #i97038# Applied patch 2009-01-13 14:47:20 +0100 ab r266226 : #i96087# Applied patch 2009-01-13 12:24:30 +0100 ab r266207 : #i95200# Applied patch 2008-12-19 16:37:32 +0100 ab r265735 : #i93214# Applied patch 2008-12-19 16:21:38 +0100 ab r265730 : #i57749# Applied patch
Diffstat (limited to 'xmlhelp')
-rw-r--r--xmlhelp/source/com/sun/star/help/HelpCompiler.cxx28
1 files changed, 13 insertions, 15 deletions
diff --git a/xmlhelp/source/com/sun/star/help/HelpCompiler.cxx b/xmlhelp/source/com/sun/star/help/HelpCompiler.cxx
index 879052117fca..5001d0907972 100644
--- a/xmlhelp/source/com/sun/star/help/HelpCompiler.cxx
+++ b/xmlhelp/source/com/sun/star/help/HelpCompiler.cxx
@@ -41,6 +41,16 @@
#include <tools/prewin.h>
#include <tools/postwin.h>
#endif
+#include <osl/thread.hxx>
+
+static void impl_sleep( sal_uInt32 nSec )
+{
+ TimeValue aTime;
+ aTime.Seconds = nSec;
+ aTime.Nanosec = 0;
+
+ osl::Thread::wait( aTime );
+}
HelpCompiler::HelpCompiler(StreamTable &in_streamTable, const fs::path &in_inputFile,
const fs::path &in_src, const fs::path &in_resEmbStylesheet,
@@ -62,11 +72,7 @@ xmlDocPtr HelpCompiler::getSourceDocument(const fs::path &filePath)
{
res = xmlParseFile(filePath.native_file_string().c_str());
if( !res ){
-#if defined(UNX) || defined(OS2)
- sleep( 3 );
-#else
- Sleep( 3 );
-#endif
+ impl_sleep( 3 );
res = xmlParseFile(filePath.native_file_string().c_str());
}
}
@@ -91,11 +97,7 @@ xmlDocPtr HelpCompiler::getSourceDocument(const fs::path &filePath)
xmlDocPtr doc = xmlParseFile(filePath.native_file_string().c_str());
if( !doc )
{
-#if defined(UNX) || defined(OS2)
- sleep( 3 );
-#else
- Sleep( 3 );
-#endif
+ impl_sleep( 3 );
doc = xmlParseFile(filePath.native_file_string().c_str());
}
@@ -416,11 +418,7 @@ bool HelpCompiler::compile( void ) throw( HelpProcessingException )
// resolve the dom
if (!docResolvedOrg)
{
-#if defined(UNX) || defined(OS2)
- sleep( 3 );
-#else
- Sleep( 3 );
-#endif
+ impl_sleep( 3 );
docResolvedOrg = getSourceDocument(inputFile);
if( !docResolvedOrg )
{