From 85d1ce27ad9ce7a3740bd8bbbaf1d3abe643ba10 Mon Sep 17 00:00:00 2001
From: Olivier Hallot <olivier.hallot@documentfoundation.org>
Date: Mon, 2 Jan 2012 15:58:10 -0200
Subject: Fix for fdo43460 Part XXVII getLength() to isEmpty()

Please find attached a partial fix for Easy Hack FDO43460

Part XXVII
Modules
padmin, pyuno, rdbmaker, regexp, registry, rsc, sal
---
 rdbmaker/source/codemaker/dependency.cxx | 8 ++++----
 rdbmaker/source/codemaker/global.cxx     | 2 +-
 rdbmaker/source/rdbmaker/rdbmaker.cxx    | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'rdbmaker')

diff --git a/rdbmaker/source/codemaker/dependency.cxx b/rdbmaker/source/codemaker/dependency.cxx
index 8df5fd4bbeff..0ca56c33c88d 100644
--- a/rdbmaker/source/codemaker/dependency.cxx
+++ b/rdbmaker/source/codemaker/dependency.cxx
@@ -60,7 +60,7 @@ sal_Bool TypeDependency::insert(const OString& type, const OString& depend, sal_
 {
     sal_Bool ret =  sal_False;
 
-    if (type.getLength() > 0 && depend.getLength() > 0)
+    if (!type.isEmpty() && !depend.isEmpty())
     {
         if (m_pImpl->m_dependencies.count(type) > 0)
         {
@@ -87,7 +87,7 @@ sal_Bool TypeDependency::insert(const OString& type, const OString& depend, sal_
 
 TypeUsingSet TypeDependency::getDependencies(const OString& type)
 {
-    if (type.getLength() > 0)
+    if (!type.isEmpty())
     {
         if (m_pImpl->m_dependencies.count(type) > 0)
         {
@@ -100,7 +100,7 @@ TypeUsingSet TypeDependency::getDependencies(const OString& type)
 
 sal_Bool TypeDependency::hasDependencies(const OString& type)
 {
-    if (type.getLength() > 0)
+    if (!type.isEmpty())
     {
         if (m_pImpl->m_dependencies.count(type) > 0)
         {
@@ -150,7 +150,7 @@ static sal_Bool checkFieldDependencies(TypeManager& typeMgr, TypeDependency& dep
     {
         fieldType = reader.getFieldType(i);
 
-        if (fieldType.getLength() > 0)
+        if (!fieldType.isEmpty())
         {
             dependencies.insert(type, fieldType, TYPEUSE_MEMBER);
             checkTypeDependencies(typeMgr, dependencies, fieldType);
diff --git a/rdbmaker/source/codemaker/global.cxx b/rdbmaker/source/codemaker/global.cxx
index 6cf654412f7a..0f4e2ab51657 100644
--- a/rdbmaker/source/codemaker/global.cxx
+++ b/rdbmaker/source/codemaker/global.cxx
@@ -130,7 +130,7 @@ sal_Bool FileStream::isValid()
 
 void FileStream::open(const OString& name, FileAccessMode mode)
 {
-    if ( name.getLength() > 0 )
+    if ( !name.isEmpty() )
     {
         m_name = name;
         m_pFile = fopen(m_name.getStr(), checkAccessMode(mode));
diff --git a/rdbmaker/source/rdbmaker/rdbmaker.cxx b/rdbmaker/source/rdbmaker/rdbmaker.cxx
index 4a4e8ae32a60..a383346d79bb 100644
--- a/rdbmaker/source/rdbmaker/rdbmaker.cxx
+++ b/rdbmaker/source/rdbmaker/rdbmaker.cxx
@@ -335,7 +335,7 @@ int __cdecl main( int argc, char * argv[] )
         }
     }
 
-    if ( bootReg.getLength() )
+    if ( !bootReg.isEmpty() )
     {
         pTypeMgr = new SpecialTypeManager();
         useSpecial = sal_True;
@@ -429,7 +429,7 @@ int __cdecl main( int argc, char * argv[] )
                 tmpName = typeName.copy( lastIndex+1 );
                 if (tmpName == "*")
                 {
-                    if (bootReg.getLength())
+                    if (!bootReg.isEmpty())
                     {
                         fprintf(stderr, "%s ERROR: %s\n",
                                 options.getProgramName().getStr(),
@@ -443,7 +443,7 @@ int __cdecl main( int argc, char * argv[] )
                     } else
                     {
                         tmpName = typeName.copy(0, typeName.lastIndexOf('.')).replace('.', '/');
-                        if (tmpName.getLength() == 0)
+                        if (tmpName.isEmpty())
                             tmpName = "/";
                         else
                             tmpName.replace('.', '/');
@@ -476,7 +476,7 @@ int __cdecl main( int argc, char * argv[] )
         {
         } else
         {
-            if (!bootReg.getLength())
+            if (bootReg.isEmpty())
             {
                 // produce all types
                 if (!produceAllTypes("/", typeMgr, typeDependencies, &options, sal_True,
-- 
cgit