diff options
Diffstat (limited to 'helpcompiler')
| -rw-r--r-- | helpcompiler/inc/HelpLinker.hxx | 2 | ||||
| -rw-r--r-- | helpcompiler/source/HelpLinker.cxx | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/helpcompiler/inc/HelpLinker.hxx b/helpcompiler/inc/HelpLinker.hxx index 5e2e88dc70f8..ef4f4216f318 100644 --- a/helpcompiler/inc/HelpLinker.hxx +++ b/helpcompiler/inc/HelpLinker.hxx @@ -58,6 +58,7 @@ public: HelpLinker() : m_pIndexerPreProcessor(NULL) + , m_bUseLangRoot(true) {} ~HelpLinker() { delete m_pIndexerPreProcessor; } @@ -82,6 +83,7 @@ private: fs::path indexDirName; fs::path indexDirParentName; IndexerPreProcessor* m_pIndexerPreProcessor; + bool m_bUseLangRoot; void initIndexerPreProcessor(); void link() throw( HelpProcessingException ); void addBookmark( FILE* pFile_DBHelp, std::string thishid, diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx index 6d00f67742e3..0bdde1848c68 100644 --- a/helpcompiler/source/HelpLinker.cxx +++ b/helpcompiler/source/HelpLinker.cxx @@ -373,7 +373,9 @@ void HelpLinker::link() throw( HelpProcessingException ) } else { - langsourceRoot.append('/' + lang + '/'); + langsourceRoot.append( "/" ); + if ( m_bUseLangRoot ) + langsourceRoot.append( lang + '/' ); xhpFile = fs::path(xhpFileName, fs::native); } @@ -732,6 +734,8 @@ void HelpLinker::main( std::vector<std::string> &args, if (!addFileUnderPath.empty() && !addFile.empty()) additionalFiles[addFileUnderPath] = addFile; } + else if (args[i].compare("-nolangroot") == 0) + m_bUseLangRoot = false; else helpFiles.push_back(args[i]); ++i; |