[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sw/source

[Jan Holesovsky]

 sw/source/core/doc/docfld.cxx      |    4 ++--
 sw/source/filter/html/htmlplug.cxx |    2 +-
 sw/source/ui/fldui/flddb.cxx       |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6ccd6981635845e9fd9ba2aef2a3ce3e46171f9b
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Apr 14 07:25:24 2011 +0200

    FALSE/TRUE in strings should not be converted to sal_False/sal_True.

diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 7dde8e1..4fcca81 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -2288,9 +2288,9 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
     }
 
     String sTrue( String::CreateFromAscii(
-                                    RTL_CONSTASCII_STRINGPARAM( "sal_True" ))),
+                                    RTL_CONSTASCII_STRINGPARAM( "TRUE" ))),
            sFalse( String::CreateFromAscii(
-                                       RTL_CONSTASCII_STRINGPARAM( "sal_False" )));
+                                       RTL_CONSTASCII_STRINGPARAM( "FALSE" )));
 
     sal_Bool bIsDBMgr = 0 != rDoc.GetNewDBMgr();
     sal_uInt16 nWhich, n;
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index c5a3080..9a64e64 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -78,7 +78,7 @@ using namespace com::sun::star;
 
 namespace {
 
-static char const sHTML_O_Hidden_False[] = "sal_False";
+static char const sHTML_O_Hidden_False[] = "FALSE";
 
 }
 
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index d95ab17..9c74cb3 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -385,7 +385,7 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox )
             aValueED.SetText(aEmptyStr);
             if (bCond)
                 aConditionED.SetText( String::CreateFromAscii(
-                        RTL_CONSTASCII_STRINGPARAM( "sal_True" )));
+                        RTL_CONSTASCII_STRINGPARAM( "TRUE" )));
             else
                 aConditionED.SetText(aEmptyStr);
         }