diff options
| m--------- | helpcontent2 | 0 | ||||
| -rw-r--r-- | l10ntools/source/treemerge.cxx | 5 | ||||
| -rw-r--r-- | solenv/inc/unitools.mk | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/helpcontent2 b/helpcontent2 -Subproject 23d7515757534fca7d50e1201745586adde4b8f +Subproject 7bb6ef60f6486e143fda08cc1527f5eb71c86b0 diff --git a/l10ntools/source/treemerge.cxx b/l10ntools/source/treemerge.cxx index 12e931c6d221..8555c8f013a1 100644 --- a/l10ntools/source/treemerge.cxx +++ b/l10ntools/source/treemerge.cxx @@ -279,8 +279,8 @@ void TreeParser::Merge( { MergeDataFile aMergeDataFile( rMergeSrc, static_cast<OString>( m_pSource->name ), false ); - - if( aMergeDataFile.GetLanguages()[0] != m_sLang ) + const std::vector<OString> vLanguages = aMergeDataFile.GetLanguages(); + if( !vLanguages.empty() && vLanguages[0] != m_sLang ) { std::cerr << "Treex error: given language conflicts with " @@ -288,7 +288,6 @@ void TreeParser::Merge( << m_sLang.getStr() << " - " << rMergeSrc.getStr() << std::endl; return; } - lcl_MergeLevel( m_pSource, pRootNode, (const xmlChar *)("help_section"), &aMergeDataFile, m_sLang, rXhpRoot ); diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk index 863c4ad23db6..bbd51bf325a1 100644 --- a/solenv/inc/unitools.mk +++ b/solenv/inc/unitools.mk @@ -33,6 +33,7 @@ CFGEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cfgex AUTODOC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/autodoc LOCALIZE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/localize GSICHECK*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/gsicheck +TREEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/treex .IF "$(XSLTPROC)"=="" .IF "$(SYSTEM_LIBXSLT)"!="YES" |