summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-07-08 18:26:47 +0200
committerMichael Stahl <mstahl@redhat.com>2013-07-08 18:47:24 +0200
commit969bc572441ef8fd43cd7d350a533ffd715b74d3 (patch)
tree675909a85da6a654578a95bec297adf4260988dc
parentb0123630a845e3b4eb9340e6aab921a2bfe0ccd2 (diff)
fdo#65055: sfx: fix automatic version on close
The parameter "FailOnWarning" is passed around better now, so it arrives in SfxBaseModel::storeSelf() which considers it illegal. (regression from e2799d253b1dc62967693aa5bccd7360a9520967) Change-Id: I2a51a2ecc24e6de506e1840bd28cbe157a8ad6a5
-rw-r--r--sfx2/source/doc/guisaveas.cxx5
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx4
2 files changed, 6 insertions, 3 deletions
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 9df4e68de3f7..7ba610f8a802 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1456,9 +1456,10 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel
{
aModelData.GetStorable2()->storeSelf( aModelData.GetMediaDescr().getAsConstPropertyValueList() );
}
- catch( const lang::IllegalArgumentException& )
+ catch (const lang::IllegalArgumentException& e)
{
- OSL_FAIL( "ModelData didn't handle illegal parameters, all the parameters are ignored!\n" );
+ SAL_WARN("sfx", "Ignoring parameters! "
+ "ModelData considers this illegal: " << e.Message);
aModelData.GetStorable()->store();
}
}
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 210dd73c03aa..1228121432ee 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1571,7 +1571,9 @@ 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 != "InteractionHandler" && aSeqArgs[nInd].Name != "StatusIndicator"
- && aSeqArgs[nInd].Name != "VersionMajor" && aSeqArgs[nInd].Name != "CheckIn" )
+ && aSeqArgs[nInd].Name != "VersionMajor"
+ && aSeqArgs[nInd].Name != "FailOnWarning"
+ && aSeqArgs[nInd].Name != "CheckIn" )
{
m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "unexpected parameter for storeSelf, might be no problem if SaveAs is executed." ) );
m_pData->m_pObjectShell->StoreLog();