diff options
author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2017-03-11 00:55:48 +0100 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2017-03-11 12:27:49 +0000 |
commit | 0aa12db1c7ddcf87fef26b1467d8e4c5f5786531 (patch) | |
tree | 38c281b6cea568f25680f7560175bfd0c0d6fdb6 /sw | |
parent | 66891aaebe089594fea38368b23800505fc6a0e4 (diff) |
Fix typos
Change-Id: I8afde16343288888d9b1806fae6cba3514812d02
Reviewed-on: https://gerrit.libreoffice.org/35062
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/anchoredobject.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/access/accselectionhelper.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/doc/docfld.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/anchoreddrawobject.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/layout/flycnt.cxx | 8 | ||||
-rw-r--r-- | sw/source/core/layout/objectformattertxtfrm.cxx | 8 | ||||
-rw-r--r-- | sw/source/core/layout/objectformattertxtfrm.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/tabfrm.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/layout/wsfrm.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/unocore/unoevent.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/unocore/unostyle.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/htmltab.cxx | 6 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/frmpage.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/misc/bookmark.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/frmpage.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/misc/glosdoc.cxx | 2 |
18 files changed, 33 insertions, 33 deletions
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx index 3b734e928d54..9f0687f864ca 100644 --- a/sw/inc/anchoredobject.hxx +++ b/sw/inc/anchoredobject.hxx @@ -98,7 +98,7 @@ class SW_DLLPUBLIC SwAnchoredObject bool mbRestartLayoutProcess; bool mbClearedEnvironment; - // i#i3317 - boolean, indicating that temporarly + // i#i3317 - boolean, indicating that temporarily // the wrapping style influence of the anchored object has to be // considered during its positioning. // This boolean is used, if compatibility option 'Consider wrapping style diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx index 563e97448d03..61b25e1a7022 100644 --- a/sw/source/core/access/accselectionhelper.cxx +++ b/sw/source/core/access/accselectionhelper.cxx @@ -99,7 +99,7 @@ void SwAccessibleSelectionHelper::selectAccessibleChild( // no frame shell, or no frame, or no fly frame -> can't select } -//When the selected state of the SwFrameOrObj is setted, return true. +//When the selected state of the SwFrameOrObj is set, return true. static bool lcl_getSelectedState(const SwAccessibleChild& aChild, SwAccessibleContext* pContext, SwAccessibleMap* pMap) diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index bfbb19a3484c..c30341c23394 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -1092,7 +1092,7 @@ void SwDocUpdateField::InsertFieldType( const SwFieldType& rType ) sFieldName = static_cast<const SwSetExpFieldType&>(rType).GetName(); break; default: - OSL_ENSURE( false, "kein gueltiger FeldTyp" ); + OSL_ENSURE( false, "No valid field type" ); } if( !sFieldName.isEmpty() ) diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx index 0b11e228cbcd..53ed59e66e88 100644 --- a/sw/source/core/layout/anchoreddrawobject.cxx +++ b/sw/source/core/layout/anchoreddrawobject.cxx @@ -402,7 +402,7 @@ void SwAnchoredDrawObject::MakeObjPosAnchoredAtPara() bool bOscillationDetected = false; SwObjPosOscillationControl aObjPosOscCtrl( *this ); - // --> #i3317# - boolean, to apply temporarly the + // --> #i3317# - boolean, to apply temporarily the // 'straightforward positioning process' for the frame due to its // overlapping with a previous column. bool bConsiderWrapInfluenceDueToOverlapPrevCol( false ); @@ -450,7 +450,7 @@ void SwAnchoredDrawObject::MakeObjPosAnchoredAtPara() // --> #i3317# - consider a detected oscillation and overlapping // with previous column. - // temporarly consider the anchored objects wrapping style influence + // temporarily consider the anchored objects wrapping style influence if ( bOscillationDetected || bConsiderWrapInfluenceDueToOverlapPrevCol ) { SetTmpConsiderWrapInfluence( true ); diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx index 4d96189c7ea5..ee8619f7b34e 100644 --- a/sw/source/core/layout/flycnt.cxx +++ b/sw/source/core/layout/flycnt.cxx @@ -370,16 +370,16 @@ void SwFlyAtContentFrame::MakeAll(vcl::RenderContext* pRenderContext) pFooter = nullptr; bool bOsz = false; bool bExtra = Lower() && Lower()->IsColumnFrame(); - // #i3317# - boolean, to apply temporarly the + // #i3317# - boolean, to apply temporarily the // 'straightforward positioning process' for the frame due to its // overlapping with a previous column. bool bConsiderWrapInfluenceDueToOverlapPrevCol( false ); - // #i35911# - boolean, to apply temporarly the + // #i35911# - boolean, to apply temporarily the // 'straightforward positioning process' for the frame due to fact // that it causes the complete content of its layout environment // to move forward. // #i40444# - extend usage of this boolean: - // apply temporarly the 'straightforward positioning process' for + // apply temporarily the 'straightforward positioning process' for // the frame due to the fact that the frame clears the area for // the anchor frame, thus it has to move forward. bool bConsiderWrapInfluenceDueToMovedFwdAnchor( false ); @@ -492,7 +492,7 @@ void SwFlyAtContentFrame::MakeAll(vcl::RenderContext* pRenderContext) GetFormat()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( GetVirtDrawObj()->GetLayer() ) ); // #i3317# - instead of attribute change apply - // temporarly the 'straightforward positioning process'. + // temporarily the 'straightforward positioning process'. // #i80924# // handle special case during splitting of table rows if ( bConsiderWrapInfluenceDueToMovedFwdAnchor && diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx index 16d3ed4fc764..4eb5d5009516 100644 --- a/sw/source/core/layout/objectformattertxtfrm.cxx +++ b/sw/source/core/layout/objectformattertxtfrm.cxx @@ -152,11 +152,11 @@ bool SwObjectFormatterTextFrame::DoFormatObj( SwAnchoredObject& _rAnchoredObj, // format anchor text frame, if wrapping style influence of the object // has to be considered and it's <NONE_SUCCESSIVE_POSITIONED> // #i3317# - consider also anchored objects, whose - // wrapping style influence is temporarly considered. + // wrapping style influence is temporarily considered. // #i40147# - consider also anchored objects, for // whose the check of a moved forward anchor frame is requested. // revise decision made for i3317: - // anchored objects, whose wrapping style influence is temporarly considered, + // anchored objects, whose wrapping style influence is temporarily considered, // have to be considered in method <SwObjectFormatterTextFrame::DoFormatObjs()> if ( bSuccess && _rAnchoredObj.ConsiderObjWrapInfluenceOnObjPos() && @@ -328,7 +328,7 @@ bool SwObjectFormatterTextFrame::DoFormatObjs() bSuccess = FormatObjsAtFrame_(); } - // consider anchored objects, whose wrapping style influence are temporarly + // consider anchored objects, whose wrapping style influence are temporarily // considered. if ( bSuccess && ( ConsiderWrapOnObjPos() || @@ -752,7 +752,7 @@ void SwObjectFormatterTextFrame::FormatAnchorFrameForCheckMoveFwd() } /** method to determine if at least one anchored object has state - <temporarly consider wrapping style influence> set. + <temporarily consider wrapping style influence> set. */ bool SwObjectFormatterTextFrame::AtLeastOneObjIsTmpConsiderWrapInfluence() { diff --git a/sw/source/core/layout/objectformattertxtfrm.hxx b/sw/source/core/layout/objectformattertxtfrm.hxx index e502ddbba1d2..68640fe9e0de 100644 --- a/sw/source/core/layout/objectformattertxtfrm.hxx +++ b/sw/source/core/layout/objectformattertxtfrm.hxx @@ -105,7 +105,7 @@ class SwObjectFormatterTextFrame : public SwObjectFormatter void FormatAnchorFrameForCheckMoveFwd(); /** method to determine if at least one anchored object has state - <temporarly consider wrapping style influence> set. + <temporarily consider wrapping style influence> set. */ bool AtLeastOneObjIsTmpConsiderWrapInfluence(); diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index eeccad4c0828..ad276edb57c9 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -942,7 +942,7 @@ bool SwTabFrame::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowK lcl_InnerCalcLayout( this->Lower(), LONG_MAX, true ); } - //In order to be able to compare the positions of the cells whith CutPos, + //In order to be able to compare the positions of the cells with CutPos, //they have to be calculated consecutively starting from the table. //They can definitely be invalid because of position changes of the table. SwRowFrame *pRow = static_cast<SwRowFrame*>(Lower()); @@ -4949,7 +4949,7 @@ void SwCellFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorder const SwFrame* pAnch = pAnchoredObj->GetAnchorFrame(); // #i43913# // #i52904# - no vertical alignment, - // if object, anchored inside cell, has temporarly + // if object, anchored inside cell, has temporarily // consider its wrapping style on object positioning. // #i58806# - no vertical alignment // if object does not follow the text flow. diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 7863e2ea8d2e..c041307020a2 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -3313,7 +3313,7 @@ void SwLayoutFrame::FormatWidthCols( const SwBorderAttrs &rAttrs, else nMaximum = LONG_MAX; - // #i3317# - reset temporarly consideration + // #i3317# - reset temporarily consideration // of wrapping style influence SwPageFrame* pPageFrame = FindPageFrame(); SwSortedObjs* pObjs = pPageFrame ? pPageFrame->GetSortedObjs() : nullptr; @@ -3507,7 +3507,7 @@ void SwLayoutFrame::FormatWidthCols( const SwBorderAttrs &rAttrs, ChgLowersProp( aOldSz ); NotifyLowerObjs(); - // #i3317# - reset temporarly consideration + // #i3317# - reset temporarily consideration // of wrapping style influence SwPageFrame* pTmpPageFrame = FindPageFrame(); SwSortedObjs* pTmpObjs = pTmpPageFrame ? pTmpPageFrame->GetSortedObjs() : nullptr; diff --git a/sw/source/core/unocore/unoevent.cxx b/sw/source/core/unocore/unoevent.cxx index f29aa1a0f8da..daf90d4b428c 100644 --- a/sw/source/core/unocore/unoevent.cxx +++ b/sw/source/core/unocore/unoevent.cxx @@ -154,7 +154,7 @@ void SwHyperlinkEventDescriptor::copyMacrosFromNameReplace( } } -// use double cast in superclass constructor to avoid ambigous cast +// use double cast in superclass constructor to avoid ambiguous cast SwFrameEventDescriptor::SwFrameEventDescriptor( SwXTextFrame& rFrameRef ) : SvEventDescriptor((text::XTextFrame&)rFrameRef, aFrameEvents), diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index fbf373d9b008..593a17e54ed0 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -2482,7 +2482,7 @@ uno::Sequence<beans::PropertyState> SwXStyle::getPropertyStates(const uno::Seque const SfxItemSet* pSourceSet = lcl_GetItemsetForProperty(rSet, m_rEntry.m_eFamily, sPropName); if(!pSourceSet) { - // if no SetItem, value is ambigous and we are done + // if no SetItem, value is ambiguous and we are done pStates[i] = beans::PropertyState_AMBIGUOUS_VALUE; continue; } diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index b473fe361c9d..bb2296e9eaa7 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -420,7 +420,7 @@ class HTMLTable bool m_bFillerBottomBorder; // top or in the bottom bool m_bInheritedLeftBorder; bool m_bInheritedRightBorder; - bool m_bBordersSet; // the border is setted already + bool m_bBordersSet; // the border is set already bool m_bForceFrame; bool m_bTableAdjustOfTag; // comes nTableAdjust from <TABLE>? sal_uInt32 m_nHeadlineRepeat; // repeating rows @@ -504,7 +504,7 @@ class HTMLTable // Set the border with the help of the information from the user void SetBorders(); - // is the border already setted? + // is the border already set? bool BordersSet() const { return m_bBordersSet; } const SvxBrushItem *GetBGBrush() const { return m_pBackgroundBrush; } @@ -2586,7 +2586,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail, } m_pLayoutInfo->SetMayBeInFlyFrame( bIsInFlyFrame ); - // Only tables with relative width or without width should be modifed + // Only tables with relative width or without width should be modified m_pLayoutInfo->SetMustResize( m_bPrcWidth || !m_nWidth ); m_pLayoutInfo->SetWidths(); diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 888d21e2b06e..108421820af0 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -1818,7 +1818,7 @@ void MSWordExportBase::WriteSpecialText( sal_uLong nStart, sal_uLong nEnd, sal_u SwPaM* pOldEnd = m_pOrigPam; bool bOldPageDescs = m_bOutPageDescs; m_bOutPageDescs = false; - // bOutKF was setted / stored in WriteKF1 + // bOutKF was set / stored in WriteKF1 SetCurPam(nStart, nEnd); // clear linked textboxes since old ones can't be linked to frames in this section diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 632963a2716a..715558e74fab 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -314,7 +314,7 @@ static FrameMap aVCharMap[] = { // introduce mappings for new vertical alignment at top of line <LB::VertLine> // and correct mapping for vertical alignment at character for position <FROM_BOTTOM> - // Note: Because of these adjustments the map becomes ambigous in its values + // Note: Because of these adjustments the map becomes ambiguous in its values // <eStrId>/<eMirrorStrId> and <nAlign>. These ambiguities are considered // in the methods <SwFramePage::FillRelLB(..)>, <SwFramePage::GetAlignment(..)> // and <SwFramePage::FillPosLB(..)> @@ -1431,7 +1431,7 @@ sal_Int32 SwFramePage::FillPosLB(const FrameMap* _pMap, _rLB.InsertEntry(sEntry); } // i#22341 - add condition to handle map <aVCharMap> - // that is ambigous in the alignment. + // that is ambiguous in the alignment. if ( _pMap[i].nAlign == _nAlign && ( !(_pMap == aVCharMap) || _pMap[i].nLBRelations & nLBRelations ) ) { @@ -1522,7 +1522,7 @@ void SwFramePage::FillRelLB( const FrameMap* _pMap, else { // special handling for map <aVCharMap>, - // because its ambigous in its <eStrId>/<eMirrorStrId>. + // because its ambiguous in its <eStrId>/<eMirrorStrId>. if ( _pMap == aVCharMap ) { nLBRelations = ::lcl_GetLBRelationsForStrID( _pMap, @@ -1652,7 +1652,7 @@ sal_Int16 SwFramePage::GetAlignment(FrameMap *pMap, sal_Int32 nMapPos, return 0; // i#22341 special handling also for map <aVCharMap>, - // because it contains ambigous items for alignment + // because it contains ambiguous items for alignment if ( pMap != aVAsCharHtmlMap && pMap != aVAsCharMap && pMap != aVCharMap ) return pMap[nMapPos].nAlign; diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index c445e95e92cf..95b4fea7fbd0 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -221,7 +221,7 @@ void SwInsertBookmarkDlg::GotoSelectedBookmark() { if (!ValidateBookmarks()) return; - // if no entries selected we cant jump anywhere + // if no entries selected we can't jump anywhere // shouldn't be needed as we disable GoTo button when jump is not possible if (m_pBookmarksBox->GetSelectionCount() == 0) return; diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 39add21348c0..bc9ef4cf3115 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -803,7 +803,7 @@ SwDBManager::SwDBManager(SwDoc* pDoc) SwDBManager::~SwDBManager() { - // copy required, m_DataSourceParams can be modifed while disposing components + // copy required, m_DataSourceParams can be modified while disposing components std::vector<uno::Reference<sdbc::XConnection>> aCopiedConnections; for (auto & pParam : m_DataSourceParams) { diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index fe4a3a1d397d..63fb4db07eb6 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -152,13 +152,13 @@ class SwFramePage: public SfxTabPage DECL_LINK( ModifyHdl, Edit&, void ); void Init(const SfxItemSet& rSet, bool bReset = false); - // OD 12.11.2003 #i22341# - adjustment to handle maps, that are ambigous + // OD 12.11.2003 #i22341# - adjustment to handle maps, that are ambiguous // in the alignment. sal_Int32 FillPosLB( const FrameMap* _pMap, const sal_Int16 _nAlign, const sal_Int16 _nRel, ListBox& _rLB ); - // OD 14.11.2003 #i22341# - adjustment to handle maps, that are ambigous + // OD 14.11.2003 #i22341# - adjustment to handle maps, that are ambiguous // in their string entries. void FillRelLB( const FrameMap* _pMap, const sal_uInt16 _nLBSelPos, diff --git a/sw/source/uibase/misc/glosdoc.cxx b/sw/source/uibase/misc/glosdoc.cxx index 19631cf4f8c2..13e50027b2e3 100644 --- a/sw/source/uibase/misc/glosdoc.cxx +++ b/sw/source/uibase/misc/glosdoc.cxx @@ -175,7 +175,7 @@ SwTextBlocks* SwGlossaries::GetGroupDoc(const OUString &rName, return GetGlosDoc( rName, bCreate ); } -// Creates a new document with the group name. temporarly also created as file +// Creates a new document with the group name. temporarily also created as file // so that groups remain there later (without access). bool SwGlossaries::NewGroupDoc(OUString& rGroupName, const OUString& rTitle) { |