[Libreoffice-commits] core.git: chart2/source connectivity/source desktop/source forms/source include/connectivity solenv/bin sw/qa sw/source
Andrea Gelmini
andrea.gelmini at gelma.net
Sun Jan 14 15:40:48 UTC 2018
chart2/source/tools/ObjectIdentifier.cxx | 4 ++--
connectivity/source/drivers/dbase/DTable.cxx | 2 +-
desktop/source/lib/init.cxx | 4 ++--
forms/source/component/DatabaseForm.cxx | 4 ++--
include/connectivity/sqliterator.hxx | 2 +-
solenv/bin/modules/installer/scriptitems.pm | 2 +-
sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 6 +++---
sw/source/core/unocore/swunohelper.cxx | 6 +++---
sw/source/filter/ww8/docxattributeoutput.cxx | 4 ++--
9 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 866fc4ddd3145f08d9cf2bce3cba7e3844c4f76d
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Sun Jan 14 13:42:52 2018 +0100
Fix typos
Change-Id: Icc5fc590a6a90e30afa5f61028d4dd0279fbe120
Reviewed-on: https://gerrit.libreoffice.org/47861
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index f93d03015cd3..54ba3dd910b7 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -636,7 +636,7 @@ OUString ObjectIdentifier::createParticleForLegend( ChartModel& rModel )
OUStringBuffer aRet;
Reference< XDiagram > xDiagram( rModel.getFirstDiagram() );
- //todo: if more than one diagram is implemeted, find the correct diagram which is owner of the given legend
+ //todo: if more than one diagram is implemented, find the correct diagram which is owner of the given legend
aRet.append( ObjectIdentifier::createParticleForDiagram() );
aRet.append(":");
@@ -652,7 +652,7 @@ OUString ObjectIdentifier::createParticleForLegend(
OUStringBuffer aRet;
Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) );
- //todo: if more than one diagram is implemeted, find the correct diagram which is owner of the given legend
+ //todo: if more than one diagram is implemented, find the correct diagram which is owner of the given legend
aRet.append( ObjectIdentifier::createParticleForDiagram() );
aRet.append(":");
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index d1b751dc7e9e..eef8df9bb5e7 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -667,7 +667,7 @@ void ODbaseTable::refreshIndexes()
for (sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++)
{
- // Refences the key an index-file?
+ // References the key an index-file?
aKeyName = aInfFile.GetKeyName( nKey );
//...if yes, add the index list of the table
if (aKeyName.startsWith("NDX"))
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 7190b030ea9a..5688dab671f6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -946,7 +946,7 @@ void CallbackFlushHandler::queue(const int type, const char* data)
if (rcNew.m_nPart == -1)
{
- // Don't merge unless fully overlaped.
+ // Don't merge unless fully overlapped.
SAL_INFO("lok", "New " << rcNew.toString() << " has " << rcOld.toString() << "?");
if (rcNew.m_aRectangle.IsInside(rcOld.m_aRectangle))
{
@@ -956,7 +956,7 @@ void CallbackFlushHandler::queue(const int type, const char* data)
}
else if (rcOld.m_nPart == -1)
{
- // Don't merge unless fully overlaped.
+ // Don't merge unless fully overlapped.
SAL_INFO("lok", "Old " << rcOld.toString() << " has " << rcNew.toString() << "?");
if (rcOld.m_aRectangle.IsInside(rcNew.m_aRectangle))
{
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 70608e16db6a..6b623752a684 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -3254,7 +3254,7 @@ void SAL_CALL ODatabaseForm::executeWithCompletion( const Reference< XInteractio
if ( !impl_approveRowChange_throw( event, true, aGuard ) )
return;
- // we're loaded and somebody want's to execute ourself -> this means a reload
+ // we're loaded and somebody wants to execute ourself -> this means a reload
reload_impl(false, _rxHandler);
}
}
@@ -3280,7 +3280,7 @@ void SAL_CALL ODatabaseForm::execute()
if ( !impl_approveRowChange_throw( event, true, aGuard ) )
return;
- // we're loaded and somebody want's to execute ourself -> this means a reload
+ // we're loaded and somebody wants to execute ourself -> this means a reload
reload_impl(false);
}
}
diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx
index 68810e20b046..eb5be747e980 100644
--- a/include/connectivity/sqliterator.hxx
+++ b/include/connectivity/sqliterator.hxx
@@ -280,7 +280,7 @@ namespace connectivity
// helper to implement getColumnTableRange
bool impl_getColumnTableRange(const OSQLParseNode* pNode, OUString &rTableRange) const;
- /** traverses the list of table names, and filles _rTables
+ /** traverses the list of table names, and fills _rTables
*/
bool traverseTableNames( OSQLTables& _rTables );
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index db2b67c5c9bb..bd4437d315de 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1725,7 +1725,7 @@ sub collect_directories_with_create_flag_from_directoryarray
$directoryhash{'HostName'} = $directoryname;
$directoryhash{'specificlanguage'} = $onedir->{'specificlanguage'};
$directoryhash{'Dir'} = $onedir->{'gid'};
- if ( ! $installer::globals::iswindowsbuild ) { $directoryhash{'Styles'} = "(CREATE)"; } # Exeception for Windows?
+ if ( ! $installer::globals::iswindowsbuild ) { $directoryhash{'Styles'} = "(CREATE)"; } # Exception for Windows?
# saving also the modules
$directoryhash{'modules'} = $onedir->{'modules'};
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index 1ff6bafb7e18..7aee53251a13 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -601,7 +601,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo74792, "fdo74792.docx")
comphelper::getComponentContext(m_xSFactory), maTempFile.GetURL());
//check that images are also saved
- OUString const sImageFile( "word/media/OOXDiagramDataRels1_0.jpeg" ); //added anchor id to form a uniqe name
+ OUString const sImageFile( "word/media/OOXDiagramDataRels1_0.jpeg" ); //added anchor id to form a unique name
uno::Reference<io::XInputStream> xInputStream(xNameAccess->getByName( sImageFile ), uno::UNO_QUERY);
CPPUNIT_ASSERT( xInputStream.is() );
}
@@ -628,12 +628,12 @@ DECLARE_OOXMLEXPORT_TEST(testFdo77718, "fdo77718.docx")
comphelper::getComponentContext(m_xSFactory), maTempFile.GetURL());
//check that images are also saved
- OUString const sImageFile1( "word/media/OOXDiagramDataRels1_0.jpeg" ); //added anchor id to form a uniqe name
+ OUString const sImageFile1( "word/media/OOXDiagramDataRels1_0.jpeg" ); //added anchor id to form a unique name
uno::Reference<io::XInputStream> xInputStream1(xNameAccess->getByName( sImageFile1 ), uno::UNO_QUERY);
CPPUNIT_ASSERT( xInputStream1.is() );
//check that images are saved for other smart-arts as well.
- OUString const sImageFile2( "word/media/OOXDiagramDataRels2_0.jpeg" ); //added anchor id to form a uniqe name
+ OUString const sImageFile2( "word/media/OOXDiagramDataRels2_0.jpeg" ); //added anchor id to form a unique name
uno::Reference<io::XInputStream> xInputStream2(xNameAccess->getByName( sImageFile2 ), uno::UNO_QUERY);
CPPUNIT_ASSERT( xInputStream2.is() );
}
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index 502b4915eb0d..354ff65703a5 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -69,7 +69,7 @@ bool UCB_DeleteFile( const OUString& rURL )
catch( css::uno::Exception& )
{
bRemoved = false;
- OSL_FAIL( "Exeception from executeCommand( delete )" );
+ OSL_FAIL( "Exception from executeCommand( delete )" );
}
return bRemoved;
}
@@ -97,7 +97,7 @@ bool UCB_CopyFile( const OUString& rURL, const OUString& rNewURL, bool bCopyIsMo
}
catch( css::uno::Exception& )
{
- OSL_FAIL( "Exeception from executeCommand( transfer )" );
+ OSL_FAIL( "Exception from executeCommand( transfer )" );
bCopyCompleted = false;
}
return bCopyCompleted;
@@ -126,7 +126,7 @@ bool UCB_IsCaseSensitiveFileName( const OUString& rURL )
catch( css::uno::Exception& )
{
bCaseSensitive = false;
- OSL_FAIL( "Exeception from compareContentIds()" );
+ OSL_FAIL( "Exception from compareContentIds()" );
}
return bCaseSensitive;
}
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 8bde2be39ada..9f7ce8cc1547 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -307,7 +307,7 @@ void DocxAttributeOutput::StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pText
bool bOneliner = m_bStartedParaSdt && !m_rExport.SdrExporter().IsDMLAndVMLDrawingOpen() && lcl_isOnelinerSdt(m_aStartedParagraphSdtPrAlias);
if (bEndParaSdt || (m_bStartedParaSdt && m_bHadSectPr) || bOneliner)
{
- // This is the common case: "close sdt before the current paragraph" was requrested by the next paragraph.
+ // This is the common case: "close sdt before the current paragraph" was requested by the next paragraph.
EndSdtBlock();
m_bStartedParaSdt = false;
m_aStartedParagraphSdtPrAlias.clear();
@@ -1149,7 +1149,7 @@ void DocxAttributeOutput::EndRun(const SwTextNode* pNode, sal_Int32 nPos, bool /
if (m_bEndCharSdt)
{
- // This is the common case: "close sdt before the current run" was requrested by the next run.
+ // This is the common case: "close sdt before the current run" was requested by the next run.
// if another sdt starts in this run, then wait
// as closing the sdt now, might cause nesting of sdts
More information about the Libreoffice-commits
mailing list