From 64d624b65124ac02d8ee59b135593fd9d8eb9067 Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Sat, 9 Jan 2016 22:55:28 +0100 Subject: Fix typos Change-Id: I9a5940027423ff0791fa7da0b79b617412ce6b86 Reviewed-on: https://gerrit.libreoffice.org/21209 Tested-by: Jenkins Reviewed-by: Ashod Nakashian --- forms/qa/integration/forms/DocumentViewHelper.java | 2 +- forms/qa/integration/forms/FormLayer.java | 4 ++-- forms/source/component/Button.cxx | 2 +- forms/source/component/Button.hxx | 2 +- forms/source/component/Currency.cxx | 2 +- forms/source/component/DatabaseForm.cxx | 6 +++--- forms/source/component/EditBase.cxx | 2 +- forms/source/component/EventThread.hxx | 2 +- forms/source/component/File.cxx | 2 +- forms/source/component/FormComponent.cxx | 2 +- forms/source/component/FormattedField.cxx | 2 +- forms/source/component/FormattedFieldWrapper.cxx | 8 ++++---- forms/source/component/Grid.cxx | 2 +- forms/source/component/clickableimage.cxx | 2 +- forms/source/helper/controlfeatureinterception.cxx | 2 +- forms/source/inc/FormComponent.hxx | 2 +- forms/source/inc/frm_resource.hxx | 2 +- forms/source/runtime/formoperations.cxx | 4 ++-- forms/source/runtime/formoperations.hxx | 2 +- forms/source/xforms/mip.hxx | 2 +- forms/source/xforms/model_ui.cxx | 2 +- 21 files changed, 28 insertions(+), 28 deletions(-) (limited to 'forms') diff --git a/forms/qa/integration/forms/DocumentViewHelper.java b/forms/qa/integration/forms/DocumentViewHelper.java index 90aa18a39636..c176247b9a07 100644 --- a/forms/qa/integration/forms/DocumentViewHelper.java +++ b/forms/qa/integration/forms/DocumentViewHelper.java @@ -90,7 +90,7 @@ public class DocumentViewHelper // go get the current view XController xController = query( XController.class ); - // go get the dispatch provider of it's frame + // go get the dispatch provider of its frame XDispatchProvider xProvider = UnoRuntime.queryInterface( XDispatchProvider.class, xController.getFrame() ); if ( null != xProvider ) diff --git a/forms/qa/integration/forms/FormLayer.java b/forms/qa/integration/forms/FormLayer.java index 06806897d00a..3d28ff054b6b 100644 --- a/forms/qa/integration/forms/FormLayer.java +++ b/forms/qa/integration/forms/FormLayer.java @@ -175,7 +175,7 @@ public class FormLayer // insert the text field control XPropertySet field = createControlAndShape( _formComponentServiceName, _xPos + 25, _yPos, 40, _height ); - // knit it to it's label component + // knit it to its label component field.setPropertyValue( "LabelControl", label ); // names @@ -221,7 +221,7 @@ public class FormLayer if ( xFieldModel.getPropertySetInfo().hasPropertyByName( "BorderColor" ) ) xFieldModel.setPropertyValue( "BorderColor", Integer.valueOf( 0x00C0C0C0 ) ); } - // knit it to it's label component + // knit it to its label component xFieldModel.setPropertyValue( "LabelControl", xLabelModel ); // some names, so later on we can find them diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index e22590701608..09c676ebe844 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -182,7 +182,7 @@ void OButtonModel::read(const Reference& _rxInStream) throw case 0x0003: { OStreamSection aSection( _rxInStream.get() ); - // this will skip any unknown bytes in it's dtor + // this will skip any unknown bytes in its dtor // button type m_eButtonType = (FormButtonType)_rxInStream->readShort(); diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx index c783928c8d91..f0b2cd2d7ebf 100644 --- a/forms/source/component/Button.hxx +++ b/forms/source/component/Button.hxx @@ -173,7 +173,7 @@ protected: virtual void allFeatureStatesChanged( ) override; virtual bool isEnabled( sal_Int16 _nFeatureId ) const override; - // XDispatchProviderInterception disambiguaiton + // XDispatchProviderInterception disambiguation virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index ce765536bd28..ea8871d6ca6a 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -119,7 +119,7 @@ void OCurrencyModel::implConstruct() OCurrencyModel::OCurrencyModel(const Reference& _rxFactory) :OEditBaseModel( _rxFactory, VCL_CONTROLMODEL_CURRENCYFIELD, FRM_SUN_CONTROL_CURRENCYFIELD, false, true ) - // use the old control name for compaytibility reasons + // use the old control name for compatibility reasons { m_nClassId = FormComponentType::CURRENCYFIELD; diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 2beb4cb25f04..60228c6c5a17 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -155,7 +155,7 @@ class OFormSubmitResetThread: public OComponentEventThread { protected: - // duplicate an event with respect to it's type + // duplicate an event with respect to its type virtual EventObject *cloneEvent( const EventObject *pEvt ) const override; // process an event. while processing the mutex isn't locked, and pCompImpl @@ -2700,7 +2700,7 @@ bool ODatabaseForm::canShareConnection( const Reference< XPropertySet >& _rxPare void ODatabaseForm::doShareConnection( const Reference< XPropertySet >& _rxParentProps ) { - // get the conneciton of the parent + // get the connection of the parent Reference< XConnection > xParentConn; _rxParentProps->getPropertyValue( PROPERTY_ACTIVE_CONNECTION ) >>= xParentConn; OSL_ENSURE( xParentConn.is(), "ODatabaseForm::doShareConnection: we're a valid sub-form, but the parent has no connection?!" ); @@ -3528,7 +3528,7 @@ void SAL_CALL ODatabaseForm::moveToInsertRow() throw( SQLException, RuntimeExcep // Formerly, the following line was conditioned with a "not is new", means we did not move the aggregate // to the insert row if it was already positioned there. // - // This prevented the RowSet implementation from resetting it's column values. We, ourself, formerly + // This prevented the RowSet implementation from resetting its column values. We, ourself, formerly // did this reset of columns in reset_impl, where we set every column to the ControlDefault, or, if this // was not present, to NULL. However, the problem with setting to NULL was #88888#, the problem with // _not_ setting to NULL (which was the original fix for #88888#) was #97955#. diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx index 997f6dfd4d40..b44505cee585 100644 --- a/forms/source/component/EditBase.cxx +++ b/forms/source/component/EditBase.cxx @@ -144,7 +144,7 @@ void OEditBaseModel::write(const Reference& _rxOutStream) t // additional members as this is not compatible to older office versions. // We decided to place the writing of the help text here as it seems the less worse alternative. There is no delivered // office version including formatted controls (and thus the OFormattedModel), and the OFormattedModel::read seems - // robust against this change (as it will read a wrong and unknown file version and thus set it's members to defaults). + // robust against this change (as it will read a wrong and unknown file version and thus set its members to defaults). if ((nVersionId & PF_HANDLE_COMMON_PROPS) != 0) writeCommonEditProperties(_rxOutStream); diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx index 6c995a3772e6..9b8cc8bcddaf 100644 --- a/forms/source/component/EventThread.hxx +++ b/forms/source/component/EventThread.hxx @@ -67,7 +67,7 @@ protected: virtual void SAL_CALL onTerminated() override; - // The following method is called to duplicate the Event while respecting it's type. + // The following method is called to duplicate the Event while respecting its type. virtual css::lang::EventObject* cloneEvent(const css::lang::EventObject* _pEvt) const = 0; // Edit an Event: diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx index abb292f4b7ac..5a8c83df5cf1 100644 --- a/forms/source/component/File.cxx +++ b/forms/source/component/File.cxx @@ -247,7 +247,7 @@ void SAL_CALL OFileControlModel::reset() throw ( css::uno::RuntimeException, std if (bContinue) { { - // If Models are threadSave + // If Models are threadSafe ::osl::MutexGuard aGuard(m_aMutex); _reset(); } diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index d4bc6084d685..544949da8fd5 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -2332,7 +2332,7 @@ void OBoundControlModel::reset() throw (RuntimeException, std::exception) { if ( bIsNewRecord ) { - // reset the control to it's default + // reset the control to its default resetNoBroadcast(); // and immediately commit the changes to the DB column, to keep consistency commitControlValueToDbColumn( true ); diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 614875ddc15f..b00f7ceb8d37 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -853,7 +853,7 @@ bool OFormattedModel::commitControlValueToDbColumn( bool /*_bPostReset*/ ) } else { - DBG_ASSERT( aControlValue.getValueType().getTypeClass() == TypeClass_STRING, "OFormattedModel::commitControlValueToDbColumn: invalud value type !" ); + DBG_ASSERT( aControlValue.getValueType().getTypeClass() == TypeClass_STRING, "OFormattedModel::commitControlValueToDbColumn: invalid value type!" ); m_xColumnUpdate->updateString( getString( aControlValue ) ); } } diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx index e7c8f0622b8a..be4a3ae8d57d 100644 --- a/forms/source/component/FormattedFieldWrapper.cxx +++ b/forms/source/component/FormattedFieldWrapper.cxx @@ -72,7 +72,7 @@ css::uno::Reference OFormattedFieldWrapper::createFormatte osl_atomic_increment(&pRef->m_refCount); if (pRef->m_xAggregate.is()) - { // has to be in it's own block because of the temporary variable created by *this + { // has to be in its own block because of the temporary variable created by *this pRef->m_xAggregate->setDelegator(static_cast(pRef)); } @@ -111,7 +111,7 @@ Reference< XCloneable > SAL_CALL OFormattedFieldWrapper::createClone() throw (Ru } if ( xRef->m_xAggregate.is() ) - { // has to be in it's own block because of the temporary variable created by *this + { // has to be in its own block because of the temporary variable created by *this xRef->m_xAggregate->setDelegator(static_cast< XWeak* >(xRef.get())); } @@ -299,7 +299,7 @@ void SAL_CALL OFormattedFieldWrapper::read(const Reference& // do the aggregation osl_atomic_increment(&m_refCount); if (m_xAggregate.is()) - { // has to be in it's own block because of the temporary variable created by *this + { // has to be in its own block because of the temporary variable created by *this m_xAggregate->setDelegator(static_cast(this)); } osl_atomic_decrement(&m_refCount); @@ -336,7 +336,7 @@ void OFormattedFieldWrapper::ensureAggregate() osl_atomic_increment(&m_refCount); if (m_xAggregate.is()) - { // has to be in it's own block because of the temporary variable created by *this + { // has to be in its own block because of the temporary variable created by *this m_xAggregate->setDelegator(static_cast(this)); } osl_atomic_decrement(&m_refCount); diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index 6b8682371372..b69582c274e3 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -783,7 +783,7 @@ void OGridControlModel::write(const Reference& _rxOutStream _rxOutStream->writeLong(nLen); for (sal_Int32 i = 0; i < nLen; i++) { - // first the service name for the unerlying model + // first the service name for the underlying model OGridColumn* pCol = getColumnImplementation(m_aItems[i]); DBG_ASSERT(pCol != nullptr, "OGridControlModel::write : such items should never reach it into my container !"); _rxOutStream << pCol->getModelName(); diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index 1d4618846f4e..d65267d2f3fd 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -747,7 +747,7 @@ namespace frm } // Search for the Object shell by iterating over all Object shells - // and comparing their XModel to our´s. + // and comparing their XModel to ours. // As an optimization, we try the current Object shell first. SfxObjectShell *pObjSh = nullptr; diff --git a/forms/source/helper/controlfeatureinterception.cxx b/forms/source/helper/controlfeatureinterception.cxx index 2cd10e668bc6..bc3dd494afbe 100644 --- a/forms/source/helper/controlfeatureinterception.cxx +++ b/forms/source/helper/controlfeatureinterception.cxx @@ -117,7 +117,7 @@ namespace frm // tell the interceptor it has a new (means no) predecessor xInterceptor->setMasterDispatchProvider( nullptr ); - // ask for it's successor + // ask for its successor Reference< XDispatchProvider > xSlave = xInterceptor->getSlaveDispatchProvider(); // and give it the new (means no) successoert xInterceptor->setSlaveDispatchProvider( nullptr ); diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index 8ebde1f7a563..40c53097846c 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -1171,7 +1171,7 @@ private: /** connects to an external value binding -

