[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc

[Caolán McNamara]

 binfilter/bf_sw/source/core/inc/flyfrm.hxx          |    4 ++--
 binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx    |   16 ++++++++--------
 binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx   |   11 +++++++----
 binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx |    1 -
 binfilter/inc/bf_sw/ndnotxt.hxx                     |    3 ---
 5 files changed, 17 insertions(+), 18 deletions(-)

New commits:
commit 109a825ef59ef05c46fea114e035c43e9e20de0b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 26 13:22:33 2010 +0000

    revert those accidental logic changes, and fix up

diff --git a/binfilter/bf_sw/source/core/inc/flyfrm.hxx b/binfilter/bf_sw/source/core/inc/flyfrm.hxx
index f0db77e..ea50741 100644
--- a/binfilter/bf_sw/source/core/inc/flyfrm.hxx
+++ b/binfilter/bf_sw/source/core/inc/flyfrm.hxx
@@ -216,9 +216,9 @@ public:
     sal_Bool IsBackgroundTransparent() const;
 };
 
-inline BOOL SwFlyFrm::IsUpperOf( const SwFlyFrm *pLower ) const
+inline BOOL SwFlyFrm::IsUpperOf( const SwFlyFrm *_pLower ) const
 {
-    return pLower->IsLowerOf( this );
+    return _pLower->IsLowerOf( this );
 }
 
 } //namespace binfilter
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx
index 3606f9b..4890018 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx
@@ -938,21 +938,21 @@ sal_Bool lcl_sw3io_insFtn( const SwTxtNode *pTxtNd )
 /*N*/ 	if( bWriteName )
 /*N*/ 		OutString( *pStrm, rFmt.GetName() );
 /*N*/ 
+/*N*/ 	BOOL bOldExportFlyFrmFmt = sal_False;
+/*N*/ 	const SwFlyFrm* pOldExportFlyFrm = NULL;
 /*N*/ 	if( pExportInfo )
 /*N*/ 	{
-/*N*/ 		BOOL bOldExportFlyFrmFmt = pExportInfo->bFlyFrmFmt;
-/*N*/ 		const SwFlyFrm* pOldExportFlyFrm = pExportInfo->pFlyFrm;
+/*N*/ 		bOldExportFlyFrmFmt = pExportInfo->bFlyFrmFmt;
+/*N*/ 		pOldExportFlyFrm = pExportInfo->pFlyFrm;
 /*N*/ 		pExportInfo->bFlyFrmFmt = (cType == SWG_FLYFMT);
 /*N*/ 		pExportInfo->pFlyFrm = pExportFlyFrm;
-                OutAttrSet( rFmt.GetAttrSet(), SWG_SECTFMT == cType );
+/*N*/ 	}
+/*N*/ 	OutAttrSet( rFmt.GetAttrSet(), SWG_SECTFMT == cType );
+/*N*/ 	if( pExportInfo )
+/*N*/ 	{
 /*N*/ 		pExportInfo->bFlyFrmFmt = bOldExportFlyFrmFmt;
 /*N*/ 		pExportInfo->pFlyFrm = pOldExportFlyFrm;
-
 /*N*/ 	}
-        else
-        {
-/*N*/ 	    OutAttrSet( rFmt.GetAttrSet(), SWG_SECTFMT == cType );
-        }
 /*N*/ 	CloseRec( cType );
 /*N*/ 	if( cType != SWG_FREEFMT && cType != SWG_SECTFMT )
 /*N*/ 		((SwFmt&)rFmt).SetWritten();
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx
index 2a3f9ef..d6ed326 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx
@@ -96,6 +96,8 @@ namespace binfilter {
 /*N*/ 	for( USHORT i=0; i<nCount; i++ )
 /*N*/ 	{
 /*N*/ 		OpenRec( SWG_REDLINEDATA_LCL );
+/*N*/
+/*N*/ 		OpenFlagRec();
 /*N*/ 
 /*N*/ 		BYTE cType;
 /*N*/ 		UINT16 nStrIdx;
@@ -286,10 +288,6 @@ xub_StrLen lcl_sw3io_getNodeOff( const SwNodeIndex& rNdIdx, xub_StrLen nCntntIdx
 /*?*/ 			continue;
 /*?*/ 		}
 /*?*/ 
-/*?*/ 		// If the redline is within one node and starts behind the
-/*?*/ 		// last position that is possible within the 5.2 version,
-/*?*/ 		// it will be ignored.
-/*?*/ 
 /*?*/ 		if( pDoc->IsInHeaderFooter( pPos->nNode ) )
 /*?*/ 		{
 /*?*/ 			pRedlines->Insert( pRedline, nCntntRedlineStart );
@@ -626,6 +624,11 @@ xub_StrLen lcl_sw3io_getNodeOff( const SwNodeIndex& rNdIdx, xub_StrLen nCntntIdx
 /*?*/ 				else if( pContentIdx )
 /*?*/ 					cFlags |= 0x20;
 /*?*/ 
+/*?*/ 				xub_StrLen nOffs = pMark->GetNodeOff();
+/*?*/ 				*pStrm  << (BYTE)  cFlags
+/*?*/ 						<< (UINT16)pMark->GetId()
+/*?*/ 						<< (UINT16)nOffs;
+/*?*/
 /*?*/ 				if( pContentIdx )
 /*?*/ 				{
 /*?*/ 					ASSERT( pContentIdx->GetNode().EndOfSectionIndex() -
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
index d39e107..31e4e1e 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
@@ -981,7 +981,6 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
                             aSet.Optimize( POLY_OPTIMIZE_CLOSE );
                             aPoly.Insert( aSet );
                         }
-                        pNoTxt->SetContourAPI( &aPoly );
                     }
                     else
                         throw IllegalArgumentException();
diff --git a/binfilter/inc/bf_sw/ndnotxt.hxx b/binfilter/inc/bf_sw/ndnotxt.hxx
index b0f21ac..a8c8bbf 100644
--- a/binfilter/inc/bf_sw/ndnotxt.hxx
+++ b/binfilter/inc/bf_sw/ndnotxt.hxx
@@ -85,9 +85,6 @@ public:
     void			   SetAutomaticContour( BOOL bSet ) { bAutomaticContour = bSet; }
     BOOL         HasAutomaticContour() const { return bAutomaticContour; }
 
-    // set either a MM100 or pixel contour
-    void               SetContourAPI( const PolyPolygon *pPoly ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void               SetContourAPI( const PolyPolygon *pPoly );
-
     // get either a MM100 or pixel contour, return FALSE if no contour is set.
     BOOL  			   GetContourAPI( PolyPolygon &rPoly ) const;