diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-04-24 12:18:52 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-04-24 12:18:52 +0000 |
| commit | 1d52704a57468f55276d763fc01731107ed93e6e (patch) | |
| tree | 7a4c68a4afbe178caad39ad968ae9ca2d888f9e7 | |
| parent | 44781f2df99491b3526270eb8d250f2ee00e7b6b (diff) | |
INTEGRATION: CWS mav4 (1.78.12); FILE MERGED
2003/04/15 10:01:16 oj 1.78.12.1: #108932# only add / when no / exists
| -rw-r--r-- | connectivity/source/drivers/dbase/DTable.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 1529feb893f1..716f961ba30e 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.78 $ + * $Revision: 1.79 $ * - * last change: $Author: hr $ $Date: 2003-03-19 16:38:22 $ + * last change: $Author: rt $ $Date: 2003-04-24 13:18:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -830,7 +830,8 @@ BOOL ODbaseTable::CreateImpl() if(!aName.Len()) { ::rtl::OUString aIdent = m_pConnection->getContent()->getIdentifier()->getContentIdentifier(); - aIdent += ::rtl::OUString::createFromAscii("/"); + if ( aIdent.lastIndexOf('/') != (aIdent.getLength()-1) ) + aIdent += ::rtl::OUString::createFromAscii("/"); aIdent += m_Name; aName = aIdent.getStr(); } @@ -1809,7 +1810,8 @@ namespace if(!aName.Len()) { ::rtl::OUString aIdent = _pConenction->getContent()->getIdentifier()->getContentIdentifier(); - aIdent += ::rtl::OUString::createFromAscii("/"); + if ( aIdent.lastIndexOf('/') != (aIdent.getLength()-1) ) + aIdent += ::rtl::OUString::createFromAscii("/"); aIdent += oldName; aName = aIdent; } @@ -1984,7 +1986,8 @@ void ODbaseTable::dropColumn(sal_Int32 _nPos) String ODbaseTable::createTempFile() { ::rtl::OUString aIdent = m_pConnection->getContent()->getIdentifier()->getContentIdentifier(); - aIdent += ::rtl::OUString::createFromAscii("/"); + if ( aIdent.lastIndexOf('/') != (aIdent.getLength()-1) ) + aIdent += ::rtl::OUString::createFromAscii("/"); String sTempName(aIdent); String sExt; sExt.AssignAscii("."); |