diff options
Diffstat (limited to 'sw/source/filter/ww1/fltshell.cxx')
| -rw-r--r-- | sw/source/filter/ww1/fltshell.cxx | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index 672cfbfb2c95..2d23c90d2c27 100644 --- a/sw/source/filter/ww1/fltshell.cxx +++ b/sw/source/filter/ww1/fltshell.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <ctype.h> #include <hintids.hxx> #include <hints.hxx> @@ -61,7 +60,6 @@ #include <viewsh.hxx> #include <shellres.hxx> - using namespace com::sun::star; static SwCntntNode* GetCntntNode(SwDoc* pDoc, SwNodeIndex& rIdx, bool bNext) @@ -107,7 +105,6 @@ void SwFltStackEntry::SetEndPos(const SwPosition& rEndPos) m_aPtPos.SetPos(rEndPos); } - bool SwFltStackEntry::MakeRegion(SwDoc* pDoc, SwPaM& rRegion, bool bCheck, const SwFltPosition &rMkPos, const SwFltPosition &rPtPos, bool bIsParaEnd, sal_uInt16 nWhich) @@ -115,7 +112,7 @@ bool SwFltStackEntry::MakeRegion(SwDoc* pDoc, SwPaM& rRegion, bool bCheck, // does this range actually contain something? // empty range is allowed if at start of empty paragraph // fields are special: never have range, so leave them - // + // The only position of 0x0D will not be able to make region in the old logic // because it is beyond the length of para...need special consideration here. SwCntntNode *const pCntntNode( @@ -161,7 +158,6 @@ SwFltControlStack::SwFltControlStack(SwDoc* pDo, sal_uLong nFieldFl) { } - SwFltControlStack::~SwFltControlStack() { OSL_ENSURE(maEntries.empty(), "There are still Attributes on the stack"); @@ -236,7 +232,7 @@ void SwFltControlStack::NewAttr(const SwPosition& rPos, const SfxPoolItem& rAttr { //Here we optimize by seeing if there is an attribute uncommited //to the document which - // + //a) has the same value as this attribute //b) is already open, or ends at the same place as where we're starting //from. If so we merge it with this one and elide adding another @@ -440,7 +436,7 @@ static void MakeBookRegionOrPoint(const SwFltStackEntry& rEntry, SwDoc* pDoc, // IterateNumrulePiece() looks for the first range valid for Numrules // between rTmpStart and rEnd. -// + // rNds denotes the doc nodes // rEnd denotes the range end, // rTmpStart is an in/out parameter: in: start of range to be searched, @@ -1016,7 +1012,7 @@ SfxPoolItem* SwFltSection::Clone(SfxItemPool*) const // here starts code generated by mdt. this is a shell, if possible, soon for // all filters. the whole trouble of inserting texts and formatting attributes, // manage positions, styles & headers/footers etc. -// + // SwFltShell SwFltShell::SwFltShell(SwDoc* pDoc, SwPaM& rPaM, const OUString& rBaseURL, sal_Bool bNew, sal_uLong nFieldFl) : pCurrentPageDesc(0), @@ -1843,7 +1839,6 @@ bool SwFltOutDoc::BeginFly( RndStdIds eAnchor, OSL_ENSURE(pFlySavedPos == NULL, "BeginFly in Fly"); // recursive doesn't work yet pFlySavedPos = new SwPosition(*pPaM->GetPoint()); - SwFmtAnchor aAnchor( eAnchor, 1 ); // If the style contained Fly attributes, use them as defaults now @@ -1979,7 +1974,6 @@ void SwFltShell::SetFlyYPos( short nYPos, sal_Int16 eVRel, SetFlyFrmAttr( SwFmtVertOrient( nYPos, eVAlign, eVRel ) ); } - void SwFltShell::EndFly() { if (!pOut->IsInFly()){ |