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

List:       kde-commits
Subject:    koffice/kword/part
From:       Thomas Zander <zander () kde ! org>
Date:       2010-10-10 19:49:31
Message-ID: 20101010194931.4496A3E1F2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1184549 by zander:

Remove property that is unused

After properly designing the concept we can decide what
class the property should be stored on, its a bit premature now since
we don't use or load it..

 M  +4 -4      KWOdfSharedLoadingData.cpp  
 M  +0 -8      KWord.h  
 M  +1 -2      frames/KWFrame.cpp  
 M  +1 -2      frames/KWFrame.h  


--- trunk/koffice/kword/part/KWOdfSharedLoadingData.cpp #1184548:1184549
@@ -181,12 +181,12 @@
     if (wrap == "none") {
         frame->setTextRunAround(KWord::NoRunAround);
     } else if (wrap == "run-through") {
-        QString runTrought = properties.attributeNS(KoXmlNS::style, "run-through", \
"background"); +        frame->setTextRunAround(KWord::RunThrough);
+        /*QString runTrought = properties.attributeNS(KoXmlNS::style, "run-through", \
"background");  if (runTrought == "background") {
-            frame->setTextRunAround(KWord::RunThrough, KWord::Background);
-        } else {
-            frame->setTextRunAround(KWord::RunThrough, KWord::Foreground);
+            // TODO handle this case
         }
+        */
     } else {
         frame->setTextRunAround(KWord::RunAround);
         if (wrap == "biggest")
--- trunk/koffice/kword/part/KWord.h #1184548:1184549
@@ -62,14 +62,6 @@
         RunThrough  ///< The text will completely ignore the frame and layout as if \
it was not there  };
 
-    /**
-     * TODO
-     */
-    enum Through {
-        Background,
-        Foreground
-    };
-
     enum FrameSetType {
         BackgroundFrameSet,
         TextFrameSet,
--- trunk/koffice/kword/part/frames/KWFrame.cpp #1184548:1184549
@@ -61,10 +61,9 @@
     delete m_outline;
 }
 
-void KWFrame::setTextRunAround(KWord::TextRunAround runAround, KWord::Through \
runThrought) +void KWFrame::setTextRunAround(KWord::TextRunAround runAround)
 {
     m_runAround = runAround;
-    m_runThrough = runThrought;
 }
 
 void KWFrame::setFrameSet(KWFrameSet *fs)
--- trunk/koffice/kword/part/frames/KWFrame.h #1184548:1184549
@@ -125,7 +125,7 @@
      * This property specifies how text from another textframe will behave when this \
                frame
      * intersects with it.
      */
-    void setTextRunAround(KWord::TextRunAround runAround, KWord::Through runThrought \
= KWord::Background); +    void setTextRunAround(KWord::TextRunAround runAround);
 
     /**
      * The space between this frames edge and the text when that text runs around \
this frame. @@ -204,7 +204,6 @@
     KWord::NewFrameBehavior m_newFrameBehavior;
     KWord::RunAroundSide m_runAroundSide;
     KWord::TextRunAround m_runAround;
-    KWord::Through m_runThrough;
     qreal m_runAroundDistance;
     // The page number is only used during loading.
     // It is set to the page number if the frame contains a page anchored frame.


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