diff options
Diffstat (limited to 'dbaccess')
67 files changed, 110 insertions, 110 deletions
diff --git a/dbaccess/qa/complex/dbaccess/DatabaseDocument.java b/dbaccess/qa/complex/dbaccess/DatabaseDocument.java index 6e0f43df91e5..da944aaeb905 100644 --- a/dbaccess/qa/complex/dbaccess/DatabaseDocument.java +++ b/dbaccess/qa/complex/dbaccess/DatabaseDocument.java @@ -886,7 +886,7 @@ public class DatabaseDocument extends TestCase implements com.sun.star.document. for (int i = 0; i < _expectedEvents.length; ++i) { - assertEquals("wrong event at positon " + (i + 1) + " for '" + _context + "'", + assertEquals("wrong event at position " + (i + 1) + " for '" + _context + "'", _expectedEvents[i], _actualEvents.get(i)); } } 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() ) diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.hxx b/dbaccess/source/ext/adabas/Acomponentmodule.hxx index 9df3b28eedab..5048c25d88c8 100644 --- a/dbaccess/source/ext/adabas/Acomponentmodule.hxx +++ b/dbaccess/source/ext/adabas/Acomponentmodule.hxx @@ -24,7 +24,7 @@ #ifndef _EXTENSIONS_COMPONENT_MODULE_HXX_ #define _EXTENSIONS_COMPONENT_MODULE_HXX_ -/** you may find this file helpfull if you implement a component (in it's own library) which can't use +/** you may find this file helpful if you implement a component (in it's own library) which can't use the usual infrastructure.<br/> More precise, you find helper classes to ease the use of resources and the registration of services. <p> diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index c2a8d7cbd4bd..c226e658f1bf 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -383,7 +383,7 @@ sal_Int32 ReadThroughComponent( if ( !xStorage->hasByName( sStreamName ) || !xStorage->isStreamElement( sStreamName ) ) { // stream name not found! Then try the compatibility name. - // if no stream can be opened, return immediatly with OK signal + // if no stream can be opened, return immediately with OK signal // do we even have an alternative name? if ( NULL == pCompatibilityStreamName ) diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index edbfdda503e5..41890dee2e6f 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -280,7 +280,7 @@ namespace dbaui @param _bMove if <TRUE/> the name of the content must be inserted without any change, otherwise not. @return - <TRUE/> if the paste opertions was successfull, otherwise <FALSE/>. + <TRUE/> if the paste opertions was successful, otherwise <FALSE/>. */ sal_Bool paste( ElementType _eType,const ::svx::ODataAccessDescriptor& _rPasteData ,const String& _sParentFolder = String(),sal_Bool _bMove = sal_False); @@ -338,7 +338,7 @@ namespace dbaui const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _xDefinition ); - /** Inserts a new object into the hierachy given be the type. + /** Inserts a new object into the hierarchy given be the type. @param _eType Where to insert the new item. @param _sParentFolder @@ -348,7 +348,7 @@ namespace dbaui @param _bMove if <TRUE/> the name of the content must be inserted without any change, otherwise not. @return - <TRUE/> if the insert opertions was successfull, otherwise <FALSE/>. + <TRUE/> if the insert opertions was successful, otherwise <FALSE/>. */ sal_Bool insertHierachyElement( ElementType _eType ,const String& _sParentFolder diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 1c81fcdaf26f..2b5e262788e4 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -294,7 +294,7 @@ void OApplicationController::deleteTables(const ::std::vector< ::rtl::OUString>& if(e.TargetException >>= aSql) aErrorInfo = aSql; else - OSL_ENSURE(sal_False, "OApplicationController::implDropTable: something strange happended!"); + OSL_ENSURE(sal_False, "OApplicationController::implDropTable: something strange happened!"); } catch( const Exception& ) { @@ -415,7 +415,7 @@ void OApplicationController::deleteObjects( ElementType _eType, const ::std::vec if ( e.TargetException >>= aSql ) showError( SQLExceptionInfo( e.TargetException ) ); else - OSL_ENSURE( sal_False, "OApplicationController::deleteObjects: something strange happended!" ); + OSL_ENSURE( sal_False, "OApplicationController::deleteObjects: something strange happened!" ); } catch( const Exception& ) { @@ -689,7 +689,7 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc if ( CommandType::QUERY == nCommandType || CommandType::COMMAND == nCommandType ) { - // read all nescessary data + // read all necessary data ::rtl::OUString sCommand; sal_Bool bEscapeProcessing = sal_True; diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index ea24dd944ed0..17bc2bc684c7 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -87,7 +87,7 @@ namespace dbaui the resulting rectangle @return - <TRUE/> when successfull + <TRUE/> when successful */ sal_Bool ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const; void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 2d887feafd92..a99c095cef60 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -482,7 +482,7 @@ void OTasksWindow::setHelpText(sal_uInt16 _nId) { String sText = ModuleRes(_nId); - // calulate the size of the text field + // calculate the size of the text field // Size aHelpTextSize = m_aHelpText.GetSizePixel(); // Size aHelpTextPixelSize = LogicToPixel( aHelpTextSize, MAP_APPFONT ); // Rectangle aPrimaryRect( Point(0,0), aHelpTextSize ); diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 0bc5d5b0ccfa..2d902fead81f 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -2112,7 +2112,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property else { if ( !SaveModified( ) ) - // give the user a chance to save the current record (if neccessary) + // give the user a chance to save the current record (if necessary) break; // maybe the user wanted to reject the modified record ? @@ -2877,7 +2877,7 @@ public: bool WaitUntilReallyLoaded(bool _bOnlyIfLoaded); - // waits 'til the first positioned event after the loaded event. returns true if successfull, + // waits 'til the first positioned event after the loaded event. returns true if successful, // false if the form was disposed or unloaded before or while waiting // if _bOnlyIfLoaded is false and the form isn't loaded already loaded, false will be returned // (without any wating) diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 25f311e58ec1..8f2187779806 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -561,7 +561,7 @@ void OGenericUnoController::ImplBroadcastFeatureState(const ::rtl::OUString& _rF sal_uInt16 nFeat = m_aSupportedFeatures[ _rFeature ].nFeatureId; FeatureState aFeatState( GetState( nFeat ) ); - FeatureState& rCachedState = m_aStateCache[nFeat]; // creates if neccessary + FeatureState& rCachedState = m_aStateCache[nFeat]; // creates if necessary if ( !_bIgnoreCache ) { // check if we really need to notify the listeners : this method may be called much more often than needed, so check @@ -863,7 +863,7 @@ void OGenericUnoController::addStatusListener(const Reference< XStatusListener > if ( m_xUrlTransformer.is() ) m_xUrlTransformer->parseStrict( aParsedURL ); - // remeber the listener together with the URL + // remember the listener together with the URL m_arrStatusListener.insert( m_arrStatusListener.end(), DispatchTarget( aParsedURL, aListener ) ); // initially broadcast the state diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index d432db22a454..06a00fa688c0 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -1234,7 +1234,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/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 040455535ba9..05d549f2335d 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -2057,7 +2057,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue { aDescriptor[daSelection] <<= aSelection; aDescriptor[daBookmarkSelection] <<= sal_False; - // these are selection indicies + // these are selection indices // before we change this, all clients have to be adjusted // so that they recognize the new BookmarkSelection property! } @@ -2303,7 +2303,7 @@ IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, SvLBoxEntry*, _pParent) if(e.TargetException >>= aSql) aInfo = aSql; else - OSL_ENSURE(sal_False, "SbaTableQueryBrowser::OnExpandEntry: something strange happended!"); + OSL_ENSURE(sal_False, "SbaTableQueryBrowser::OnExpandEntry: something strange happened!"); } catch( const Exception& ) { @@ -2314,7 +2314,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 @@ -2776,7 +2776,7 @@ bool SbaTableQueryBrowser::implSelect( SvLBoxEntry* _pEntry ) if(e.TargetException >>= aSql) showError(SQLExceptionInfo(aSql)); else - OSL_ENSURE(sal_False, "SbaTableQueryBrowser::implSelect: something strange happended!"); + OSL_ENSURE(sal_False, "SbaTableQueryBrowser::implSelect: something strange happened!"); // reset the values xRowSetProps->setPropertyValue(PROPERTY_DATASOURCENAME,Any()); xRowSetProps->setPropertyValue(PROPERTY_ACTIVE_CONNECTION,Any()); @@ -3115,7 +3115,7 @@ void SbaTableQueryBrowser::unloadAndCleanup( sal_Bool _bDisposeConnection ) if(e.TargetException >>= aSql) showError(SQLExceptionInfo(aSql)); else - OSL_ENSURE(sal_False, "SbaTableQueryBrowser::unloadAndCleanup: something strange happended!"); + OSL_ENSURE(sal_False, "SbaTableQueryBrowser::unloadAndCleanup: something strange happened!"); } catch(Exception&) { diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index da7766899797..84cc55c44c0d 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -184,7 +184,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 4101744b37bd..c34b4b697c8c 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -246,7 +246,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/AdabasStat.hxx b/dbaccess/source/ui/dlg/AdabasStat.hxx index ca212a976c54..472ba0d32a4d 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.hxx +++ b/dbaccess/source/ui/dlg/AdabasStat.hxx @@ -76,7 +76,7 @@ namespace dbaui m_xConnection; /// valid as long as the page is active sal_Bool m_bErrorShown; // true when we shown already the error - // check if the given table is accessable by the connected user + // check if the given table is accessible by the connected user sal_Bool checkSystemTable(const ::rtl::OUString& _rsSystemTable, ::rtl::OUString& _rsSchemaName ); void showError(); diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx index 9df3bb282fd7..7030f4e29b0e 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx @@ -47,7 +47,7 @@ namespace dbaui //= OConnectionTabPage //========================================================================= - /** implements the connection page of teh data source properties dialog. + /** implements the connection page of the data source properties dialog. */ class OConnectionTabPage : public OConnectionHelper { diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx index 801c2ce206f6..d5801d06360a 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx @@ -154,7 +154,7 @@ namespace dbaui */ String getConnectionURL() const; - /// fill the nescessary information from the url line + /// fill the necessary information from the url line void convertUrl(SfxItemSet& _rDest); const MapInt2String& getIndirectProperties() const { return m_aIndirectPropTranslator; } diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index ad728e337290..7c8e4f99715b 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -138,7 +138,7 @@ OPasswordDialog::OPasswordDialog(Window* _pParent,const String& _sUserName) : aCancelBtn ( this, ModuleRes( BTN_PASSWORD_CANCEL ) ), aHelpBtn ( this, ModuleRes( BTN_PASSWORD_HELP ) ) { - // hide until a help is avalable + // hide until a help is available aHelpBtn.Hide(); FreeResource(); diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index 1ee532dafa16..8a583942c651 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -159,7 +159,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); @@ -218,7 +218,7 @@ namespace dbaui @param _pCheckBox The check box which is checked. @param _nID - The id in the itemset to set whith the new value. + The id in the itemset to set with the new value. @param _bChangedSomething <TRUE/> if something changed otherwise <FALSE/> @param _bRevertValue @@ -232,7 +232,7 @@ namespace dbaui @param _pEdit The check box which is checked. @param _nID - The id in the itemset to set whith the new value. + The id in the itemset to set with the new value. @param _bChangedSomething <TRUE/> if something changed otherwise <FALSE/> */ @@ -244,7 +244,7 @@ namespace dbaui @param _pEdit The check box which is checked. @param _nID - The id in the itemset to set whith the new value. + The id in the itemset to set with the new value. @param _bChangedSomething <TRUE/> if something changed otherwise <FALSE/> */ diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index b63fd5ef1898..cd55d2243c01 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -215,7 +215,7 @@ namespace dbaui { OSL_PRECOND( m_aBooleanSettings.empty(), "SpecialSettingsPage::impl_initBooleanSettings: called twice!" ); - // for easier maintainance, write the table in this form, then copy it to m_aBooleanSettings + // for easier maintenance, write the table in this form, then copy it to m_aBooleanSettings BooleanSettingDesc aSettings[] = { { &m_pIsSQL92Check, CB_SQL92CHECK, DSID_SQL92CHECK, false }, { &m_pAppendTableAlias, CB_APPENDTABLEALIAS, DSID_APPEND_TABLE_ALIAS, false }, diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 45c44d6539d2..0fe6f5f62d61 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -488,7 +488,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp //------------------------------------------------------------------------- void ODbAdminDialog::destroyItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults) { - // _first_ delete the set (refering the pool) + // _first_ delete the set (referring the pool) if (_rpSet) { delete _rpSet; diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 8262163635b1..0c3a089561a1 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -246,7 +246,7 @@ DBG_NAME(DirectSQLDialog) if (xStatement.is()) xStatement->execute(_rStatement); - // successfull + // successful sStatus = String(ModuleRes(STR_COMMAND_EXECUTED_SUCCESSFULLY)); // dispose the statement diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index b2589b41f6f9..456e760bf8ac 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -406,7 +406,7 @@ namespace dbaui // For the databaseWizard we only have one entry for the MySQL Database, - // because we have a seperate tabpage to retrieve the respective datasource type + // because we have a separate tabpage to retrieve the respective datasource type // ( ::dbaccess::DST_MYSQL_ODBC || ::dbaccess::DST_MYSQL_JDBC). Therefore we use ::dbaccess::DST_MYSQL_JDBC as a temporary // representative for all MySQl databases) // Also, embedded databases (embedded HSQL, at the moment), are not to appear in the list of diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index 6d65ae2ced07..e435f83ce2a0 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -113,7 +113,7 @@ namespace dbaui Link m_aTypeSelectHandler; /// to be called if a new type is selected Link m_aCreationModeHandler; /// to be called if a new type is selected Link m_aDocumentSelectionHandler; /// to be called when a document in the RecentDoc list is selected - Link m_aChooseDocumentHandler; /// to be called when a recent document has been definately chosen + Link m_aChooseDocumentHandler; /// to be called when a recent document has been definitely chosen sal_Bool m_bDisplayingInvalid : 1; // the currently displayed data source is deleted sal_Bool m_bUserGrabFocus : 1; bool m_bInitTypeList : 1; diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 33c1f4da1577..1914b7a22dd1 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -258,7 +258,7 @@ DBG_NAME(OTableSubscriptionPage) // the catalog entry SvLBoxEntry* pCatalog = m_aTablesList.GetEntryPosByName(sCatalog, pRootEntry); if (!pCatalog && sCatalog.getLength()) - // the table (resp. its catalog) refered in this filter entry does not exist anymore + // the table (resp. its catalog) referred in this filter entry does not exist anymore continue; if (bAllSchemas && pCatalog) @@ -270,7 +270,7 @@ DBG_NAME(OTableSubscriptionPage) // the schema entry SvLBoxEntry* pSchema = m_aTablesList.GetEntryPosByName(sSchema, (pCatalog ? pCatalog : pRootEntry)); if (!pSchema && sSchema.getLength()) - // the table (resp. its schema) refered in this filter entry does not exist anymore + // the table (resp. its schema) referred in this filter entry does not exist anymore continue; if (bAllTables && pSchema) diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index 629a2ef0ff67..8ceef0b1b0d7 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -209,7 +209,7 @@ namespace dbaui OTableConnection* GetTabConn(const OTableWindow* pLhs,const OTableWindow* pRhs,bool _bSupressCrossOrNaturalJoin = false,const OTableConnection* _rpFirstAfter = NULL) const; // clears the window map and connection vector without destroying it - // that means teh data of the windows and connection will be untouched + // that means the data of the windows and connection will be untouched void clearLayoutInformation(); // set the focus to that tab win which most recently had it (or to the first available one) @@ -247,7 +247,7 @@ namespace dbaui void modified(); - /** returns if teh given window is visible. + /** returns if the given window is visible. @param _rPoint The Point to check @param _rSize diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index 3024f5c481d3..e77cecd498f4 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -55,7 +55,7 @@ namespace dbaui ::rtl::OUString m_sName; // table for update data ::rtl::OUString m_sAutoIncrementValue; // the autoincrement value set in the datasource String m_sTypeNames; // these type names are the ones out of the resource file - TOTypeInfoSP m_pTypeInfo; // fall back when type is unkown because database driver has a failure + TOTypeInfoSP m_pTypeInfo; // fall back when type is unknown because database driver has a failure sal_Bool m_bAllowAutoIncrementValue; // no : 1 NO BIT , is true when the datasource has a AutoIncrementValue property in their info property sal_Bool m_bNew : 1; // is true when we create a new table @@ -107,7 +107,7 @@ namespace dbaui inline ::std::vector< ::boost::shared_ptr<OTableRow> >* getRows() { return &m_vRowList; } - /// returns the postion of the the first empty row + /// returns the position of the the first empty row sal_Int32 getFirstEmptyRowPosition(); inline const OTypeInfoMap* getTypeInfo() const { return &m_aTypeInfo; } diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index 116ae17ccea7..730c3af10216 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -148,7 +148,7 @@ namespace dbaui /** fills a map and a vector with localized type names @param _rxConnection the connection to acces the metadata - @param _rsTypeNames a list of localized type names seperated with ';' + @param _rsTypeNames a list of localized type names separated with ';' @param _rTypeInfoMap the filled map with the type names @param _rTypeInfoIters the vector filled with map iterators */ @@ -222,7 +222,7 @@ namespace dbaui */ ::com::sun::star::awt::FontDescriptor CreateFontDescriptor( const Font& _rFont ); - /** call teh format dialog and set the selected format at the column + /** call the format dialog and set the selected format at the column @param _xAffectedCol Font to be converted @param _xField Font to be converted */ @@ -419,7 +419,7 @@ namespace dbaui */ const SfxFilter* getStandardDatabaseFilter(); - /** opens a save dialog to store a form or report folder in the current hierachy. + /** opens a save dialog to store a form or report folder in the current hierarchy. @param _pParent The parent of the dialog. @param _rxORB @@ -437,7 +437,7 @@ namespace dbaui @param _bMove if <TRUE/> the name of the content must be inserted without any change, otherwise not. @return - <TRUE/> if the insert opertions was successfull, otherwise <FALSE/>. + <TRUE/> if the insert opertions was successful, otherwise <FALSE/>. */ sal_Bool insertHierachyElement( Window* _pParent, diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index 71dc1fa62ab6..2a9dcf3f4219 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -123,7 +123,7 @@ namespace dbaui sal_Bool m_bLoadCanceled : 1; // the load was canceled somehow sal_Bool m_bClosingKillOpen : 1; // are we killing the load thread because we are to be suspended ? - bool m_bCannotSelectUnfiltered : 1; // recieved an DATA_CANNOT_SELECT_UNFILTERED error + bool m_bCannotSelectUnfiltered : 1; // received a DATA_CANNOT_SELECT_UNFILTERED error protected: class FormErrorHelper @@ -252,7 +252,7 @@ namespace dbaui // is synchronized with a foreign ::com::sun::star::form::DatabaseForm you got elsewhere) virtual sal_Bool InitializeForm( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& i_formProperties ) = 0; - // called immediately after a successfull CreateForm + // called immediately after a successful CreateForm // do any initialization (data source etc.) here. the form should be fully functional after that. // return sal_False if you didn't succeed (don't throw exceptions, they won't be caught) diff --git a/dbaccess/source/ui/inc/datasourcemap.hxx b/dbaccess/source/ui/inc/datasourcemap.hxx index 71c650e088d7..71d347dbd788 100644 --- a/dbaccess/source/ui/inc/datasourcemap.hxx +++ b/dbaccess/source/ui/inc/datasourcemap.hxx @@ -118,7 +118,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 1f28dd731d4b..82bb30ca883a 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -125,7 +125,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/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index 84749e4f1612..0b5b5165d6b1 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -123,7 +123,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 a848397f4401..f328c381a8a9 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -160,7 +160,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/inc/dsitems.hxx b/dbaccess/source/ui/inc/dsitems.hxx index 8335722b9d00..23842652325e 100644 --- a/dbaccess/source/ui/inc/dsitems.hxx +++ b/dbaccess/source/ui/inc/dsitems.hxx @@ -30,7 +30,7 @@ typedef sal_Int32 ItemID; //= item ids for the data source administration dialog #define DSID_NAME 1 // name of a data source, SfxStringItem -#define DSID_ORIGINALNAME 2 // orginal name, internal, SfxStringItem +#define DSID_ORIGINALNAME 2 // original name, internal, SfxStringItem #define DSID_CONNECTURL 3 // connection URL, SfxStringItem #define DSID_TABLEFILTER 4 // table filter, OStringListItem #define DSID_TYPECOLLECTION 5 // collection of data source types, ODsnTypeCollection diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index d95a328f8460..d2747afe4e4a 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -285,7 +285,7 @@ namespace dbaui @param eObjType The type to ask for @param _nPosition - The position of a tablecell (index position), header bar colum/row cell + The position of a tablecell (index position), header bar column/row cell @return The description of the specified object. */ diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index 5a3795333ed5..cf87abc4997a 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -219,7 +219,7 @@ void ODatabaseImportExport::impl_initFromDescriptor( const ODataAccessDescriptor m_sDataSourceName = _aDataDescriptor.getDataSource(); _aDataDescriptor[daCommandType] >>= m_nCommandType; _aDataDescriptor[daCommand] >>= m_sName; - // some additonal information + // some additional information if(_aDataDescriptor.has(daConnection)) { Reference< XConnection > xPureConn( _aDataDescriptor[daConnection], UNO_QUERY ); diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 60f0f358b2bb..5511e8062130 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -1543,7 +1543,7 @@ TOTypeInfoSP queryPrimaryKeyType(const OTypeInfoMap& _rTypeInfo) for(;aIter != aEnd;++aIter) { // OJ: we don't want to set an autoincrement column to be key - // because we don't have the possiblity to know how to create + // because we don't have the possibility to know how to create // such auto increment column later on // so until we know how to do it, we create a column without autoincrement // if ( !aIter->second->bAutoIncrement ) diff --git a/dbaccess/source/ui/misc/indexcollection.cxx b/dbaccess/source/ui/misc/indexcollection.cxx index a4046a06d0b2..6d9428154fcd 100644 --- a/dbaccess/source/ui/misc/indexcollection.cxx +++ b/dbaccess/source/ui/misc/indexcollection.cxx @@ -263,7 +263,7 @@ namespace dbaui // adjust the OIndex structure Indexes::iterator aDropped = findOriginal(_rPos->getOriginalName()); - OSL_ENSURE(aDropped != m_aIndexes.end(), "OIndexCollection::drop: invalid original name, but successfull commit?!"); + OSL_ENSURE(aDropped != m_aIndexes.end(), "OIndexCollection::drop: invalid original name, but successful commit?!"); aDropped->flagAsNew(GrantIndexAccess()); return sal_True; diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx index 5d1f64ebe3e5..4ae86f3d9548 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx @@ -118,7 +118,7 @@ namespace dbaui sal_Int32 nIndex = -1; if( m_pLine ) { - // search the postion of our table window in the table window map + // search the position of our table window in the table window map nIndex = m_pLine->GetParent()->GetTabWinMap()->size(); const ::std::vector<OTableConnection*>* pVec = m_pLine->GetParent()->getTableConnections(); ::std::vector<OTableConnection*>::const_iterator aIter = pVec->begin(); diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 27c560ec3f3b..7b9d6cdac199 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -196,7 +196,7 @@ void OScrollWindowHelper::Resize() GetVScrollBar()->SetPageSize( aTotalOutputSize.Height() ); GetVScrollBar()->SetVisibleSize( aTotalOutputSize.Height() ); - // adjust the ranges of the scrollbars if neccessary + // adjust the ranges of the scrollbars if necessary long lRange = GetHScrollBar()->GetRange().Max() - GetHScrollBar()->GetRange().Min(); if (m_pTableView->GetScrollOffset().X() + aTotalOutputSize.Width() > lRange) GetHScrollBar()->SetRangeMax(m_pTableView->GetScrollOffset().X() + aTotalOutputSize.Width() + GetHScrollBar()->GetRange().Min()); @@ -1534,7 +1534,7 @@ long OJoinTableView::PreNotify(NotifyEvent& rNEvt) else if (pNextConn) { GrabFocus(); - // neccessary : a conn may be selected even if a tab win has the focus, in this case + // necessary : a conn may be selected even if a tab win has the focus, in this case // the next travel would select the same conn again if we would not reset te focus ... SelectConn(pNextConn); } diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 4521677da251..60f4688da5dc 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -312,7 +312,7 @@ namespace bError = sal_True; } } - // check if error occured + // check if error occurred if ( bError ) eErrorCode = eIllegalJoin; @@ -2912,7 +2912,7 @@ sal_Bool OQueryDesignView::checkStatement() { sal_Bool bRet = sal_True; if ( m_pSelectionBox ) - bRet = m_pSelectionBox->Save(); // a error occured so we return no + bRet = m_pSelectionBox->Save(); // a error occurred so we return no return bRet; } //------------------------------------------------------------------------------- @@ -3201,7 +3201,7 @@ void OQueryDesignView::GetFocus() OQueryView::GetFocus(); if ( m_pSelectionBox && !m_pSelectionBox->HasChildPathFocus() ) { - // first we have to deactivate the current cell to refill when nescessary + // first we have to deactivate the current cell to refill when necessary m_pSelectionBox->DeactivateCell(); m_pSelectionBox->ActivateCell(m_pSelectionBox->GetCurRow(), m_pSelectionBox->GetCurColumnId()); m_pSelectionBox->GrabFocus(); @@ -3278,7 +3278,7 @@ void OQueryDesignView::fillFunctionInfo( const ::connectivity::OSQLParseNode* p ,const ::rtl::OUString& sFunctionTerm ,OTableFieldDescRef& aInfo) { - // get the type out of the funtion name + // get the type out of the function name OQueryController& rController = static_cast<OQueryController&>(getController()); sal_Int32 nDataType = DataType::DOUBLE; ::rtl::OUString sFieldName = sFunctionTerm; diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index 2400ff2b7267..ec9e3e415bbb 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -639,7 +639,7 @@ void OQueryTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::r case KeyType::PRIMARY: { - // we have a primary key so look in our list if there exsits a key which this is refered to + // we have a primary key so look in our list if there exists a key which this is referred to OTableWindowMap::const_iterator aIter = pTabWins->begin(); OTableWindowMap::const_iterator aEnd = pTabWins->end(); for(;aIter != aEnd;++aIter) diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index efc3895c8bcb..606efe6d99b4 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -685,7 +685,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); @@ -1605,7 +1605,7 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, sal_uInt16& _n DeactivateCell(); - // remember the column id of the current positon + // remember the column id of the current position sal_uInt16 nColumnId = GetColumnId(_nColumnPostion); // Wenn zu klein oder zu gross, auf Ende der Liste setzen if ((_nColumnPostion == BROWSER_INVALIDID) || (_nColumnPostion >= getFields().size())) // Anhaengen des Feldes diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index b581f849daff..aa0096e52c51 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -194,7 +194,7 @@ namespace dbaui @param eObjType The type to ask for @param _nPosition - The position of a tablecell (index position), header bar colum/row cell + The position of a tablecell (index position), header bar column/row cell @return The name of the specified object. */ @@ -267,11 +267,11 @@ namespace dbaui @param _sFieldName The field name inserted by the user. @param _pEntry - The entry which will contain the nescessary entries. + The entry which will contain the necessary entries. @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); @@ -291,11 +291,11 @@ namespace dbaui @param _xMetaData Use to parse the node to a string. @param _pEntry - The entry which will contain the nescessary entries. + The entry which will contain the necessary entries. @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 c1e10adc3c64..e2fbaaac8dab 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -220,7 +220,7 @@ sal_Bool OTableWindow::FillListBox() } catch(Exception&) { - OSL_ENSURE(0,"Exception occured!"); + OSL_ENSURE(0,"Exception occurred!"); } try { @@ -249,7 +249,7 @@ sal_Bool OTableWindow::FillListBox() } catch(Exception&) { - OSL_ENSURE(0,"Exception occured!"); + OSL_ENSURE(0,"Exception occurred!"); } return sal_True; diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx index d3b174d949c1..6abbf1a17781 100644 --- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx @@ -177,7 +177,7 @@ namespace dbaui sal_Int32 nIndex = -1; if( m_pTable ) { - // search the postion of our table window in the table window map + // search the position of our table window in the table window map OJoinTableView::OTableWindowMap* pMap = m_pTable->getTableView()->GetTabWinMap(); OJoinTableView::OTableWindowMap::iterator aIter = pMap->begin(); OJoinTableView::OTableWindowMap::iterator aEnd = pMap->end(); diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index a14e3959a6db..3a0c33c4343a 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -1612,7 +1612,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 8a992b12294d..b46b95dd1c17 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -314,7 +314,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 770d62fef16d..5764726d1901 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -470,7 +470,7 @@ sal_Bool OTableController::doSaveDoc(sal_Bool _bSaveAs) stopTableListening(); m_xTable = NULL; } - // reload(); // a error occured so we have to reload + // reload(); // a error occurred so we have to reload } return ! (aInfo.isValid() || bError); } @@ -949,7 +949,7 @@ void OTableController::loadData() if(aTypeIter == m_aTypeInfo.end()) aTypeIter = m_aTypeInfo.begin(); - OSL_ENSURE(aTypeIter != m_aTypeInfo.end(),"We have no type infomation!"); + OSL_ENSURE(aTypeIter != m_aTypeInfo.end(),"We have no type information!"); bool bReadRow = !isAddAllowed(); for(sal_Int32 i=m_vRowList.size(); i < NEWCOLS; i++ ) @@ -1146,7 +1146,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 57c2b274897f..64c43ce00fa8 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -323,7 +323,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 @@ -1114,7 +1114,7 @@ bool CopyTableWizard::impl_processCopyError_nothrow( const CopyTableRowEvent& _r aError.NextException = _rEvent.Error; else { - // a non-SQL exception happend + // a non-SQL exception happened Exception aException; OSL_VERIFY( _rEvent.Error >>= aException ); SQLContext aContext; @@ -1172,11 +1172,11 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou sal_Int32 nCount = xMeta->getColumnCount(); ::std::vector< sal_Int32 > aSourceColTypes; aSourceColTypes.reserve( nCount + 1 ); - aSourceColTypes.push_back( -1 ); // just to avoid a everytime i-1 call + aSourceColTypes.push_back( -1 ); // just to avoid a every time i-1 call ::std::vector< sal_Int32 > aSourcePrec; aSourcePrec.reserve( nCount + 1 ); - aSourcePrec.push_back( -1 ); // just to avoid a everytime i-1 call + aSourcePrec.push_back( -1 ); // just to avoid a every time i-1 call for ( sal_Int32 k=1; k <= nCount; ++k ) { |