[Libreoffice-commits] core.git: sw/source

Adrien adriendev84 at gmail.com
Sun Aug 18 06:22:14 PDT 2013


 sw/source/ui/uiview/viewstat.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 1fb69ba27999606db68915fe745629b2ed42c8b1
Author: Adrien <adriendev84 at gmail.com>
Date:   Sun Aug 18 15:42:50 2013 +0200

    Fix bug 47680, accept change is not displayed if file is protected
    
    Change-Id: Ic37d96c0f3cad6eba9a4e9327463f70ebbbfd317
    Reviewed-on: https://gerrit.libreoffice.org/5501
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/ui/uiview/viewstat.cxx
index 47c6a5f..147ae0e 100644
--- a/sw/source/ui/uiview/viewstat.cxx
+++ b/sw/source/ui/uiview/viewstat.cxx
@@ -271,6 +271,8 @@ void SwView::GetState(SfxItemSet &rSet)
                 SwPaM *pCursor = m_pWrtShell->GetCrsr();
                 if (0 == pDoc->GetRedline(*pCursor->Start(), 0))
                     rSet.DisableItem(nWhich);
+                if (GetDocShell()->HasChangeRecordProtection())
+                    rSet.DisableItem(nWhich);
             }
             break;
 


More information about the Libreoffice-commits mailing list