Return-Path: X-Original-To: apmail-openoffice-commits-archive@www.apache.org Delivered-To: apmail-openoffice-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C34A4E4A9 for ; Mon, 18 Mar 2013 20:38:37 +0000 (UTC) Received: (qmail 77446 invoked by uid 500); 18 Mar 2013 20:38:37 -0000 Delivered-To: apmail-openoffice-commits-archive@openoffice.apache.org Received: (qmail 77374 invoked by uid 500); 18 Mar 2013 20:38:37 -0000 Mailing-List: contact commits-help@openoffice.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openoffice.apache.org Delivered-To: mailing list commits@openoffice.apache.org Received: (qmail 77353 invoked by uid 99); 18 Mar 2013 20:38:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Mar 2013 20:38:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Mar 2013 20:38:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9008523888EA; Mon, 18 Mar 2013 20:38:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1457979 - in /openoffice/branches/l10n/main/l10ntools/source: gConXcsWrap.cxx gConXcuWrap.cxx Date: Mon, 18 Mar 2013 20:38:14 -0000 To: commits@openoffice.apache.org From: jani@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130318203814.9008523888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jani Date: Mon Mar 18 20:38:14 2013 New Revision: 1457979 URL: http://svn.apache.org/r1457979 Log: base part of merge works. Modified: openoffice/branches/l10n/main/l10ntools/source/gConXcsWrap.cxx openoffice/branches/l10n/main/l10ntools/source/gConXcuWrap.cxx Modified: openoffice/branches/l10n/main/l10ntools/source/gConXcsWrap.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConXcsWrap.cxx?rev=1457979&r1=1457978&r2=1457979&view=diff ============================================================================== --- openoffice/branches/l10n/main/l10ntools/source/gConXcsWrap.cxx (original) +++ openoffice/branches/l10n/main/l10ntools/source/gConXcsWrap.cxx Mon Mar 18 20:38:14 2013 @@ -153,8 +153,7 @@ void convert_xcs::stopCollectData(char * } #endif } - else - mcMemory.setSourceKey(miLineNo, msSourceFile, sKey, sText); + mcMemory.setSourceKey(miLineNo, msSourceFile, sKey, sText); mbCollectingData = false; } Modified: openoffice/branches/l10n/main/l10ntools/source/gConXcuWrap.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConXcuWrap.cxx?rev=1457979&r1=1457978&r2=1457979&view=diff ============================================================================== --- openoffice/branches/l10n/main/l10ntools/source/gConXcuWrap.cxx (original) +++ openoffice/branches/l10n/main/l10ntools/source/gConXcuWrap.cxx Mon Mar 18 20:38:14 2013 @@ -167,9 +167,9 @@ void convert_xcu::stopCollectData(char * } #endif } - else - if (useText.size()) - mcMemory.setSourceKey(miLineNo, msSourceFile, useKey, useText); + + if (useText.size()) + mcMemory.setSourceKey(miLineNo, msSourceFile, useKey, useText); }