mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add opt -nolangroot needed for gbuild

Browse Source 
Change-Id: Id76dfc5698619f8095e0c682ae4ce5e181c9a599
This commit is contained in:
David Tardon
2013-02-26 14:55:52 +01:00
parent 2f1c0be453
commit f094641d3a
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
helpcompiler/inc/HelpLinker.hxx
View File

@@ -58,6 +58,7 @@ public:
HelpLinker() HelpLinker()
: m_pIndexerPreProcessor(NULL) : m_pIndexerPreProcessor(NULL)
, m_bUseLangRoot(true)
{} {}
~HelpLinker() ~HelpLinker()
{ delete m_pIndexerPreProcessor; } { delete m_pIndexerPreProcessor; }
@@ -82,6 +83,7 @@ private:
fs::path indexDirName; fs::path indexDirName;
fs::path indexDirParentName; fs::path indexDirParentName;
IndexerPreProcessor* m_pIndexerPreProcessor; IndexerPreProcessor* m_pIndexerPreProcessor;
bool m_bUseLangRoot;
void initIndexerPreProcessor(); void initIndexerPreProcessor();
void link() throw( HelpProcessingException ); void link() throw( HelpProcessingException );
void addBookmark( FILE* pFile_DBHelp, std::string thishid, void addBookmark( FILE* pFile_DBHelp, std::string thishid,

6
helpcompiler/source/HelpLinker.cxx
View File

@@ -373,7 +373,9 @@ void HelpLinker::link() throw( HelpProcessingException )
} }
else else
{ {
langsourceRoot.append('/' + lang + '/'); langsourceRoot.append( "/" );
if ( m_bUseLangRoot )
langsourceRoot.append( lang + '/' );
xhpFile = fs::path(xhpFileName, fs::native); xhpFile = fs::path(xhpFileName, fs::native);
} }
@@ -732,6 +734,8 @@ void HelpLinker::main( std::vector<std::string> &args,
if (!addFileUnderPath.empty() && !addFile.empty()) if (!addFileUnderPath.empty() && !addFile.empty())
additionalFiles[addFileUnderPath] = addFile; additionalFiles[addFileUnderPath] = addFile;
} }
else if (args[i].compare("-nolangroot") == 0)
m_bUseLangRoot = false;
else else
helpFiles.push_back(args[i]); helpFiles.push_back(args[i]);
++i; ++i;