desktop: sal_Bool->bool

Change-Id: I3462a9d4c23c9bc858c1a9d91caa58d87b204ee0

3 files changed, 18 insertions, 18 deletions

diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 4b53ec3af5fc..f455821204a0 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -211,7 +211,7 @@ void Migration::migrateSettingsIfNecessary()
     if (! aImpl.initializeMigration() )
         return;
 
-    sal_Bool bResult = sal_False;
+    bool bResult = false;
     try
     {
         bResult = aImpl.doMigration();
@@ -236,12 +236,12 @@ MigrationImpl::~MigrationImpl()
 }
 
 // The main entry point for migrating settings
-sal_Bool MigrationImpl::doMigration()
+bool MigrationImpl::doMigration()
 {
     // compile file list for migration
     m_vrFileList = compileFileList();
 
-    sal_Bool result = sal_False;
+    bool result = false;
     try
     {
         NewVersionUIInfo aNewVersionUIInfo;
@@ -313,7 +313,7 @@ sal_Bool MigrationImpl::doMigration()
         runServices();
         refresh();
 
-        result = sal_True;
+        result = true;
     }
     catch (css::uno::Exception & e)
     {
@@ -352,7 +352,7 @@ void MigrationImpl::setMigrationCompleted()
 
 bool MigrationImpl::checkMigrationCompleted()
 {
-    sal_Bool bMigrationCompleted = sal_False;
+    bool bMigrationCompleted = false;
     try {
         uno::Reference< XPropertySet > aPropertySet(
             getConfigAccess("org.openoffice.Setup/Office"), uno::UNO_QUERY_THROW);
@@ -362,7 +362,7 @@ bool MigrationImpl::checkMigrationCompleted()
         {
             // migration prevented - fake it's success
             setMigrationCompleted();
-            bMigrationCompleted = sal_True;
+            bMigrationCompleted = true;
         }
     }
     catch (const Exception&)
@@ -859,7 +859,7 @@ void MigrationImpl::copyConfig() {
     }
 }
 
-uno::Reference< XNameAccess > MigrationImpl::getConfigAccess(const sal_Char* pPath, sal_Bool bUpdate)
+uno::Reference< XNameAccess > MigrationImpl::getConfigAccess(const sal_Char* pPath, bool bUpdate)
 {
     uno::Reference< XNameAccess > xNameAccess;
     try{
@@ -1030,7 +1030,7 @@ void MigrationImpl::runServices()
                 if (xNameAccess->getElementNames().getLength() > 0)
                 {
                     aModuleInfo.sModuleShortName = sModuleShortName;
-                    aModuleInfo.bHasMenubar = sal_True;
+                    aModuleInfo.bHasMenubar = true;
                 }
             }
 
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index 576e7d7870e9..5f8e345fb0a0 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -114,7 +114,7 @@ struct MigrationItem
         return *this;
     }
 
-    sal_Bool operator==(const MigrationItem& aMigrationItem)
+    bool operator==(const MigrationItem& aMigrationItem)
     {
         return ( aMigrationItem.m_sParentNodeName == m_sParentNodeName &&
             aMigrationItem.m_sPrevSibling    == m_sPrevSibling     &&
@@ -150,10 +150,10 @@ struct MigrationItemInfo
 struct MigrationModuleInfo
 {
     OUString sModuleShortName;
-    sal_Bool        bHasMenubar;
+    bool     bHasMenubar;
     ::std::vector< OUString > m_vToolbars;
 
-    MigrationModuleInfo():bHasMenubar(sal_False){};
+    MigrationModuleInfo() : bHasMenubar(false) {};
 };
 
 
@@ -205,7 +205,7 @@ private:
     // helpers
     strings_vr getAllFiles(const OUString& baseURL) const;
     strings_vr applyPatterns(const strings_v& vSet, const strings_v& vPatterns) const;
-    css::uno::Reference< css::container::XNameAccess > getConfigAccess(const sal_Char* path, sal_Bool rw=sal_False);
+    css::uno::Reference< css::container::XNameAccess > getConfigAccess(const sal_Char* path, bool rw=false);
 
     ::std::vector< MigrationModuleInfo > dectectUIChangesForAllModules() const;
     void compareOldAndNewConfig(const OUString& sParentNodeName,
@@ -230,7 +230,7 @@ public:
     MigrationImpl();
     ~MigrationImpl();
     bool initializeMigration();
-    sal_Bool doMigration();
+    bool doMigration();
     OUString getOldVersionName();
 };
 }
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index c4420e5a0021..c59fbeaf965b 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -257,8 +257,8 @@ void SAL_CALL JavaMigration::initialize( const css::uno::Sequence< css::uno::Any
         *pIter >>= aValue;
         if ( aValue.Name == "OldConfiguration" )
         {
-            sal_Bool bSuccess = aValue.Value >>= aOldConfigValues;
-            OSL_ENSURE(bSuccess == sal_True, "[Service implementation " IMPL_NAME
+            bool bSuccess = aValue.Value >>= aOldConfigValues;
+            OSL_ENSURE(bSuccess, "[Service implementation " IMPL_NAME
                        "] XInitialization::initialize: Argument OldConfiguration has wrong type.");
             if (bSuccess)
             {
@@ -307,10 +307,10 @@ void JavaMigration::migrateJavarc()
 
     OUString sValue;
     rtl::Bootstrap javaini(m_sUserDir + "/user/config/" + SAL_CONFIGFILE("java"));
-    sal_Bool bSuccess = javaini.getFrom("Home", sValue);
+    bool bSuccess = javaini.getFrom("Home", sValue);
     OSL_ENSURE(bSuccess, "[Service implementation " IMPL_NAME
                        "] XJob::execute: Could not get Home entry from java.ini/javarc.");
-    if (bSuccess == sal_True && !sValue.isEmpty())
+    if (bSuccess && !sValue.isEmpty())
     {
         //get the directory
         CJavaInfo aInfo;
@@ -416,7 +416,7 @@ void SAL_CALL  JavaMigration::setPropertyValue(
         {
         case ENABLE_JAVA:
         {
-            sal_Bool val = sal_Bool();
+            bool val;
             if (!(aValue >>= val))
                 throw MalformedDataException(
                        OUString("[Service implementation ") + IMPL_NAME +