diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -678,6 +678,7 @@
 	::rtl::OUString aAuthorString = ::rtl::OUString::createFromAscii( "Author" );
 	::rtl::OUString aInteractionHandlerString = ::rtl::OUString::createFromAscii( "InteractionHandler" );
 	::rtl::OUString aStatusIndicatorString = ::rtl::OUString::createFromAscii( "StatusIndicator" );
+	::rtl::OUString aFailOnWarningString = ::rtl::OUString::createFromAscii( "FailOnWarning" );
 
 	if ( GetMediaDescr().find( aVersionCommentString ) != GetMediaDescr().end() )
 	{
@@ -690,6 +691,8 @@
 		aAcceptedArgs[ aInteractionHandlerString ] = GetMediaDescr()[ aInteractionHandlerString ];
 	if ( GetMediaDescr().find( aStatusIndicatorString ) != GetMediaDescr().end() )
 		aAcceptedArgs[ aStatusIndicatorString ] = GetMediaDescr()[ aStatusIndicatorString ];
+	if ( GetMediaDescr().find( aFailOnWarningString ) != GetMediaDescr().end() )
+		aAcceptedArgs[ aFailOnWarningString ] = GetMediaDescr()[ aFailOnWarningString ];
 
 	// remove unacceptable entry if there is any
 	DBG_ASSERT( GetMediaDescr().size() == aAcceptedArgs.size(),
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -1087,7 +1134,6 @@
                 nAdditional++;
             if ( rSet.GetItemState( SID_ENCRYPTIONDATA ) == SFX_ITEM_SET )
                 nAdditional++;
-                nAdditional++;
             if ( rSet.GetItemState( SID_SUGGESTEDSAVEASNAME ) == SFX_ITEM_SET )
                 nAdditional++;