incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mba...@apache.org
Subject svn commit: r1172359 - in /incubator/ooo/trunk/main/sfx2/source: appl/appuno.cxx doc/guisaveas.cxx
Date Sun, 18 Sep 2011 21:16:39 GMT
Author: mbauer
Date: Sun Sep 18 21:16:39 2011
New Revision: 1172359

URL: http://svn.apache.org/viewvc?rev=1172359&view=rev
Log:
cws mba34issues01: #i116025#: fix typo and add missing treatment of new parameter

Modified:
    incubator/ooo/trunk/main/sfx2/source/appl/appuno.cxx
    incubator/ooo/trunk/main/sfx2/source/doc/guisaveas.cxx

Modified: incubator/ooo/trunk/main/sfx2/source/appl/appuno.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/source/appl/appuno.cxx?rev=1172359&r1=1172358&r2=1172359&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sfx2/source/appl/appuno.cxx (original)
+++ incubator/ooo/trunk/main/sfx2/source/appl/appuno.cxx Sun Sep 18 21:16:39 2011
@@ -1087,7 +1087,6 @@ void TransformItems( sal_uInt16 nSlotId,
                 nAdditional++;
             if ( rSet.GetItemState( SID_ENCRYPTIONDATA ) == SFX_ITEM_SET )
                 nAdditional++;
-                nAdditional++;
             if ( rSet.GetItemState( SID_SUGGESTEDSAVEASNAME ) == SFX_ITEM_SET )
                 nAdditional++;
 

Modified: incubator/ooo/trunk/main/sfx2/source/doc/guisaveas.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/source/doc/guisaveas.cxx?rev=1172359&r1=1172358&r2=1172359&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sfx2/source/doc/guisaveas.cxx (original)
+++ incubator/ooo/trunk/main/sfx2/source/doc/guisaveas.cxx Sun Sep 18 21:16:39 2011
@@ -682,6 +682,7 @@ sal_Int8 ModelData_Impl::CheckStateForSa
 	::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() )
 	{
@@ -694,6 +695,8 @@ sal_Int8 ModelData_Impl::CheckStateForSa
 		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(),



Mime
View raw message