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

List:       kde-commits
Subject:    koffice/libs/kotext/styles
From:       Thorsten Zachmann <t.zachmann () zagge ! de>
Date:       2008-01-02 14:28:20
Message-ID: 1199284100.471407.28936.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 755974 by zachmann:

o use a KoOasisLoadingContext instead a KoTextLoadingContext


 M  +2 -3      KoListLevelProperties.cpp  
 M  +2 -2      KoListLevelProperties.h  
 M  +1 -2      KoListStyle.cpp  
 M  +2 -2      KoListStyle.h  


--- trunk/koffice/libs/kotext/styles/KoListLevelProperties.cpp #755973:755974
@@ -19,7 +19,6 @@
 
 #include "KoListLevelProperties.h"
 #include "Styles_p.h"
-#include "opendocument/KoTextLoadingContext.h"
 //#include "KoTextBlockData.h"
 
 //#include <QTextCursor>
@@ -258,8 +257,8 @@
     return llp;
 }
 
-void KoListLevelProperties::loadOasis(KoTextLoadingContext& context, const KoXmlElement& style) {
-
+void KoListLevelProperties::loadOasis(KoOasisLoadingContext& context, const KoXmlElement& style)
+{
     Q_UNUSED( context );
 
     // The text:level attribute specifies the level of the number list
--- trunk/koffice/libs/kotext/styles/KoListLevelProperties.h #755973:755974
@@ -28,7 +28,7 @@
 #include <KoXmlReader.h>
 
 class KoListStyle;
-class KoTextLoadingContext;
+class KoOasisLoadingContext;
 
 class KOTEXT_EXPORT KoListLevelProperties {
 public:
@@ -117,7 +117,7 @@
     /**
      * Load the properties from the \p style using the OpenDocument format.
      */
-    void loadOasis(KoTextLoadingContext& context, const KoXmlElement& style);
+    void loadOasis(KoOasisLoadingContext& context, const KoXmlElement& style);
 
 private:
     void setProperty(int key, const QVariant &value);
--- trunk/koffice/libs/kotext/styles/KoListStyle.cpp #755973:755974
@@ -20,7 +20,6 @@
 #include "KoListStyle.h"
 #include "KoListLevelProperties.h"
 #include "KoTextBlockData.h"
-#include "opendocument/KoTextLoadingContext.h"
 
 #include <KoStyleStack.h>
 #include <KoOdfStylesReader.h>
@@ -202,7 +201,7 @@
     return answer;
 }
 
-void KoListStyle::loadOasis(KoTextLoadingContext& context, const KoXmlElement& style)
+void KoListStyle::loadOasis(KoOasisLoadingContext& context, const KoXmlElement& style)
 {
     //kDebug(32500)<<"KoListStyle::loadOasis style.localName="<<style.localName();
     //KoStyleStack &styleStack = context.styleStack();
--- trunk/koffice/libs/kotext/styles/KoListStyle.h #755973:755974
@@ -29,7 +29,7 @@
 #include <KoXmlReader.h>
 
 class KoListLevelProperties;
-class KoTextLoadingContext;
+class KoOasisLoadingContext;
 
 /**
  * This class groups all styling-options for lists.
@@ -179,7 +179,7 @@
      * Load the style from the \a KoStyleStack style stack using the
      * OpenDocument format.
      */
-    void loadOasis(KoTextLoadingContext& context, const KoXmlElement& style = KoXmlElement());
+    void loadOasis(KoOasisLoadingContext& context, const KoXmlElement& style = KoXmlElement());
 
 protected:
     friend class KoParagraphStyle;
[prev in list] [next in list] [prev in thread] [next in thread]