Skip to content
  • Halla Rempt's avatar
    Merged revisions 1108961,1108972,1108989 via svnmerge from · acf9adc6
    Halla Rempt authored
    https://rempt@svn.kde.org/home/kde/trunk/koffice
    
    ........
      r1108961 | lassin | 2010-03-30 10:08:15 +0200 (Tue, 30 Mar 2010) | 3 lines
      
      Fixes small caps for 2007 DrawingML
    ........
      r1108972 | vandenoever | 2010-03-30 10:31:49 +0200 (Tue, 30 Mar 2010) | 1 line
      
      Fix crash caused by dereferencing a zero pointer.
    ........
      r1108989 | staniek | 2010-03-30 11:26:10 +0200 (Tue, 30 Mar 2010) | 33 lines
      
      KoGenStyle(s) cleanup
      
      * KoGenStyle::Type cleanup:
      - renamed StyleUser to StyleParagraph
      - renamed StyleAuto to StyleParagraphAuto
      - move the 'Auto' to the end for the table style families
      * KoGenStyles::Flags made QFlags                         
      * KoGenStyles::lookup() -> KoGenStyles::insert()
      * move KoGenStyle::isEmpty() code to .cpp
      * use constFind(), constBegin(), constEnd() for iterators if possible
      * made some methods const
      * introduced KoGenStyles::StylesPlacement for saving odf and inserting raw styles.
      * insertRawStyles() replaces 4 methods. saveOdfStyles() replaces 4 other methods.
      * KoGenStyle::N_NumTypes -> KoGenStyle::N_NumPropertyTypes
      * added KoGenStyle::N_NumTypes
      * KoGenStyles: StyleArray -> QList<KoGenStyles::NamedStyle>
      * KoGenStyles: NameMap typedef removed, using just QSet<QString> is clear
      * To minimize size of the patch, I am noting down remaining possible TODOs:
      * Implemented qDebug() for KoGenStyles instead of dump()
      * Added KoGenStyles::FontFaceDecls to enum KoGenStyles::StylesPlacement, so
      - removed void KoGenStyles::saveOdfFontFaceDecls(KoXmlWriter* xmlWriter) const; for the same result use KoGenStyles::saveOdfStyles(FontFaceDecls, xmlWriter)
      - it's possible to add font faces using raw XML in insertRawOdfStyles()
      - moved private methods to the Private class
      * Added other proposed improvements
      * Use Style and AutoStyle suffixes for Type enum
      * Updated the whole koffice code for the KoGenStyle(s) change
      
      Revieweing, testing:
      *reviewed and approved by Jos; http://reviewboard.kde.org/r/3090/
      *builds agains trunk, checked if there's no change in semantics, relevant unit tests updated and passed
      *while global search/replace was executed to port to the new API, the change has been reviewed line-by-line too
    ........
    
    svn path=/branches/work/koffice-ko/; revision=1108994
    acf9adc6