You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2014/07/07 11:17:53 UTC
svn commit: r1608384 - in /openoffice/branches/AOO410: ./ main/
main/sfx2/source/doc/sfxbasemodel.cxx
Author: orw
Date: Mon Jul 7 09:17:53 2014
New Revision: 1608384
URL: http://svn.apache.org/r1608384
Log:
123812: <SfxBaseModel::storeSelf(..)> - accept arguement FailOnWarning in order to get new Version saved, if requested
Patch by: hanya
Review by: orw
cherry-picked from trunk
Modified:
openoffice/branches/AOO410/ (props changed)
openoffice/branches/AOO410/main/ (props changed)
openoffice/branches/AOO410/main/sfx2/source/doc/sfxbasemodel.cxx
Propchange: openoffice/branches/AOO410/
------------------------------------------------------------------------------
Merged /openoffice/trunk:r1608376
Propchange: openoffice/branches/AOO410/main/
------------------------------------------------------------------------------
Merged /openoffice/trunk/main:r1608376
Modified: openoffice/branches/AOO410/main/sfx2/source/doc/sfxbasemodel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sfx2/source/doc/sfxbasemodel.cxx?rev=1608384&r1=1608383&r2=1608384&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/sfx2/source/doc/sfxbasemodel.cxx (original)
+++ openoffice/branches/AOO410/main/sfx2/source/doc/sfxbasemodel.cxx Mon Jul 7 09:17:53 2014
@@ -1610,7 +1610,8 @@ void SAL_CALL SfxBaseModel::storeSelf( c
if ( !aSeqArgs[nInd].Name.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VersionComment" ) ) )
&& !aSeqArgs[nInd].Name.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Author" ) ) )
&& !aSeqArgs[nInd].Name.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ) ) )
- && !aSeqArgs[nInd].Name.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StatusIndicator" ) ) ) )
+ && !aSeqArgs[nInd].Name.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StatusIndicator" ) ) )
+ && !aSeqArgs[nInd].Name.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FailOnWarning" ) ) ) )
{
m_pData->m_pObjectShell->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "unexpected parameter for storeSelf, might be no problem if SaveAs is executed." ) ) );
m_pData->m_pObjectShell->StoreLog();