diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-07-01 14:29:50 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-07-10 08:25:01 +0200 |
| commit | 49436b2e6dbfe3eaedf60e999abb771d4f90f15b (patch) | |
| tree | 044ac1ced68710bd034a252b3d38b6b03f539020 | |
| parent | 2126303ec6acc70f18289dcfddeaaea6b08b7915 (diff) | |
IsContinous -> IsContinuous
Change-Id: Ib2f5eaf58060125134d3c9ba3f570c4fdceb3732
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par5.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 67267bbc83d2..32dc410f9f11 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -3994,7 +3994,7 @@ void wwSectionManager::InsertSegments() bool bThisAndPreviousAreCompatible = ((aIter->GetPageWidth() == aPrev->GetPageWidth()) && (aIter->GetPageHeight() == aPrev->GetPageHeight()) && (aIter->IsLandScape() == aPrev->IsLandScape())); - bool bInsertSection = (aIter != aStart) ? (aIter->IsContinous() && bThisAndPreviousAreCompatible): false; + bool bInsertSection = (aIter != aStart) ? (aIter->IsContinuous() && bThisAndPreviousAreCompatible): false; bool bInsertPageDesc = !bInsertSection; bool bProtected = SectionIsProtected(*aIter); // do we really need this ?? I guess I have a different logic in editshell which disables this... if (bUseEnhFields && mrReader.pWDop->fProtEnabled && aIter->IsNotProtected()) @@ -4020,7 +4020,7 @@ void wwSectionManager::InsertSegments() bool bThisAndNextAreCompatible = (aNext != aEnd) ? ((aIter->GetPageWidth() == aNext->GetPageWidth()) && (aIter->GetPageHeight() == aNext->GetPageHeight()) && (aIter->IsLandScape() == aNext->IsLandScape())) : true; - if (((aNext != aEnd && aNext->IsContinous() && bThisAndNextAreCompatible) || bProtected)) + if (((aNext != aEnd && aNext->IsContinuous() && bThisAndNextAreCompatible) || bProtected)) { bIgnoreCols = true; if ((aIter->NoCols() > 1) || bProtected) @@ -4109,7 +4109,7 @@ void wwSectionManager::InsertSegments() // Otherwise set to unbalanced if the following section is // not continuous, (which also means that the last section // is unbalanced) - if (aNext == aEnd || !aNext->IsContinous()) + if (aNext == aEnd || !aNext->IsContinuous()) pRet->SetFmtAttr(SwFmtNoBalancedColumns(true)); } } diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 4dd903e15087..61663e2ed495 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -715,7 +715,7 @@ public: void SetDirection(); void SetLinkId(short sLinkId) { mLinkId = sLinkId; } bool DoesContainFootnote() const { return mbHasFootnote; } - bool IsContinous() const { return maSep.bkc == 0; } + bool IsContinuous() const { return maSep.bkc == 0; } bool IsLinked() const { return mLinkId != 0; } bool IsNotProtected() const { return maSep.fUnlocked != 0; } bool IsVertical() const; diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 163f9b8a79df..de7cb1b46919 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -2967,7 +2967,7 @@ bool wwSectionManager::WillHavePageDescHere(SwNodeIndex aIdx) const bool bRet = false; if (!maSegments.empty()) { - if (!maSegments.back().IsContinous() && + if (!maSegments.back().IsContinuous() && maSegments.back().maStart == aIdx) { bRet = true; |