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

List:       kde-commits
Subject:    koffice/lib/kofficecore
From:       David Faure <faure () kde ! org>
Date:       2004-02-04 10:16:25
Message-ID: 20040204101625.EE6A69913 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Keep ref to office:styles


  M +15 -10    koOasisStyles.cc   1.4
  M +5 -2      koOasisStyles.h   1.3


--- koffice/lib/kofficecore/koOasisStyles.cc  #1.3:1.4
@@ -55,15 +55,9 @@ void KoOasisStyles::createStyleMap( cons
     //kdDebug(30003) << "Starting reading in office:styles" << endl;
 
-    QDomElement userStyles = docElement.namedItem( "office:styles" ).toElement();
-
-    if ( !userStyles.isNull() ) {
-        // Collect user styles
-        QDomNodeList children = userStyles.elementsByTagName( "style:style" );
-        Q_ASSERT( m_userStyles.empty() );
-        m_userStyles.resize( children.length() );
-        for ( unsigned int i = 0 ; i < children.length(); ++i )
-            m_userStyles[i] = children.item( i ).toElement();
+    QDomElement officeStyle = docElement.namedItem( "office:styles" ).toElement();
 
-        insertStyles( userStyles );
+    if ( !officeStyle.isNull() ) {
+        m_officeStyle = officeStyle;
+        insertStyles( m_officeStyle );
     }
 
@@ -71,4 +65,15 @@ void KoOasisStyles::createStyleMap( cons
 }
 
+QValueVector<QDomElement> KoOasisStyles::userStyles() const
+{
+    QValueVector<QDomElement> vec;
+    // Collect user styles
+    QDomNodeList children = m_officeStyle.elementsByTagName( "style:style" );
+    vec.resize( children.length() );
+    for ( unsigned int i = 0 ; i < children.length(); ++i )
+        vec[i] = children.item( i ).toElement();
+    return vec;
+}
+
 void KoOasisStyles::insertStyles( const QDomElement& styles )
 {

--- koffice/lib/kofficecore/koOasisStyles.h  #1.2:1.3
@@ -22,9 +22,12 @@ public:
 
     /// Contains the sub-set of "user styles", i.e. those from office:styles
-    const QValueVector<QDomElement> &userStyles() const { return m_userStyles; }
+    QValueVector<QDomElement> userStyles() const;
 
     /// @return the default style
     const QDomElement& defaultStyle() const { return m_defaultStyle; }
 
+    /// @return the office:style element
+    const QDomElement& officeStyle() const { return m_officeStyle; }
+
     /// @return all list styles ("text:list-style" elements), hashed by name
     const QDict<QDomElement>& listStyles() const { return m_listStyles; }
@@ -42,6 +45,6 @@ private:
 
     QDict<QDomElement>   m_styles;
-    QValueVector<QDomElement> m_userStyles;
     QDomElement m_defaultStyle;
+    QDomElement m_officeStyle;
 
     QDict<QDomElement>   m_masterPages;


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