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>
This commit is contained in:
@@ -32,10 +32,6 @@
|
|||||||
#include <rtl/character.hxx>
|
#include <rtl/character.hxx>
|
||||||
#include <sal/log.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,
|
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_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,
|
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 )
|
if( bExtensionMode )
|
||||||
{
|
{
|
||||||
res = xmlParseFile(filePath.native_file_string().c_str());
|
res = xmlParseFile(filePath.native_file_string().c_str());
|
||||||
if( !res ){
|
|
||||||
impl_sleep( 3 );
|
|
||||||
res = xmlParseFile(filePath.native_file_string().c_str());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -146,11 +138,6 @@ xmlDocPtr HelpCompiler::getSourceDocument(const fs::path &filePath)
|
|||||||
params[nbparams] = nullptr;
|
params[nbparams] = nullptr;
|
||||||
}
|
}
|
||||||
xmlDocPtr doc = xmlParseFile(filePath.native_file_string().c_str());
|
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 );
|
saveXhpForJar( doc, filePath );
|
||||||
|
|
||||||
@@ -453,16 +440,11 @@ void HelpCompiler::compile()
|
|||||||
// resolve the dom
|
// resolve the dom
|
||||||
|
|
||||||
if (!docResolvedOrg)
|
if (!docResolvedOrg)
|
||||||
{
|
|
||||||
impl_sleep( 3 );
|
|
||||||
docResolvedOrg = getSourceDocument(inputFile);
|
|
||||||
if( !docResolvedOrg )
|
|
||||||
{
|
{
|
||||||
std::stringstream aStrStream;
|
std::stringstream aStrStream;
|
||||||
aStrStream << "ERROR: file not existing: " << inputFile.native_file_string().c_str() << std::endl;
|
aStrStream << "ERROR: file not existing: " << inputFile.native_file_string().c_str() << std::endl;
|
||||||
throw HelpProcessingException( HelpProcessingErrorClass::General, aStrStream.str() );
|
throw HelpProcessingException( HelpProcessingErrorClass::General, aStrStream.str() );
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
std::string documentId;
|
std::string documentId;
|
||||||
std::string fileName;
|
std::string fileName;
|
||||||
|
Reference in New Issue
Block a user