summaryrefslogtreecommitdiff
path: root/extensions/source/dbpilots
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2003-04-01 13:13:29 +0000
committerVladimir Glazounov <vg@openoffice.org>2003-04-01 13:13:29 +0000
commit7d142a994ff3dd4493057f2eb4d803514ef5197a (patch)
tree32010ab3f7036c7d4130cd471fb84cb567f3d647 /extensions/source/dbpilots
parentf3426f57a4956e61321d148945db561f35340f2a (diff)
INTEGRATION: CWS dba03 (1.5.70); FILE MERGED
2003/03/14 12:21:35 fs 1.5.70.2: RESYNC: (1.5-1.5.28.1); FILE MERGED 2003/02/28 13:41:28 oj 1.5.70.1: #107842# remember type info
Diffstat (limited to 'extensions/source/dbpilots')
-rw-r--r--extensions/source/dbpilots/gridwizard.cxx18
1 files changed, 5 insertions, 13 deletions
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index 7c31a8e240c7..a4d3f3f25c03 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: gridwizard.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: hr $ $Date: 2003-03-25 16:03:28 $
+ * last change: $Author: vg $ $Date: 2003-04-01 14:13:29 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -161,7 +161,6 @@ namespace dbp
if (!xColumnFactory.is() || !xColumnContainer.is())
return;
- static const ::rtl::OUString s_sFieldTypeProperty = ::rtl::OUString::createFromAscii("Type");
static const ::rtl::OUString s_sDataFieldProperty = ::rtl::OUString::createFromAscii("DataField");
static const ::rtl::OUString s_sLabelProperty = ::rtl::OUString::createFromAscii("Label");
static const ::rtl::OUString s_sWidthProperty = ::rtl::OUString::createFromAscii("Width");
@@ -184,16 +183,9 @@ namespace dbp
{
// get the information for the selected column
sal_Int32 nFieldType = DataType::OTHER;
- try
- {
- Reference< XPropertySet > xColumn;
- rContext.xFields->getByName(*pSelectedFields) >>= xColumn;
- xColumn->getPropertyValue(s_sFieldTypeProperty) >>= nFieldType;
- }
- catch(Exception&)
- {
- DBG_ERROR("OGridWizard::implApplySettings: unexpected exception while gathering column information!");
- }
+ OControlWizardContext::TNameTypeMap::const_iterator aFind = rContext.aTypes.find(*pSelectedFields);
+ if ( aFind != rContext.aTypes.end() )
+ nFieldType = aFind->second;
aFormFieldNames.push_back(*pSelectedFields);
switch (nFieldType)