From 398cd8ea79780a15a486afe4d79c95f5b53e0e1f Mon Sep 17 00:00:00 2001
From: Nils Fuhrmann <nf@openoffice.org>
Date: Tue, 31 Jul 2001 14:42:54 +0000
Subject: Fixes problems with new texts

---
 transex3/source/lngmerge.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'transex3')

diff --git a/transex3/source/lngmerge.cxx b/transex3/source/lngmerge.cxx
index 0e48d861e492..f12a571a2247 100644
--- a/transex3/source/lngmerge.cxx
+++ b/transex3/source/lngmerge.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: lngmerge.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: nf $ $Date: 2001-07-04 13:06:41 $
+ *  last change: $Author: nf $ $Date: 2001-07-31 15:42:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -358,7 +358,7 @@ BOOL LngParser::Merge(
         }
         if ( nLastLangPos ) {
             for ( USHORT i = 0; i < LANGUAGES; i++ ) {
-                if (( i != GERMAN ) && ( !Text[ i ].Len())) {
+                if (( i != GERMAN ) && ( !Text[ i ].Len()) && ( pEntrys )) {
                     ByteString sNewText;
                     pEntrys->GetText( sNewText, STRING_TYP_TEXT, i, TRUE );
                     if (( sNewText.Len()) &&
-- 
cgit