summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorPranav Kant <pranavk@collabora.co.uk>2016-07-12 20:10:03 +0530
committerpranavk <pranavk@collabora.com>2016-07-12 18:31:25 +0000
commitdd48972fc2b66ec2810db1a7cdf673fd5b0e9c40 (patch)
treec2fd1961a5285ceed5979b5c709b5f098c5bfe18 /sfx2
parentba94c97644bf75d39eb30de30ef29b44ad83233d (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>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/doc/guisaveas.cxx3
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx1
2 files changed, 4 insertions, 0 deletions
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 6a4010260947..440185028461 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 3a691bec8b6a..ab6d33354131 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"