[Libreoffice-commits] core.git: basctl/source editeng/source filter/source framework/source oox/source sc/qa sc/source sd/source shell/source sw/qa sw/source
Andrea Gelmini
andrea.gelmini at gelma.net
Mon Jan 15 12:54:01 UTC 2018
basctl/source/basicide/baside2b.cxx | 2 +-
editeng/source/misc/svxacorr.cxx | 4 ++--
editeng/source/outliner/outliner.cxx | 4 ++--
filter/source/config/cache/filtercache.cxx | 2 +-
filter/source/msfilter/msoleexp.cxx | 2 +-
framework/source/services/autorecovery.cxx | 16 ++++++++--------
framework/source/services/frame.cxx | 10 +++++-----
oox/source/drawingml/diagram/layoutatomvisitors.cxx | 2 +-
sc/qa/unit/ucalc.cxx | 2 +-
sc/source/ui/unoobj/docuno.cxx | 2 +-
sc/source/ui/view/tabview3.cxx | 2 +-
sc/source/ui/view/viewfun3.cxx | 2 +-
sd/source/ui/view/drviews1.cxx | 2 +-
shell/source/cmdmail/cmdmailsuppl.cxx | 2 +-
sw/qa/extras/odfexport/odfexport.cxx | 2 +-
sw/qa/extras/uiwriter/uiwriter.cxx | 2 +-
sw/source/core/text/itrcrsr.cxx | 2 +-
sw/source/core/unocore/unostyle.cxx | 2 +-
18 files changed, 31 insertions(+), 31 deletions(-)
New commits:
commit a6b69a9384801f77f4cc30a366a45561c28eab3e
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Mon Jan 15 09:11:52 2018 +0100
Fix typo
Change-Id: I51c97356c9c2939f2d94d6388c829a179ca00daa
Reviewed-on: https://gerrit.libreoffice.org/47853
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index b4036f27f159..2b44c67dead8 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1227,7 +1227,7 @@ void EditorWindow::DoSyntaxHighlight( sal_uLong nPara )
// that this line does not exist anymore!
if ( nPara < pEditEngine->GetParagraphCount() )
{
- // unfortunately I'm not sure that excactly this line does Modified() ...
+ // unfortunately I'm not sure that exactly this line does Modified()...
if ( pProgress )
pProgress->StepProgress();
ImpDoHighlight( nPara );
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index fc8fb97e140f..0b830e96c3b6 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1764,7 +1764,7 @@ bool SvxAutoCorrect::FindInWrdSttExceptList( LanguageType eLang,
{
LanguageTag aLanguageTag( eLang);
- /* TODO-BCP47: again horrible uglyness */
+ /* TODO-BCP47: again horrible ugliness */
// First search for eLang, then primary language of eLang
// and last in LANGUAGE_UNDETERMINED
@@ -1841,7 +1841,7 @@ bool SvxAutoCorrect::FindInCplSttExceptList(LanguageType eLang,
{
LanguageTag aLanguageTag( eLang);
- /* TODO-BCP47: did I mention terrible horrible uglyness? */
+ /* TODO-BCP47: did I mention terrible horrible ugliness? */
// First search for eLang, then primary language of eLang
// and last in LANGUAGE_UNDETERMINED
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 5112c7cfd000..b6d5ac108ecc 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -2026,7 +2026,7 @@ NonOverflowingText *Outliner::GetNonOverflowingText() const
sal_Int32 nCount = pEditEngine->GetOverflowingParaNum();
sal_Int32 nOverflowLine = pEditEngine->GetOverflowingLineNum(); // XXX: Unused for now
- // Defensive check: oveflowing para index beyond actual # of paragraphs?
+ // Defensive check: overflowing para index beyond actual # of paragraphs?
if ( nCount > GetParagraphCount()-1) {
SAL_INFO("editeng.chaining",
"[Overflowing] Ops, trying to retrieve para "
@@ -2133,7 +2133,7 @@ OverflowingText *Outliner::GetOverflowingText() const
return nullptr;
- // Defensive check: oveflowing para index beyond actual # of paragraphs?
+ // Defensive check: overflowing para index beyond actual # of paragraphs?
if ( pEditEngine->GetOverflowingParaNum() > GetParagraphCount()-1) {
SAL_INFO("editeng.chaining",
"[Overflowing] Ops, trying to retrieve para "
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index c551e8f43bb0..f56186ac0cde 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -1029,7 +1029,7 @@ void FilterCache::impl_validateAndOptimize()
// a "Preferred" one - set it to the front of this list.
// Of course multiple "Preferred" registrations can occur
// (they shouldn't - but they can!) ... Ignore it. The last
- // preferred type is useable in the same manner then every
+ // preferred type is usable in the same manner then every
// other type!
bool bPreferred = false;
aType[PROPNAME_PREFERRED] >>= bPreferred;
diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx
index 1d8d54249f69..e47470b27603 100644
--- a/filter/source/msfilter/msoleexp.cxx
+++ b/filter/source/msfilter/msoleexp.cxx
@@ -153,7 +153,7 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef const & rObj
{SO3_SCH_CLASSID_40}, {SO3_SCH_CLASSID_30 }}},
{ 0, "",
{{SO3_SDRAW_CLASSID_60}, {SO3_SDRAW_CLASSID_50}, // SJ: !!!! SO3_SDRAW_CLASSID is only available up from
- {SO3_SDRAW_CLASSID_60}, {SO3_SDRAW_CLASSID_50 }}}, // ver 5.0, it is purpose to have double entrys here.
+ {SO3_SDRAW_CLASSID_60}, {SO3_SDRAW_CLASSID_50 }}}, // ver 5.0, it is purpose to have double entries here.
{ 0xffff,nullptr,
{{SO3_SDRAW_CLASSID_60}, {SO3_SDRAW_CLASSID_50},
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 8ba3e8487bad..861cfcffe1d7 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -202,7 +202,7 @@ public:
/* FINAL STATES */
- /// the Auto/Emergency saved document is not useable any longer
+ /// the Auto/Emergency saved document is not usable any longer
E_DAMAGED = 64,
/// the Auto/Emergency saved document is not really up-to-date (some changes can be missing)
E_INCOMPLETE = 128,
@@ -1580,7 +1580,7 @@ void SAL_CALL AutoRecovery::documentEventOccured(const css::document::DocumentEv
}
// If saving of a document failed by an error ... we have to save this document
// by ourself next time AutoSave or EmergencySave is triggered.
- // But we can reset the state "used for other save requests". Otherwhise
+ // But we can reset the state "used for other save requests". Otherwise
// these documents will never be saved!
else if (
(aEvent.EventName == EVENT_ON_SAVEFAILED) ||
@@ -2398,7 +2398,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame
if (bNoAutoSave)
return;
- // Check if doc is well known on the desktop. Otherwhise ignore it!
+ // Check if doc is well known on the desktop. Otherwise ignore it!
// Other frames mostly are used from external programs - e.g. the bean ...
css::uno::Reference< css::frame::XController > xController = xDocument->getCurrentController();
if (!xController.is())
@@ -2510,7 +2510,7 @@ void AutoRecovery::implts_deregisterDocument(const css::uno::Reference< css::fra
// Sometimes we close documents by ourself.
// And these documents can't be deregistered.
- // Otherwhise we lose our configuration data... but need it !
+ // Otherwise we lose our configuration data... but need it !
// see SessionSave !
if (aInfo.IgnoreClosing)
return;
@@ -2766,7 +2766,7 @@ void AutoRecovery::implts_prepareSessionShutdown()
// Prevent us from deregistration of these documents.
// Because we close these documents by ourself (see XClosable below) ...
// it's fact, that we reach our deregistration method. There we
- // must not(!) update our configuration ... Otherwhise all
+ // must not(!) update our configuration ... Otherwise all
// session data are lost !!!
rInfo.IgnoreClosing = true;
@@ -3030,7 +3030,7 @@ void AutoRecovery::implts_saveOneDoc(const OUString&
lNewArgs[utl::MediaDescriptor::PROP_ENCRYPTIONDATA()] <<= aEncryptionData;
// Further it must be saved using the default file format of that application.
- // Otherwhise we will some data lost.
+ // Otherwise we will some data lost.
if (!rInfo.DefaultFilter.isEmpty())
lNewArgs[utl::MediaDescriptor::PROP_FILTERNAME()] <<= rInfo.DefaultFilter;
@@ -3325,7 +3325,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
/* Normally we listen as XModifyListener on a document to know if a document was changed
since our last AutoSave. And we deregister us in case we know this state.
But directly after one document as recovered ... we must start listening.
- Otherwhise the first "modify" doesn't reach us. Because we ourself called setModified()
+ Otherwise the first "modify" doesn't reach us. Because we ourself called setModified()
on the document via API. And currently we don't listen for any events (not at theGlobalEventBroadcaster
nor at any document!).
*/
@@ -4057,7 +4057,7 @@ bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace)
#else // SIMULATE_FULL_DISC
// In case an error occurs and we are not able to retrieve the needed information
// it's better to "disable" the feature ShowErrorOnFullDisc !
- // Otherwhise we start a confusing process of error handling ...
+ // Otherwise we start a confusing process of error handling ...
sal_uInt64 nFreeSpace = SAL_MAX_UINT64;
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 2f2011d60364..adc174a8ad3a 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -985,7 +985,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
// I.III) "_top"
// If we are not the top frame in this hierarchy, we must forward request to our parent.
- // Otherwhise we must return ourself.
+ // Otherwise we must return ourself.
else if ( sTargetFrameName==SPECIALTARGET_TOP )
{
@@ -1404,7 +1404,7 @@ void SAL_CALL Frame::contextChanged()
May <NULL/> for releasing.
@param xController
reference to new component controller
- (may <NULL/> for relasing or setting of a simple component)
+ (may <NULL/> for releasing or setting of a simple component)
@return <TRUE/> if operation was successful, <FALSE/> otherwise.
@@ -1626,7 +1626,7 @@ void SAL_CALL Frame::removeFrameActionListener( const css::uno::Reference< css::
@param bDeliverOwnership
If parameter is set to <FALSE/> the original caller will be the owner after thrown
- veto exception and must try to close this frame at later time again. Otherwhise the
+ veto exception and must try to close this frame at later time again. Otherwise the
source of throwed exception is the right one. May it will be the frame himself.
@throws CloseVetoException
@@ -2105,7 +2105,7 @@ void SAL_CALL Frame::disposing()
// Don't show any dialogs, errors or something else any more!
// If somewhere called dispose() whitout close() before - normally no dialogs
- // should exist. Otherwhise it's the problem of the outside caller.
+ // should exist. Otherwise it's the problem of the outside caller.
// Note:
// (a) Do it after stopWindowListening(). May that force some active/deactive
// notifications which we don't need here really.
@@ -2529,7 +2529,7 @@ void SAL_CALL Frame::windowClosing( const css::lang::EventObject& )
/*ATTENTION!
Don't try to suspend the controller here! Because it's done inside used dispatch().
- Otherwhise the dialog "would you save your changes?" will be shown more than once ...
+ Otherwise the dialog "would you save your changes?" will be shown more than once ...
*/
css::util::URL aURL;
diff --git a/oox/source/drawingml/diagram/layoutatomvisitors.cxx b/oox/source/drawingml/diagram/layoutatomvisitors.cxx
index 7e951bc20eba..ce8e6ab72b9e 100644
--- a/oox/source/drawingml/diagram/layoutatomvisitors.cxx
+++ b/oox/source/drawingml/diagram/layoutatomvisitors.cxx
@@ -51,7 +51,7 @@ void ShapeCreationVisitor::visit(ForEachAtom& rAtom)
sal_Int32 nChildren=1;
if( rAtom.iterator().mnPtType == XML_node )
{
- // cound child data nodes - check all child Atoms for "name"
+ // count child data nodes - check all child Atoms for "name"
// attribute that is contained in diagram's
// getPointsPresNameMap()
ShallowPresNameVisitor aVisitor(mrDgm);
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 99bd10ca627a..7c47940cc7bd 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -6362,7 +6362,7 @@ void Test::testCopyPasteMatrixFormula()
aMark.SelectOneTable(0);
m_pDoc->InsertMatrixFormula(0, 0, 0, 0, aMark, "=COUNTIF(ISBLANK(B1:D1);TRUE())");
m_pDoc->CalcAll();
- // A1 should containg 0
+ // A1 should contain 0
CPPUNIT_ASSERT_EQUAL( 0.0, m_pDoc->GetValue(ScAddress(0,0,0)) ); // A1
// Copy cell A1 to clipboard.
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 7322c70493b5..a54f054bd664 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -1911,7 +1911,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec
const double nPrintFactor = 1.0; /* XXX: currently (2017-08-28) is not evaluated */
// The bMetaFile argument maybe could be
// pDev->GetConnectMetaFile() != nullptr
- // but for some yet unknow reason does not draw cell content if true.
+ // but for some yet unknown reason does not draw cell content if true.
ScPrintFunc::DrawToDev( &rDoc, pDev, nPrintFactor, aBound, &aViewData, false /*bMetaFile*/ );
return;
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index a6b94f86f091..13e2ac264bea 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -328,7 +328,7 @@ void ScTabView::InvalidateAttribs()
// SetCursor - Cursor, set, draw, update InputWin
// or send reference
-// Optimising breaks the funtionality
+// Optimising breaks the functionality
void ScTabView::SetCursor( SCCOL nPosX, SCROW nPosY, bool bNew )
{
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 4111afb66aac..689ffe0e3c77 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -1334,7 +1334,7 @@ bool ScViewFunc::PasteFromClip( InsertDeleteFlags nFlags, ScDocument* pClipDoc,
pDoc->ExtendMergeSel( nStartCol, nStartRow, nEndCol, nEndRow, aFilteredMark, true ); // refresh
// new range
- if ( pMixDoc ) // calculate with originial data ?
+ if ( pMixDoc ) // calculate with original data?
{
pDoc->MixDocument( aUserRange, nFunction, bSkipEmpty, pMixDoc.get() );
}
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 2fcb816d77e0..95f6ceac6084 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -1124,7 +1124,7 @@ void DrawViewShell::ResetActualLayer()
LayerTabBar* pLayerBar = GetLayerTabControl();
if (pLayerBar != nullptr)
{
- // remember old layer cound and current layer id
+ // remember old layer count and current layer id
// this is needed when one layer is renamed to
// restore current layer
sal_uInt16 nOldLayerCnt = pLayerBar->GetPageCount();
diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx
index 8e4afb1b333d..1173bac1ced7 100644
--- a/shell/source/cmdmail/cmdmailsuppl.cxx
+++ b/shell/source/cmdmail/cmdmailsuppl.cxx
@@ -145,7 +145,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
OUString aProgram;
if ( FileBase::E_None != FileBase::getSystemPathFromFileURL(aProgramURL, aProgram))
{
- throw css::uno::Exception("Cound not convert executable path",
+ throw css::uno::Exception("Could not convert executable path",
static_cast < XSimpleMailClient * > (this));
}
diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx
index d4f8991b56de..14bd0bc2bc0e 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -1832,7 +1832,7 @@ DECLARE_ODFEXPORT_TEST(testTdf100492, "tdf100492.odt")
// xmlDocPtr pXmlDoc = parseXmlStream(&aStream);
// Check amount of paths required to draw an arrow.
- // Since there are still some emty paths in output test can fail later. There are just two
+ // Since there are still some empty paths in output test can fail later. There are just two
// really used and visible paths.
//assertXPath(pXmlDoc, "/svg/path", 4);
}
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 7319c80a6835..7d39895f39bd 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -2263,7 +2263,7 @@ void SwUiWriterTest::testTdf72788()
SwIndex aSt( pTextNode, 0 );
sal_Int32 nEnd = pTextNode->Len();
pTextNode->RstTextAttr(aSt, nEnd - aSt.GetIndex());
- //Incase of Regression RstTextAttr() call will result to infinite recursion
+ //In case of Regression RstTextAttr() call will result to infinite recursion
//Check that bold is removed in first paragraph
pTextNode->GetAttr(aSet, 5, 12);
SfxPoolItem const * pPoolItem2 = aSet.GetItem(RES_CHRATR_WEIGHT);
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 2a0778b2d23e..2757a2c7e49d 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -1832,7 +1832,7 @@ bool SwTextFrame::FillSelection( SwSelectionList& rSelList, const SwRect& rRect
}
// If we get a right position and if the left position
// is not the same like the left position of the line before
- // which cound happen e.g. for field portions or fly frames
+ // which could happen e.g. for field portions or fly frames
// a SwPaM will be inserted with these positions
if( GetCursorOfst( &aPosR, aPoint, &aState ) &&
nOld != aPosL.nContent.GetIndex() )
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 78c172462a5d..604be8e774c6 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -4793,7 +4793,7 @@ OUString SAL_CALL SwXTextCellStyle::getParentStyle()
void SAL_CALL SwXTextCellStyle::setParentStyle(const OUString& /*sParentStyle*/)
{
SolarMutexGuard aGuard;
- // Changing parent to one which is unaware of it will lead to a something unexcpected. getName() rely on a parent.
+ // Changing parent to one which is unaware of it will lead to a something unexpected. getName() rely on a parent.
SAL_INFO("sw.uno", "Changing SwXTextCellStyle parent");
}
More information about the Libreoffice-commits
mailing list