[Libreoffice-commits] core.git: Branch 'feature/orcus-odf' - sc/source

[Jaskaran Singh]

 sc/source/filter/orcus/interface.cxx |   18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

New commits:
commit d7ce6e9b3892efed1a9d90de8a9838add28f99c5
Author: Jaskaran Singh <jvsg1303 at gmail.com>
Date:   Sun Jul 17 14:52:13 2016 +0530

    Reform function to apply protection in orcus interface
    
    Change-Id: Idb25283fbd504d64c3518b1a4b742e9e50f6ccff

diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
index b4a210e..37591d2 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -22,6 +22,7 @@
 #include "scitems.hxx"
 #include "patattr.hxx"
 #include "docpool.hxx"
+#include "attrib.hxx"
 
 #include <editeng/postitem.hxx>
 #include <editeng/wghtitem.hxx>
@@ -827,22 +828,7 @@ ScOrcusStyles::protection::protection():
 
 void ScOrcusStyles::protection::applyToItemSet(SfxItemSet& rSet) const
 {
-    if (mbHidden)
-        rSet.Put(SvxCharHiddenItem(mbHidden, ATTR_PROTECTION));
-
-    if (!mbLocked)
-    {
-        SvxProtectItem aItem(ATTR_PROTECTION);
-
-        aItem.SetContentProtect (false);
-        aItem.SetSizeProtect (false);
-        aItem.SetPosProtect (false);
-
-        rSet.Put(aItem);
-    }
-
-    if (!mbPrintContent)
-        rSet.Put(SvxPrintItem(ATTR_PROTECTION, mbPrintContent));
+    rSet.Put(ScProtectionAttr(mbLocked, mbFormulaHidden, mbHidden, mbPrintContent));
 }
 
 ScOrcusStyles::border::border():