← Back to branch summary

~smartboyhw/ubuntu/raring/calligra/2.6.0-0ubuntu1

« back to all changes in this revision

Viewing changes to sheets/StyleManager.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-10-23 21:09:16 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20121023210916-m82w6zxnxhaxz7va
Tags: 1:2.5.90-0ubuntu1
https://launchpad.net/bugs/1070436
https://launchpad.net/bugs/1071686
* New upstream alpha release (LP: #1070436)
  - Add libkactivities-dev and libopenimageio-dev to build-depends
  - Add kubuntu_build_calligraactive.diff to build calligraactive by default
  - Add package for calligraauthor and move files that are shared between
    calligrawords and calligraauthor to calligrawords-common
* Document the patches
* Remove numbers from patches so they follow the same naming scheme as
  the rest of our patches.
* calligra-data breaks replaces krita-data (<< 1:2.5.3) (LP: #1071686)

Show diffs side-by-side

added added

removed removed

Lines of Context:
sheets/StyleManager.cpp
127
127
            style->loadOdf(stylesReader, *styleElem, name, conditions, this, map->parser());
128
128
            // TODO Stefan: conditions
129
129
            insertStyle(style);
130
 
            // insert it into the the map sorted the OpenDocument name
 
130
            // insert it into the map sorted the OpenDocument name
131
131
            m_oasisStyles[oasisName] = style->name();
132
132
            kDebug(36003) << "Style" << style->name() << ":" << style;
133
133
        }