User: obo Date: 06/03/29 04:19:32 Modified: /dba/connectivity/source/drivers/mozab/mozillasrc/ MQueryHelper.cxx
Log: INTEGRATION: CWS dba203a (1.12.76); FILE MERGED 2006/03/17 15:37:59 fs 1.12.76.1: #i60163# localized error messages 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&r2=1.13 Delta lines: +12 -10 --------------------- --- MQueryHelper.cxx 8 Sep 2005 06:30:05 -0000 1.12 +++ MQueryHelper.cxx 29 Mar 2006 12:19:29 -0000 1.13 @@ -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" @@ -253,16 +256,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; } @@ -607,7 +610,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; \ } @@ -644,7 +647,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)); } @@ -692,7 +695,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)); } @@ -701,13 +704,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; } @@ -840,7 +843,6 @@ MQueryHelperResultEntry *resEntry; if (rowIndex>0) { - ::rtl::OUString m_aErrorString; resEntry = getByIndex(rowIndex); } else @@ -992,7 +994,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]
