svn commit: r1362030 - in /incubator/ooo/branches/AOO34: ./ main/ main/sw/source/ui/fldui/flddb.cxx

[arielch]

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);
                }