← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/koffice/oneiric-updates

« back to all changes in this revision

Viewing changes to filters/kword/docx/DocxXmlStylesReader.h

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2010-10-27 17:52:57 UTC
  • mfrom: (0.12.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20101027175257-s04zqqk5bs8ckm9o
Tags: 1:2.2.83-0ubuntu1
* Merge with Debian git remaining changes:
 - Add build-deps on librcps-dev, opengtl-dev, libqtgtl-dev, freetds-dev,
   create-resources, libspnav-dev
 - Remove needless build-dep on libwv2-dev
 - koffice-libs recommends create-resources
 - krita recommends pstoedit
 - Keep our patches
* New upstream release 2.3 beta 3
  - Remove debian/patches fixed by upstream
  - Update install files

Show diffs side-by-side

added added

removed removed

Lines of Context:
filters/kword/docx/DocxXmlStylesReader.h
50
50
    KoFilter::ConversionStatus read_rPrDefault();
51
51
    KoFilter::ConversionStatus read_style();
52
52
    KoFilter::ConversionStatus read_name();
53
 
 
54
 
    //! Context used by methods like read_lang to know the parent element
55
 
    enum DocxXmlStylesReadingContext {
56
 
        NoContext,
57
 
        DocDefaultsContext, //!< we're within read_docDefaults()
58
 
        StyleContext //!< we're within read_style()
59
 
    };
60
 
    DocxXmlStylesReadingContext m_context;
 
53
    KoFilter::ConversionStatus read_tblStylePr();
61
54
 
62
55
    void createDefaultStyle(KoGenStyle::Type type, const char* family);
63
56
    QMap<QByteArray, KoGenStyle*> m_defaultStyles;