sfx2/source/doc/guisaveas.cxx | 3 +++ sfx2/source/doc/sfxbasemodel.cxx | 1 + 2 files changed, 4 insertions(+)
New commits: commit dd48972fc2b66ec2810db1a7cdf673fd5b0e9c40 Author: Pranav Kant <[email protected]> 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 <[email protected]> Tested-by: pranavk <[email protected]> diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 6a40102..4401850 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -677,6 +677,7 @@ sal_Int8 ModelData_Impl::CheckStateForSave() OUString aVersionCommentString("VersionComment"); OUString aAuthorString("Author"); + OUString aDontTerminateEdit("DontTerminateEdit"); OUString aInteractionHandlerString("InteractionHandler"); OUString aStatusIndicatorString("StatusIndicator"); OUString aFailOnWarningString("FailOnWarning"); @@ -685,6 +686,8 @@ sal_Int8 ModelData_Impl::CheckStateForSave() aAcceptedArgs[ aVersionCommentString ] = GetMediaDescr()[ aVersionCommentString ]; 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 3a691be..ab6d333 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -1507,6 +1507,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" _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
