Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts:
dbaccess/source/core/misc/services.cxx
dbaccess/source/filter/migration/cfgimport.cxx
reportdesign/source/core/api/ReportDefinition.cxx

1 files changed, 5 insertions, 5 deletions

diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx
index c8a2664f3771..4ac330a3fc87 100644
--- a/dbaccess/source/ui/misc/RowSetDrop.cxx
+++ b/dbaccess/source/ui/misc/RowSetDrop.cxx
@@ -107,19 +107,19 @@ void ORowSetImportExport::initialize()
     }
 }
 // -----------------------------------------------------------------------------
-BOOL ORowSetImportExport::Write()
+sal_Bool ORowSetImportExport::Write()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORowSetImportExport::Write" );
-    return TRUE;
+    return sal_True;
 }
 // -----------------------------------------------------------------------------
-BOOL ORowSetImportExport::Read()
+sal_Bool ORowSetImportExport::Read()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORowSetImportExport::Read" );
     // check if there is any column to copy
     if(::std::find_if(m_aColumnMapping.begin(),m_aColumnMapping.end(),
                         ::std::bind2nd(::std::greater<sal_Int32>(),0)) == m_aColumnMapping.end())
-        return FALSE;
+        return sal_False;
     sal_Bool bContinue = sal_True;
     if(m_aSelection.getLength())
     {
@@ -165,7 +165,7 @@ BOOL ORowSetImportExport::Read()
             }
         }
     }
-    return TRUE;
+    return sal_True;
 }
 // -----------------------------------------------------------------------------
 sal_Bool ORowSetImportExport::insertNewRow()