summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
Diffstat (limited to 'forms')
-rw-r--r--forms/qa/complex/forms/CheckOGroupBoxModel.java6
-rw-r--r--forms/source/component/Columns.cxx2
-rw-r--r--forms/source/component/DatabaseForm.cxx4
-rw-r--r--forms/source/component/RadioButton.hxx2
-rw-r--r--forms/source/component/propertybaghelper.cxx2
-rw-r--r--forms/source/inc/FormComponent.hxx2
-rw-r--r--forms/source/richtext/richtextcontrol.cxx4
-rw-r--r--forms/source/richtext/richtextcontrol.hxx2
-rw-r--r--forms/source/solar/component/navbarcontrol.cxx4
-rw-r--r--forms/source/solar/component/navbarcontrol.hxx2
-rw-r--r--forms/source/solar/inc/navtoolbar.hxx2
-rw-r--r--forms/source/xforms/datatypes.hxx2
-rw-r--r--forms/source/xforms/model.cxx2
13 files changed, 17 insertions, 19 deletions
diff --git a/forms/qa/complex/forms/CheckOGroupBoxModel.java b/forms/qa/complex/forms/CheckOGroupBoxModel.java
index 62b97c9d9e70..b1f4bbadf022 100644
--- a/forms/qa/complex/forms/CheckOGroupBoxModel.java
+++ b/forms/qa/complex/forms/CheckOGroupBoxModel.java
@@ -114,15 +114,15 @@ public class CheckOGroupBoxModel
}
catch (com.sun.star.beans.PropertyVetoException e)
{
- fail("Exception occured while trying to change the properties.");
+ fail("Exception occurred while trying to change the properties.");
}
catch (com.sun.star.lang.IllegalArgumentException e)
{
- fail("Exception occured while trying to change the properties.");
+ fail("Exception occurred while trying to change the properties.");
}
catch (com.sun.star.lang.WrappedTargetException e)
{
- fail("Exception occured while trying to change the properties.");
+ fail("Exception occurred while trying to change the properties.");
} // end of try-catch
assertTrue("Listener was not called.", ml.wasListenerCalled());
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index 9140f0816a22..bc5c53af6e5d 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -177,7 +177,7 @@ Sequence<Type> SAL_CALL OGridColumn::getTypes() throw(RuntimeException, std::exc
Any SAL_CALL OGridColumn::queryAggregation( const Type& _rType ) throw (RuntimeException, std::exception)
{
Any aReturn;
- // some functionality at our aggregate cannot be reasonably fullfilled here.
+ // some functionality at our aggregate cannot be reasonably fulfilled here.
if ( _rType.equals(::getCppuType(static_cast< Reference< XFormComponent >* >(NULL)))
|| _rType.equals(::getCppuType(static_cast< Reference< XServiceInfo >* >(NULL)))
|| _rType.equals(::getCppuType(static_cast< Reference< XBindableValue >* >(NULL)))
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index c288991b1bb3..3994979f63b8 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -84,7 +84,7 @@
#include <ctype.h>
#include <boost/unordered_map.hpp>
-// compatiblity: DatabaseCursorType is dead, but for compatiblity reasons we still have to write it ...
+// compatibility: DatabaseCursorType is dead, but for compatibility reasons we still have to write it ...
namespace com {
namespace sun {
namespace star {
@@ -3068,7 +3068,7 @@ void SAL_CALL ODatabaseForm::rowSetChanged(const EventObject& /*event*/) throw(
// if our parent is an ODatabaseForm, too, then after this rowSetChanged we'll get a "reloaded"
// or a "loaded" event.
// If somebody gave us another parent which is an XRowSet but doesn't handle an execute as
- // "load" respectivly "reload" ... can't do anything ....
+ // "load" respectively "reload" ... can't do anything ....
}
diff --git a/forms/source/component/RadioButton.hxx b/forms/source/component/RadioButton.hxx
index 7bdde1c9a717..9eb8ba82ff5b 100644
--- a/forms/source/component/RadioButton.hxx
+++ b/forms/source/component/RadioButton.hxx
@@ -73,7 +73,7 @@ protected:
private:
/** sets the given value as new State at the aggregate
@precond
- our mutex is aquired exactly once
+ our mutex is acquired exactly once
*/
void setNewAggregateState( const ::com::sun::star::uno::Any& _rValue );
diff --git a/forms/source/component/propertybaghelper.cxx b/forms/source/component/propertybaghelper.cxx
index 890109092000..a81f8589cc01 100644
--- a/forms/source/component/propertybaghelper.cxx
+++ b/forms/source/component/propertybaghelper.cxx
@@ -116,7 +116,7 @@ namespace frm
if ( ( nHandle != -1 ) && rPropInfo.fillPropertyMembersByHandle( NULL, NULL, nHandle ) )
nHandle = -1;
- // seach a free handle in <math>F_1009</math>
+ // search a free handle in <math>F_1009</math>
if ( nHandle == -1 )
{
sal_Int32 nPrime = 1009;
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index b06168e15e83..85863203aa27 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -664,7 +664,7 @@ private:
const sal_Bool m_bSupportsExternalBinding : 1; // do we support XBindableValue?
const sal_Bool m_bSupportsValidation : 1; // do we support XValidatable?
sal_Bool m_bForwardValueChanges : 1; // do we currently handle changes in the bound database field?
- sal_Bool m_bTransferingValue : 1; // true if we're currently transfering our value to an external binding
+ sal_Bool m_bTransferingValue : 1; // true if we're currently transferring our value to an external binding
sal_Bool m_bIsCurrentValueValid : 1; // flag specifying whether our current value is valid, relative to our external validator
sal_Bool m_bBindingControlsRO : 1; // is our ReadOnly property currently controlled by our external binding?
sal_Bool m_bBindingControlsEnable : 1; // is our Enabled property currently controlled by our external binding?
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 44829c67fafc..f18fec8a8eca 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -216,7 +216,7 @@ namespace frm
DBG_ASSERT( pPeer, "ORichTextControl::createPeer: invalid peer returned!" );
if ( pPeer )
{
- // by definition, the returned component is aquired once
+ // by definition, the returned component is acquired once
pPeer->release();
// announce the peer to the base class
@@ -316,7 +316,7 @@ namespace frm
// the peer itself
ORichTextPeer* pPeer = new ORichTextPeer;
- pPeer->acquire(); // by definition, the returned object is aquired once
+ pPeer->acquire(); // by definition, the returned object is acquired once
// the VCL control for the peer
RichTextControl* pRichTextControl = new RichTextControl( pEngine, _pParentWindow, _nStyle, NULL, pPeer );
diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx
index ba719cb949cc..e6853916d8db 100644
--- a/forms/source/richtext/richtextcontrol.hxx
+++ b/forms/source/richtext/richtextcontrol.hxx
@@ -100,7 +100,7 @@ namespace frm
public:
/** factory method
@return
- a new ORichTextPeer instance, which has been aquired once!
+ a new ORichTextPeer instance, which has been acquired once!
*/
static ORichTextPeer* Create(
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxModel,
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index bc875876e0d3..d9816e8a0b7e 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -146,7 +146,7 @@ namespace frm
ONavigationBarPeer* pPeer = ONavigationBarPeer::Create( m_xContext, pParentWin, getModel() );
DBG_ASSERT( pPeer, "ONavigationBarControl::createPeer: invalid peer returned!" );
if ( pPeer )
- // by definition, the returned component is aquired once
+ // by definition, the returned component is acquired once
pPeer->release();
// announce the peer to the base class
@@ -240,7 +240,7 @@ namespace frm
// the peer itself
ONavigationBarPeer* pPeer = new ONavigationBarPeer( _rxORB );
- pPeer->acquire(); // by definition, the returned object is aquired once
+ pPeer->acquire(); // by definition, the returned object is acquired once
// the VCL control for the peer
Reference< XModel > xContextDocument( getXModel( _rxModel ) );
diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx
index 962cda8945a0..365d81fe9cfb 100644
--- a/forms/source/solar/component/navbarcontrol.hxx
+++ b/forms/source/solar/component/navbarcontrol.hxx
@@ -94,7 +94,7 @@ namespace frm
public:
/** factory method
@return
- a new ONavigationBarPeer instance, which has been aquired once!
+ a new ONavigationBarPeer instance, which has been acquired once!
*/
static ONavigationBarPeer* Create(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB,
diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx
index e83667d379db..09fa2b6a6adc 100644
--- a/forms/source/solar/inc/navtoolbar.hxx
+++ b/forms/source/solar/inc/navtoolbar.hxx
@@ -81,7 +81,7 @@ namespace frm
then the states of the features are updated
@param _pDispatcher
- the new (or old) dispatcher. The caller is reponsible for
+ the new (or old) dispatcher. The caller is responsible for
ensuring the life time of the object does exceed the life time
of the tool bar instance.
*/
diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx
index 4f40daeb9f30..4e9c1741b64f 100644
--- a/forms/source/xforms/datatypes.hxx
+++ b/forms/source/xforms/datatypes.hxx
@@ -214,7 +214,7 @@ namespace xforms
The normalization must respect the "<" and "==" relations on the value
space. That is, if two values are equal, their normalizations must be equal, too.
- Similarily, if <code>foo</code> is less than <code>bar</code>, the same
+ Similarly, if <code>foo</code> is less than <code>bar</code>, the same
must hold for their normalizations.
@param _rValue
diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index 0ce8aefcf3af..a17158ec176f 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -234,8 +234,6 @@ void Model::dbg_assertInvariant() const
// MIP management
-
-
void Model::addMIP( void* pTag, const XNode_t& xNode, const MIP& rMIP )
{
OSL_ENSURE( pTag != NULL, "empty tag?" );