[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KOFFICE_1_3_BRANCH: koffice/filters/kword/oowriter
From:       David Faure <faure () kde ! org>
Date:       2004-04-03 16:40:50
Message-ID: 20040403164050.BB0B099E3 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

fo:keep-with-next can be auto/always


  M +5 -3      oowriterimport.cc   1.56.2.29


--- koffice/filters/kword/oowriter/oowriterimport.cc  #1.56.2.28:1.56.2.29
@@ -1546,7 +1546,9 @@ void OoWriterImport::writeLayout( QDomDo
             pageBreak.setAttribute("linesTogether", breakInside ? "false" : "true"); \
// opposite meaning  }
-        if ( m_styleStack.hasAttribute( "fo:keep-with-next" ) ) // 3.11.31 (the doc \
                said style:keep-with-next but DV said it's wrong)
-            // Copy the boolean value
-            pageBreak.setAttribute("keepWithNext", m_styleStack.attribute( \
"fo:keep-with-next" )); +        if ( m_styleStack.hasAttribute( "fo:keep-with-next" \
) ) { // 3.11.31 (the doc said style:keep-with-next but DV said it's wrong) +         \
// OASIS spec says it's "auto"/"always", not a boolean. Not sure which one OO uses. + \
QString val = context.styleStack().attribute( "fo:keep-with-next" ); +            \
pageBreak.setAttribute("keepWithNext", ( val == "true" || val == "always" ) ? "true" \
: "false"); +        }
         layoutElement.appendChild( pageBreak );
     }


[prev in list] [next in list] [prev in thread] [next in thread]