diff options
Diffstat (limited to 'connectivity/source/drivers/mozab')
7 files changed, 48 insertions, 45 deletions
diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx index ef3b63bf8801..1b38325b0494 100644 --- a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx @@ -245,9 +245,9 @@ sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLExc return sal_False; } -sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) +bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) { - return sal_False; + return false; } sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) @@ -265,14 +265,14 @@ sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLExc return sal_False; } -sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw( ) +bool ODatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw( ) { - return sal_False; + return false; } -sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) +bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) { - return sal_False; + return false; } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException) @@ -309,9 +309,9 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) return sal_True; } -sal_Bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) +bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) { - return sal_True; + return true; } sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException) @@ -370,9 +370,9 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int3 return sal_False; } -sal_Bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) +bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) { - return sal_False; + return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException) @@ -395,14 +395,14 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw return sal_False; } -sal_Bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw( ) +bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw( ) { - return sal_False; + return false; } -sal_Bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) +bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) { - return sal_False; + return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException) @@ -410,9 +410,9 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) thro return sal_False; } -sal_Bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) +bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) { - return sal_False; + return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException) @@ -562,10 +562,10 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLE return sal_True; } -sal_Bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) +bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) { // Any case may be used - return sal_True; + return true; } sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException) diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx index fbefd5dadc9b..49fa119d5858 100644 --- a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx +++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx @@ -48,19 +48,19 @@ namespace connectivity private: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); // cached database information - virtual OUString impl_getIdentifierQuoteString_throw( ); - virtual sal_Bool impl_isCatalogAtStart_throw( ); - virtual OUString impl_getCatalogSeparator_throw( ); - virtual sal_Bool impl_supportsCatalogsInTableDefinitions_throw( ); - virtual sal_Bool impl_supportsSchemasInTableDefinitions_throw( ) ; - virtual sal_Bool impl_supportsCatalogsInDataManipulation_throw( ); - virtual sal_Bool impl_supportsSchemasInDataManipulation_throw( ) ; - virtual sal_Bool impl_supportsMixedCaseQuotedIdentifiers_throw( ) ; - virtual sal_Bool impl_supportsAlterTableWithAddColumn_throw( ); - virtual sal_Bool impl_supportsAlterTableWithDropColumn_throw( ); - virtual sal_Int32 impl_getMaxStatements_throw( ); - virtual sal_Int32 impl_getMaxTablesInSelect_throw( ); - virtual sal_Bool impl_storesMixedCaseQuotedIdentifiers_throw( ); + virtual OUString impl_getIdentifierQuoteString_throw( ); + virtual bool impl_isCatalogAtStart_throw( ); + virtual OUString impl_getCatalogSeparator_throw( ); + virtual bool impl_supportsCatalogsInTableDefinitions_throw( ); + virtual bool impl_supportsSchemasInTableDefinitions_throw( ) ; + virtual bool impl_supportsCatalogsInDataManipulation_throw( ); + virtual bool impl_supportsSchemasInDataManipulation_throw( ) ; + virtual bool impl_supportsMixedCaseQuotedIdentifiers_throw( ) ; + virtual bool impl_supportsAlterTableWithAddColumn_throw( ); + virtual bool impl_supportsAlterTableWithDropColumn_throw( ); + virtual sal_Int32 impl_getMaxStatements_throw( ); + virtual sal_Int32 impl_getMaxTablesInSelect_throw( ); + virtual bool impl_storesMixedCaseQuotedIdentifiers_throw( ); // as I mentioned before this interface is really BIG // XDatabaseMetaData diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index 01f7c59ce22d..c73159fc85d6 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx @@ -58,7 +58,7 @@ MozillaBootstrap::~MozillaBootstrap() void MozillaBootstrap::Init() { - sal_Bool aProfileExists=sal_False; + bool aProfileExists=false; #ifndef MINIMAL_PROFILEDISCOVER //This must be call before any mozilla code diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx index 6ff17b7fedc5..7b27b45c6cc1 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx @@ -23,14 +23,16 @@ #include <sal/types.h> -sal_Bool MNS_Init(sal_Bool& aProfileExists); -sal_Bool MNS_Term(sal_Bool aForce=sal_False); +bool MNS_Init(bool& aProfileExists); +bool MNS_Term(bool aForce = false); + +bool MNS_InitXPCOM(sal_Bool* aProfileExists); -sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists); typedef struct UI_Thread_ARGS { - sal_Bool* bProfileExists; -}UI_Thread_ARGS; + bool* bProfileExists; +} UI_Thread_ARGS; + void MNS_XPCOM_EventLoop(); #endif // _CONNECTIVITY_MAB_NS_INIT_HXX_ diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx index e66a79b6b13b..b151d81dc214 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx @@ -360,12 +360,12 @@ namespace connectivity } #endif - sal_Bool ProfileAccess::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) + bool ProfileAccess::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { #ifdef MINIMAL_PROFILEDISCOVER (void)product; /* avoid warning about unused parameter */ (void)profileName; /* avoid warning about unused parameter */ - return sal_True; + return true; #else OUString path = getProfilePath(product,profileName); if (path.isEmpty()) @@ -394,16 +394,16 @@ namespace connectivity #endif } - sal_Bool ProfileAccess::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) + bool ProfileAccess::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { sal_Int32 index=product; ProductStruct &m_Product = m_ProductProfileList[index]; if (!m_Product.mProfileList.size() || m_Product.mProfileList.find(profileName) == m_Product.mProfileList.end()) { - return sal_False; + return false; } else - return sal_True; + return true; } } } diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx index 0c11e2b5d26b..f5ee6a6f6f5a 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx @@ -95,8 +95,8 @@ namespace connectivity ::sal_Int32 getProfileCount( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException); ::sal_Int32 getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< OUString >& list ) throw (::com::sun::star::uno::RuntimeException); OUString getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException); - sal_Bool SAL_CALL isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); - sal_Bool SAL_CALL getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); + bool SAL_CALL isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); + bool SAL_CALL getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); protected: ProductStruct m_ProductProfileList[4]; sal_Int32 LoadProductsInfo(); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx index 0d40bff8ab8f..2eeef78a0386 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx @@ -34,7 +34,8 @@ namespace connectivity{ class OConnection; } } -sal_Bool isProfileLocked(connectivity::mozab::OConnection* _pCon); + +bool isProfileLocked(connectivity::mozab::OConnection* _pCon); class nsIAbDirectory; sal_Int32 getDirectoryType(const nsIAbDirectory* directory); |