diff options
Diffstat (limited to 'dbaccess/source/core')
-rw-r--r-- | dbaccess/source/core/api/CacheSet.cxx | 6 | ||||
-rw-r--r-- | dbaccess/source/core/api/KeySet.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/api/RowSet.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/api/RowSet.hxx | 4 | ||||
-rw-r--r-- | dbaccess/source/core/api/RowSetBase.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/api/RowSetBase.hxx | 4 | ||||
-rw-r--r-- | dbaccess/source/core/api/RowSetCache.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/core/api/definitioncolumn.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/api/query.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/api/querycomposer.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/api/querycontainer.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/dataaccess/ComponentDefinition.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/dataaccess/ModelImpl.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/dataaccess/connection.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/dataaccess/databasedocument.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/dataaccess/databasedocument.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/dataaccess/datasource.cxx | 8 | ||||
-rw-r--r-- | dbaccess/source/core/misc/DatabaseDataProvider.cxx | 2 |
18 files changed, 26 insertions, 26 deletions
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx index cd21bf96f98e..2b76e757d37b 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -171,11 +171,11 @@ OCacheSet::~OCacheSet() } catch(Exception&) { - OSL_ENSURE(0,"Exception occured"); + OSL_ENSURE(0,"Exception occurred"); } catch(...) { - OSL_ENSURE(0,"Unknown Exception occured"); + OSL_ENSURE(0,"Unknown Exception occurred"); } DBG_DTOR(OCacheSet,NULL); @@ -300,7 +300,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow ::rtl::OUString aQuote = getIdentifierQuoteString(); - sal_Int32 nCheckCount = 1; // index for the orginal values + sal_Int32 nCheckCount = 1; // index for the original values sal_Int32 i = 1; ::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL")); diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index aa2539946104..f3464c35f476 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -182,7 +182,7 @@ OKeySet::~OKeySet() } catch(...) { - OSL_ENSURE(0,"Unknown Exception occured"); + OSL_ENSURE(0,"Unknown Exception occurred"); } m_xComposer = NULL; diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 974b60e8b442..5b7e0a1ac3cf 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -2313,7 +2313,7 @@ sal_Bool ORowSet::impl_initComposer_throw( ::rtl::OUString& _out_rCommandToExecu if ( m_bIgnoreResult ) { // append a "0=1" filter // don't simply overwrite an existent filter, this would lead to problems if this existent - // filter contains paramters (since a keyset may add parameters itself) + // filter contains parameters (since a keyset may add parameters itself) // 2003-12-12 - #23418# - fs@openoffice.org m_xComposer->setElementaryQuery( m_xComposer->getQuery( ) ); m_xComposer->setFilter( ::rtl::OUString::createFromAscii( "0 = 1" ) ); diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx index e1554e4e35a8..755d4be95c80 100644 --- a/dbaccess/source/core/api/RowSet.hxx +++ b/dbaccess/source/core/api/RowSet.hxx @@ -173,7 +173,7 @@ namespace dbaccess m_xActiveConnection points to a valid SDB-level connection @throws com::sun::star::sdb::SQLException - if an database-related error occured + if a database-related error occurred @throws com::sun::star::uno::RuntimeException if any of the components involved throws a com::sun::star::uno::RuntimeException @@ -217,7 +217,7 @@ namespace dbaccess void checkUpdateIterator(); const connectivity::ORowSetValue& getInsertValue(sal_Int32 columnIndex); void setParameter(sal_Int32 parameterIndex, const connectivity::ORowSetValue& x); - // resizes the parameter vector if nescessary + // resizes the parameter vector if necessary ::connectivity::ORowSetValue& getParameterStorage( sal_Int32 parameterIndex ); void updateValue(sal_Int32 columnIndex,const connectivity::ORowSetValue& x); diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index 6458dcd7faf4..7a05b9641b20 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -1134,7 +1134,7 @@ void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const OR #if OSL_DEBUG_LEVEL > 0 sal_Int32 nNewRow = m_pCache->getRow(); #endif - OSL_ENSURE(nOldRow == nNewRow,"Old position is not equal to new postion"); + OSL_ENSURE(nOldRow == nNewRow,"Old position is not equal to new position"); m_aCurrentRow = m_pCache->m_aMatrixIter; m_bIsInsertRow = sal_False; OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is nul after positionCache!"); diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx index 73e265a3c495..51998b4c19b9 100644 --- a/dbaccess/source/core/api/RowSetBase.hxx +++ b/dbaccess/source/core/api/RowSetBase.hxx @@ -236,7 +236,7 @@ namespace dbaccess void movementFailed(); ORowSetRow getOldRow(sal_Bool _bWasNew); - /** move the cache the postion defined by the member functor + /** move the cache the position defined by the member functor @param _aCheckFunctor Return <TRUE/> when we already stand on the row we want to. @param _aMovementFunctor @@ -405,7 +405,7 @@ namespace dbaccess private: ::std::auto_ptr<ORowSetNotifierImpl> m_pImpl; ORowSetBase* m_pRowSet; - // not aquired! This is not necessary because this class here is to be used on the stack within + // not acquired! This is not necessary because this class here is to be used on the stack within // a method of ORowSetBase (or derivees) sal_Bool m_bWasNew; sal_Bool m_bWasModified; diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index d8ebf30f2d75..31fba3e39e7c 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -1030,7 +1030,7 @@ sal_Bool ORowSetCache::moveWindow() if(m_nStartPos < 0) m_nStartPos = 0; } - // here we need only to check if the begining row is valid. If not we have to fetch it. + // here we need only to check if the beginning row is valid. If not we have to fetch it. if(!m_pMatrix->begin()->isValid()) { aIter = m_pMatrix->begin(); @@ -1063,7 +1063,7 @@ sal_Bool ORowSetCache::moveWindow() sal_Bool ORowSetCache::first( ) { // first move to the first row - // then check if the cache window is at the begining + // then check if the cache window is at the beginning // when not postionize the window and fill it with data // smart moving of the window -> clear only the rows whom are out of range sal_Bool bRet = m_pCacheSet->first(); diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx index a83604e04b89..fb7b810bd21b 100644 --- a/dbaccess/source/core/api/definitioncolumn.cxx +++ b/dbaccess/source/core/api/definitioncolumn.cxx @@ -357,7 +357,7 @@ OColumnWrapper::OColumnWrapper( const Reference< XPropertySet > & rCol, const bo { DBG_CTOR(OColumnWrapper,NULL); // which type of aggregate property do we have? - // we distingish the properties by the containment of optional properties + // we distinguish the properties by the containment of optional properties m_nColTypeID = 0; if ( m_xAggregate.is() ) { diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx index 98a36650bb8b..3eb0f9eca9b5 100644 --- a/dbaccess/source/core/api/query.cxx +++ b/dbaccess/source/core/api/query.cxx @@ -288,7 +288,7 @@ void SAL_CALL OQuery::propertyChange( const PropertyChangeEvent& _rSource ) thro "OQuery::propertyChange : where did this call come from ?"); if (m_eDoingCurrently == SETTING_PROPERTIES) - // we're setting the property ourself, so we will do the neccessary notifications later + // we're setting the property ourself, so we will do the necessary notifications later return; // forward this to our own member holding a copy of the property value diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx index f71b98a1cc80..c7fa7e47f5c2 100644 --- a/dbaccess/source/core/api/querycomposer.cxx +++ b/dbaccess/source/core/api/querycomposer.cxx @@ -122,7 +122,7 @@ OQueryComposer::OQueryComposer(const Reference< XConnection>& _xConnection) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::OQueryComposer" ); DBG_CTOR(OQueryComposer,NULL); - OSL_ENSURE(_xConnection.is()," Connection cant be null!"); + OSL_ENSURE(_xConnection.is()," Connection can't be null!"); Reference<XMultiServiceFactory> xFac( _xConnection, UNO_QUERY_THROW ); m_xComposer.set( xFac->createInstance( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER ), UNO_QUERY_THROW ); diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx index c91ee7d417b7..0241444e74b0 100644 --- a/dbaccess/source/core/api/querycontainer.cxx +++ b/dbaccess/source/core/api/querycontainer.cxx @@ -249,7 +249,7 @@ void SAL_CALL OQueryContainer::dropByName( const ::rtl::OUString& _rName ) throw throw DisposedException( ::rtl::OUString(), *this ); // now simply forward the remove request to the CommandDefinition container, we're a listener for the removal - // and thus we do everything neccessary in ::elementRemoved + // and thus we do everything necessary in ::elementRemoved m_xCommandDefinitions->removeByName(_rName); } diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx index 71d6cd301b50..cd0517fc0c86 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx @@ -312,7 +312,7 @@ void OComponentDefinition::columnAppended( const Reference< XPropertySet >& _rxS // but xColDesc will live longer than this. So effectively, the setParent call was pretty useless. // // The intention for this parenting was that the column descriptor is able to find the data source, - // by traveling up the parent hierachy until there's an XDataSource. This didn't work (which + // by traveling up the parent hierarchy until there's an XDataSource. This didn't work (which // for instance causes #i65023#). We need another way to properly ensure this. notifyDataSourceModified(); diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index 8b76d323edce..8360d4f0bf7b 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -270,7 +270,7 @@ public: /** stores the embedded storage ("database") @param _bPreventRootCommits - Normally, committing the embedded storage results in also commiting the root storage + Normally, committing the embedded storage results in also committing the root storage - this is an automatism for data safety reasons. If you pass <TRUE/> here, committing the root storage is prevented for this particular call. diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index b71a8e15ee3a..13fbb4946311 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -315,7 +315,7 @@ OConnection::OConnection(ODatabaseSource& _rDB , const Reference< XMultiServiceFactory >& _rxORB) :OSubComponent(m_aMutex, static_cast< OWeakObject* >(&_rDB)) // as the queries reroute their refcounting to us, this m_aMutex is okey. If the queries - // container would do it's own refcounting, it would have to aquire m_pMutex + // container would do it's own refcounting, it would have to acquire m_pMutex // same for tables ,m_aTableFilter(_rDB.m_pImpl->m_aTableFilter) ,m_aTableTypeFilter(_rDB.m_pImpl->m_aTableTypeFilter) diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index f0da7a07476d..2a21b0b3b464 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -992,7 +992,7 @@ void ODatabaseDocument::impl_storeAs_throw( const ::rtl::OUString& _rURL, const // if we're in the process of initializing the document (which effectively means it is an implicit // initialization triggered in storeAsURL), the we do not notify events, since to an observer, the SaveAs - // should not be noticable + // should not be noticeable bool bIsInitializationProcess = impl_isInitializing(); if ( !bIsInitializationProcess ) diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx index d2aa28034d44..2256522d2ed5 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.hxx +++ b/dbaccess/source/core/dataaccess/databasedocument.hxx @@ -503,7 +503,7 @@ private: /** closes the frames of all connected controllers @param _bDeliverOwnership - determines if the ownership should be transfered to the component which + determines if the ownership should be transferred to the component which possibly vetos the closing @raises ::com::sun::star::util::CloseVetoException diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 348408609f1b..f0bb910db27a 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -330,7 +330,7 @@ class OSharedConnectionManager : public OConnectionHelper_BASE typedef ::std::map< Reference< XConnection >,TConnectionMap::iterator> TSharedConnectionMap;// holds the shared connections ::osl::Mutex m_aMutex; - TConnectionMap m_aConnections; // remeber the master connection in conjunction with the digest + TConnectionMap m_aConnections; // remember the master connection in conjunction with the digest TSharedConnectionMap m_aSharedConnection; // the shared connections with conjunction with an iterator into the connections map Reference< XProxyFactory > m_xProxyFactory; @@ -1232,7 +1232,7 @@ Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const if (bNewPasswordGiven) { m_pImpl->m_sFailedPassword = m_pImpl->m_aPassword; - // assume that we had an authentication problem. Without this we may, after an unsucessful connect, while + // assume that we had an authentication problem. Without this we may, after an unsuccessful connect, while // the user gave us a password an the order to remember it, never allow an password input again (at least // not without restarting the session) m_pImpl->m_aPassword = ::rtl::OUString(); @@ -1393,8 +1393,8 @@ void SAL_CALL ODatabaseSource::flushed( const EventObject& /*rEvent*/ ) throw (R // // Since this is a conceptual problem as long as we do use those ZIP packages (in fact, we *cannot* // provide the desired functionality as long as we do not have a package format which allows O(1) writes), - // we cannot completely fix this. However, we can relax the problem by commiting more often - often - // enough so that data loss is more seldom, and seldom enough so that there's no noticable performance + // we cannot completely fix this. However, we can relax the problem by committing more often - often + // enough so that data loss is more seldom, and seldom enough so that there's no noticeable performance // decrease. // // For this, we introduced a few places which XFlushable::flush their connections, and register as diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx index d3fdfce13834..79a64226baf9 100644 --- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx +++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx @@ -237,7 +237,7 @@ uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::creat { } } - if ( !bRet ) // no command set or an error occured, use Internal data handler + if ( !bRet ) // no command set or an error occurred, use Internal data handler { uno::Reference< lang::XInitialization> xIni(m_xInternal,uno::UNO_QUERY); if ( xIni.is() ) |