diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-05-18 21:58:31 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-05-18 21:58:31 +0200 |
commit | 52ef15cbdb428596b562dbbbc92ae2fcf3473890 (patch) | |
tree | e2a73ce67c78e310a41e55d2873667d9f4d20e27 /sw | |
parent | 6bde2e93a2e0f94bc2263928cb27c4b85827822d (diff) |
Revert "Fix typos"
This reverts commit 26a67002fcb9381b54de6cae1aaa37120d49066a. "Iff" is not a
typo, see 2a65bf32ec270484dcea4d22d3c93552dc0c24dd "Revert 'Typo: iff->if'".
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/ndhints.hxx | 4 | ||||
-rw-r--r-- | sw/inc/ndtxt.hxx | 2 | ||||
-rw-r--r-- | sw/inc/node.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/inc/UndoSection.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/txtnode/thints.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/undo/unsect.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtww8.hxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8scan.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/xml/xmlimp.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/wrtsh/navmgr.cxx | 2 |
11 files changed, 12 insertions, 12 deletions
diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx index d712f49bd98a..ec712316751e 100644 --- a/sw/inc/ndhints.hxx +++ b/sw/inc/ndhints.hxx @@ -172,14 +172,14 @@ public: SwRegHistory* GetHistory() const { return m_pHistory; } /// try to insert the hint - /// @return true if hint successfully inserted + /// @return true iff hint successfully inserted bool TryInsertHint( SwTextAttr * const pHint, SwTextNode & rNode, const SetAttrMode nMode = SetAttrMode::DEFAULT ); bool HasFootnote() const { return m_bFootnote; } bool IsInSplitNode() const { return m_bInSplitNode; } - /// calc current value of m_bHasHiddenParaField, returns true if changed + /// calc current value of m_bHasHiddenParaField, returns true iff changed bool CalcHiddenParaField(); DECL_FIXEDMEMPOOL_NEWDEL(SwpHints) diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index 981bce9ff7f2..6a4b563a519c 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -282,7 +282,7 @@ public: /// initialize the hints after file loading (which takes shortcuts) void FileLoadedInitHints(); - /// Insert pAttr into hints array. @return true if inserted successfully + /// Insert pAttr into hints array. @return true iff inserted successfully bool InsertHint( SwTextAttr * const pAttr, const SetAttrMode nMode = SetAttrMode::DEFAULT ); /// create new text attribute from rAttr and insert it diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index f68137d8e717..83fbbd2da269 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -94,7 +94,7 @@ class SW_DLLPUBLIC SwNode #endif /// all SwFrameFormat that are anchored at the node - /// invariant: SwFrameFormat is in the list if + /// invariant: SwFrameFormat is in the list iff /// SwFrameFormat::GetAnchor().GetContentAnchor() points to this node std::unique_ptr<std::vector<SwFrameFormat*>> m_pAnchoredFlys; diff --git a/sw/source/core/inc/UndoSection.hxx b/sw/source/core/inc/UndoSection.hxx index 0d5728612722..a3c3ea307233 100644 --- a/sw/source/core/inc/UndoSection.hxx +++ b/sw/source/core/inc/UndoSection.hxx @@ -34,7 +34,7 @@ class SwUndoInsSection : public SwUndo, private SwUndRng { private: const std::unique_ptr<SwSectionData> m_pSectionData; - const std::unique_ptr<SwTOXBase> m_pTOXBase; /// set if section is TOX + const std::unique_ptr<SwTOXBase> m_pTOXBase; /// set iff section is TOX const std::unique_ptr<SfxItemSet> m_pAttrSet; std::unique_ptr<SwHistory> m_pHistory; std::unique_ptr<SwRedlineData> m_pRedlData; diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 64530e3bda17..c590a6e5cab7 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -342,7 +342,7 @@ splitting of exising hints that is necessary for backward compatibility. @param rNode the text node @param rHint the hint to be inserted - @returns true if hint was successfully inserted + @returns true iff hint was successfully inserted */ bool SwpHints::TryInsertNesting( SwTextNode & rNode, SwTextAttrNesting & rNewHint ) diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx index ddafc7ac07a5..e2b3c08fc15c 100644 --- a/sw/source/core/undo/unsect.cxx +++ b/sw/source/core/undo/unsect.cxx @@ -279,7 +279,7 @@ class SwUndoDelSection { private: std::unique_ptr<SwSectionData> const m_pSectionData; /// section not TOX - std::unique_ptr<SwTOXBase> const m_pTOXBase; /// set if section is TOX + std::unique_ptr<SwTOXBase> const m_pTOXBase; /// set iff section is TOX std::unique_ptr<SfxItemSet> const m_pAttrSet; std::shared_ptr< ::sfx2::MetadatableUndo > const m_pMetadataUndo; sal_uLong const m_nStartNode; diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 08c4ad1974f3..73b134eba59f 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -523,7 +523,7 @@ public: SwWW8WrGrf* m_pGrf; const SwAttrSet* m_pStyAttr; // StyleAttr for Tabs const SwModify* m_pOutFormatNode; // write Format or Node - const SwFormat *m_pCurrentStyle; // if bStyDef=true, then this store the current style + const SwFormat *m_pCurrentStyle; // iff bStyDef=true, then this store the current style MainTextPlcDrawObj *m_pSdrObjs; // Draw-/Fly-Objects HdFtPlcDrawObj *m_pHFSdrObjs; // Draw-/Fly-Objects in header or footer diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 49619f444ca2..e62807df07ad 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -5904,7 +5904,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher() {0x2A0C, &SwWW8ImplReader::Read_CharHighlight},//"sprmCHighlight" //chp.fHighlight, //chp.icoHighlight;ico - //(fHighlight is set to 1 if + //(fHighlight is set to 1 iff //ico is not 0);byte; {NS_sprm::LN_CObjLocation, &SwWW8ImplReader::Read_PicLoc}, //"sprmCObjLocation" chp.fcObj; //FC;long; diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index adf5661bfa88..b8b5eac1853e 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -545,7 +545,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher() {NS_sprm::LN_CIdCharType, { 0, L_FIX} }, // "sprmCIdCharType" obsolete: not applicable in // Word97 and later versions;;; {0x2A0C, { 1, L_FIX} }, // "sprmCHighlight" chp.fHighlight, - // chp.icoHighlight;ico (fHighlight is set to 1 if + // chp.icoHighlight;ico (fHighlight is set to 1 iff // ico is not 0) {NS_sprm::LN_CObjLocation, { 4, L_FIX} }, // "sprmCObjLocation" chp.fcObj;FC;long; {NS_sprm::LN_CFFtcAsciSymb, { 0, L_FIX} }, // "sprmCFFtcAsciSymb" ;;; diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index e82ddadd5d63..0208a60a13cd 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -300,7 +300,7 @@ SvXMLImportContext* SwXMLOfficeDocContext_Impl::CreateChildContext( } } - // behave like meta base class if we encounter office:meta + // behave like meta base class iff we encounter office:meta if ( XML_TOK_DOC_META == rTokenMap.Get( nPrefix, rLocalName ) ) { return SvXMLMetaDocumentContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); diff --git a/sw/source/uibase/wrtsh/navmgr.cxx b/sw/source/uibase/wrtsh/navmgr.cxx index 284a01836a4c..b507c7c2ffac 100644 --- a/sw/source/uibase/wrtsh/navmgr.cxx +++ b/sw/source/uibase/wrtsh/navmgr.cxx @@ -123,7 +123,7 @@ void SwNavigationMgr::goBack() { // We are adding the current Point to the navigation history // so we could later navigate forward to it - // The addEntry() method returns true if we should decrement + // The addEntry() method returns true iff we should decrement // the index before navigating back if (addEntry(*pPaM->GetPoint()) ) { |