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

[Pranav Kant]

 sfx2/source/doc/guisaveas.cxx    |    3 +++
 sfx2/source/doc/sfxbasemodel.cxx |    1 +
 2 files changed, 4 insertions(+)

New commits:
commit c62dba689bfd7bf5910f0da3b22f8c25c989e7a3
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Tue Jul 12 20:10:03 2016 +0530

    Fix a warning when DontTerminateEdit is mentioned
    
    DontTerminateEdit was added in a5a71cea62ac3041006c5e9815ae2317999639ac
    
    Change-Id: Ia1d2ac626dbdeea689a1f36494963be18316127f
    Reviewed-on: https://gerrit.libreoffice.org/27161
    Reviewed-by: pranavk <pranavk at collabora.com>
    Tested-by: pranavk <pranavk at collabora.com>
    (cherry picked from commit dd48972fc2b66ec2810db1a7cdf673fd5b0e9c40)

diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 1cc8974..7899d3a 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -692,6 +692,7 @@ sal_Int8 ModelData_Impl::CheckStateForSave()
 
     OUString aVersionCommentString("VersionComment");
     OUString aAuthorString("Author");
+    OUString aDontTerminateEdit("DontTerminateEdit");
     OUString aInteractionHandlerString("InteractionHandler");
     OUString aStatusIndicatorString("StatusIndicator");
     OUString aFailOnWarningString("FailOnWarning");
@@ -702,6 +703,8 @@ sal_Int8 ModelData_Impl::CheckStateForSave()
     }
     if ( GetMediaDescr().find( aAuthorString ) != GetMediaDescr().end() )
         aAcceptedArgs[ aAuthorString ] = GetMediaDescr()[ aAuthorString ];
+    if ( GetMediaDescr().find( aDontTerminateEdit ) != GetMediaDescr().end() )
+        aAcceptedArgs[ aDontTerminateEdit ] = GetMediaDescr()[ aDontTerminateEdit ];
     if ( GetMediaDescr().find( aInteractionHandlerString ) != GetMediaDescr().end() )
         aAcceptedArgs[ aInteractionHandlerString ] = GetMediaDescr()[ aInteractionHandlerString ];
     if ( GetMediaDescr().find( aStatusIndicatorString ) != GetMediaDescr().end() )
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 8213f68..8b135cf 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1530,6 +1530,7 @@ void SAL_CALL SfxBaseModel::storeSelf( const    Sequence< beans::PropertyValue >
         {
             // check that only acceptable parameters are provided here
             if ( aSeqArgs[nInd].Name != "VersionComment" && aSeqArgs[nInd].Name != "Author"
+              && aSeqArgs[nInd].Name != "DontTerminateEdit"
               && aSeqArgs[nInd].Name != "InteractionHandler" && aSeqArgs[nInd].Name != "StatusIndicator"
               && aSeqArgs[nInd].Name != "VersionMajor"
               && aSeqArgs[nInd].Name != "FailOnWarning"