Note that by definition, external data bindings superseede the SQL data binding which +

Note that by definition, external data bindings supersede the SQL data binding which is defined by our RowSet-column-related properties. This means that in case we're currently connected to a database column when this is called, this connection is suspended.

diff --git a/forms/source/inc/frm_resource.hxx b/forms/source/inc/frm_resource.hxx index d25e9d68b40e..78ffa5554120 100644 --- a/forms/source/inc/frm_resource.hxx +++ b/forms/source/inc/frm_resource.hxx @@ -38,7 +38,7 @@ namespace frm ResourceManager() { } ~ResourceManager() { } - // we'll instantiate one static member of the following class, which, in it's dtor, + // we'll instantiate one static member of the following class, which, in its dtor, // ensures that m_pImpl will be deleted class EnsureDelete { diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index 756d42f2bd55..bdd507f05c7d 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -1590,7 +1590,7 @@ namespace frm } catch( const Exception& ) { - OSL_FAIL( "FormOperations::impl_executeAutoSort_throw: could not reset the form to it's original state!" ); + OSL_FAIL( "FormOperations::impl_executeAutoSort_throw: could not reset the form to its original state!" ); } } @@ -1659,7 +1659,7 @@ namespace frm } catch( const Exception& ) { - OSL_FAIL( "FormOperations::impl_executeAutoFilter_throw: could not reset the form to it's original state!" ); + OSL_FAIL( "FormOperations::impl_executeAutoFilter_throw: could not reset the form to its original state!" ); } } diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx index 4602445491b5..08ee8667b52e 100644 --- a/forms/source/runtime/formoperations.hxx +++ b/forms/source/runtime/formoperations.hxx @@ -298,7 +298,7 @@ namespace frm and rethrows them @param f - a fuctionoid with no arguments to do the work + a functionoid with no arguments to do the work @param _nErrorResourceId the id of the resources string to use as error message */ diff --git a/forms/source/xforms/mip.hxx b/forms/source/xforms/mip.hxx index 729e408f8833..cd0a5f919d17 100644 --- a/forms/source/xforms/mip.hxx +++ b/forms/source/xforms/mip.hxx @@ -86,7 +86,7 @@ public: void setRelevant( bool ); void resetRelevant(); - // - constraing (computed XPath; default: true) + // - constraint (computed XPath; default: true) bool hasConstraint() const { return mbHasConstraint; } bool isConstraint() const { return mbConstraint; } void setConstraint( bool ); diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx index dd393299fe23..cd68e8fcc384 100644 --- a/forms/source/xforms/model_ui.cxx +++ b/forms/source/xforms/model_ui.cxx @@ -829,7 +829,7 @@ static OUString lcl_serializeForDisplay( const Reference& xNodes ) xTextInputStream->setInputStream( aSerialization.getInputStream() ); /* WORK AROUND for problem in serialization: currently, multiple - XML delarations () are being written out and we don't + XML declarations () are being written out and we don't want them. When this is fixed, the code below is nice and simple. The current code filters out the declarations. OUString sResult = xTextInputStream->readString( Sequence(), -- cgit