Tag: cws_src680_warnings01 User: sb Date: 06/04/07 13:24:04 Modified: /dba/connectivity/source/drivers/mozab/mozillasrc/ MQueryHelper.cxx
Log: RESYNC: (1.12-1.13); FILE MERGED File Changes: Directory: /dba/connectivity/source/drivers/mozab/mozillasrc/ ============================================================= File [changed]: MQueryHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx?r1=1.12.30.3&r2=1.12.30.4 Delta lines: +15 -12 --------------------- --- MQueryHelper.cxx 21 Nov 2005 10:07:55 -0000 1.12.30.3 +++ MQueryHelper.cxx 7 Apr 2006 20:24:01 -0000 1.12.30.4 @@ -45,6 +45,9 @@ #include <MConnection.hxx> #endif +#ifndef CONNECTIVITY_SHARED_RES_HRC +#include "conn_shared_res.hrc" +#endif #ifndef _CONNECTIVITY_MAB_NS_DECLARES_HXX_ #include "MNSDeclares.hxx" @@ -247,16 +250,16 @@ } if (times >= 20 && rv == ::osl::Condition::result_timeout ) { OSL_TRACE("waitForResultOrComplete() : Timeout!"); - m_aErrorString = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Timeout waiting for result.")); + setError( STR_TIMEOUT_WAITING ); return sal_False; } if ( isError() ) { OSL_TRACE("waitForResultOrComplete() : Error returned!"); - m_aErrorString = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Error found when executing query")); + setError( STR_ERR_EXECUTING_QUERY ); return sal_False; } - m_aErrorString = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("")); + resetError(); OSL_TRACE(" Out : waitForResultOrComplete()"); return sal_True; } @@ -592,7 +595,7 @@ #define ENSURE_MOZAB_PROFILE_NOT_LOOKED(directory) \ if (getDirectoryType(directory) == SDBCAddress::Mozilla && isProfileLocked(NULL)) \ { \ - m_aErrorString = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("You can't make any changes to mozilla address book when mozilla is running.")); \ + setError( STR_MOZILLA_IS_RUNNIG_NO_CHANGES ); \ return sal_False; \ } @@ -629,7 +632,7 @@ } //We return NS_ERROR_FILE_ACCESS_DENIED in the case the mozillaAB has been changed out side of our process if (rv == NS_ERROR_FILE_ACCESS_DENIED ) - m_aErrorString = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Mozilla Address Book has been changed out of this process, we can't modify it in this condition.")); + setError( STR_FOREIGN_PROCESS_CHANGED_AB ); return !(NS_FAILED(rv)); } @@ -677,7 +680,7 @@ resEntry->setRowStates(RowStates_Deleted); //We return NS_ERROR_FILE_ACCESS_DENIED in the case the mozillaAB has been changed out side of our process if (rv == NS_ERROR_FILE_ACCESS_DENIED ) - m_aErrorString = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Mozilla Address Book has been changed out of this process, we can't modify it in this condition.")); + setError( STR_FOREIGN_PROCESS_CHANGED_AB ); return !(NS_FAILED(rv)); } @@ -686,13 +689,13 @@ MQueryHelperResultEntry *resEntry = getByIndex(rowIndex); if (!resEntry) { - m_aErrorString = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Can't find the requested row.")); + setError( STR_CANT_FIND_ROW ); return sal_False; } nsIAbCard *card=resEntry->getCard(); if (!card) { - m_aErrorString = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Can't find the card for the requested row.")); + setError( STR_CANT_FIND_CARD_FOR_ROW ); return sal_False; } @@ -976,7 +979,7 @@ MQueryHelperResultEntry *resEntry = getByIndex(rowIndex); if (!resEntry) { - m_aErrorString = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Can't find the requested row.")); + setError( STR_CANT_FIND_ROW ); return sal_False; } nsIAbCard *card=resEntry->getCard(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
