diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2016-07-12 20:10:03 +0530 |
|---|---|---|
| committer | Pranav Kant <pranavk@collabora.co.uk> | 2016-07-19 23:46:08 +0530 |
| commit | c62dba689bfd7bf5910f0da3b22f8c25c989e7a3 (patch) | |
| tree | 67da7d66a085b387d35dcd3281a4c8e731465a2a /sfx2/source | |
| parent | 03d5a294f3e5eedb6e7eb3bbc2af6512df471d4d (diff) | |
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@collabora.com>
Tested-by: pranavk <pranavk@collabora.com>
(cherry picked from commit dd48972fc2b66ec2810db1a7cdf673fd5b0e9c40)
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/doc/guisaveas.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 1cc89742b928..7899d3a9178b 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 8213f68e643b..8b135cf225f3 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" |