[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sw/source

Michael Stahl mstahl at redhat.com
Wed Sep 21 09:30:44 UTC 2016


 sw/source/uibase/utlui/unotools.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e91e11d091a323d13b480a8bf995e1d70a0f8e89
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Sep 20 17:23:27 2016 +0200

    tdf#101536 sw: do load Insert Index dialog's document ReadOnly
    
    Turns out SwOneExampleFrame is used for different things, so load doc
    read-only only if it's an existing document.
    
    (regression from 6a8407d82d71083c8bdec6a106ba9092a5196cbe)
    
    (cherry picked from commit b7faef01678573f7b060ad26798aa841689ce3e6)
    
    Change-Id: I0a1ab0725ed9dccca23742c9d83cd9635a188edf
    Reviewed-on: https://gerrit.libreoffice.org/29100
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx
index 77dfc9f..15ca5d1 100644
--- a/sw/source/uibase/utlui/unotools.cxx
+++ b/sw/source/uibase/utlui/unotools.cxx
@@ -137,13 +137,15 @@ void SwOneExampleFrame::CreateControl()
             sTempURL = sArgumentURL;
         aURL <<= sTempURL;
 
-        uno::Sequence<beans::PropertyValue> aSeq(2);
+        uno::Sequence<beans::PropertyValue> aSeq(3);
         beans::PropertyValue* pValues = aSeq.getArray();
 
         pValues[0].Name = "OpenFlags";
         pValues[0].Value <<= OUString("-RB");
         pValues[1].Name = "Referer";
         pValues[1].Value <<= OUString("private:user");
+        pValues[2].Name = "ReadOnly";
+        pValues[2].Value <<= (sTempURL != cFactory);
         uno::Any aArgs;
         aArgs.setValue(&aSeq, cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get());
 


More information about the Libreoffice-commits mailing list