diff options
Diffstat (limited to 'dbaccess/source/ui')
24 files changed, 31 insertions, 31 deletions
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 82663d00fccb..d1a38b9afcfd 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -1410,7 +1410,7 @@ IMPL_LINK( SbaXDataBrowserController, OnAsyncDisplayError, void*, /* _pNotIntere //------------------------------------------------------------------------------ void SbaXDataBrowserController::errorOccured(const ::com::sun::star::sdb::SQLErrorEvent& aEvent) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::errorOccured" ); + RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::errorOccurred" ); ::osl::MutexGuard aGuard( getMutex() ); SQLExceptionInfo aInfo( aEvent.Reason ); @@ -1419,7 +1419,7 @@ void SbaXDataBrowserController::errorOccured(const ::com::sun::star::sdb::SQLErr if ( m_nFormActionNestingLevel ) { - OSL_ENSURE( !m_aCurrentError.isValid(), "SbaXDataBrowserController::errorOccured: can handle one error per transaction only!" ); + OSL_ENSURE( !m_aCurrentError.isValid(), "SbaXDataBrowserController::errorOccurred: can handle one error per transaction only!" ); m_aCurrentError = aInfo; } else diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index f4d783f4df89..ca4f4aaf32ce 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -1113,7 +1113,7 @@ Reference< XPropertySet > SbaGridControl::getField(sal_uInt16 nModelPos) } catch(Exception&) { - OSL_ENSURE(0,"SbaGridControl::getField Exception occured!"); + OSL_ENSURE(0,"SbaGridControl::getField Exception occurred!"); } return xEmptyReturn; diff --git a/dbaccess/source/ui/browser/sbagrid.src b/dbaccess/source/ui/browser/sbagrid.src index ca43b02732ba..b3fd77757364 100644 --- a/dbaccess/source/ui/browser/sbagrid.src +++ b/dbaccess/source/ui/browser/sbagrid.src @@ -124,7 +124,7 @@ String STR_NO_COLUMNNAME_MATCHING Text [ en-US ] = "No matching column names were found."; }; -String STR_ERROR_OCCURED_WHILE_COPYING +String STR_ERROR_OCCURRED_WHILE_COPYING { Text [ en-US ] = "An error occurred. Do you want to continue copying?"; }; diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index af280c66794f..3bf1e1021c76 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -2174,7 +2174,7 @@ IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, SvLBoxEntry*, _pParent) } else return 0L; - // 0 indicates that an error occured + // 0 indicates that an error occurred } else { // we have to expand the queries or bookmarks diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 1c272c4839b3..ecec957c6ef4 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -155,7 +155,7 @@ void DBTreeListBox::RequestingChilds( SvLBoxEntry* pParent ) { if (!m_aPreExpandHandler.Call(pParent)) { - // an error occured. The method calling us will reset the entry flags, so it can't be expanded again. + // an error occurred. The method calling us will reset the entry flags, so it can't be expanded again. // But we want that the user may do a second try (i.e. because he misstypes a password in this try), so // we have to reset these flags controlling the expand ability PostUserEvent(LINK(this, DBTreeListBox, OnResetEntry), pParent); diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 73212e395748..0e7d8d8aff66 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -199,7 +199,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn } catch(Exception&) { - // a non-SQLException exception occured ... simply throw an SQLException + // a non-SQLException exception occurred ... simply throw an SQLException SQLException aInfo; aInfo.Message = sCurrentActionError; throw aInfo; diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index eba739fec877..95a6f63d01ec 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -151,7 +151,7 @@ namespace dbaui @param _sReturn <OUT/> contains the selected name. @return - <FALSE/> if an error occured, otherwise <TRUE/> + <FALSE/> if an error occurred, otherwise <TRUE/> */ sal_Bool getSelectedDataSource(::rtl::OUString& _sReturn,::rtl::OUString& _sCurr); diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx index 7c27a499e783..5f7af2163220 100644 --- a/dbaccess/source/ui/inc/JoinController.hxx +++ b/dbaccess/source/ui/inc/JoinController.hxx @@ -150,14 +150,14 @@ namespace dbaui /** only defines a method to save a SQLException in d&d methods to show the error at a later state set the internal member m_aExceptionInfo to _rInfo */ - void setErrorOccured(const ::dbtools::SQLExceptionInfo& _rInfo) + void setErrorOccurred(const ::dbtools::SQLExceptionInfo& _rInfo) { m_aExceptionInfo = _rInfo; } /** just returns the internal member and clears it */ - ::dbtools::SQLExceptionInfo clearOccuredError() + ::dbtools::SQLExceptionInfo clearOccurredError() { ::dbtools::SQLExceptionInfo aInfo = m_aExceptionInfo; m_aExceptionInfo = ::dbtools::SQLExceptionInfo(); diff --git a/dbaccess/source/ui/inc/datasourcemap.hxx b/dbaccess/source/ui/inc/datasourcemap.hxx index 836f001bf580..54802093e17d 100644 --- a/dbaccess/source/ui/inc/datasourcemap.hxx +++ b/dbaccess/source/ui/inc/datasourcemap.hxx @@ -113,7 +113,7 @@ namespace dbaui void clearModifiedFlag(const ::rtl::OUString& _rName); /** tell the map that a data source is scheduled to be deleted. - @return id for accessing the deleted data source later. -1 if no free id existed or an error occured + @return id for accessing the deleted data source later. -1 if no free id existed or an error occurred */ sal_Int32 markDeleted(const ::rtl::OUString& _rName); diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index 4ba63866454b..c01550fb8647 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -123,7 +123,7 @@ private: { AR_LEAVE_MODIFIED, // somthing was modified and has successfully been committed AR_LEAVE_UNCHANGED, // no changes were made - AR_KEEP // don't leave the page (e.g. because an error occured) + AR_KEEP // don't leave the page (e.g. because an error occurred) }; /** apply all changes made */ diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index a1f852d2130e..c08d6597e829 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -328,7 +328,7 @@ #define STR_TABLEDESIGN_DBFIELDTYPES RID_STR_GEN_START + 8 #define STR_QRY_CONTINUE RID_STR_GEN_START + 9 #define STR_COLUMN_NAME RID_STR_GEN_START + 10 -#define STR_ERROR_OCCURED_WHILE_COPYING RID_STR_GEN_START + 11 +#define STR_ERROR_OCCURRED_WHILE_COPYING RID_STR_GEN_START + 11 #define STR_MISSING_TABLES_XDROP RID_STR_GEN_START + 12 #define STR_QUERY_DELETE_TABLE RID_STR_GEN_START + 13 #define STR_BUTTON_TEXT_ALL RID_STR_GEN_START + 14 diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index 882f78b806de..414a3a0b5108 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -116,7 +116,7 @@ protected: { AR_LEAVE_MODIFIED, // somthing was modified and has successfully been committed AR_LEAVE_UNCHANGED, // no changes were made - AR_KEEP // don't leave the page (e.g. because an error occured) + AR_KEEP // don't leave the page (e.g. because an error occurred) }; /** apply all changes made */ diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index ad8c6fb07eef..a6b4db6b6b02 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -149,7 +149,7 @@ protected: { AR_LEAVE_MODIFIED, // somthing was modified and has successfully been committed AR_LEAVE_UNCHANGED, // no changes were made - AR_KEEP // don't leave the page (e.g. because an error occured) + AR_KEEP // don't leave the page (e.g. because an error occurred) }; private: diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index e7931223700e..cb22ad23c43a 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -257,7 +257,7 @@ sal_Bool ORowSetImportExport::insertNewRow() { if(!m_bAlreadyAsked) { - String sAskIfContinue = String(ModuleRes(STR_ERROR_OCCURED_WHILE_COPYING)); + String sAskIfContinue = String(ModuleRes(STR_ERROR_OCCURRED_WHILE_COPYING)); OSQLWarningBox aDlg( m_pParent, sAskIfContinue, WB_YES_NO | WB_DEF_YES ); if(aDlg.Execute() == RET_YES) m_bAlreadyAsked = sal_True; diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index ed1f7e1c6c1d..cd4fd7c016fc 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -247,7 +247,7 @@ namespace bError = sal_True; } } - // check if error occured + // check if error occurred if ( bError ) eErrorCode = eIllegalJoin; @@ -2823,7 +2823,7 @@ sal_Bool OQueryDesignView::checkStatement() { sal_Bool bRet = sal_True; if ( m_pSelectionBox ) - bRet = m_pSelectionBox->Save(); // an error occured so we return no + bRet = m_pSelectionBox->Save(); // an error occurred so we return no return bRet; } //------------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 6bb3a056bb80..a3763deafc02 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -640,7 +640,7 @@ sal_Bool OSelectionBrowseBox::fillColumnRef(const ::rtl::OUString& _sColumnName, if ( pTabWinList ) { sal_uInt16 nTabCount = 0; - if ( !static_cast<OQueryTableView*>(getDesignView()->getTableView())->FindTableFromField(_sColumnName,_pEntry,nTabCount) ) // error occured: column not in table window + if ( !static_cast<OQueryTableView*>(getDesignView()->getTableView())->FindTableFromField(_sColumnName,_pEntry,nTabCount) ) // error occurred: column not in table window { String sErrorMsg(ModuleRes(RID_STR_FIELD_DOESNT_EXIST)); sErrorMsg.SearchAndReplaceAscii("$name$",_sColumnName); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 4ecb2e8e0245..8d25da432916 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -259,7 +259,7 @@ namespace dbaui @param _bListAction Will be set to <TRUE/> when we are in a list action otherwise <FALSE/> @return - <TRUE/> if an error occured otherwise <FALSE/> + <TRUE/> if an error occurred otherwise <FALSE/> */ sal_Bool saveField(const String& _sFieldName,OTableFieldDescRef& _pEntry,sal_Bool& _bListAction); @@ -283,7 +283,7 @@ namespace dbaui @param _bListAction Will be set to <TRUE/> when we are in a list action otherwise <FALSE/> @return - <TRUE/> if an error occured otherwise <FALSE/> + <TRUE/> if an error occurred otherwise <FALSE/> */ sal_Bool fillColumnRef( const ::connectivity::OSQLParseNode* _pColumnRef, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 0bf51df79eac..13c0797033ed 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -205,7 +205,7 @@ BOOL OTableWindow::FillListBox() } catch(Exception&) { - OSL_ENSURE(0,"Exception occured!"); + OSL_ENSURE(0,"Exception occurred!"); } try { @@ -234,7 +234,7 @@ BOOL OTableWindow::FillListBox() } catch(Exception&) { - OSL_ENSURE(0,"Exception occured!"); + OSL_ENSURE(0,"Exception occurred!"); } return TRUE; diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index 530f808b46f9..b324c9263097 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -77,7 +77,7 @@ OTableWindowListBox::OTableWindowListBox( OTableWindow* pParent ) void OTableWindowListBox::dragFinished( ) { // first show the error msg when existing - m_pTabWin->getDesignView()->getController().showError(m_pTabWin->getDesignView()->getController().clearOccuredError()); + m_pTabWin->getDesignView()->getController().showError(m_pTabWin->getDesignView()->getController().clearOccurredError()); // second look for ui activities which should happen after d&d if (m_nUiEvent) Application::RemoveUserEvent(m_nUiEvent); @@ -322,7 +322,7 @@ IMPL_LINK( OTableWindowListBox, DropHdl, void *, /*EMPTY_ARG*/) catch(const SQLException& e) { // remember the exception so that we can show them later when d&d is finished - m_pTabWin->getDesignView()->getController().setErrorOccured(::dbtools::SQLExceptionInfo(e)); + m_pTabWin->getDesignView()->getController().setErrorOccurred(::dbtools::SQLExceptionInfo(e)); } return 0L; } diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index eeb8f26c5b59..cc8777a8e854 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -1614,7 +1614,7 @@ bool OQueryController::doSaveAsDoc(sal_Bool _bSaveAs) { ::dbtools::SQLExceptionInfo aInfo(e); showError(aInfo); - // an error occured so we clear the statement + // an error occurred so we clear the statement sTranslatedStmt = ::rtl::OUString(); } } diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index b345ecaa4a07..cb26447c96d3 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -319,7 +319,7 @@ bool ORelationTableView::RemoveConnection( OTableConnection* pConn ,sal_Bool /*_ } catch(Exception&) { - OSL_ENSURE(0,"ORelationTableView::RemoveConnection: Something other than SQLException occured!"); + OSL_ENSURE(0,"ORelationTableView::RemoveConnection: Something other than SQLException occurred!"); } return false; } diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 0061bac5fed3..c90c0638548f 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -1147,7 +1147,7 @@ void OTableController::alterColumns() xAppend->appendByDescriptor(xNewColumn); } catch(const SQLException&) - { // an error occured so we try to reactivate the old one + { // an error occurred so we try to reactivate the old one xAppend->appendByDescriptor(xColumn); throw; } diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 2091f941838d..d93f9d3bd6c9 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -328,7 +328,7 @@ namespace dbaui const Reference< XPropertySet >& _rxDestTable ); - /** processes an error which occured during copying + /** processes an error which occurred during copying First, all listeners are ask. If a listener tells to cancel or continue copying, this is reported to the method's caller. If a listener tells to ask the user, this is done, and the user's decision is @@ -1112,7 +1112,7 @@ bool CopyTableWizard::impl_processCopyError_nothrow( const CopyTableRowEvent& _r { SQLContext aError; aError.Context = *this; - aError.Message = String( ModuleRes( STR_ERROR_OCCURED_WHILE_COPYING ) ); + aError.Message = String( ModuleRes( STR_ERROR_OCCURRED_WHILE_COPYING ) ); ::dbtools::SQLExceptionInfo aInfo( _rEvent.Error ); if ( aInfo.isValid() ) diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx index 09d6ef37ac11..90beac1b797e 100644 --- a/dbaccess/source/ui/uno/dbinteraction.hxx +++ b/dbaccess/source/ui/uno/dbinteraction.hxx @@ -124,7 +124,7 @@ namespace dbaui SUPPLY_DOCUMENTSAVE }; /** check if a given continuation sequence contains a given continuation type<p/> - @return the index within <arg>_rContinuations</arg> of the first occurence of a continuation + @return the index within <arg>_rContinuations</arg> of the first occurrence of a continuation of the requested type, -1 of no such continuation exists */ sal_Int32 getContinuation( |