diff options
Diffstat (limited to 'connectivity/source/drivers/mozab/mozillasrc')
7 files changed, 61 insertions, 61 deletions
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx index 77a9020a7207..e71d28ba965a 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx @@ -87,7 +87,7 @@ namespace connectivity extern sal_Bool MNS_Init(sal_Bool& aProfileExists); -// ------------------------------------------------------------------------- + MDatabaseMetaDataHelper::MDatabaseMetaDataHelper() :m_bProfileExists(sal_False) { @@ -96,7 +96,7 @@ MDatabaseMetaDataHelper::MDatabaseMetaDataHelper() OSL_TRACE( "\tOUT MDatabaseMetaDataHelper::MDatabaseMetaDataHelper()" ); } -// ------------------------------------------------------------------------- + MDatabaseMetaDataHelper::~MDatabaseMetaDataHelper() { m_aTableNames.clear(); @@ -198,7 +198,7 @@ static nsresult insertPABDescription() {0xa2, 0xda, 0x0, 0x10, 0x83, 0x0, 0x3d, 0xc} \ } -// ------------------------------------------------------------------------- + // Case where we get a parent uri, and need to list its children. static nsresult getSubsFromParent(const OString& aParent, nsIEnumerator **aSubs) { diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx index add19e6852ba..1324d7822a97 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx @@ -141,21 +141,21 @@ namespace connectivity { namespace mozab { //==================================================================== //= MLdapAttributeMap //==================================================================== - // ------------------------------------------------------------------- + MLdapAttributeMap::MLdapAttributeMap() :m_pData( new AttributeMap_Data ) { } - // ------------------------------------------------------------------- + MLdapAttributeMap::~MLdapAttributeMap() { } - // ------------------------------------------------------------------- + NS_IMPL_THREADSAFE_ISUPPORTS1( MLdapAttributeMap, nsIAbLDAPAttributeMap ) - // ------------------------------------------------------------------- + NS_IMETHODIMP MLdapAttributeMap::GetAttributeList(const nsACString & aProperty, nsACString & _retval) { OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) ); @@ -175,7 +175,7 @@ namespace connectivity { namespace mozab { return NS_OK; } - // ------------------------------------------------------------------- + NS_IMETHODIMP MLdapAttributeMap::GetAttributes(const nsACString & aProperty, PRUint32* aCount, char*** aAttrs) { OSL_FAIL( "MLdapAttributeMap::GetAttributes: not implemented!" ); @@ -185,7 +185,7 @@ namespace connectivity { namespace mozab { return NS_ERROR_NOT_IMPLEMENTED; } - // ------------------------------------------------------------------- + NS_IMETHODIMP MLdapAttributeMap::GetFirstAttribute(const nsACString & aProperty, nsACString & _retval) { OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) ); @@ -207,7 +207,7 @@ namespace connectivity { namespace mozab { return NS_OK; } - // ------------------------------------------------------------------- + NS_IMETHODIMP MLdapAttributeMap::SetAttributeList(const nsACString & aProperty, const nsACString & aAttributeList, PRBool allowInconsistencies) { OSL_FAIL( "MLdapAttributeMap::SetAttributeList: not implemented!" ); @@ -217,7 +217,7 @@ namespace connectivity { namespace mozab { return NS_ERROR_NOT_IMPLEMENTED; } - // ------------------------------------------------------------------- + NS_IMETHODIMP MLdapAttributeMap::GetProperty(const nsACString & aAttribute, nsACString & _retval) { OSL_FAIL( "MLdapAttributeMap::GetProperty: not implemented!" ); @@ -226,7 +226,7 @@ namespace connectivity { namespace mozab { return NS_ERROR_NOT_IMPLEMENTED; } - // ------------------------------------------------------------------- + NS_IMETHODIMP MLdapAttributeMap::GetAllCardAttributes(nsACString & _retval) { const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() ); @@ -246,14 +246,14 @@ namespace connectivity { namespace mozab { return NS_OK; } - // ------------------------------------------------------------------- + NS_IMETHODIMP MLdapAttributeMap::CheckState(void) { // we do not allow modifying the map, so we're always in a valid state return NS_OK; } - // ------------------------------------------------------------------- + NS_IMETHODIMP MLdapAttributeMap::SetFromPrefs(const nsACString & aPrefBranchName) { OSL_FAIL( "MLdapAttributeMap::SetFromPrefs: not implemented!" ); @@ -261,7 +261,7 @@ namespace connectivity { namespace mozab { return NS_ERROR_NOT_IMPLEMENTED; } - // ------------------------------------------------------------------- + NS_IMETHODIMP MLdapAttributeMap::SetCardPropertiesFromLDAPMessage(nsILDAPMessage* aMessage, nsIAbCard* aCard) { NS_ENSURE_ARG_POINTER( aMessage ); @@ -313,7 +313,7 @@ namespace connectivity { namespace mozab { return NS_OK; } - // ------------------------------------------------------------------- + namespace { struct PreferMailFormatType @@ -347,7 +347,7 @@ namespace connectivity { namespace mozab { } } - // ------------------------------------------------------------------- + void MLdapAttributeMap::fillCardFromResult( nsIAbCard& _card, const MQueryHelperResultEntry& _result ) { _card.SetPreferMailFormat( nsIAbPreferMailFormat::unknown ); @@ -391,7 +391,7 @@ namespace connectivity { namespace mozab { } } - // ------------------------------------------------------------------- + void MLdapAttributeMap::fillResultFromCard( MQueryHelperResultEntry& _result, nsIAbCard& _card ) { nsXPIDLString value; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx index 039db52576f5..9cd96b40acdc 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx @@ -191,7 +191,7 @@ nsresult MNSMozabProxy::QueryHelperStub() } return rv; } -//------------------------------------------------------------------- + #define NS_LDAPCONNECTION_CONTRACTID "@mozilla.org/network/ldap-connection;1" #define NS_LDAPOPERATION_CONTRACTID "@mozilla.org/network/ldap-operation;1" @@ -287,7 +287,7 @@ NS_IMETHODIMP MLDAPMessageListener::OnLDAPMessage( nsILDAPMessage* aMessage ) return NS_OK; } -//------------------------------------------------------------------- + nsresult MNSMozabProxy::testLDAPConnection( ) diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx index be8d8e637ae2..4325f4e31892 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx @@ -28,33 +28,33 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::frame; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTerminateListener> MNSTerminateListener::mxTerminateListener = new MNSTerminateListener(); -// ----------------------------------------- + // - MNSTerminateListener - -// ----------------------------------------- + MNSTerminateListener::MNSTerminateListener( ) { } -// ----------------------------------------------------------------------------- + MNSTerminateListener::~MNSTerminateListener() { } -// ----------------------------------------------------------------------------- + void SAL_CALL MNSTerminateListener::disposing( const EventObject& /*Source*/ ) throw( RuntimeException ) { } -// ----------------------------------------------------------------------------- + void SAL_CALL MNSTerminateListener::queryTermination( const EventObject& /*aEvent*/ ) throw( TerminationVetoException, RuntimeException ) { } -// ----------------------------------------------------------------------------- + void SAL_CALL MNSTerminateListener::notifyTermination( const EventObject& /*aEvent*/ ) throw( RuntimeException ) { diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx index 3a618fa8c62a..2395bd0009b0 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx @@ -50,7 +50,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbc; using namespace connectivity; -// ------------------------------------------------------------------------- + // Used to store an nsIAbDirectoryQuery member without the need to use Mozilla // types in the MQuery.hxx file. // @@ -65,7 +65,7 @@ namespace connectivity { } } -// ------------------------------------------------------------------------- + MQuery::MQuery( const OColumnAlias& _ca ) :m_rColumnAlias( _ca ) { @@ -79,7 +79,7 @@ MQuery::MQuery( const OColumnAlias& _ca ) OSL_TRACE( "\tOUT MQuery::MQuery( ca )" ); } -// ------------------------------------------------------------------------- + MQuery::~MQuery() { OSL_TRACE("IN MQuery::~MQuery()"); @@ -98,7 +98,7 @@ MQuery::~MQuery() OSL_TRACE("\tOUT MQuery::~MQuery()"); } -// ----------------------------------------------------------------------------- + void MQuery::construct() { // Set default values. (For now just as a reminder). @@ -113,7 +113,7 @@ void MQuery::construct() m_aQueryHelper = new MQueryHelper(); NS_IF_ADDREF( m_aQueryHelper); } -// ------------------------------------------------------------------------- + void MQuery::setAddressbook(OUString &ab) { OSL_TRACE("IN MQuery::setAddressbook()"); @@ -123,7 +123,7 @@ void MQuery::setAddressbook(OUString &ab) OSL_TRACE("\tOUT MQuery::setAddressbook()"); } -// ------------------------------------------------------------------------- + void MQuery::setMaxNrOfReturns(const sal_Int32 mnr) { OSL_TRACE( "IN MQuery::setMaxNrOfReturns()" ); @@ -132,7 +132,7 @@ void MQuery::setMaxNrOfReturns(const sal_Int32 mnr) m_nMaxNrOfReturns = mnr; OSL_TRACE("\tOUT MQuery::setMaxNrOfReturns()" ); } -// ------------------------------------------------------------------------- + void MQuery::setExpression( MQueryExpression &_expr ) { OSL_TRACE("IN MQuery::setExpression()"); @@ -142,7 +142,7 @@ void MQuery::setExpression( MQueryExpression &_expr ) OSL_TRACE("\tOUT MQuery::setExpression()"); } -// ------------------------------------------------------------------------- + static sal_Int32 generateExpression( MQuery* _aQuery, MQueryExpression* _aExpr, nsIAbBooleanExpression* queryExpression ) { @@ -312,7 +312,7 @@ sal_Bool isProfileLocked(OConnection* _pCon) } -// ------------------------------------------------------------------------- + sal_Int32 getDirectoryType(const nsIAbDirectory* directory) { nsresult retCode; @@ -349,7 +349,7 @@ sal_Int32 getDirectoryType(const nsIAbDirectory* directory) return SDBCAddress::Unknown; } -// ------------------------------------------------------------------------- + sal_Bool isForceQueryProxyUsed(const nsIAbDirectory* directory) { sal_Int32 nType = getDirectoryType(directory); @@ -357,7 +357,7 @@ sal_Bool isForceQueryProxyUsed(const nsIAbDirectory* directory) return sal_True; return sal_False; } -// ------------------------------------------------------------------------- + sal_Int32 MQuery::commitRow(const sal_Int32 rowIndex) { if (!m_aQueryHelper || !m_aQueryDirectory || !m_aQueryDirectory->directoryQuery) @@ -374,7 +374,7 @@ sal_Int32 MQuery::commitRow(const sal_Int32 rowIndex) return rv; } -// ------------------------------------------------------------------------- + sal_Int32 MQuery::deleteRow(const sal_Int32 rowIndex) { if (!m_aQueryHelper || !m_aQueryDirectory || !m_aQueryDirectory->directoryQuery) @@ -392,7 +392,7 @@ sal_Int32 MQuery::deleteRow(const sal_Int32 rowIndex) } -// ------------------------------------------------------------------------- + sal_Int32 MQuery::executeQuery(OConnection* _pCon) { ::osl::MutexGuard aGuard(m_aMutex); @@ -410,7 +410,7 @@ sal_Int32 MQuery::executeQuery(OConnection* _pCon) rv = xMProxy.StartProxy(&args,m_Product,m_Profile); return rv; } -// ------------------------------------------------------------------------- + sal_Int32 MQuery::executeQueryProxied(OConnection* _pCon) { #if OSL_DEBUG_LEVEL > 0 @@ -563,7 +563,7 @@ sal_Int32 MQuery::executeQueryProxied(OConnection* _pCon) return(0); } -// ------------------------------------------------------------------------- + // // // If the query executed is being done asynchronously then this may return @@ -575,7 +575,7 @@ MQuery::getRowCount() return( m_aQueryHelper->getResultCount() ); } -// ------------------------------------------------------------------------- + // // // As opposed to getRowCount() this returns the actual number of rows fetched @@ -606,7 +606,7 @@ MQuery::waitForQueryComplete( void ) return( sal_False ); } -// ------------------------------------------------------------------------- + sal_Bool MQuery::checkRowAvailable( sal_Int32 nDBRow ) @@ -619,7 +619,7 @@ MQuery::checkRowAvailable( sal_Int32 nDBRow ) return( getRowCount() > nDBRow ); } -// ------------------------------------------------------------------------- + sal_Bool MQuery::setRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUString& aDBColumnName, sal_Int32 nType ) const { @@ -644,7 +644,7 @@ MQuery::setRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUString& aDBC return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool MQuery::getRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUString& aDBColumnName, sal_Int32 nType ) const { @@ -670,7 +670,7 @@ MQuery::getRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUString& aDBC return sal_True; } -// ------------------------------------------------------------------------- + sal_Int32 MQuery::getRowStates(sal_Int32 nDBRow) { @@ -728,7 +728,7 @@ MQuery::createNewCard() NS_ENSURE_SUCCESS(rv,0); return nNumber; } -// ------------------------------------------------------------------------- + MNameMapper* MQuery::CreateNameMapper() @@ -736,13 +736,13 @@ MQuery::CreateNameMapper() return( new MNameMapper() ); } -// ------------------------------------------------------------------------- + void MQuery::FreeNameMapper( MNameMapper* _ptr ) { delete _ptr; } -// ------------------------------------------------------------------------- + sal_Bool MQuery::isWritable(OConnection* _pCon) { if ( !m_aQueryDirectory ) diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx index 6ef6759e2bbb..0e9264a39fad 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx @@ -290,7 +290,7 @@ MQueryHelper::waitForRow( sal_Int32 rowNum ) return( sal_True ); } -// ------------------------------------------------------------------------- + sal_Int32 MQueryHelper::getResultCount() const @@ -308,7 +308,7 @@ MQueryHelper::getResultCount() const } } -// ------------------------------------------------------------------------- + sal_uInt32 MQueryHelper::getRealCount() const @@ -317,7 +317,7 @@ MQueryHelper::getRealCount() const return static_cast<sal_Int32>(m_aResults.size()); } -// ------------------------------------------------------------------------- + NS_IMETHODIMP MQueryHelper::OnQueryItem(nsIAbDirectoryQueryResult *result) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -398,7 +398,7 @@ NS_IMETHODIMP MQueryHelper::OnQueryItem(nsIAbDirectoryQueryResult *result) return(NS_OK); } -// ----------------------------------------------------------------------------- + void MQueryHelper::notifyQueryError() { m_bQueryComplete = sal_True ; @@ -591,7 +591,7 @@ sal_Bool MQueryHelper::resyncRow(sal_uInt32 rowIndex) getCardValues(card,rowIndex); return sal_True; } -// ------------------------------------------------------------------------- + sal_Int32 MQueryHelper::createNewCard() { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx index 813d67b09179..5272a6b61cab 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx @@ -24,7 +24,7 @@ using namespace connectivity::mozab; -// ------------------------------------------------------------------------- + void MTypeConverter::ouStringToNsString(OUString const &ous, nsString &nss) { // Convert to OString (utf-8 encoding). @@ -37,20 +37,20 @@ void MTypeConverter::ouStringToNsString(OUString const &ous, nsString &nss) //const PRUnichar* uniMozString = (const PRUnichar*) mozString; nss = mozString; // temp. } -// ------------------------------------------------------------------------- + OString MTypeConverter::nsACStringToOString( const nsACString& _source ) { const char* buffer = _source.BeginReading(); const char* bufferEnd = _source.EndReading(); return OString( buffer, static_cast<sal_Int32>(bufferEnd - buffer) ); } -// ------------------------------------------------------------------------- + void MTypeConverter::asciiToNsACString( const sal_Char* _asciiString, nsACString& _dest ) { _dest.Truncate(); _dest.AppendASCII( _asciiString ); } -// ------------------------------------------------------------------------- + void MTypeConverter::nsStringToOUString(nsString const &nss, OUString &ous) { // Get clone of buffer. @@ -64,7 +64,7 @@ void MTypeConverter::nsStringToOUString(nsString const &nss, OUString &ous) nsMemory::Free(uc); } -// ------------------------------------------------------------------------- + void MTypeConverter::prUnicharToOUString(PRUnichar const *pru, OUString &ous) { // TODO, specify length. @@ -72,7 +72,7 @@ void MTypeConverter::prUnicharToOUString(PRUnichar const *pru, OUString &ous) OUString _ous(reinterpret_cast_mingw_only<const sal_Unicode *>(pru)); ous = _ous; } -// ------------------------------------------------------------------------- + char *MTypeConverter::ouStringToCCharStringAscii(OUString const &ous) { // Convert OUString to OString, @@ -80,6 +80,6 @@ char *MTypeConverter::ouStringToCCharStringAscii(OUString const &ous) return(strdup(os.getStr())); } -// ------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |