From koffice-devel  Sat Nov 22 21:01:51 2003
From: Nicolas Goutte <nicolasg () snafu ! de>
Date: Sat, 22 Nov 2003 21:01:51 +0000
To: koffice-devel
Subject: koffice/filters/kword/rtf/import
X-MARC-Message: https://marc.info/?l=koffice-devel&m=106953499429034

CVS commit by goutte: 

Use newFrameBahaviour==0, not ==2 for header/footer
Reason: KWord does so and doing otherwise could lead to errors, as it would use
code under untested situations.
CCMAIL:koffice-devel@kde.org


  M +6 -6      rtfimport.cpp   1.89


--- koffice/filters/kword/rtf/import/rtfimport.cpp  #1.88:1.89
@@ -549,5 +549,5 @@ KoFilter::ConversionStatus RTFImport::co
             mainDoc.addFrameSet( "First Page Header", 1, 1 );
               mainDoc.addFrame( leftMargin, state.section.headerMargin,
-                        (paperWidth - rightMargin), (topMargin - 80), 2, 2, 0 );
+                        (paperWidth - rightMargin), (topMargin - 80), 0, 2, 0 );
               mainDoc.closeNode( "FRAME" );
               mainDoc.appendNode( firstPageHeader.node );
@@ -555,5 +555,5 @@ KoFilter::ConversionStatus RTFImport::co
             mainDoc.addFrameSet( "Odd Pages Header", 1, 2 );
               mainDoc.addFrame( leftMargin, state.section.headerMargin,
-                        (paperWidth - rightMargin), (topMargin - 80), 2, 2, 1 );
+                        (paperWidth - rightMargin), (topMargin - 80), 0, 2, 1 );
               mainDoc.closeNode( "FRAME" );
               mainDoc.appendNode( oddPagesHeader.node );
@@ -561,5 +561,5 @@ KoFilter::ConversionStatus RTFImport::co
             mainDoc.addFrameSet( "Even Pages Header", 1, 3 );
               mainDoc.addFrame( leftMargin, state.section.headerMargin,
-                        (paperWidth - rightMargin), (topMargin - 80), 2, 2, 2 );
+                        (paperWidth - rightMargin), (topMargin - 80), 0, 2, 2 );
               mainDoc.closeNode( "FRAME" );
               mainDoc.appendNode( evenPagesHeader.node );
@@ -571,5 +571,5 @@ KoFilter::ConversionStatus RTFImport::co
             mainDoc.addFrameSet( "First Page Footer", 1, 4 );
               mainDoc.addFrame( leftMargin, state.section.headerMargin,
-                        (paperWidth - rightMargin), (topMargin - 80), 2, 2, 0 );
+                        (paperWidth - rightMargin), (topMargin - 80), 0, 2, 0 );
               mainDoc.closeNode( "FRAME" );
               mainDoc.appendNode( firstPageFooter.node );
@@ -577,5 +577,5 @@ KoFilter::ConversionStatus RTFImport::co
             mainDoc.addFrameSet( "Odd Pages Footer", 1, 5 );
               mainDoc.addFrame( leftMargin, state.section.headerMargin,
-                        (paperWidth - rightMargin), (topMargin - 80), 2, 2, 1 );
+                        (paperWidth - rightMargin), (topMargin - 80), 0, 2, 1 );
               mainDoc.closeNode( "FRAME" );
               mainDoc.appendNode( oddPagesFooter.node );
@@ -583,5 +583,5 @@ KoFilter::ConversionStatus RTFImport::co
             mainDoc.addFrameSet( "Even Pages Footer", 1, 6 );
               mainDoc.addFrame( leftMargin, state.section.headerMargin,
-                        (paperWidth - rightMargin), (topMargin - 80), 2, 2, 2 );
+                        (paperWidth - rightMargin), (topMargin - 80), 0, 2, 2 );
               mainDoc.closeNode( "FRAME" );
               mainDoc.appendNode( evenPagesFooter.node );


_______________________________________________
koffice-devel mailing list
koffice-devel@mail.kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel