[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - configmgr/source

[Stephan Bergmann]

 configmgr/source/access.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit af5e5cc9af0c88de4a708071cfd3336a64398c5e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Sep 25 22:37:15 2013 +0200

    fdo#69028 Set PropertyAttribute::READONLY for finalized configmgr props
    
    ...thanks to Andras for pointing me to the problem
    
    Change-Id: I98786e8fe3159426b7e4c8b5345be500be2fc87b

diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 9f18e8f..94a14ce 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -2196,9 +2196,10 @@ css::beans::Property Access::asProperty() {
         (css::beans::PropertyAttribute::BOUND | //TODO: correct for group/set?
          css::beans::PropertyAttribute::CONSTRAINED |
          (nillable ? css::beans::PropertyAttribute::MAYBEVOID : 0) |
-         (getRootAccess()->isUpdate()
-          ? (removable ? css::beans::PropertyAttribute::REMOVABLE : 0)
-          : css::beans::PropertyAttribute::READONLY))); //TODO: MAYBEDEFAULT
+         (getRootAccess()->isUpdate() && removable
+          ? css::beans::PropertyAttribute::REMOVABLE : 0) |
+         (!getRootAccess()->isUpdate() || p->getFinalized() != Data::NO_LAYER
+          ? css::beans::PropertyAttribute::READONLY : 0))); //TODO: MAYBEDEFAULT
 }
 
 void Access::checkFinalized() {