[Libreoffice-commits] core.git: dbaccess/source editeng/source forms/source include/svtools include/tools sal/osl sfx2/qa sfx2/source svx/source sw/qa sw/source toolkit/source
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jan 8 12:25:43 UTC 2020
dbaccess/source/core/api/RowSetCache.cxx | 2 +-
editeng/source/editeng/impedit5.cxx | 2 +-
forms/source/component/FormattedField.cxx | 6 +++---
forms/source/component/FormattedFieldWrapper.cxx | 2 +-
include/svtools/table/tablerenderer.hxx | 2 +-
include/tools/date.hxx | 2 +-
sal/osl/all/utility.cxx | 2 +-
sfx2/qa/complex/sfx2/UndoManager.java | 4 ++--
sfx2/source/appl/newhelp.cxx | 2 +-
svx/source/fmcomp/fmgridcl.cxx | 2 +-
svx/source/form/fmshell.cxx | 2 +-
sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 2 +-
sw/source/core/inc/txtfly.hxx | 2 +-
toolkit/source/controls/grid/gridcontrol.cxx | 2 +-
14 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 2e5c4b4081411b77b5e0593225b805d3756f7533
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Wed Jan 8 06:57:25 2020 +0100
Commit: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Wed Jan 8 13:25:05 2020 +0100
Grammar fixes
Change-Id: I6ac6f6abb601aa254e94612e6826488393de8e3c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86383
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index 2f71f9e4bc5d..1ca8ba61b7da 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -875,7 +875,7 @@ void ORowSetCache::moveWindow()
bool bCheck;
bCheck = m_xCacheSet->absolute(nNewStartPos + 1);
- // m_nEndPos < nNewEndPos when window not filled (e.g. there are less rows in total than window size)
+ // m_nEndPos < nNewEndPos when window not filled (e.g. there are fewer rows in total than window size)
m_nEndPos = std::min(nNewEndPos, m_nEndPos);
const sal_Int32 nOverlapSize = m_nEndPos - m_nStartPos;
const sal_Int32 nStartPosOffset = m_nStartPos - nNewStartPos; // by how much m_nStartPos moves
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index 975eddebf6ae..0e6b6af722fa 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -395,7 +395,7 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, EditEngineAttribs nOnl
SfxItemSet ImpEditEngine::GetAttribs( sal_Int32 nPara, sal_Int32 nStart, sal_Int32 nEnd, GetAttribsFlags nFlags ) const
{
- // Optimized function with less Puts(), which cause unnecessary cloning from default items.
+ // Optimized function with fewer Puts(), which cause unnecessary cloning from default items.
// If this works, change GetAttribs( EditSelection ) to use this for each paragraph and merge the results!
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 805076b545d1..fb84dcb2e531 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -748,7 +748,7 @@ void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream)
{ // since version 3 there is a "skippable" block at this position
OStreamSection aDownCompat(_rxInStream);
_rxInStream->readShort(); // sub-version
- // version 0 and higher : the "effective value" property
+ // version 0 and higher: the "effective value" property
Any aEffectiveValue;
{
OStreamSection aDownCompat2(_rxInStream);
@@ -763,10 +763,10 @@ void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream)
case 2:
break;
case 3:
- OSL_FAIL("FmXFormattedModel::read : unknown effective value type !");
+ OSL_FAIL("FmXFormattedModel::read : unknown effective value type!");
}
}
- // this property is only to be set if we have no control source : in all other cases the base class did a
+ // this property is only to be set if we have no control source: in all other cases the base class made a
// reset after it's read and this set the effective value to a default value
if ( m_xAggregateSet.is() && getControlSource().isEmpty() )
{
diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx
index 1a7cf9446190..b434e1bd2e84 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.cxx
@@ -237,7 +237,7 @@ void SAL_CALL OFormattedFieldWrapper::read(const Reference<XObjectInputStream>&
{
SolarMutexGuard g;
if (m_xAggregate.is())
- { // we already did a decision if we're an EditModel or a FormattedModel
+ { // we already made a decision if we're an EditModel or a FormattedModel
// if we act as formatted, we have to read the edit part first
if (m_xFormattedPart.is())
diff --git a/include/svtools/table/tablerenderer.hxx b/include/svtools/table/tablerenderer.hxx
index 7ac30e26c3ff..b5c99dca4433 100644
--- a/include/svtools/table/tablerenderer.hxx
+++ b/include/svtools/table/tablerenderer.hxx
@@ -61,7 +61,7 @@ namespace svt { namespace table
First, there might be less columns than fit into the view - in this case, right
beside the right-most column, there's still room which belongs to the column header
area, but is not occupied by any particular column header.<br/>
- An equivalent statement holds for the row header area, if there are less rows than
+ An equivalent statement holds for the row header area, if there are fewer rows than
fit into the view.
Second, if the table control has both a row header and a column header,
diff --git a/include/tools/date.hxx b/include/tools/date.hxx
index 03f0057c27c8..0adbc2ea4b4f 100644
--- a/include/tools/date.hxx
+++ b/include/tools/date.hxx
@@ -124,7 +124,7 @@ public:
/** Add months skipping year 0 and truncating at limits. If the original
date was on Feb-29 or day 31 and the resulting date is not a leap year
- or a month with less days, the result is adjusted to Feb-28 or day 30.
+ or a month with fewer days, the result is adjusted to Feb-28 or day 30.
*/
void AddMonths( sal_Int32 nAddMonths );
diff --git a/sal/osl/all/utility.cxx b/sal/osl/all/utility.cxx
index 76bdc4cd26ed..e22bdd3de2de 100644
--- a/sal/osl/all/utility.cxx
+++ b/sal/osl/all/utility.cxx
@@ -22,7 +22,7 @@
/*
* mfe : maybe it would be wishful to include initialization
* of the global timer in dllmain or _init directly.
- * But none the less this (should) work too.
+ * But nonetheless this (should) work too.
*/
namespace osl
{
diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java
index 7e438e852e71..a455a5eb4ca0 100644
--- a/sfx2/qa/complex/sfx2/UndoManager.java
+++ b/sfx2/qa/complex/sfx2/UndoManager.java
@@ -663,9 +663,9 @@ public class UndoManager
m_currentTestCase.verifyInitialDocumentState();
// redo the modification, ensure the listener got the proper notifications
- assertEquals( "did not yet do a redo!", 0, m_undoListener.getRedoActionCount() );
+ assertEquals( "not yet made a redo!", 0, m_undoListener.getRedoActionCount() );
i_undoManager.redo();
- assertEquals( "did a redo, but got no notification of it!", 1, m_undoListener.getRedoActionCount() );
+ assertEquals( "made a redo, but got no notification of it!", 1, m_undoListener.getRedoActionCount() );
// ensure the document is in the proper state, again
m_currentTestCase.verifySingleModificationDocumentState();
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index e615a3f88baf..44f6d04c3821 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1695,7 +1695,7 @@ void SfxHelpIndexWindow_Impl::SetFactory( const OUString& rFactory, bool bActive
if ( !rFactory.isEmpty() )
{
GetIndexPage()->SetFactory( rFactory );
- // the index page did a check if rFactory is valid,
+ // the index page made a check if rFactory is valid,
// so the index page always returns a valid factory
GetSearchPage()->SetFactory( GetIndexPage()->GetFactory() );
if ( bActive )
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 69574776f876..39daa6993d62 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1808,7 +1808,7 @@ Sequence< Any> FmGridControl::getSelectionBookmarks()
// (I'm not sure if the problem isn't deeper: The scenario: a large table displayed by a grid with a
// thread-safe cursor (dBase). On loading the sdb-cursor started a counting thread. While this counting progress
- // was running, I tried do delete 3 records from within the grid. Deletion caused a SeekCursor, which did a
+ // was running, I tried do delete 3 records from within the grid. Deletion caused a SeekCursor, which made a
// m_pSeekCursor->moveRelative and a m_pSeekCursor->getPosition.
// Unfortunately the first call caused a propertyChanged(RECORDCOUNT) which resulted in a repaint of the
// navigation bar and the grid. The latter itself will result in SeekRow calls. So after (successfully) returning
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index b9edd4610ad1..1be63bbfaaf4 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -214,7 +214,7 @@ void FmFormShell::NotifyMarkListChanged(FmFormView* pWhichView)
bool FmFormShell::PrepareClose(bool bUI)
{
if (GetImpl()->didPrepareClose_Lock())
- // we already did a PrepareClose for the current modifications of the current form
+ // we already made a PrepareClose for the current modifications of the current form
return true;
bool bResult = true;
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index bac58439d272..6c0cfcf7cf7b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -307,7 +307,7 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFDO74106, "FDO74106.docx")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFDO74215, "FDO74215.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/numbering.xml");
- // tdf#106849 NumPicBullet xShape should not to be resized.
+ // tdf#106849 NumPicBullet xShape should not be resized.
// This is dependent on the running system: see MSWordExportBase::BulletDefinitions
// FIXME: the size of a bullet is defined by GraphicSize property
diff --git a/sw/source/core/inc/txtfly.hxx b/sw/source/core/inc/txtfly.hxx
index ff70f1d2217b..0f3c9e8c7bb0 100644
--- a/sw/source/core/inc/txtfly.hxx
+++ b/sw/source/core/inc/txtfly.hxx
@@ -282,7 +282,7 @@ public:
bool IsAnyFrame() const;
/**
- true when a frame or DrawObj must to be taken in account. The optimizations
+ true when a frame or DrawObj must be taken in account. The optimizations
like Paint/FormatEmpty for empty sentences or the virtual OutputDevice can
be used only when false is returned.
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index f8e0a8b8a5d8..4301415d1263 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -131,7 +131,7 @@ UnoGridModel::UnoGridModel( const UnoGridModel& rModel )
if ( !xDataModel.is() )
xDataModel = lcl_getDefaultDataModel_throw( m_xContext );
UnoControlModel::setFastPropertyValue_NoBroadcast( BASEPROPERTY_GRID_DATAMODEL, makeAny( xDataModel ) );
- // do *not* use setFastPropertyValue here: The UnoControlModel ctor did a simple copy of all property values,
+ // do *not* use setFastPropertyValue here: The UnoControlModel ctor made a simple copy of all property values,
// so before this call here, we share our data model with the own of the clone source. setFastPropertyValue,
// then, disposes the old data model - which means the data model which in fact belongs to the clone source.
// so, call the UnoControlModel's impl-method for setting the value.
More information about the Libreoffice-commits
mailing list