summaryrefslogtreecommitdiff
path: root/l10ntools
diff options
context:
space:
mode:
Diffstat (limited to 'l10ntools')
-rw-r--r--l10ntools/source/propmerge.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx
index a858f44d8210..689e931c4b72 100644
--- a/l10ntools/source/propmerge.cxx
+++ b/l10ntools/source/propmerge.cxx
@@ -182,7 +182,8 @@ void PropParser::Merge( const OString &rMergeSrc, const OString &rDestinationFil
MergeDataFile aMergeDataFile( rMergeSrc, m_sSource, false );
- if( aMergeDataFile.GetLanguages()[0] != m_sLang )
+ const std::vector<OString> aLanguages = aMergeDataFile.GetLanguages();
+ if( m_sLang != "qtz" && !aLanguages.empty() && aLanguages[0] != m_sLang )
{
std::cerr
<< "Propex error: given language conflicts with "