[Libreoffice-commits] core.git: bridges/source package/source sd/source sot/source svtools/source svx/source sw/source testtools/source vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Nov 12 19:45:03 UTC 2018
bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx | 2 +-
package/source/zippackage/ZipPackageStream.cxx | 2 +-
sd/source/ui/inc/AccessibleDocumentViewBase.hxx | 2 +-
sot/source/sdstor/ucbstorage.cxx | 2 +-
svtools/source/control/toolbarmenu.cxx | 2 +-
svx/source/fmcomp/gridctrl.cxx | 2 +-
sw/source/core/crsr/pam.cxx | 2 +-
sw/source/core/undo/untbl.cxx | 4 ++--
testtools/source/bridgetest/cli/cli_bridgetest_inprocess.cs | 2 +-
vcl/source/control/tabctrl.cxx | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 69b46d7a3b7cd1f0f398ec18583a7383deef25d8
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Mon Nov 12 17:05:25 2018 +0100
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Mon Nov 12 20:44:39 2018 +0100
Fix typos
Change-Id: Ibb94b2b16afbcca84dd55ae51fde6fd27afede3a
Reviewed-on: https://gerrit.libreoffice.org/63297
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
index 2f1a87c961f9..521dccd6dae1 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
@@ -631,7 +631,7 @@ unsigned char * codeSnippet( unsigned char * code, sal_Int32 functionIndex, sal
// #now load up the pointer to the saved fpr registers
// addi r6,r1,-2016
- // if no dedicated floating point registers are used than we have NULL
+ // if no dedicated floating point registers are used then we have NULL
// pointer there
// li r6, 0
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index 5fe4d0ef80c5..6dad7d6f8b07 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -621,7 +621,7 @@ bool ZipPackageStream::saveChild(
// at position zero...otherwise, assert and skip this stream...
if ( IsPackageMember() )
{
- // if the password has been changed than the stream should not be package member any more
+ // if the password has been changed then the stream should not be package member any more
if ( m_bIsEncrypted && m_bToBeEncrypted )
{
// Should be handled close to the raw stream handling
diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
index dfdbdea5690a..2ad10b77aac6 100644
--- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
+++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
@@ -53,7 +53,7 @@ namespace accessibility {
<p>The different view modes of the Draw and Impress applications
are made accessible by derived classes. When the view mode is
- changed than the object representing the document view is
+ changed then the object representing the document view is
disposed and replaced by a new instance of the then appropriate
derived class.</p>
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 05027ed580b2..98633c9fec72 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -733,7 +733,7 @@ bool UCBStorageStream_Impl::Init()
}
else
{
- // if the new file is edited than no source exist
+ // if the new file is edited then no source exist
m_bSourceRead = false;
//SetError( SVSTREAM_CANNOT_MAKE );
}
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index b64c0b788442..824de42d35ca 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -965,7 +965,7 @@ ToolbarMenuEntry* ToolbarMenu::implCursorUpDown( bool bUp, bool bHomeEnd )
else
{
// if we have a currently selected entry and
- // cursor keys are used than check if this entry
+ // cursor keys are used then check if this entry
// has a control that can use those cursor keys
ToolbarMenuEntry* pData = mpImpl->maEntryVector[n].get();
if( pData && pData->mpControl && !pData->mbHasText )
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 325d2b2957ef..a0e898c3d571 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2666,7 +2666,7 @@ sal_uInt32 DbGridControl::GetTotalCellWidth(long nRow, sal_uInt16 nColId)
void DbGridControl::PreExecuteRowContextMenu(sal_uInt16 /*nRow*/, PopupMenu& rMenu)
{
bool bDelete = (m_nOptions & DbGridControlOptions::Delete) && GetSelectRowCount() && !IsCurrentAppending();
- // if only a blank row is selected than do not delete
+ // if only a blank row is selected then do not delete
bDelete = bDelete && !((m_nOptions & DbGridControlOptions::Insert) && GetSelectRowCount() == 1 && IsRowSelected(GetRowCount() - 1));
rMenu.EnableItem(rMenu.GetItemId("delete"), bDelete);
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index eff3dad802f1..1c10bea10ac5 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -737,7 +737,7 @@ bool SwPaM::HasReadonlySel( bool bFormView ) const
/// This function returns the next node in direction of search. If there is no
/// left or the next is out of the area, then a null-pointer is returned.
-/// @param rbFirst If <true> than first time request. If so than the position of
+/// @param rbFirst If <true> then first time request. If so than the position of
/// the PaM must not be changed!
SwContentNode* GetNode( SwPaM & rPam, bool& rbFirst, SwMoveFnCollection const & fnMove,
bool bInReadOnly )
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index d1d349ae9615..7b7f7cd5115e 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -2226,7 +2226,7 @@ void SwUndoTableNumFormat::UndoImpl(::sw::UndoRedoContext & rContext)
return;
SwTextNode* pTextNd = rDoc.GetNodes()[ m_nNodePos ]->GetTextNode();
- // If more than one node was deleted than all "node" attributes were also
+ // If more than one node was deleted then all "node" attributes were also
// saved
if( pTextNd->HasSwAttrSet() )
pTextNd->ResetAllAttr();
@@ -2687,7 +2687,7 @@ void SwUndoTableCpyTable::AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex
{
UndoTableCpyTable_Entry *const pEntry = m_vArr.back().get();
- // If the content was deleted than remove also the temporarily created node
+ // If the content was deleted then remove also the temporarily created node
if( bDelContent )
{
SwDoc* pDoc = rBox.GetFrameFormat()->GetDoc();
diff --git a/testtools/source/bridgetest/cli/cli_bridgetest_inprocess.cs b/testtools/source/bridgetest/cli/cli_bridgetest_inprocess.cs
index 1cb4f319e747..7518e569d15d 100644
--- a/testtools/source/bridgetest/cli/cli_bridgetest_inprocess.cs
+++ b/testtools/source/bridgetest/cli/cli_bridgetest_inprocess.cs
@@ -88,7 +88,7 @@ public class BridgeTest
"\n\ncli_bridgetest_inprocess [bootstrap file] \n\n"
+ "bootstrap file \n"
+ "\t contains the entries UNO_TYPES and UNO_SERVICES.\n"
- + "\t If a file is not provided than it is assumed that a\n"
+ + "\t If a file is not provided then it is assumed that a\n"
+ "\t cli_bridgetest_inprocess.ini file can be found in the\n "
+ "\t current working directory.\n"
);
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index ea022457025b..e0079e4cffd3 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -1683,7 +1683,7 @@ void TabControl::RemovePage( sal_uInt16 nPageId )
mpTabCtrlData->mpListBox->SetDropDownLineCount( mpTabCtrlData->mpListBox->GetEntryCount() );
}
- // If current page is removed, than first page gets the current page
+ // If current page is removed, then first page gets the current page
if ( bIsCurrentPage )
{
mnCurPageId = 0;
More information about the Libreoffice-commits
mailing list