[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:       2007-12-31 7:48:25
Message-ID: 1199087305.938673.29597.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 755009 by zachmann:

o no need to use a KoTextLoadingContext a KoOasisCntext is enough


 M  +2 -3      KoCharacterStyle.cpp  
 M  +4 -4      KoCharacterStyle.h  


--- trunk/koffice/libs/kotext/styles/KoCharacterStyle.cpp #755008:755009
@@ -17,14 +17,13 @@
  * Boston, MA 02110-1301, USA.
  */
 #include "KoCharacterStyle.h"
-#include "opendocument/KoTextLoadingContext.h"
 
 #include "Styles_p.h"
 
 #include <QTextBlock>
 #include <QTextCursor>
 
-#include <KoStyleStack.h>
+#include <KoOasisLoadingContext.h>
 #include <KoOdfStylesReader.h>
 #include <KoXmlNS.h>
 #include <KoXmlReader.h>
@@ -478,7 +477,7 @@
 }
 
 //in 1.6 this was defined in KoTextFormat::load(KoOasisContext& context)
-void KoCharacterStyle::loadOasis(KoTextLoadingContext& context) {
+void KoCharacterStyle::loadOasis(KoOasisLoadingContext& context) {
     KoStyleStack &styleStack = context.styleStack();
 
     // The fo:color attribute specifies the foreground color of text.
--- trunk/koffice/libs/kotext/styles/KoCharacterStyle.h #755008:755009
@@ -29,7 +29,7 @@
 class StylePrivate;
 class QTextBlock;
 class KoStyleStack;
-class KoTextLoadingContext;
+class KoOasisLoadingContext;
 class KoGenStyle;
 
 /**
@@ -228,15 +228,15 @@
      * Load the style from the \a KoStyleStack style stack using the
      * OpenDocument format.
      */
-    void loadOasis(KoTextLoadingContext& context);
+    void loadOasis(KoOasisLoadingContext& context);
 
     /// return true if this style has a non-default value set for the Property
     bool hasProperty(int key) const;
 
     bool operator==( const KoCharacterStyle &other ) const;
-    
+
     void removeDuplicates ( const KoCharacterStyle &other );
-    
+
     void saveOdf ( KoGenStyle *target );
 private:
     class Private;
[prev in list] [next in list] [prev in thread] [next in thread]