diff options
| author | Frank Schönheit <fs@openoffice.org> | 2001-02-28 08:16:40 +0000 |
|---|---|---|
| committer | Frank Schönheit <fs@openoffice.org> | 2001-02-28 08:16:40 +0000 |
| commit | 977a008e1c77763e7c7b2035b9186f705c3260fb (patch) | |
| tree | abf007fcd16b13bff375a2ecb7db8fb93d64bec2 /connectivity | |
| parent | af33fe8c9bce794eb916a67c3950b3a8ded74a95 (diff) | |
ooops did not resolve all merge conflicts
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/dbase/DTable.cxx | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 43475795511a..843fb697a963 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DTable.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: fs $ $Date: 2001-02-28 09:15:30 $ + * last change: $Author: fs $ $Date: 2001-02-28 09:16:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1105,20 +1105,10 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo) if (aName.getLength() > nMaxFieldLength) { -<<<<<<< DTable.cxx - String sError; - sError.AppendAscii("Invalid length (>"); - sError += String::CreateFromInt32(nMaxFieldLength); - sError.AppendAscii(") for field name "); - sError += aName.getStr(); - throwGenericSQLException(sError, static_cast<XNamed*>(this)); - break; -======= ::rtl::OUString sMsg = ::rtl::OUString::createFromAscii("Invalid column name length for column: "); sMsg += aName; sMsg += ::rtl::OUString::createFromAscii("!"); throw SQLException(sMsg,*this,::rtl::OUString::createFromAscii("HY0000"),1000,Any()); ->>>>>>> 1.27 } ByteString aCol(aName.getStr(), getConnection()->getTextEncoding()); |