diff options
Diffstat (limited to 'sw/source/filter/ww8/ww8par.cxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 7fe474c8fda4..76c6ae1b2caf 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -395,7 +395,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, && maShapeRecords.Current()->nRecLen ) { UINT32 nBytesLeft = maShapeRecords.Current()->nRecLen; - UINT32 nUDData; + UINT32 nUDData; UINT16 nPID; while( 5 < nBytesLeft ) { @@ -604,10 +604,10 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, aSet.Put( SdrTextRightDistItem( nTextRight ) ); aSet.Put( SdrTextUpperDistItem( nTextTop ) ); aSet.Put( SdrTextLowerDistItem( nTextBottom ) ); - pImpRec->nDxTextLeft = nTextLeft; - pImpRec->nDyTextTop = nTextTop; - pImpRec->nDxTextRight = nTextRight; - pImpRec->nDyTextBottom = nTextBottom; + pImpRec->nDxTextLeft = nTextLeft; + pImpRec->nDyTextTop = nTextTop; + pImpRec->nDxTextRight = nTextRight; + pImpRec->nDyTextBottom = nTextBottom; // --> SJ 2009-03-06 : taking the correct default (which is mso_anchorTop) MSO_Anchor eTextAnchor = @@ -701,19 +701,19 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, double fExtraTextRotation = 0.0; if ( mnFix16Angle && !( GetPropertyValue( DFF_Prop_FitTextToShape ) & 4 ) ) - { // text is already rotated, we have to take back the object rotation if DFF_Prop_RotateText is false + { // text is already rotated, we have to take back the object rotation if DFF_Prop_RotateText is false fExtraTextRotation = -mnFix16Angle; } - if ( rObjData.nSpFlags & SP_FFLIPV ) // sj: in ppt the text is flipped, whereas in word the text - { // remains unchanged, so we have to take back the flipping here - fExtraTextRotation += 18000.0; // because our core will flip text if the shape is flipped. + if ( rObjData.nSpFlags & SP_FFLIPV ) // sj: in ppt the text is flipped, whereas in word the text + { // remains unchanged, so we have to take back the flipping here + fExtraTextRotation += 18000.0; // because our core will flip text if the shape is flipped. } fExtraTextRotation += nTextRotationAngle; if ( !::basegfx::fTools::equalZero( fExtraTextRotation ) ) { fExtraTextRotation /= 100.0; SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); - const rtl::OUString sTextRotateAngle( RTL_CONSTASCII_USTRINGPARAM ( "TextRotateAngle" ) ); + const rtl::OUString sTextRotateAngle( RTL_CONSTASCII_USTRINGPARAM ( "TextRotateAngle" ) ); com::sun::star::beans::PropertyValue aPropVal; aPropVal.Name = sTextRotateAngle; aPropVal.Value <<= fExtraTextRotation; @@ -756,7 +756,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, pImpRec->bDrawHell = FALSE; if (GetPropertyValue(DFF_Prop_fPrint) & 0x02) pImpRec->bHidden = TRUE; - pImpRec->nNextShapeId = GetPropertyValue( DFF_Prop_hspNext, 0 ); + pImpRec->nNextShapeId = GetPropertyValue( DFF_Prop_hspNext, 0 ); if ( nTextId ) { @@ -3001,7 +3001,7 @@ long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTxtPos, bool& rbStartLine) aRes.nAktCp = rTxtPos; // Akt. Cp-Pos bool bNewSection = (aRes.nFlags & MAN_MASK_NEW_SEP) && !bIgnoreText; - if ( bNewSection ) // neue Section + if ( bNewSection ) // neue Section { OSL_ENSURE(pPaM->GetNode()->GetTxtNode(), "Missing txtnode"); // PageDesc erzeugen und fuellen @@ -4845,8 +4845,8 @@ public: outlineeq(BYTE nNum) : mnNum(nNum) {} bool operator()(const SwTxtFmtColl *pTest) const { - //return pTest->GetOutlineLevel() == mnNum; //#outline level,zhaojianwei - return pTest->IsAssignedToListLevelOfOutlineStyle() && pTest->GetAssignedOutlineStyleLevel() == mnNum; //<-end,zhaojianwei + //return pTest->GetOutlineLevel() == mnNum; //#outline level,zhaojianwei + return pTest->IsAssignedToListLevelOfOutlineStyle() && pTest->GetAssignedOutlineStyleLevel() == mnNum; //<-end,zhaojianwei } }; @@ -4884,7 +4884,7 @@ void SwWW8ImplReader::SetOutLineStyles() for ( sw::ParaStyles::reverse_iterator aIter = aOutLined.rbegin(); aIter < aEnd; ++aIter) // <-- { - //if ((*aIter)->GetOutlineLevel() < MAXLEVEL) //#outline level,zhaojianwei, + //if ((*aIter)->GetOutlineLevel() < MAXLEVEL) //#outline level,zhaojianwei, //nFlagsStyleOutlLevel |= 1 << (*aIter)->GetOutlineLevel(); if ((*aIter)->IsAssignedToListLevelOfOutlineStyle()) nFlagsStyleOutlLevel |= 1 << (*aIter)->GetAssignedOutlineStyleLevel();//<-end,zhaojianwei @@ -4958,7 +4958,7 @@ void SwWW8ImplReader::SetOutLineStyles() //if ((*aIter)->GetOutlineLevel() < MAXLEVEL)//#outline level,zhaojianwei // (*aIter)->SetOutlineLevel(NO_NUMBERING); if((*aIter)->IsAssignedToListLevelOfOutlineStyle()) - (*aIter)->DeleteAssignmentToListLevelOfOutlineStyle(); //<-end + (*aIter)->DeleteAssignmentToListLevelOfOutlineStyle(); //<-end else break; @@ -5030,7 +5030,7 @@ void SwWW8ImplReader::SetOutLineStyles() aOutlineRule.Set(nToLevel, rRule); // Set my outline level //((SwTxtFmtColl*)rSI.pFmt)->SetOutlineLevel(nToLevel);//#outline level,zhaojianwei - ((SwTxtFmtColl*)rSI.pFmt)->AssignToListLevelOfOutlineStyle(nToLevel); //<-end,zhaojianwei + ((SwTxtFmtColl*)rSI.pFmt)->AssignToListLevelOfOutlineStyle(nToLevel); //<-end,zhaojianwei // If there are more styles on this level ignore them nFlagsStyleOutlLevel |= nAktFlags; } |