summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/misc/WCopyTable.cxx
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2006-05-04 07:45:10 +0000
committerRüdiger Timm <rt@openoffice.org>2006-05-04 07:45:10 +0000
commitd5228dea6e1a0958be9c5bd924eaa7955e33514e (patch)
tree528389e28b4e05fef2aa5178f98572cc161c2aa0 /dbaccess/source/ui/misc/WCopyTable.cxx
parent46d11e8b9809fb3505178eb87589911341ae82d9 (diff)
INTEGRATION: CWS dba203c (1.42.48); FILE MERGED
2006/04/27 06:29:34 oj 1.42.48.3: duplicate method 2006/04/24 13:45:38 oj 1.42.48.2: RESYNC: (1.42-1.43); FILE MERGED 2006/04/13 13:55:20 oj 1.42.48.1: #i62797# format regconition corrected
Diffstat (limited to 'dbaccess/source/ui/misc/WCopyTable.cxx')
-rw-r--r--dbaccess/source/ui/misc/WCopyTable.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 6c18e328a420..2d1c2aaade3c 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: WCopyTable.cxx,v $
*
- * $Revision: 1.43 $
+ * $Revision: 1.44 $
*
- * last change: $Author: hr $ $Date: 2006-04-19 13:23:48 $
+ * last change: $Author: rt $ $Date: 2006-05-04 08:45:10 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -782,8 +782,9 @@ void OCopyTableWizard::appendColumns(Reference<XColumnsSupplier>& _rxColSup,cons
// now only the settings are missing
if(xColumns->hasByName(pField->GetName()))
{
- xColumns->getByName(pField->GetName()) >>= xColumn;
- if(xColumn.is())
+ xColumn.set(xColumns->getByName(pField->GetName()),UNO_QUERY);
+ OSL_ENSURE(xColumn.is(),"OCopyTableWizard::appendColumns: Column is NULL!");
+ if ( xColumn.is() )
dbaui::setColumnUiProperties(xColumn,pField);
}
else
@@ -1202,3 +1203,4 @@ void OCopyTableWizard::showColumnTypeNotSupported(const ::rtl::OUString& _rColum
aMsg.Execute();
}
// -----------------------------------------------------------------------------
+