[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sfx2/source

[Libreoffice Gerrit user]

 sfx2/source/view/viewfrm.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 43a81897b2735db7116ec62ba07efc97a6b71b8e
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Fri Oct 5 18:43:49 2018 +0200
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Tue Oct 9 14:21:58 2018 +0200

    tdf#120271 related: Allow finalizing of LastTimeGetInvolvedShown
    
    This avoids abort() on modifying the setting in case it's finalized
    
    Change-Id: I5982a4d7bf867301d7ba0e7e0dbb3f7c87013134
    Reviewed-on: https://gerrit.libreoffice.org/61430
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit ec235750bb30c3b66bd8b642f6abd1f9ea8244df)
    Reviewed-on: https://gerrit.libreoffice.org/61543
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index b0b972a4f572..1a852e0f1f2a 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1239,7 +1239,8 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
                     pInfoBar->addButton(xGetInvolvedButton);
                 }
 
-                if (bUpdateLastTimeGetInvolvedShown)
+                if (bUpdateLastTimeGetInvolvedShown
+                    && !officecfg::Setup::Product::LastTimeGetInvolvedShown::isReadOnly())
                 {
                     std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create());
                     officecfg::Setup::Product::LastTimeGetInvolvedShown::set(nNow, batch);