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

List:       kde-commits
Subject:    KOFFICE_1_3_BRANCH: koffice/kword
From:       David Faure <faure () kde ! org>
Date:       2004-01-15 20:26:25
Message-ID: 20040115202625.157EE90DF () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Load and save z-index.
CCMAIL: 47413@bugs.kde.org


  M +3 -0      kwframe.cc   1.393.2.1
  M +37 -2     dtd/kword.dtd   1.154.2.1


--- koffice/kword/kwframe.cc  #1.393:1.393.2.1
@@ -457,4 +457,6 @@ void KWFrame::save( QDomElement &frameEl
     if(sheetSide()!= AnySide)
         frameElem.setAttribute( "sheetSide", static_cast<int>( sheetSide()) );
+
+    frameElem.setAttribute( "z-index", zOrder() );
 }
 
@@ -545,4 +547,5 @@ void KWFrame::load( QDomElement &frameEl
     bbottom = frameElem.attribute( "bbottompt" ).toDouble();
     m_bCopy = KWDocument::getAttribute( frameElem, "copy", \
frameSet->isHeaderOrFooter() /* default to true for h/f */ ); +    m_zOrder = \
frameElem.attribute( "z-index" ).toInt();  }
 

--- koffice/kword/dtd/kword.dtd  #1.154:1.154.2.1
@@ -426,5 +426,5 @@
             min-height:         If set (and >0), this is the minimum height. Applies \
to AutoExtendFrame.  
-            runaround:          0...No run around
+            runaround:          0...No run around, the text runs through the frame
                                 1...Frame repels text in overlapping frames
                                 2...Text in overlapping frames will avoid the
@@ -476,4 +476,8 @@
 
             bleftpt, brightpt, btoppt, bbottompt: frame margins
+
+            z-index: z index (signed int).
+                     Relative to the other frame in the same page.
+                     The frame with the biggest z index in a given page, is on top.
 -->
 <!ATTLIST FRAME
@@ -482,4 +486,5 @@
     top CDATA #REQUIRED
     bottom CDATA #REQUIRED
+    min-height CDATA #IMPLIED
     runaround CDATA #IMPLIED
     runaroundSide CDATA #IMPLIED
@@ -487,5 +492,35 @@
     autoCreateNewFrame CDATA #IMPLIED
     newFrameBehavior CDATA #REQUIRED
-    copy CDATA #IMPLIED>
+    copy CDATA #IMPLIED
+    sheetSide CDATA #IMPLIED
+    lWidth CDATA #IMPLIED
+    rWidth CDATA #IMPLIED
+    tWidth CDATA #IMPLIED
+    bWidth CDATA #IMPLIED
+    lRed CDATA #IMPLIED
+    lGreen CDATA #IMPLIED
+    lBlue CDATA #IMPLIED
+    rRed CDATA #IMPLIED
+    rGreen CDATA #IMPLIED
+    rBlue CDATA #IMPLIED
+    tRed CDATA #IMPLIED
+    tGreen CDATA #IMPLIED
+    tBlue CDATA #IMPLIED
+    bRed CDATA #IMPLIED
+    bGreen CDATA #IMPLIED
+    bBlue CDATA #IMPLIED
+    lStyle CDATA #IMPLIED
+    rStyle CDATA #IMPLIED
+    tStyle CDATA #IMPLIED
+    bStyle CDATA #IMPLIED
+    bkRed CDATA #IMPLIED
+    bkGreen CDATA #IMPLIED
+    bkBlue CDATA #IMPLIED
+    bkStyle CDATA #IMPLIED
+    bleftpt CDATA #IMPLIED
+    brightpt CDATA #IMPLIED
+    btoppt CDATA #IMPLIED
+    bbottompt CDATA #IMPLIED
+    z-index CDATA #IMPLIED>
 
 <!ELEMENT PARAGRAPH


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