summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2006-12-01 16:26:35 +0000
committerRüdiger Timm <rt@openoffice.org>2006-12-01 16:26:35 +0000
commitab3d08f45afbb15ec4349e40ec83134f108166d8 (patch)
treeea28c5d361220ff41b9e6901b7f5da03df5ced9a
parent8f1699ee521917bbbdd82ba0004e2ec52bae8186 (diff)
INTEGRATION: CWS dba22a (1.36.20); FILE MERGED
2006/11/22 20:47:01 fs 1.36.20.1: #i71860# displayException with Any
-rw-r--r--svx/source/form/fmtools.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 1cf66b50314c..4165dc284d2f 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: fmtools.cxx,v $
*
- * $Revision: 1.36 $
+ * $Revision: 1.37 $
*
- * last change: $Author: obo $ $Date: 2006-10-12 12:46:59 $
+ * last change: $Author: rt $ $Date: 2006-12-01 17:26:35 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -272,7 +272,7 @@ using namespace ::svxform;
using namespace ::connectivity::simple;
// ------------------------------------------------------------------------------
-void displayException(const Any& _rExcept, Window* _pParent = NULL)
+void displayException(const Any& _rExcept, Window* _pParent)
{
try
{
@@ -281,7 +281,7 @@ void displayException(const Any& _rExcept, Window* _pParent = NULL)
Reference< XWindow > xParentWindow = VCLUnoHelper::GetInterface(pParentWindow);
Sequence< Any > aArgs(2);
- aArgs[0] <<= PropertyValue(::rtl::OUString::createFromAscii("SQLException"), 0, makeAny(_rExcept), PropertyState_DIRECT_VALUE);
+ aArgs[0] <<= PropertyValue(::rtl::OUString::createFromAscii("SQLException"), 0, _rExcept, PropertyState_DIRECT_VALUE);
aArgs[1] <<= PropertyValue(::rtl::OUString::createFromAscii("ParentWindow"), 0, makeAny(xParentWindow), PropertyState_DIRECT_VALUE);
static ::rtl::OUString s_sDialogServiceName = ::rtl::OUString::createFromAscii("com.sun.star.sdb.ErrorMessageDialog");