Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4FD6AD170 for ; Mon, 16 Jul 2012 13:31:17 +0000 (UTC) Received: (qmail 68134 invoked by uid 500); 16 Jul 2012 13:31:17 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 67854 invoked by uid 500); 16 Jul 2012 13:31:13 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 67829 invoked by uid 99); 16 Jul 2012 13:31:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Jul 2012 13:31:13 +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, 16 Jul 2012 13:31:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0CED623889D5; Mon, 16 Jul 2012 13:30:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1362030 - in /incubator/ooo/branches/AOO34: ./ main/ main/sw/source/ui/fldui/flddb.cxx Date: Mon, 16 Jul 2012 13:30:52 -0000 To: ooo-commits@incubator.apache.org From: arielch@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120716133053.0CED623889D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: arielch Date: Mon Jul 16 13:30:52 2012 New Revision: 1362030 URL: http://svn.apache.org/viewvc?rev=1362030&view=rev Log: #i120278# - Merge fix from trunk into AOO34 branch Modified: incubator/ooo/branches/AOO34/ (props changed) incubator/ooo/branches/AOO34/main/ (props changed) incubator/ooo/branches/AOO34/main/sw/source/ui/fldui/flddb.cxx Propchange: incubator/ooo/branches/AOO34/ ------------------------------------------------------------------------------ Merged /incubator/ooo/trunk:r1361594 Propchange: incubator/ooo/branches/AOO34/main/ ------------------------------------------------------------------------------ Merged /incubator/ooo/trunk/main:r1361594 Modified: incubator/ooo/branches/AOO34/main/sw/source/ui/fldui/flddb.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/sw/source/ui/fldui/flddb.cxx?rev=1362030&r1=1362029&r2=1362030&view=diff ============================================================================== --- incubator/ooo/branches/AOO34/main/sw/source/ui/fldui/flddb.cxx (original) +++ incubator/ooo/branches/AOO34/main/sw/source/ui/fldui/flddb.cxx Mon Jul 16 13:30:52 2012 @@ -418,7 +418,7 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox aValueED.SetText(aEmptyStr); if (bCond) aConditionED.SetText( String::CreateFromAscii( - RTL_CONSTASCII_STRINGPARAM( "sal_True" ))); + RTL_CONSTASCII_STRINGPARAM( "TRUE" ))); else aConditionED.SetText(aEmptyStr); }