Kaydet (Commit) cd401a03 authored tarafından Oliver Bolte's avatar Oliver Bolte

INTEGRATION: CWS fr8fix2 (1.4.10); FILE MERGED

2005/04/13 13:41:53 dvo 1.4.10.1: #i47248# submit, even if invalid data is present
Issue number:
Submitted by:
Reviewed by:
üst 85465898
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: submission.cxx,v $ * $RCSfile: submission.cxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: vg $ $Date: 2005-03-23 11:38:39 $ * last change: $Author: obo $ $Date: 2005-05-03 14:41:36 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -558,6 +558,10 @@ void SAL_CALL Submission::submitWithInteraction( ...@@ -558,6 +558,10 @@ void SAL_CALL Submission::submitWithInteraction(
Model* pModel = Model::getModel( xModel ); Model* pModel = Model::getModel( xModel );
OSL_ENSURE( pModel != NULL, "illegal model?" ); OSL_ENSURE( pModel != NULL, "illegal model?" );
// #i36765# #i47248# warning on submission of illegal data. Removed for
// upcoming 2.0 release because string change could not go through
// translation anymore. Please re-enable in the next version.
/*
// check for validity (and query user if invalid) // check for validity (and query user if invalid)
bool bValid = pModel->isValid(); bool bValid = pModel->isValid();
if( ! bValid ) if( ! bValid )
...@@ -565,10 +569,6 @@ void SAL_CALL Submission::submitWithInteraction( ...@@ -565,10 +569,6 @@ void SAL_CALL Submission::submitWithInteraction(
InvalidDataOnSubmitException aInvalidDataException( InvalidDataOnSubmitException aInvalidDataException(
lcl_message(sID, OUSTRING(" due to invalid data") ), *this ); lcl_message(sID, OUSTRING(" due to invalid data") ), *this );
// #i36765# warning on submission of illegal data. Removed for
// upcoming 2.0 release because string change could not go through
// translation anymore. Please re-enable in the next version.
/*
if( _rxHandler.is() ) if( _rxHandler.is() )
{ {
// labouriously create interaction request // labouriously create interaction request
...@@ -596,12 +596,12 @@ void SAL_CALL Submission::submitWithInteraction( ...@@ -596,12 +596,12 @@ void SAL_CALL Submission::submitWithInteraction(
if( pContinue->wasSelected() ) if( pContinue->wasSelected() )
bValid = true; bValid = true;
} }
*/
// abort if invalid (and user didn't tell us to continue) // abort if invalid (and user didn't tell us to continue)
if( ! bValid ) if( ! bValid )
throw aInvalidDataException; throw aInvalidDataException;
} }
*/
// attempt submission // attempt submission
bool bResult = false; bool bResult = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment