← Back to branch summary

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

« back to all changes in this revision

Viewing changes to sheets/Style.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2012-07-16 10:51:29 UTC
  • mfrom: (1.1.8)
  • Revision ID: package-import@ubuntu.com-20120716105129-es1ebubwiwlsfvv0
Tags: 1:2.4.92-0ubuntu1
New upstream RC release

Show diffs side-by-side

added added

removed removed

Lines of Context:
sheets/Style.cpp
37
37
#include <KoUnit.h>
38
38
#include <KoXmlNS.h>
39
39
#include <KoXmlWriter.h>
 
40
#include <KoOdfWorkaround.h>
40
41
 
41
42
#include "Condition.h"
42
43
#include "Currency.h"
411
412
    }
412
413
    if (styleStack.hasProperty(KoXmlNS::style, "cell-protect")) {
413
414
        str = styleStack.property(KoXmlNS::style, "cell-protect");
 
415
#ifndef NWORKAROUND_ODF_BUGS
 
416
        KoOdfWorkaround::fixBadFormulaHiddenForStyleCellProtect(str);
 
417
#endif
414
418
        if (str == "none")
415
419
            setNotProtected(true);
416
420
        else if (str == "hidden-and-protected")
1352
1356
        if (isNotProtected && !hideFormula)
1353
1357
            style.addProperty("style:cell-protect", "none");
1354
1358
        else if (isNotProtected && hideFormula)
1355
 
            style.addProperty("style:cell-protect", "Formula.hidden");
 
1359
            style.addProperty("style:cell-protect", "formula-hidden");
1356
1360
        else if (hideFormula)
1357
 
            style.addProperty("style:cell-protect", "protected Formula.hidden");
 
1361
            style.addProperty("style:cell-protect", "protected formula-hidden");
1358
1362
        else if (keysToStore.contains(NotProtected) && !isNotProtected)
1359
1363
            // write out, only if it is explicitly set
1360
1364
            style.addProperty("style:cell-protect", "protected");