[Libreoffice-commits] core.git: sw/source
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Fri Aug 2 09:01:31 UTC 2019
sw/source/uibase/app/docshini.cxx | 2 +-
sw/source/uibase/config/StoredChapterNumbering.cxx | 4 ++--
sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx | 2 +-
sw/source/uibase/dochdl/gloshdl.cxx | 4 ++--
sw/source/uibase/docvw/PostItMgr.cxx | 2 +-
sw/source/uibase/docvw/edtwin.cxx | 10 +++++-----
sw/source/uibase/frmdlg/frmmgr.cxx | 4 ++--
sw/source/uibase/inc/maildispatcher.hxx | 2 +-
sw/source/uibase/inc/mmconfigitem.hxx | 2 +-
sw/source/uibase/inc/wrtsh.hxx | 4 ++--
sw/source/uibase/shells/basesh.cxx | 4 ++--
sw/source/uibase/shells/textsh2.cxx | 2 +-
sw/source/uibase/uiview/view2.cxx | 2 +-
sw/source/uibase/uiview/viewdraw.cxx | 2 +-
sw/source/uibase/uno/unodispatch.cxx | 2 +-
sw/source/uibase/utlui/content.cxx | 4 ++--
sw/source/uibase/wrtsh/move.cxx | 2 +-
sw/source/uibase/wrtsh/select.cxx | 4 ++--
sw/source/uibase/wrtsh/wrtsh1.cxx | 2 +-
19 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit e154e3652e8292fce066f0f942620c859a5e3991
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Fri Aug 2 08:43:12 2019 +0200
Commit: Andrea Gelmini <andrea.gelmini at gelma.net>
CommitDate: Fri Aug 2 11:00:40 2019 +0200
Fix typos
Change-Id: I3d1dd03022eb37609ee0dd62c4ee9cec93ac0717
Reviewed-on: https://gerrit.libreoffice.org/76813
Tested-by: Jenkins
Reviewed-by: Andrea Gelmini <andrea.gelmini at gelma.net>
diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx
index 4f9690818f65..a8fec573095d 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -373,7 +373,7 @@ SwDocShell::SwDocShell( SwDoc *const pD, SfxObjectCreateMode const eMode )
// Dtor
SwDocShell::~SwDocShell()
{
- // disable chart related objects now because in ~SwDoc it may be to late for this
+ // disable chart related objects now because in ~SwDoc it may be too late for this
if (m_xDoc)
{
m_xDoc->getIDocumentChartDataProviderAccess().GetChartControllerHelper().Disconnect();
diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx
index 653bd737bd0c..2416195fb899 100644
--- a/sw/source/uibase/config/StoredChapterNumbering.cxx
+++ b/sw/source/uibase/config/StoredChapterNumbering.cxx
@@ -48,7 +48,7 @@ class StoredChapterNumberingRules
: public ::cppu::WeakImplHelper<container::XNamed,container::XIndexReplace>
{
private:
- // TODO in case this ever becomes accessible via api need a invalidate
+ // TODO in case this ever becomes accessible via API need an invalidate
SwChapterNumRules & m_rNumRules;
sal_uInt16 const m_nIndex;
@@ -227,7 +227,7 @@ public:
GetNamespaceMap_().GetNameByKey(XML_NAMESPACE_SVG));
{
- // let's just have a office:styles as a dummy root
+ // let's just have an office:styles as a dummy root
SvXMLElementExport styles(*this,
XML_NAMESPACE_OFFICE, XML_STYLES, true, true);
diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
index 918d48436145..f9b85ca705f8 100644
--- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
@@ -254,7 +254,7 @@ svx::SpellPortions SwSpellDialogChildWindow::GetNextWrongSentence(bool bRecheck)
Note: spelling in a selection only, or starting in a mid of a drawing object requires
further changes elsewhere. (Especially if it should work in sc and sd as well.)
The code below would only be part of the solution.
-(Keeping it a as a comment for the time being)
+(Keeping it as a comment for the time being)
ESelection aCurSel( pOLV->GetSelection() );
ESelection aSentenceSel( pOLV->GetEditView().GetEditEngine()->SelectSentence( aCurSel ) );
if (!aCurSel.HasRange())
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx
index bdb9e7da045e..784a6933ad98 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -203,7 +203,7 @@ void SwGlossaryHdl::RenameGroup(const OUString& rOld, OUString& rNew, const OUSt
}
}
-// delete a autotext-file-group
+// delete an autotext-file-group
bool SwGlossaryHdl::DelGroup(const OUString &rGrpName)
{
OUString sGroup(rGrpName);
@@ -304,7 +304,7 @@ bool SwGlossaryHdl::NewGlossary(const OUString& rName, const OUString& rShortNam
return nSuccess != sal_uInt16(-1);
}
-// Delete a autotext
+// Delete an autotext
bool SwGlossaryHdl::DelGlossary(const OUString &rShortName)
{
SwTextBlocks *pGlossary = pCurGrp ? pCurGrp.get()
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index 3866231bcb0c..3e7f48844fae 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -792,7 +792,7 @@ void SwPostItMgr::LayoutPostIts()
}
else if (sal_Int32 nScrollSize = GetScrollSize())
{
- //when we changed our zoom level, the offset value can be to big, so lets check for the largest possible zoom value
+ //when we changed our zoom level, the offset value can be too big, so lets check for the largest possible zoom value
long aAvailableHeight = mpEditWin->LogicToPixel(Size(0,pPage->mPageRect.Height())).Height() - 2 * GetSidebarScrollerHeight();
long lOffset = -1 * nScrollSize * (aVisiblePostItList.size() - aAvailableHeight / nScrollSize);
if (pPage->lOffset < lOffset)
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index e37b3aabe040..51a26c8447a4 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -324,7 +324,7 @@ static bool IsMinMove(const Point &rStartPos, const Point &rLPt)
/**
* For MouseButtonDown - determine whether a DrawObject
- * an NO SwgFrame was hit! Shift/Ctrl should only result
+ * a NO SwgFrame was hit! Shift/Ctrl should only result
* in selecting, with DrawObjects; at SwgFlys to trigger
* hyperlinks if applicable (Download/NewWindow!)
*/
@@ -2657,7 +2657,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
// in case the buffered characters are inserted
if( bFlushBuffer && !m_aInBuffer.isEmpty() )
{
- // bFlushCharBuffer was not resetted here
+ // bFlushCharBuffer was not reset here
// why not?
bool bSave = g_bFlushCharBuffer;
FlushInBuffer();
@@ -4194,7 +4194,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
m_aSaveCallEvent.Set( EVENT_OBJECT_URLITEM, pFormat );
}
- // should be over a InternetField with an
+ // should be over an InternetField with an
// embedded macro?
if( m_aSaveCallEvent != aLastCallEvent )
{
@@ -4891,7 +4891,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
}
ReleaseMouse();
// Only processed MouseEvents arrive here; only at these this mode can
- // be resetted.
+ // be reset.
m_bMBPressed = false;
// Make this call just to be sure. Selecting has finished surely by now.
@@ -5033,7 +5033,7 @@ SwEditWin::SwEditWin(vcl::Window *pParent, SwView &rMyView):
m_aKeyInputFlushTimer.SetTimeout( 200 );
m_aKeyInputFlushTimer.SetInvokeHandler(LINK(this, SwEditWin, KeyInputFlushHandler));
- // TemplatePointer for colors should be resetted without
+ // TemplatePointer for colors should be reset without
// selection after single click, but not after double-click (tdf#122442)
m_aTemplateTimer.SetTimeout(GetSettings().GetMouseSettings().GetDoubleClickTime());
m_aTemplateTimer.SetInvokeHandler(LINK(this, SwEditWin, TemplateTimerHdl));
diff --git a/sw/source/uibase/frmdlg/frmmgr.cxx b/sw/source/uibase/frmdlg/frmmgr.cxx
index 2c2205b1597c..5894fa74daab 100644
--- a/sw/source/uibase/frmdlg/frmmgr.cxx
+++ b/sw/source/uibase/frmdlg/frmmgr.cxx
@@ -582,8 +582,8 @@ void SwFlyFrameAttrMgr::SetHeightSizeType( SwFrameSize eType )
void SwFlyFrameAttrMgr::SetRotation(sal_uInt16 nOld, sal_uInt16 nNew, const Size& rUnrotatedSize)
{
- // RotGrfFlyFrame: Central handling of real change of rotation here, all adaptions use this.
- // Adaption of pos/size may be wanted in the future. Already tried to keep last Size in
+ // RotGrfFlyFrame: Central handling of real change of rotation here, all adaptations use this.
+ // Adaptation of pos/size may be wanted in the future. Already tried to keep last Size in
// UnrotatedSize in the SwRotationGrf Item, but this will lead to various problems. Also tried
// to use m_aSet.Put(...) as in other methods (also tried read methods for Rotation/UnrotatedSize) but
// somehow the needed ID (RES_GRFATR_ROTATION) is *not* in the SfxItemSet of the Frame, so for
diff --git a/sw/source/uibase/inc/maildispatcher.hxx b/sw/source/uibase/inc/maildispatcher.hxx
index af7494b19d87..c4cdf253c620 100644
--- a/sw/source/uibase/inc/maildispatcher.hxx
+++ b/sw/source/uibase/inc/maildispatcher.hxx
@@ -88,7 +88,7 @@ public:
a listener for mail dispatcher events. For every mail message sent
the notification will be sent. While handling such notification a
client may enqueue new mail messages. If there are no more mail
- messages to send an respective notification is sent and the mail
+ messages to send a respective notification is sent and the mail
dispatcher waits for more mail messages.
@precond not isStarted()
diff --git a/sw/source/uibase/inc/mmconfigitem.hxx b/sw/source/uibase/inc/mmconfigitem.hxx
index f6f6f66eb58b..9b27e4092207 100644
--- a/sw/source/uibase/inc/mmconfigitem.hxx
+++ b/sw/source/uibase/inc/mmconfigitem.hxx
@@ -225,7 +225,7 @@ public:
bool IsMailAvailable() const;
- // notify a completed merge, provid the appropriate e-Mail address if available
+ // notify a completed merge, provide the appropriate e-Mail address if available
void AddMergedDocument(SwDocMergeInfo const & rInfo);
//returns the page and database cursor information of each merged document
SwDocMergeInfo& GetDocumentMergeInfo(sal_uInt32 nDocument);
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index 54e97e0b40d3..041be40fe4b6 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -248,7 +248,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
void EndOfPrevColumn ();
// set the cursor to page "nPage" at the beginning
- // additionally to a identically named implementation in crsrsh.hxx
+ // additionally to an identically named implementation in crsrsh.hxx
// here all existing selections are being reset before setting the
// cursor
bool GotoPage( sal_uInt16 nPage, bool bRecord );
@@ -426,7 +426,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
const SwView& GetView() const { return m_rView; }
SwView& GetView() { return m_rView; }
- // Because nobody else is doing it, here is a ExecMacro()
+ // Because nobody else is doing it, here is an ExecMacro()
void ExecMacro( const SvxMacro& rMacro, OUString* pRet = nullptr, SbxArray* pArgs = nullptr );
// call into the dark Basic/JavaScript
sal_uInt16 CallEvent( SvMacroItemId nEvent, const SwCallMouseEvent& rCallEvent,
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index aceb8a9d1d9d..287006ee13e9 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -1219,7 +1219,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
{
bool bDesignMode = pBoolItem->GetValue();
- // set form design mode
+ // set from design mode
OSL_ENSURE( GetView().GetFormShell() != nullptr, "form shell?" );
SfxRequest aReq( GetView().GetViewFrame(), SID_FM_DESIGN_MODE );
aReq.AppendItem( SfxBoolItem( SID_FM_DESIGN_MODE, bDesignMode ) );
@@ -1308,7 +1308,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
}
}
-// Here the state fpr SID_IMAP / SID_CONTOUR will be handled
+// Here the state for SID_IMAP / SID_CONTOUR will be handled
// until the swapping of the graphic is finished.
IMPL_LINK_NOARG(SwBaseShell, GraphicArrivedHdl, SwCursorShell&, void)
diff --git a/sw/source/uibase/shells/textsh2.cxx b/sw/source/uibase/shells/textsh2.cxx
index 4400cada0a57..f3f3d8937b8f 100644
--- a/sw/source/uibase/shells/textsh2.cxx
+++ b/sw/source/uibase/shells/textsh2.cxx
@@ -228,7 +228,7 @@ IMPL_LINK( SwBaseShell, InsertDBTextHdl, void*, p, void )
bool bDispose = false;
Reference< sdbc::XConnection> xConnection = pDBStruct->xConnection;
Reference<XDataSource> xSource = SwDBManager::getDataSourceAsParent(xConnection,pDBStruct->aDBData.sDataSource);
- // #111987# the connection is disposed an so no parent has been found
+ // #111987# the connection is disposed and so no parent has been found
if(xConnection.is() && !xSource.is())
return;
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index b94db6f5b633..874c940e0fe1 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -576,7 +576,7 @@ void SwView::Execute(SfxRequest &rReq)
Sequence <sal_Int8> aPasswd = rIDRA.GetRedlinePassword();
if( aPasswd.hasElements() )
{
- OSL_ENSURE( !static_cast<const SfxBoolItem*>(pItem)->GetValue(), "SwView::Execute(): password set an redlining off doesn't match!" );
+ OSL_ENSURE( !static_cast<const SfxBoolItem*>(pItem)->GetValue(), "SwView::Execute(): password set and redlining off doesn't match!" );
// xmlsec05: new password dialog
SfxPasswordDialog aPasswdDlg(GetFrameWeld());
aPasswdDlg.SetMinLen(1);
diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx
index 5b129d13e201..e9372ceefb24 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -554,7 +554,7 @@ bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin,
SdrObject* pToBeActivated = pObj;
// Always the original object is edited. To allow the TextEdit to happen
- // where the VirtObj is positioned, on demand a occurring offset is set at
+ // where the VirtObj is positioned, on demand an occurring offset is set at
// the TextEdit object. That offset is used for creating and managing the
// OutlinerView.
Point aNewTextEditOffset(0, 0);
diff --git a/sw/source/uibase/uno/unodispatch.cxx b/sw/source/uibase/uno/unodispatch.cxx
index fd34d95602c9..40353c7baba3 100644
--- a/sw/source/uibase/uno/unodispatch.cxx
+++ b/sw/source/uibase/uno/unodispatch.cxx
@@ -51,7 +51,7 @@ SwXDispatchProviderInterceptor::SwXDispatchProviderInterceptor(SwView& rVw) :
osl_atomic_increment(&m_refCount);
m_xIntercepted->registerDispatchProviderInterceptor(static_cast<frame::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
uno::Reference< lang::XComponent> xInterceptedComponent(m_xIntercepted, uno::UNO_QUERY);
if (xInterceptedComponent.is())
xInterceptedComponent->addEventListener(static_cast<lang::XEventListener*>(this));
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 11bef9fd89d9..c8bfe4411688 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1749,7 +1749,7 @@ void SwContentTree::Display( bool bActive )
Expand(pEntry);
if(nEntryRelPos && nCntType == m_nLastSelType)
{
- // Now maybe select a additional child
+ // Now maybe select an additional child
SvTreeListEntry* pChild = pEntry;
SvTreeListEntry* pTemp = nullptr;
sal_uLong nPos = 1;
@@ -1829,7 +1829,7 @@ void SwContentTree::Display( bool bActive )
}
else
{
- // Now maybe select a additional child
+ // Now maybe select an additional child
SvTreeListEntry* pChild = pParent;
SvTreeListEntry* pTemp = nullptr;
sal_uLong nPos = 1;
diff --git a/sw/source/uibase/wrtsh/move.cxx b/sw/source/uibase/wrtsh/move.cxx
index 8b15c5e9dff7..76f4baedaba5 100644
--- a/sw/source/uibase/wrtsh/move.cxx
+++ b/sw/source/uibase/wrtsh/move.cxx
@@ -226,7 +226,7 @@ bool SwWrtShell::GoStart( bool bKeepArea, bool *pMoveTable,
}
else if( bBoxSelection && pMoveTable )
{
- // JP 09.01.96: We have a box selection (or a empty cell)
+ // JP 09.01.96: We have a box selection (or an empty cell)
// and we want select (pMoveTable will be
// set in SelAll). Then the table must not
// be left, otherwise there is no selection
diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx
index 5534ac0c29a5..348876e7ffad 100644
--- a/sw/source/uibase/wrtsh/select.cxx
+++ b/sw/source/uibase/wrtsh/select.cxx
@@ -453,7 +453,7 @@ void SwWrtShell::ExtSelWrd(const Point *pPt, bool )
return;
// Bug 66823: actual crsr has in additional mode no selection?
- // Then destroy the actual an go to prev, this will be expand
+ // Then destroy the actual and go to prev, this will be expand
if( !HasMark() && GoPrevCursor() )
{
bool bHasMark = HasMark(); // that's wrong!
@@ -511,7 +511,7 @@ void SwWrtShell::ExtSelLn(const Point *pPt, bool )
return;
// Bug 66823: actual crsr has in additional mode no selection?
- // Then destroy the actual an go to prev, this will be expand
+ // Then destroy the actual and go to prev, this will be expand
if( !HasMark() && GoPrevCursor() )
{
bool bHasMark = HasMark(); // that's wrong!
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index a2de7b9c1bcb..1bf28c2f8c54 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -478,7 +478,7 @@ bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyFrame
//Some differences between StarMath and any other objects:
//1. Selections should be deleted. For StarMath the Text should be
// passed to the Object
- //2. If the cursor is at the end of an non empty paragraph a paragraph
+ //2. If the cursor is at the end of a non empty paragraph a paragraph
// break should be inserted. StarMath objects are character bound and
// no break should be inserted.
//3. If an selection is passed to a StarMath object, this object should
More information about the Libreoffice-commits
mailing list