summaryrefslogtreecommitdiff
path: root/helpcompiler/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-11-22 11:03:07 +0000
committerCaolán McNamara <caolanm@redhat.com>2019-11-22 14:24:20 +0100
commitb587072aeae0670758b517d26fe0cb1fdda6a3b6 (patch)
tree10a511f89f9b96b3e9640c5fca0ad0dace98a497 /helpcompiler/source
parentfb5e0581f922dba93f3689786201ee067cb01a73 (diff)
drop impl_sleep hack
doesn't seem to make any sense, maybe it did in some dmake-era dependency problem when building our help content ? Change-Id: Id964ad73249ef33ba0102fb7d2d853b2719e3814 Reviewed-on: https://gerrit.libreoffice.org/83466 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'helpcompiler/source')
-rw-r--r--helpcompiler/source/HelpCompiler.cxx24
1 files changed, 3 insertions, 21 deletions
diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx
index 8be6842fd3a1..b8a0af737d89 100644
--- a/helpcompiler/source/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -32,10 +32,6 @@
#include <rtl/character.hxx>
#include <sal/log.hxx>
-static void impl_sleep( sal_uInt32 nSec )
-{
- osl::Thread::wait( std::chrono::seconds(nSec) );
-}
HelpCompiler::HelpCompiler(StreamTable &in_streamTable, const fs::path &in_inputFile,
const fs::path &in_src, const fs::path &in_zipdir, const fs::path &in_resCompactStylesheet,
const fs::path &in_resEmbStylesheet, const std::string &in_module, const std::string &in_lang,
@@ -124,10 +120,6 @@ xmlDocPtr HelpCompiler::getSourceDocument(const fs::path &filePath)
if( bExtensionMode )
{
res = xmlParseFile(filePath.native_file_string().c_str());
- if( !res ){
- impl_sleep( 3 );
- res = xmlParseFile(filePath.native_file_string().c_str());
- }
}
else
{
@@ -146,11 +138,6 @@ xmlDocPtr HelpCompiler::getSourceDocument(const fs::path &filePath)
params[nbparams] = nullptr;
}
xmlDocPtr doc = xmlParseFile(filePath.native_file_string().c_str());
- if( !doc )
- {
- impl_sleep( 3 );
- doc = xmlParseFile(filePath.native_file_string().c_str());
- }
saveXhpForJar( doc, filePath );
@@ -454,14 +441,9 @@ void HelpCompiler::compile()
if (!docResolvedOrg)
{
- impl_sleep( 3 );
- docResolvedOrg = getSourceDocument(inputFile);
- if( !docResolvedOrg )
- {
- std::stringstream aStrStream;
- aStrStream << "ERROR: file not existing: " << inputFile.native_file_string().c_str() << std::endl;
- throw HelpProcessingException( HelpProcessingErrorClass::General, aStrStream.str() );
- }
+ std::stringstream aStrStream;
+ aStrStream << "ERROR: file not existing: " << inputFile.native_file_string().c_str() << std::endl;
+ throw HelpProcessingException( HelpProcessingErrorClass::General, aStrStream.str() );
}
std::string documentId;