INTEGRATION: CWS reportdesign01 (1.68.42); FILE MERGED

2007/09/24 13:14:39 lla 1.68.42.1: #i78099# if user pressed cancelled, throw exception with 'parameterinteractioncancelled'

1 files changed, 7 insertions, 3 deletions

diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 16336f560b3f..4328e1514fac 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: dbtools.cxx,v $
  *
- *  $Revision: 1.68 $
+ *  $Revision: 1.69 $
  *
- *  last change: $Author: rt $ $Date: 2007-07-06 06:47:28 $
+ *  last change: $Author: ihi $ $Date: 2007-11-20 19:14:55 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -1834,8 +1834,12 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer,
         _rxHandler->handle(xRequest);
 
         if (!pParams->wasSelected())
+        {
             // canceled by the user (i.e. (s)he canceled the dialog)
-            throw RowSetVetoException();
+            RowSetVetoException e;
+            e.ErrorCode = ParameterInteractionCancelled;
+            throw e;
+        }
 
         // now transfer the values from the continuation object to the parameter columns
         Sequence< PropertyValue > aFinalValues = pParams->getValues();