diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-07-02 19:25:22 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-07-02 23:03:08 +0200 |
| commit | 0879c444ed5187f813827ae0e486ad9cc7a4c0d4 (patch) | |
| tree | 96e7526052989a8c9f4fd4df51e5f210af24125a /sc/source | |
| parent | 63ea2d467b50452ae0cab18b4151107a747ae70d (diff) | |
improve indentation
Change-Id: I10917e6a6a73af68ddb72a2b45666892d318806b
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/filter/xml/xmlstyle.cxx | 87 |
1 files changed, 39 insertions, 48 deletions
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index a1d24f176b68..0a05a563e753 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -984,61 +984,52 @@ bool XmlScPropHdl_CellProtection::importXML( } if ((rValue >>= aCellProtection) || bDefault) { - if (!IsXMLToken(rStrImpValue, XML_NONE)) + if (IsXMLToken(rStrImpValue, XML_NONE)) { - if (!IsXMLToken(rStrImpValue, XML_HIDDEN_AND_PROTECTED)) - { - if (!IsXMLToken(rStrImpValue, XML_PROTECTED)) - { - if (!IsXMLToken(rStrImpValue, XML_FORMULA_HIDDEN)) - { - sal_Int16 i(0); - while (i < rStrImpValue.getLength() && rStrImpValue[i] != ' ') - ++i; - OUString sFirst(rStrImpValue.copy(0, i)); - OUString sSecond(rStrImpValue.copy(i + 1)); - aCellProtection.IsFormulaHidden = false; - aCellProtection.IsHidden = false; - aCellProtection.IsLocked = false; - if ((IsXMLToken(sFirst, XML_PROTECTED)) || (IsXMLToken(sSecond, XML_PROTECTED))) - aCellProtection.IsLocked = sal_True; - if ((IsXMLToken(sFirst, XML_FORMULA_HIDDEN)) || (IsXMLToken(sSecond, XML_FORMULA_HIDDEN))) - aCellProtection.IsFormulaHidden = sal_True; - rValue <<= aCellProtection; - bRetval = true; - } - else - { - aCellProtection.IsFormulaHidden = sal_True; - aCellProtection.IsHidden = false; - aCellProtection.IsLocked = false; - rValue <<= aCellProtection; - bRetval = true; - } - } - else - { - aCellProtection.IsFormulaHidden = false; - aCellProtection.IsHidden = false; - aCellProtection.IsLocked = sal_True; - rValue <<= aCellProtection; - bRetval = true; - } - } - else - { - aCellProtection.IsFormulaHidden = sal_True; - aCellProtection.IsHidden = sal_True; - aCellProtection.IsLocked = sal_True; - rValue <<= aCellProtection; - bRetval = true; - } + aCellProtection.IsFormulaHidden = false; + aCellProtection.IsHidden = false; + aCellProtection.IsLocked = false; + rValue <<= aCellProtection; + bRetval = true; + } + else if (IsXMLToken(rStrImpValue, XML_HIDDEN_AND_PROTECTED)) + { + aCellProtection.IsFormulaHidden = sal_True; + aCellProtection.IsHidden = sal_True; + aCellProtection.IsLocked = sal_True; + rValue <<= aCellProtection; + bRetval = true; + } + else if (IsXMLToken(rStrImpValue, XML_PROTECTED)) + { + aCellProtection.IsFormulaHidden = false; + aCellProtection.IsHidden = false; + aCellProtection.IsLocked = sal_True; + rValue <<= aCellProtection; + bRetval = true; + } + else if (IsXMLToken(rStrImpValue, XML_FORMULA_HIDDEN)) + { + aCellProtection.IsFormulaHidden = sal_True; + aCellProtection.IsHidden = false; + aCellProtection.IsLocked = false; + rValue <<= aCellProtection; + bRetval = true; } else { + sal_Int16 i(0); + while (i < rStrImpValue.getLength() && rStrImpValue[i] != ' ') + ++i; + OUString sFirst(rStrImpValue.copy(0, i)); + OUString sSecond(rStrImpValue.copy(i + 1)); aCellProtection.IsFormulaHidden = false; aCellProtection.IsHidden = false; aCellProtection.IsLocked = false; + if ((IsXMLToken(sFirst, XML_PROTECTED)) || (IsXMLToken(sSecond, XML_PROTECTED))) + aCellProtection.IsLocked = sal_True; + if ((IsXMLToken(sFirst, XML_FORMULA_HIDDEN)) || (IsXMLToken(sSecond, XML_FORMULA_HIDDEN))) + aCellProtection.IsFormulaHidden = sal_True; rValue <<= aCellProtection; bRetval = true; } |