[Libreoffice-commits] core.git: svx/source
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Mon Aug 12 09:40:54 UTC 2019
svx/source/accessibility/AccessibleControlShape.cxx | 2 +-
svx/source/form/fmtools.cxx | 2 +-
svx/source/form/fmview.cxx | 2 +-
svx/source/form/formcontroller.cxx | 8 ++++----
svx/source/form/formdispatchinterceptor.cxx | 2 +-
svx/source/form/navigatortree.cxx | 6 +++---
svx/source/inc/fmobj.hxx | 4 ++--
svx/source/inc/fmtextcontrolfeature.hxx | 2 +-
svx/source/inc/formcontrolling.hxx | 2 +-
9 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit ef67f74b791abec6d36c573d1eaf5fbfc1f83c46
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Sun Aug 11 18:28:54 2019 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Mon Aug 12 11:39:49 2019 +0200
Fix typos
Change-Id: Ieccfec878aeaeacc55841f28c7d67cd2bd08556e
Reviewed-on: https://gerrit.libreoffice.org/77284
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 47f4c41aff01..a287b6cf964d 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -648,7 +648,7 @@ void SAL_CALL AccessibleControlShape::disposing()
{
// don't listen for mode changes anymore
Reference< XModeChangeBroadcaster > xControlModes( m_xUnoControl, UNO_QUERY );
- OSL_ENSURE( xControlModes.is(), "AccessibleControlShape::disposing: don't have an mode broadcaster anymore!" );
+ OSL_ENSURE( xControlModes.is(), "AccessibleControlShape::disposing: don't have a mode broadcaster anymore!" );
if ( xControlModes.is() )
xControlModes->removeModeChangeListener( this );
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 0d13fda390b2..c277a4b06925 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -331,7 +331,7 @@ sal_Int16 getControlTypeByObject(const Reference< css::lang::XServiceInfo>& _rxO
{
// ask for the persistent service name
Reference< css::io::XPersistObject> xPersistence(_rxObject, UNO_QUERY);
- DBG_ASSERT(xPersistence.is(), "::getControlTypeByObject : argument shold be an css::io::XPersistObject !");
+ DBG_ASSERT(xPersistence.is(), "::getControlTypeByObject : argument should be a css::io::XPersistObject !");
if (!xPersistence.is())
return OBJ_FM_CONTROL;
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 839be000cb1b..894002d8c7de 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -253,7 +253,7 @@ void FmFormView::ChangeDesignMode(bool bDesign)
// --- 5. base class functionality
SetDesignMode( bDesign );
- // --- 6. simulate a activation (the shell will handle some things there ...?)
+ // --- 6. simulate an activation (the shell will handle some things there ...?)
OSL_PRECOND( pFormShell && pFormShell->GetImpl(), "FmFormView::ChangeDesignMode: is this really allowed? No shell?" );
if ( pFormShell && pFormShell->GetImpl() )
pFormShell->GetImpl()->viewActivated_Lock(*this);
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 9af97e6789dd..9043ae73ac64 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -1346,7 +1346,7 @@ void FormController::toggleAutoFields(bool bAutoFields)
Reference< XPropertySet > xField;
xSet->getPropertyValue(FM_PROP_BOUNDFIELD) >>= xField;
- // is it a autofield?
+ // is it an autofield?
if ( xField.is()
&& ::comphelper::hasProperty( FM_PROP_AUTOINCREMENT, xField )
&& ::comphelper::getBOOL( xField->getPropertyValue( FM_PROP_AUTOINCREMENT ) )
@@ -1374,7 +1374,7 @@ void FormController::toggleAutoFields(bool bAutoFields)
Reference< XPropertySet > xField;
xSet->getPropertyValue(FM_PROP_BOUNDFIELD) >>= xField;
- // is it a autofield?
+ // is it an autofield?
if ( xField.is()
&& ::comphelper::hasProperty( FM_PROP_AUTOINCREMENT, xField )
&& ::comphelper::getBOOL( xField->getPropertyValue(FM_PROP_AUTOINCREMENT ) )
@@ -3009,7 +3009,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
// ok, we receive the list of filters as sequence of fieldnames, value
// now we have to transform the fieldname into UI names, that could be a label of the field or
- // a aliasname or the fieldname itself
+ // an aliasname or the fieldname itself
// first adjust the field names if necessary
Reference< XNameAccess > xQueryColumns =
@@ -4118,7 +4118,7 @@ Reference< XDispatchProviderInterceptor > FormController::createInterceptor(con
{
OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
#ifdef DBG_UTIL
- // check if we already have a interceptor for the given object
+ // check if we already have an interceptor for the given object
for ( const auto & it : m_aControlDispatchInterceptors )
{
if (it->getIntercepted() == _xInterception)
diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx
index 85f33b8e87d7..84396d02cf64 100644
--- a/svx/source/form/formdispatchinterceptor.cxx
+++ b/svx/source/form/formdispatchinterceptor.cxx
@@ -50,7 +50,7 @@ namespace svxform
{
_rxToIntercept->registerDispatchProviderInterceptor(static_cast<XDispatchProviderInterceptor*>(this));
// this should make us the top-level dispatch-provider for the component, via a call to our
- // setDispatchProvider we should have got an fallback for requests we (i.e. our master) cannot fulfill
+ // setDispatchProvider we should have got a fallback for requests we (i.e. our master) cannot fulfill
Reference< XComponent> xInterceptedComponent(_rxToIntercept, UNO_QUERY);
if (xInterceptedComponent.is())
{
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index d1e12886d6ab..2e2fa562dd67 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -776,7 +776,7 @@ namespace svxform
// conditions to disallow the drop
// 0) the root entry is part of the list (can't DnD the root!)
- // 1) one of the draged entries is to be dropped onto its own parent
+ // 1) one of the dragged entries is to be dropped onto its own parent
// 2) - " - is to be dropped onto itself
// 3) - " - is a Form and to be dropped onto one of its descendants
// 4) one of the entries is a control and to be dropped onto the root
@@ -913,7 +913,7 @@ namespace svxform
DBG_ASSERT(!bForeignCollection || bHasHiddenControlsFormat, "NavigatorTree::implExecuteDataTransfer: invalid format (AcceptDrop shouldn't have let this pass) !");
DBG_ASSERT(bForeignCollection || !m_bDragDataDirty, "NavigatorTree::implExecuteDataTransfer: invalid state (shell changed since last exchange resync) !");
// this should be done in AcceptDrop: the list of controls is created in _rData
- // and m_bDragDataDirty is resetted
+ // and m_bDragDataDirty is reset
#endif
if ( DND_ACTION_COPY == _nAction )
@@ -1804,7 +1804,7 @@ namespace svxform
while (pParentLoop)
{
// actually i would have to test, if parent is part of m_arr_CurrentSelection ...
- // but if it's selected, than it's in m_arrCurrentSelection
+ // but if it's selected, then it's in m_arrCurrentSelection
// or one of its ancestors, which was selected earlier.
// In both cases IsSelected is enough
if (IsSelected(pParentLoop))
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx
index 476c3c52d0ae..d64275dd42db 100644
--- a/svx/source/inc/fmobj.hxx
+++ b/svx/source/inc/fmobj.hxx
@@ -88,8 +88,8 @@ public:
/** returns the FmFormObj behind the given SdrObject
- In case the SdrObject *is* an FmFormObject, this is a simple cast. In case the SdrObject
- is a virtual object whose referenced object is an FmFormObj, then this referenced
+ In case the SdrObject *is* a FmFormObject, this is a simple cast. In case the SdrObject
+ is a virtual object whose referenced object is a FmFormObj, then this referenced
object is returned. In all other cases, NULL is returned.
*/
SAL_DLLPRIVATE static FmFormObj* GetFormObject( SdrObject* _pSdrObject );
diff --git a/svx/source/inc/fmtextcontrolfeature.hxx b/svx/source/inc/fmtextcontrolfeature.hxx
index 651307bfe372..e1e463838e41 100644
--- a/svx/source/inc/fmtextcontrolfeature.hxx
+++ b/svx/source/inc/fmtextcontrolfeature.hxx
@@ -47,7 +47,7 @@ namespace svx
bool m_bFeatureEnabled;
public:
- /** constructs an FmTextControlFeature object
+ /** constructs a FmTextControlFeature object
@param _rxDispatcher
the dispatcher which the instance should work with
@param _rFeatureURL
diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx
index a24a04321c7d..db72e9114ebb 100644
--- a/svx/source/inc/formcontrolling.hxx
+++ b/svx/source/inc/formcontrolling.hxx
@@ -67,7 +67,7 @@ namespace svx
};
class FormControllerHelper;
- /** easier access to an FormControllerHelper instance
+ /** easier access to a FormControllerHelper instance
*/
class ControllerFeatures final
{
More information about the Libreoffice-commits
mailing list