From 2facbebb88fe72614d566c3187c8f86c5c61f8bd Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Wed, 19 Mar 2003 16:57:12 +0000 Subject: MWS_SRX644: migrate branch mws_srx644 -> HEAD --- dbaccess/source/ui/misc/DExport.cxx | 106 ++- dbaccess/source/ui/misc/TokenWriter.cxx | 6 +- dbaccess/source/ui/misc/UITools.cxx | 135 +++- dbaccess/source/ui/misc/WCPage.cxx | 11 +- dbaccess/source/ui/misc/WColumnSelect.cxx | 11 +- dbaccess/source/ui/misc/WCopyTable.cxx | 135 ++-- dbaccess/source/ui/misc/WNameMatch.cxx | 9 +- dbaccess/source/ui/misc/WTypeSelect.cxx | 14 +- dbaccess/source/ui/misc/WizardPages.src | 70 +- dbaccess/source/ui/misc/charsets.cxx | 131 ++-- dbaccess/source/ui/misc/datasourceconnector.cxx | 17 +- dbaccess/source/ui/misc/dbumiscres.src | 900 ++++++++---------------- dbaccess/source/ui/misc/dsntypes.cxx | 121 ++-- dbaccess/source/ui/misc/indexcollection.cxx | 21 +- dbaccess/source/ui/misc/linkeddocuments.cxx | 26 +- dbaccess/source/ui/misc/moduledbu.cxx | 11 +- dbaccess/source/ui/misc/propertysetitem.cxx | 11 +- dbaccess/source/ui/misc/singledoccontroller.cxx | 35 +- dbaccess/source/ui/misc/stringlistitem.cxx | 11 +- 19 files changed, 752 insertions(+), 1029 deletions(-) (limited to 'dbaccess/source/ui/misc') diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 86f981123492..b5d9e8be94c5 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DExport.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: oj $ $Date: 2002-12-10 09:17:06 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -155,6 +155,16 @@ #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX #include #endif +#ifndef _DBHELPER_DBEXCEPTION_HXX_ +#include +#endif +#ifndef _COM_SUN_STAR_SDBC_SQLWARNING_HPP_ +#include +#endif +#ifndef _COM_SUN_STAR_SDB_SQLCONTEXT_HPP_ +#include +#endif + #define CONTAINER_ENTRY_NOTFOUND ((ULONG)0xFFFFFFFF) @@ -285,7 +295,7 @@ ODatabaseExport::ODatabaseExport(const Reference< XConnection >& _rxConnection, sal_Int16 nType = xRow->getShort(2); if( nType == DataType::VARCHAR) { - m_pTypeInfo = new OTypeInfo(); + m_pTypeInfo = TOTypeInfoSP(new OTypeInfo()); m_pTypeInfo->aTypeName = sTypeName; m_pTypeInfo->nType = nType; m_pTypeInfo->nPrecision = xRow->getInt (3); @@ -311,7 +321,6 @@ ODatabaseExport::ODatabaseExport(const Reference< XConnection >& _rxConnection, //--------------------------------------------------------------------------- ODatabaseExport::~ODatabaseExport() { - delete m_pTypeInfo; DBG_DTOR(ODatabaseExport,NULL); } //------------------------------------------------------------------------------ @@ -669,49 +678,72 @@ sal_Bool ODatabaseExport::createRowSet() sal_Bool ODatabaseExport::executeWizard(const ::rtl::OUString& _sTableName,const Any& _aTextColor,const FontDescriptor& _rFont) { sal_Bool bError = sal_False; - OCopyTableWizard aWizard(NULL,_sTableName,m_aDestColumns,m_vDestVector,m_xConnection,m_xFormatter,m_xFactory); + try + { + OCopyTableWizard aWizard(NULL,_sTableName,m_aDestColumns,m_vDestVector,m_xConnection,m_xFormatter,m_xFactory); + aWizard.fillTypeInfo(); - OCopyTable* pPage1 = new OCopyTable(&aWizard,COPY, sal_False,OCopyTableWizard::WIZARD_DEF_DATA); - OWizNameMatching* pPage2 = new OWizNameMatching(&aWizard); - OWizColumnSelect* pPage3 = new OWizColumnSelect(&aWizard); - OWizTypeSelect* pPage4 = createPage(&aWizard); + OCopyTable* pPage1 = new OCopyTable(&aWizard,COPY, sal_False,OCopyTableWizard::WIZARD_DEF_DATA); + OWizNameMatching* pPage2 = new OWizNameMatching(&aWizard); + OWizColumnSelect* pPage3 = new OWizColumnSelect(&aWizard); + OWizTypeSelect* pPage4 = createPage(&aWizard); - aWizard.AddWizardPage(pPage1); - aWizard.AddWizardPage(pPage2); - aWizard.AddWizardPage(pPage3); - aWizard.AddWizardPage(pPage4); + aWizard.AddWizardPage(pPage1); + aWizard.AddWizardPage(pPage2); + aWizard.AddWizardPage(pPage3); + aWizard.AddWizardPage(pPage4); - aWizard.ActivatePage(); + aWizard.ActivatePage(); - if (aWizard.Execute()) - { - switch(aWizard.getCreateStyle()) + if (aWizard.Execute()) { - case OCopyTableWizard::WIZARD_DEF_DATA: - case OCopyTableWizard::WIZARD_APPEND_DATA: - { - m_xTable = aWizard.createTable(); - bError = !m_xTable.is(); - if(m_xTable.is()) + switch(aWizard.getCreateStyle()) + { + case OCopyTableWizard::WIZARD_DEF_DATA: + case OCopyTableWizard::WIZARD_APPEND_DATA: { - m_xTable->setPropertyValue(PROPERTY_FONT,makeAny(_rFont)); - if(_aTextColor.hasValue()) - m_xTable->setPropertyValue(PROPERTY_TEXTCOLOR,_aTextColor); + m_xTable = aWizard.createTable(); + bError = !m_xTable.is(); + if(m_xTable.is()) + { + m_xTable->setPropertyValue(PROPERTY_FONT,makeAny(_rFont)); + if(_aTextColor.hasValue()) + m_xTable->setPropertyValue(PROPERTY_TEXTCOLOR,_aTextColor); + } + m_bIsAutoIncrement = aWizard.isAutoincrementEnabled(); + m_vColumns = aWizard.GetColumnPositions(); + m_vColumnTypes = aWizard.GetColumnTypes(); } - m_bIsAutoIncrement = aWizard.isAutoincrementEnabled(); - m_vColumns = aWizard.GetColumnPositions(); - m_vColumnTypes = aWizard.GetColumnTypes(); - } - break; - default: - bError = sal_True; // there is no error but I have nothing more to do + break; + default: + bError = sal_True; // there is no error but I have nothing more to do + } } + else + bError = sal_True; + + if(!bError) + bError = !createRowSet(); } - else + catch(SQLContext& e) + { + ::dbaui::showError(::dbtools::SQLExceptionInfo(e),NULL,m_xFactory); bError = sal_True; - - if(!bError) - bError = !createRowSet(); + } + catch(SQLWarning& e) + { + ::dbaui::showError(::dbtools::SQLExceptionInfo(e),NULL,m_xFactory); + bError = sal_True; + } + catch(SQLException& e) + { + ::dbaui::showError(::dbtools::SQLExceptionInfo(e),NULL,m_xFactory); + bError = sal_True; + } + catch(Exception& ) + { + OSL_ENSURE(sal_False, "ODatabaseExport::executeWizard: caught a generic exception!"); + } return bError; } diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index d3bc7b8446f3..5846d7aa1ea3 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -2,9 +2,9 @@ * * $RCSfile: TokenWriter.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: oj $ $Date: 2002-10-25 08:32:43 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -668,7 +668,7 @@ OHTMLImportExport::OHTMLImportExport(const ODataAccessDescriptor& _aDataDescript ,m_bCheckFont(FALSE) #endif { - strcpy( sIndent, sIndentSource ); + strncpy( sIndent, sIndentSource ,std::min(sizeof(sIndent),sizeof(sIndentSource))); sIndent[0] = 0; } //------------------------------------------------------------------- diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 2323e5f0f5ea..34c075dbdf40 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -2,9 +2,9 @@ * * $RCSfile: UITools.cxx,v $ * - * $Revision: 1.44 $ + * $Revision: 1.45 $ * - * last change: $Author: oj $ $Date: 2002-11-29 12:29:59 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -405,14 +405,15 @@ void showError(const SQLExceptionInfo& _rInfo,Window* _pParent,const Reference< } // ----------------------------------------------------------------------------- -const OTypeInfo* getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, +TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, sal_Int32 _nType, const ::rtl::OUString& _sTypeName, sal_Int32 _nPrecision, sal_Int32 _nScale, + sal_Bool _bAutoIncrement, sal_Bool& _brForceToType) { - const OTypeInfo* pTypeInfo = NULL; + TOTypeInfoSP pTypeInfo; _brForceToType = sal_False; // search for type ::std::pair aPair = _rTypeInfo.equal_range(_nType); @@ -423,15 +424,17 @@ const OTypeInfo* getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, { // search the best matching type #ifdef DBG_UTIL - ::rtl::OUString sDBTypeName = aIter->second->aTypeName; - sal_Int32 nDBTypePrecision = aIter->second->nPrecision; - sal_Int32 nDBTypeScale = aIter->second->nMaximumScale; + ::rtl::OUString sDBTypeName = aIter->second->aTypeName; + sal_Int32 nDBTypePrecision = aIter->second->nPrecision; + sal_Int32 nDBTypeScale = aIter->second->nMaximumScale; + sal_Bool bDBAutoIncrement = aIter->second->bAutoIncrement; #endif if ( ( !_sTypeName.getLength() || (aIter->second->aTypeName.equalsIgnoreAsciiCase(_sTypeName)) ) && (aIter->second->nPrecision >= _nPrecision) && (aIter->second->nMaximumScale >= _nScale) + && (aIter->second->bAutoIncrement == _bAutoIncrement) ) break; } @@ -440,10 +443,13 @@ const OTypeInfo* getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, { for(aIter = aPair.first; aIter != aPair.second; ++aIter) { + sal_Int32 nPrec = aIter->second->nPrecision; + sal_Int32 nScale = aIter->second->nMaximumScale; // search the best matching type (now comparing the local names) if ( (aIter->second->aLocalTypeName.equalsIgnoreAsciiCase(_sTypeName)) - && (aIter->second->nPrecision >= _nPrecision) - && (aIter->second->nMaximumScale >= _nScale) + && (nPrec >= _nPrecision) + && (nScale >= _nScale) + && (aIter->second->bAutoIncrement == _bAutoIncrement) ) { // we can not assert here because we could be in d&d @@ -473,8 +479,56 @@ const OTypeInfo* getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, += ::rtl::OString(_sTypeName.getStr(), _sTypeName.getLength(), gsl_getSystemTextEncoding()) += ::rtl::OString(")! Defaulting to the first matching type.")).getStr()); */ - pTypeInfo = aPair.first->second; - _brForceToType = sal_True; + for(aIter = aPair.first; aIter != aPair.second; ++aIter) + { + // search the best matching type (now comparing the local names) +#ifdef DBG_UTIL + ::rtl::OUString sDBTypeName = aIter->second->aTypeName; +#endif + sal_Int32 nPrec = aIter->second->nPrecision; + sal_Int32 nScale = aIter->second->nMaximumScale; + if ( (nPrec >= _nPrecision) + && (nScale >= _nScale) + && (aIter->second->bAutoIncrement == _bAutoIncrement) + ) + break; + } + } + if (aIter == aPair.second) + { + if ( _bAutoIncrement ) + { + for(aIter = aPair.first; aIter != aPair.second; ++aIter) + { + // search the best matching type (now comparing the local names) +#ifdef DBG_UTIL + ::rtl::OUString sDBTypeName = aIter->second->aTypeName; +#endif + sal_Int32 nScale = aIter->second->nMaximumScale; + if ( (nScale >= _nScale) + && (aIter->second->bAutoIncrement == _bAutoIncrement) + ) + break; + } + if ( aIter == aPair.second ) + { + // try it without the auto increment flag + pTypeInfo = getTypeInfoFromType(_rTypeInfo, + _nType, + _sTypeName, + _nPrecision, + _nScale, + sal_False, + _brForceToType); + } + else + pTypeInfo = aIter->second; + } + else + { + pTypeInfo = aPair.first->second; + _brForceToType = sal_True; + } } else pTypeInfo = aIter->second; @@ -483,17 +537,16 @@ const OTypeInfo* getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, { ::comphelper::TStringMixEqualFunctor aCase(sal_False); // search for typeinfo where the typename is equal _sTypeName - OTypeInfoMap::const_iterator aFind = ::std::find_if(_rTypeInfo.begin(), - _rTypeInfo.end(), - ::std::compose1( - ::std::bind2nd(aCase, _sTypeName), - ::std::compose1( - ::std::mem_fun(&OTypeInfo::getDBName), - ::std::select2nd()) - ) - ); - if(aFind != _rTypeInfo.end()) - pTypeInfo = aFind->second; + OTypeInfoMap::const_iterator aIter = _rTypeInfo.begin(); + OTypeInfoMap::const_iterator aEnd = _rTypeInfo.end(); + for (; aIter != aEnd ; ++aIter) + { + if ( aCase(aIter->second->getDBName() , _sTypeName) ) + break; + } + + if ( aIter != aEnd ) + pTypeInfo = aIter->second; } // we can not assert here because we could be in d&d @@ -518,7 +571,7 @@ void fillTypeInfo( const Reference< ::com::sun::star::sdbc::XConnection>& _rxCo // Loop on the result set until we reach end of file while (xRs->next()) { - OTypeInfo* pInfo = new OTypeInfo(); + TOTypeInfoSP pInfo(new OTypeInfo()); pInfo->aTypeName = xRow->getString (1); pInfo->nType = xRow->getShort (2); pInfo->nPrecision = xRow->getInt (3); @@ -1290,9 +1343,9 @@ void setEvalDateFormatForFormatter(Reference< XNumberFormatter >& _rxFormatter) } } // ----------------------------------------------------------------------------- -const OTypeInfo* queryPrimaryKeyType(const OTypeInfoMap& _rTypeInfo) +TOTypeInfoSP queryPrimaryKeyType(const OTypeInfoMap& _rTypeInfo) { - const OTypeInfo* pTypeInfo = NULL; + TOTypeInfoSP pTypeInfo; // first we search for a type which supports autoIncrement OTypeInfoMap::const_iterator aIter = _rTypeInfo.begin(); OTypeInfoMap::const_iterator aEnd = _rTypeInfo.end(); @@ -1309,27 +1362,47 @@ const OTypeInfo* queryPrimaryKeyType(const OTypeInfoMap& _rTypeInfo) pTypeInfo = aIter->second; // alternative break; } - else if ( !pTypeInfo && aIter->second->nType == DataType::DOUBLE ) + else if ( !pTypeInfo.get() && aIter->second->nType == DataType::DOUBLE ) pTypeInfo = aIter->second; // alternative - else if ( !pTypeInfo && aIter->second->nType == DataType::REAL ) + else if ( !pTypeInfo.get() && aIter->second->nType == DataType::REAL ) pTypeInfo = aIter->second; // alternative } } - if ( !pTypeInfo ) // just a fallback + if ( !pTypeInfo.get() ) // just a fallback pTypeInfo = queryTypeInfoByType(DataType::VARCHAR,_rTypeInfo); - OSL_ENSURE(pTypeInfo,"checkColumns: cann't find a type which is useable as a key!"); + OSL_ENSURE(pTypeInfo.get(),"checkColumns: cann't find a type which is useable as a key!"); return pTypeInfo; } // ----------------------------------------------------------------------------- -const OTypeInfo* queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rTypeInfo) +TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rTypeInfo) { OTypeInfoMap::const_iterator aIter = _rTypeInfo.find(_nDataType); if(aIter != _rTypeInfo.end()) return aIter->second; OSL_ENSURE(0,"Wrong DataType supplied!"); - return NULL; + return TOTypeInfoSP(); } +// ----------------------------------------------------------------------------- +::rtl::OUString getUserDefinedDriverNodeName() +{ + static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess/UserDefinedDriverSettings")); + return s_sNodeName; +} +// ----------------------------------------------------------------------------- +::rtl::OUString getDriverTypeDisplayNodeName() +{ + static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("DriverTypeDisplayName")); + return s_sNodeName; +} +// ----------------------------------------------------------------------------- +::rtl::OUString getDriverDsnPrefixNodeName() +{ + static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("DriverDsnPrefix")); + return s_sNodeName; +} +// ----------------------------------------------------------------------------- + // ......................................................................... } // ......................................................................... diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index 410c4d810429..bf9f8b8098c1 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: WCPage.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: oj $ $Date: 2002-12-10 09:17:06 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -411,17 +411,18 @@ sal_Bool OCopyTable::checkAppendData() ODatabaseExport::TColumnVector::const_iterator aDestIter = pDestColumns->begin(); m_pParent->m_vColumnPos.reserve(pDestColumns->size()+1); m_pParent->m_vColumnTypes.reserve(pDestColumns->size()+1); + sal_Bool bNotConvert; for(sal_Int32 nPos = 1;aDestIter != pDestColumns->end();++aDestIter,++nPos) { m_pParent->m_vColumnPos.push_back( ODatabaseExport::TPositions::value_type(nPos,nPos) ); - const OTypeInfo* pTypeInfo = m_pParent->convertType((*aDestIter)->second->getTypeInfo()); - if(pTypeInfo) + TOTypeInfoSP pTypeInfo = m_pParent->convertType((*aDestIter)->second->getTypeInfo(),bNotConvert); + if ( pTypeInfo.get() ) m_pParent->m_vColumnTypes.push_back(pTypeInfo->nType); else m_pParent->m_vColumnTypes.push_back(DataType::VARCHAR); } } - if(!m_pParent->m_xDestObject.is()) + if ( !m_pParent->m_xDestObject.is() ) { ErrorBox(this, ModuleRes(ERROR_INVALID_TABLE_NAME)).Execute(); return sal_False; diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index a7ba85a71a04..5e01c88b7de5 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -2,9 +2,9 @@ * * $RCSfile: WColumnSelect.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: oj $ $Date: 2002-08-19 07:51:08 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -181,7 +181,7 @@ void OWizColumnSelect::Reset() m_lbOrgColumnNames.SetEntryData(nPos,(*aIter)->second); } - m_pParent->clearDestColumns(); + // m_pParent->clearDestColumns(); if(m_lbOrgColumnNames.GetEntryCount()) m_lbOrgColumnNames.SelectEntryPos(0); @@ -360,8 +360,9 @@ void OWizColumnSelect::createNewColumn( ListBox* _pListbox, _nMaxNameLen); OFieldDescription* pNewField = new OFieldDescription(*_pSrcField); pNewField->SetName(sConvertedName); - pNewField->SetType(m_pParent->convertType(_pSrcField->getTypeInfo())); - if(!m_pParent->supportsPrimaryKey()) + sal_Bool bNotConvert; + pNewField->SetType(m_pParent->convertType(_pSrcField->getTypeInfo(),bNotConvert)); + if ( !m_pParent->supportsPrimaryKey() ) pNewField->SetPrimaryKey(sal_False); _pListbox->SetEntryData(_pListbox->InsertEntry(sConvertedName),pNewField); diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 18e64d537f24..a96c80b76e3a 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -2,9 +2,9 @@ * * $RCSfile: WCopyTable.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: oj $ $Date: 2002-12-10 09:17:06 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -131,6 +131,9 @@ #ifndef _SV_WAITOBJ_HXX #include #endif +#ifndef DBAUI_WIZ_TYPESELECT_HXX +#include "WTypeSelect.hxx" +#endif using namespace ::dbaui; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -197,8 +200,6 @@ OCopyTableWizard::OCopyTableWizard(Window * pParent, _xSourceObject->getPropertyValue(PROPERTY_NAME) >>= m_sSourceName; m_sName = m_sSourceName; } - loadData(m_xSourceObject,m_vSourceColumns,m_vSourceVec); // create the field description - } // ----------------------------------------------------------------------------- OCopyTableWizard::OCopyTableWizard(Window * pParent, @@ -261,9 +262,7 @@ void OCopyTableWizard::construct() FreeResource(); - ::dbaui::fillTypeInfo(m_xSourceConnection,m_sTypeNames,m_aTypeInfo,m_aTypeInfoIndex); - ::dbaui::fillTypeInfo(m_xConnection,m_sTypeNames,m_aDestTypeInfo,m_aDestTypeInfoIndex); - m_pTypeInfo = new OTypeInfo(); + m_pTypeInfo = TOTypeInfoSP(new OTypeInfo()); m_pTypeInfo->aUIName = m_sTypeNames.GetToken(TYPE_OTHER); } //------------------------------------------------------------------------ @@ -283,21 +282,9 @@ OCopyTableWizard::~OCopyTableWizard() // clear the type information m_aTypeInfoIndex.clear(); - OTypeInfoMap::iterator aIter = m_aTypeInfo.begin(); - for(;aIter != m_aTypeInfo.end();++aIter) - delete aIter->second; - m_aTypeInfo.clear(); - - m_aDestTypeInfoIndex.clear(); - aIter = m_aDestTypeInfo.begin(); - for(;aIter != m_aDestTypeInfo.end();++aIter) - delete aIter->second; - m_aDestTypeInfoIndex.clear(); - DELETEZ(m_pTypeInfo); - DBG_DTOR(OCopyTableWizard,NULL); } // ----------------------------------------------------------------------- @@ -339,8 +326,9 @@ IMPL_LINK( OCopyTableWizard, ImplNextHdl, PushButton*, EMPTYARG ) return 0; } // ----------------------------------------------------------------------- -void OCopyTableWizard::CheckColumns() +sal_Bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos) { + sal_Bool bRet = sal_True; m_vColumnPos.clear(); m_vColumnTypes.clear(); @@ -357,14 +345,13 @@ void OCopyTableWizard::CheckColumns() if ( bPKeyAllowed && isAutoincrementEnabled() ) { // add extra column for the primary key - const OTypeInfo* pTypeInfo = queryPrimaryKeyType(m_aDestTypeInfo); - if ( pTypeInfo ) + TOTypeInfoSP pTypeInfo = queryPrimaryKeyType(m_aDestTypeInfo); + if ( pTypeInfo.get() ) { OFieldDescription* pField = new OFieldDescription(); pField->SetName(m_aKeyName); pField->FillFromTypeInfo(pTypeInfo,sal_True,sal_True); pField->SetPrimaryKey(sal_True); - pField->SetIsNullable(ColumnValue::NO_NULLS); insertColumn(0,pField); m_vColumnPos.push_back(ODatabaseExport::TPositions::value_type(1,1)); m_vColumnTypes.push_back(pField->GetType()); @@ -398,11 +385,12 @@ void OCopyTableWizard::CheckColumns() sal_Int32 nMaxNameLen = getMaxColumnNameLength(); ODatabaseExport::TColumnVector::const_iterator aSrcIter = m_vSourceVec.begin(); - for(;aSrcIter != m_vSourceVec.end();++aSrcIter) + for(_rnBreakPos=0;aSrcIter != m_vSourceVec.end() && bRet ;++aSrcIter,++_rnBreakPos) { OFieldDescription* pField = new OFieldDescription(*(*aSrcIter)->second); pField->SetName(convertColumnName(TExportColumnFindFunctor(&m_vDestColumns),(*aSrcIter)->first,sExtraChars,nMaxNameLen)); - pField->SetType(convertType((*aSrcIter)->second->getTypeInfo())); + TOTypeInfoSP pType = convertType((*aSrcIter)->second->getTypeInfo(),bRet); + pField->SetType(pType); if ( !bPKeyAllowed ) pField->SetPrimaryKey(sal_False); @@ -413,6 +401,7 @@ void OCopyTableWizard::CheckColumns() } } } + return bRet; } // ----------------------------------------------------------------------- IMPL_LINK( OCopyTableWizard, ImplOKHdl, OKButton*, EMPTYARG ) @@ -428,14 +417,26 @@ IMPL_LINK( OCopyTableWizard, ImplOKHdl, OKButton*, EMPTYARG ) case WIZARD_DEF_DATA: case WIZARD_DEF: { - if( GetCurLevel() == 0 ) + sal_Bool bOnFirstPage; + if ( bOnFirstPage = (GetCurLevel() == 0) ) { // we came from the first page so we have to clear // all column information already collected clearDestColumns(); m_mNameMapping.clear(); } - CheckColumns(); + sal_Int32 nBreakPos = 0; + sal_Bool bCheckOk = CheckColumns(nBreakPos); + if ( bOnFirstPage && !bCheckOk ) + { + OWizTypeSelect* pPage = reinterpret_cast(GetPage(3)); + if ( pPage ) + { + pPage->setDisplayRow(nBreakPos); + ShowPage(3); + return 0; + } + } break; } case WIZARD_APPEND_DATA: @@ -589,6 +590,7 @@ void OCopyTableWizard::loadData(const Reference& _xTable, sal_Int32 nType = 0; sal_Int32 nScale = 0; sal_Int32 nPrecision = 0; + sal_Bool bAutoIncrement = sal_False; ::rtl::OUString sTypeName; // get the properties from the column @@ -596,12 +598,13 @@ void OCopyTableWizard::loadData(const Reference& _xTable, xColumn->getPropertyValue(PROPERTY_TYPE) >>= nType; xColumn->getPropertyValue(PROPERTY_SCALE) >>= nScale; xColumn->getPropertyValue(PROPERTY_PRECISION) >>= nPrecision; + xColumn->getPropertyValue(PROPERTY_ISAUTOINCREMENT) >>= bAutoIncrement; pActFieldDescr = new OFieldDescription(xColumn); // search for type sal_Bool bForce; - const OTypeInfo* pTypeInfo = ::dbaui::getTypeInfoFromType(m_aTypeInfo,nType,sTypeName,nPrecision,nScale,bForce); - if ( !pTypeInfo ) + TOTypeInfoSP pTypeInfo = ::dbaui::getTypeInfoFromType(m_aTypeInfo,nType,sTypeName,nPrecision,nScale,bAutoIncrement,bForce); + if ( !pTypeInfo.get() ) pTypeInfo = m_pTypeInfo; pActFieldDescr->FillFromTypeInfo(pTypeInfo,sal_True,sal_False); @@ -618,8 +621,11 @@ void OCopyTableWizard::loadData(const Reference& _xTable, for(;pKeyBegin != pKeyEnd;++pKeyBegin) { ODatabaseExport::TColumns::iterator aIter = _rColumns.find(*pKeyBegin); - if(aIter != _rColumns.end()) + if ( aIter != _rColumns.end() ) + { aIter->second->SetPrimaryKey(sal_True); + aIter->second->SetIsNullable(ColumnValue::NO_NULLS); + } } } } @@ -921,8 +927,14 @@ sal_Bool OCopyTableWizard::supportsPrimaryKey() const sal_Bool bAllowed = sal_False; if(m_xConnection.is()) { - Reference< XDatabaseMetaData > xMetaData(m_xConnection->getMetaData()); - bAllowed = xMetaData.is() && xMetaData->supportsCoreSQLGrammar(); + try + { + Reference< XDatabaseMetaData > xMetaData(m_xConnection->getMetaData()); + bAllowed = xMetaData.is() && xMetaData->supportsCoreSQLGrammar(); + } + catch(const Exception&) + { + } } return bAllowed; } @@ -932,8 +944,14 @@ sal_Int32 OCopyTableWizard::getMaxColumnNameLength() const sal_Int32 nLen = 0; if(m_xConnection.is()) { - Reference< XDatabaseMetaData > xMetaData(m_xConnection->getMetaData()); - nLen = xMetaData.is() ? xMetaData->getMaxColumnNameLength() : 0; + try + { + Reference< XDatabaseMetaData > xMetaData(m_xConnection->getMetaData()); + nLen = xMetaData.is() ? xMetaData->getMaxColumnNameLength() : 0; + } + catch(const Exception&) + { + } } return nLen; } @@ -987,18 +1005,20 @@ OCopyTableWizard::Wizard_Create_Style OCopyTableWizard::getCreateStyle() const // ----------------------------------------------------------------------------- sal_Bool OCopyTableWizard::supportsType(sal_Int32 _nDataType,sal_Int32& _rNewDataType) { - _rNewDataType = _nDataType; - return m_aDestTypeInfo.find(_nDataType) != m_aDestTypeInfo.end(); + sal_Bool bRet = m_aDestTypeInfo.find(_nDataType) != m_aDestTypeInfo.end(); + if ( bRet ) + _rNewDataType = _nDataType; + return bRet; } // ----------------------------------------------------------------------------- -const OTypeInfo* OCopyTableWizard::convertType(const OTypeInfo* _pType) +TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType,sal_Bool& _bNotConvert) { - if(m_xSourceConnection == m_xConnection) + if ( m_xSourceConnection == m_xConnection ) return _pType; sal_Bool bForce; - const OTypeInfo* pType = ::dbaui::getTypeInfoFromType(m_aDestTypeInfo,_pType->nType,_pType->aTypeName,_pType->nPrecision,_pType->nMaximumScale,bForce); - if(!pType || bForce) + TOTypeInfoSP pType = ::dbaui::getTypeInfoFromType(m_aDestTypeInfo,_pType->nType,_pType->aTypeName,_pType->nPrecision,_pType->nMaximumScale,_pType->bAutoIncrement,bForce); + if ( !pType.get() || bForce ) { // no type found so we have to find the correct one ourself sal_Int32 nDefaultType = DataType::VARCHAR; switch(_pType->nType) @@ -1030,33 +1050,39 @@ const OTypeInfo* OCopyTableWizard::convertType(const OTypeInfo* _pType) case DataType::TIMESTAMP: case DataType::REAL: case DataType::BIGINT: - if(supportsType(DataType::DOUBLE,nDefaultType)) + if ( supportsType(DataType::DOUBLE,nDefaultType) ) break; // run through case DataType::DOUBLE: - if(supportsType(DataType::NUMERIC,nDefaultType)) + if ( supportsType(DataType::NUMERIC,nDefaultType) ) break; // run through case DataType::NUMERIC: supportsType(DataType::DECIMAL,nDefaultType); break; - // run through case DataType::DECIMAL: - if(supportsType(DataType::NUMERIC,nDefaultType)) + if ( supportsType(DataType::NUMERIC,nDefaultType) ) + break; + if ( supportsType(DataType::DOUBLE,nDefaultType) ) break; - if(supportsType(DataType::DOUBLE,nDefaultType)) + break; + case DataType::VARCHAR: + if ( supportsType(DataType::LONGVARCHAR,nDefaultType) ) break; break; default: nDefaultType = DataType::VARCHAR; } - pType = ::dbaui::getTypeInfoFromType(m_aDestTypeInfo,nDefaultType,_pType->aTypeName,_pType->nPrecision,_pType->nMaximumScale,bForce); - if(!pType) + pType = ::dbaui::getTypeInfoFromType(m_aDestTypeInfo,nDefaultType,_pType->aTypeName,_pType->nPrecision,_pType->nMaximumScale,_pType->bAutoIncrement,bForce); + if ( !pType.get() ) { - pType = ::dbaui::getTypeInfoFromType(m_aDestTypeInfo,DataType::VARCHAR,_pType->aTypeName,_pType->nPrecision,_pType->nMaximumScale,bForce); - if(!pType) + _bNotConvert = sal_False; + pType = ::dbaui::getTypeInfoFromType(m_aDestTypeInfo,DataType::VARCHAR,_pType->aTypeName,50,0,sal_False,bForce); + if ( !pType.get() ) pType = m_pTypeInfo; } + else if ( bForce ) + _bNotConvert = sal_False; } return pType; } @@ -1081,3 +1107,14 @@ const OTypeInfo* OCopyTableWizard::convertType(const OTypeInfo* _pType) return sName; } // ----------------------------------------------------------------------------- +void OCopyTableWizard::fillTypeInfo() +{ + ::dbaui::fillTypeInfo(m_xSourceConnection,m_sTypeNames,m_aTypeInfo,m_aTypeInfoIndex); + ::dbaui::fillTypeInfo(m_xConnection,m_sTypeNames,m_aDestTypeInfo,m_aDestTypeInfoIndex); +} +// ----------------------------------------------------------------------------- +void OCopyTableWizard::loadData() +{ + loadData(m_xSourceObject,m_vSourceColumns,m_vSourceVec); // create the field description +} +// ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index 48f5d09df7c6..3dca40141566 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -2,9 +2,9 @@ * * $RCSfile: WNameMatch.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: oj $ $Date: 2002-08-19 07:51:09 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -235,9 +235,10 @@ sal_Bool OWizNameMatching::LeavePage() m_pParent->m_vColumnPos[nPos].first = ::std::distance(pDestColumns->begin(),aDestIter) + 1; m_pParent->m_vColumnPos[nPos].second = ++nParamPos; - const OTypeInfo* pTypeInfo = m_pParent->convertType((*aDestIter)->second->getTypeInfo()); + sal_Bool bNotConvert; + TOTypeInfoSP pTypeInfo = m_pParent->convertType((*aDestIter)->second->getTypeInfo(),bNotConvert); sal_Int32 nType = ::com::sun::star::sdbc::DataType::VARCHAR; - if(pTypeInfo) + if ( pTypeInfo.get() ) nType = pTypeInfo->nType; m_pParent->m_vColumnTypes[nPos] = nType; } diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index e5683d6e2adb..c7c42bf82ba1 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -2,9 +2,9 @@ * * $RCSfile: WTypeSelect.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: oj $ $Date: 2002-12-10 09:17:06 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -245,7 +245,7 @@ Reference< XNumberFormatter > OWizTypeSelectControl::GetFormatter() const return static_cast(GetParent())->m_pParent->GetFormatter(); } // ----------------------------------------------------------------------------- -const OTypeInfo* OWizTypeSelectControl::getTypeInfo(sal_Int32 _nPos) +TOTypeInfoSP OWizTypeSelectControl::getTypeInfo(sal_Int32 _nPos) { return static_cast(GetParent())->m_pParent->getDestTypeInfo(_nPos); } @@ -291,6 +291,7 @@ OWizTypeSelect::OWizTypeSelect( Window* pParent,SvStream* _pStream) ,m_pbAuto( this, ModuleRes( PB_AUTO ) ) ,m_pParserStream(_pStream) ,m_bAutoIncrementEnabled(sal_False) + ,m_nDisplayRow(0) { DBG_CTOR(OWizTypeSelect,NULL); m_lbColumnNames.SetSelectHdl(LINK(this,OWizTypeSelect,ColumnSelectHdl)); @@ -378,7 +379,8 @@ void OWizTypeSelect::ActivatePage( ) Reset(); m_bFirstTime = bOldFirstTime; - m_lbColumnNames.SelectEntryPos(0); + m_lbColumnNames.SelectEntryPos(m_nDisplayRow); + m_nDisplayRow = 0; m_lbColumnNames.GetSelectHdl().Call(&m_lbColumnNames); } // ----------------------------------------------------------------------- @@ -398,7 +400,8 @@ void OWizTypeSelect::EnableAuto(sal_Bool bEnable) //------------------------------------------------------------------------------ IMPL_LINK( OWizTypeSelect, ButtonClickHdl, Button *, pButton ) { - m_pParent->CheckColumns(); + sal_Int32 nBreakPos; + m_pParent->CheckColumns(nBreakPos); fillColumnList(m_etAuto.GetText().ToInt32()); ActivatePage(); @@ -423,7 +426,6 @@ void OWizTypeSelectList::setPrimaryKey(OFieldDescription* _pFieldDescr,sal_uInt1 String sColumnName = GetEntry(_nPos); RemoveEntry(_nPos); _pFieldDescr->SetPrimaryKey(_bSet); - _pFieldDescr->SetIsNullable(ColumnValue::NO_NULLS); if( _bSet ) InsertEntry(sColumnName,((OWizTypeSelect*)GetParent())->m_imgPKey,_nPos); else if( _pFieldDescr->getTypeInfo()->bNullable ) diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src index 18a2657c1b11..15f9ea45c8f0 100644 --- a/dbaccess/source/ui/misc/WizardPages.src +++ b/dbaccess/source/ui/misc/WizardPages.src @@ -2,9 +2,9 @@ * * $RCSfile: WizardPages.src,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: kz $ $Date: 2002-12-05 10:32:12 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,7 +96,7 @@ String STR_HTML_TITLE Text[ polish ] = "Kopiuj tabel HTML"; Text[ portuguese_brazilian ] = "Copy HTML table"; Text[ japanese ] = "HTML テーブルのコピー"; - Text[ korean ] = "HTML 표 복사"; + Text[ korean ] = "HTML 테이블 복사"; Text[ chinese_simplified ] = "复制 HTML 表格"; Text[ chinese_traditional ] = "複製 HTML 表格"; Text[ arabic ] = " HTML"; @@ -123,7 +123,7 @@ String STR_RTF_TITLE Text[ polish ] = "Kopiuj tabel RTF"; Text[ portuguese_brazilian ] = "Copy RTF table"; Text[ japanese ] = "RTF テーブルのコピー"; - Text[ korean ] = "RTF 표 복사"; + Text[ korean ] = "RTF 테이블 복사"; Text[ chinese_simplified ] = "复制 RTF 表格"; Text[ chinese_traditional ] = "複製RTF表格"; Text[ arabic ] = " RTF"; @@ -143,7 +143,7 @@ String STR_WIZ_COLUMN_SELECT_TITEL Text[ greek ] = " "; Text[ dutch ] = "Kolom overnemen"; Text[ french ] = "Application de colonnes"; - Text[ spanish ] = "Aplicacin de columnas"; + Text[ spanish ] = "Aplicar columnas"; Text[ italian ] = "Applica colonne"; Text[ danish ] = "Overtag kolonner"; Text[ swedish ] = "verta kolumner"; @@ -177,7 +177,7 @@ String STR_WIZ_TYPE_SELECT_TITEL Text[ polish ] = "Formatowanie typu"; Text[ portuguese_brazilian ] = "Undo"; Text[ japanese ] = "タイプの書式設定"; - Text[ korean ] = "형식 지정"; + Text[ korean ] = "유형 서식"; Text[ chinese_simplified ] = "类型格式化"; Text[ chinese_traditional ] = "類型格式化"; Text[ arabic ] = " "; @@ -204,7 +204,7 @@ String STR_WIZ_PKEY_ALREADY_DEFINED Text[ polish ] = "Jako klucze gwne osadzono ju nastpujce pola:\n"; Text[ portuguese_brazilian ] = "There are already primary keys defined for this fields:\n"; Text[ japanese ] = "以下のフィールドはすでにプライマリキーとして設定されています。\n"; - Text[ korean ] = "다음 필드에는 기본 키가 이미 정의되어 있습니다.:\n"; + Text[ korean ] = "다음 필드에는 기본 키가 이미 지정되어 있습니다:\n"; Text[ chinese_simplified ] = "已经为下列字段设定了主关键字：\n"; Text[ chinese_traditional ] = "以下的欄位已經指定成主關鍵字：\n"; Text[ arabic ] = " :\n"; @@ -342,7 +342,7 @@ ModalDialog WIZ_RTFCOPYTABLE Text[ polish ] = "< Wstecz"; Text[ portuguese_brazilian ] = "< ~Back"; Text[ japanese ] = "< 戻る(~B)"; - Text[ korean ] = "<뒤로(~B)"; + Text[ korean ] = "< 뒤로(~B)"; Text[ chinese_simplified ] = "< 返回(~B)"; Text[ chinese_traditional ] = "< 返回(~B)"; Text[ arabic ] = "<"; @@ -370,7 +370,7 @@ ModalDialog WIZ_RTFCOPYTABLE Text[ polish ] = "Dalej>"; Text[ portuguese_brazilian ] = "~Next>"; Text[ japanese ] = "次へ(~N)>"; - Text[ korean ] = "다음(~N)"; + Text[ korean ] = "다음>(~N)"; Text[ chinese_simplified ] = "继续 (~N)>"; Text[ chinese_traditional ] = "繼續 (~N)>"; Text[ arabic ] = ">"; @@ -399,7 +399,7 @@ ModalDialog WIZ_RTFCOPYTABLE Text[ polish ] = "Utwrz"; Text[ portuguese_brazilian ] = "Finish"; Text[ japanese ] = "完了(~R)"; - Text[ korean ] = "완료(~R)"; + Text[ korean ] = "만들기(~R)"; Text[ chinese_simplified ] = "完成(~R)"; Text[ chinese_traditional ] = "完成(~R)"; Text[ arabic ] = ""; @@ -410,7 +410,7 @@ ModalDialog WIZ_RTFCOPYTABLE }; Text[ greek ] = " RTF"; - Text[ korean ] = "RTF 표 복사"; + Text[ korean ] = "RTF 테이블 복사"; Text[ chinese_traditional ] = "複製RTF表格"; Text[ arabic ] = " RTF"; Text[ turkish ] = "RTF tablosunu kopyala"; @@ -635,14 +635,14 @@ TabPage TAB_WIZ_TYPE_SELECT Text[ greek ] = " "; Text[ dutch ] = "Autom. herkenning van type"; Text[ french ] = "Reconnaissance automatique du type"; - Text[ spanish ] = "Autoreconocimiento de tipo"; + Text[ spanish ] = "Reconocimiento automtico del tipo"; Text[ italian ] = "Riconoscimento autom. tipo"; Text[ danish ] = "Automatisk typegenkendelse"; Text[ swedish ] = "Autom. typigenknning"; Text[ polish ] = "Automat. identyfikacja typu"; Text[ portuguese_brazilian ] = "Tablename:"; Text[ japanese ] = "種類の自動認識"; - Text[ korean ] = "자동 형식 인식"; + Text[ korean ] = "자동 유형 인식"; Text[ chinese_simplified ] = "自动识别类型"; Text[ chinese_traditional ] = "自動識別類型"; Text[ arabic ] = " "; @@ -672,7 +672,7 @@ TabPage TAB_WIZ_TYPE_SELECT Text[ polish ] = "Wiersze (maks.)"; Text[ portuguese_brazilian ] = "Tablename:"; Text[ japanese ] = "最大行数(~X)"; - Text[ korean ] = "(최대)줄(~X):"; + Text[ korean ] = "최대 줄 수(~X)"; Text[ chinese_simplified ] = "(最多的)行(~X)"; Text[ chinese_traditional ] = "(最多的)列(~X)"; Text[ turkish ] = "Satrlar (azami):"; @@ -764,7 +764,7 @@ TabPage TAB_WIZ_NAME_MATCHING Text[ polish ] = "Tabela rdowa: \n"; Text[ portuguese_brazilian ] = "Source table: \n"; Text[ japanese ] = "ソーステーブル: \n"; - Text[ korean ] = "시트(소스): \n"; + Text[ korean ] = "원본 테이블: \n"; Text[ chinese_simplified ] = "源表格：\n"; Text[ chinese_traditional ] = "源表格：\n"; Text[ turkish ] = "Kaynak tablo: \n"; @@ -781,7 +781,7 @@ TabPage TAB_WIZ_NAME_MATCHING Text [ ENGLISH ] = "Destination table: \n" ; Text[ english_us ] = "Destination table: \n"; Text[ portuguese ] = "Tabela de destino: \n"; - Text[ russian ] = " : \n"; + Text[ russian ] = " : \n"; Text[ greek ] = " : \n"; Text[ dutch ] = "Doeltabel: \n"; Text[ french ] = "Table cible : \n"; @@ -793,7 +793,7 @@ TabPage TAB_WIZ_NAME_MATCHING Text[ polish ] = "Tabela docelowa: \n"; Text[ portuguese_brazilian ] = "Destination table: \n"; Text[ japanese ] = "ターゲットテーブル: \n"; - Text[ korean ] = "시트(대상): \n"; + Text[ korean ] = "대상 테이블: \n"; Text[ chinese_simplified ] = "目标表格：\n"; Text[ chinese_traditional ] = "目標表格：\n"; Text[ turkish ] = "Hedef tablo: \n"; @@ -914,7 +914,7 @@ TabPage TAB_WIZ_NAME_MATCHING Text[ greek ] = "~"; Text[ dutch ] = "a~lle"; Text[ french ] = "~Tous"; - Text[ spanish ] = "to~dos"; + Text[ spanish ] = "To~dos"; Text[ italian ] = "Tutti"; Text[ danish ] = "a~lle"; Text[ swedish ] = "A~lla"; @@ -989,7 +989,7 @@ TabPage TAB_WIZ_COPYTABLE Text[ polish ] = "Nazwa tabeli"; Text[ portuguese_brazilian ] = "Tabellenname:"; Text[ japanese ] = "テーブル名(~B)"; - Text[ korean ] = "시트 이름(~B):"; + Text[ korean ] = "테이블 이름(~B)"; Text[ chinese_simplified ] = "表格名称(~B)"; Text[ chinese_traditional ] = "表格名稱(~B)"; Text[ turkish ] = "Tablo ad:"; @@ -1057,7 +1057,7 @@ TabPage TAB_WIZ_COPYTABLE Text[ chinese_traditional ] = "定義和資料(~F)"; Text[ arabic ] = " "; Text[ greek ] = " ~"; - Text[ korean ] = "정의와 데이터(~F)"; + Text[ korean ] = "정의 및 데이터(~F)"; Text[ turkish ] = "Tanm ve veriler"; Text[ catalan ] = "De~finici i dades"; Text[ finnish ] = "M~ritys ja tiedot"; @@ -1100,7 +1100,7 @@ TabPage TAB_WIZ_COPYTABLE Text [ ENGLISH ] = "A~s View" ; Text[ english_us ] = "A~s table view"; Text[ portuguese ] = "Como ~vista de tabela"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ greek ] = "~ "; Text[ dutch ] = "Al~s tabelmodus"; Text[ french ] = "Comme ~vue"; @@ -1111,7 +1111,7 @@ TabPage TAB_WIZ_COPYTABLE Text[ polish ] = "Jako widok tabeli"; Text[ portuguese_brazilian ] = "A~s View"; Text[ japanese ] = "テーブルビューとして(~S)"; - Text[ korean ] = "시트 보기로(~S)"; + Text[ korean ] = "테이블 보기로(~S)"; Text[ chinese_simplified ] = "当作表格视图(~S)"; Text[ chinese_traditional ] = "當作表格檢視(~S)"; Text[ arabic ] = " "; @@ -1143,7 +1143,7 @@ TabPage TAB_WIZ_COPYTABLE Text[ chinese_traditional ] = "附加資料(~D)"; Text[ arabic ] = " "; Text[ greek ] = " ~"; - Text[ korean ] = "데이터 수정(~D)"; + Text[ korean ] = "데이터 첨부(~D)"; Text[ turkish ] = "Verileri ekle"; Text[ catalan ] = "~Adjunta dades"; Text[ finnish ] = "~Liit tiedot"; @@ -1198,7 +1198,7 @@ TabPage TAB_WIZ_COPYTABLE Text[ polish ] = "Nazwa"; Text[ portuguese_brazilian ] = "Name:"; Text[ japanese ] = "名前"; - Text[ korean ] = "이름:"; + Text[ korean ] = "이름"; Text[ chinese_simplified ] = "名称"; Text[ chinese_traditional ] = "名稱"; Text[ turkish ] = "Ad:"; @@ -1222,7 +1222,7 @@ String STR_WIZ_TABLE_COPY Text [ ENGLISH ] = "Copy table" ; Text [ english_us ] = "Copy table" ; Text[ portuguese ] = "Copiar tabela"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ greek ] = " "; Text[ dutch ] = "Tabel kopiren"; Text[ french ] = "Copier la table"; @@ -1233,7 +1233,7 @@ String STR_WIZ_TABLE_COPY Text[ polish ] = "Kopiuj tabel"; Text[ portuguese_brazilian ] = "Copy table"; Text[ japanese ] = "テーブルのコピー"; - Text[ korean ] = "시트 복사"; + Text[ korean ] = "테이블 복사"; Text[ chinese_simplified ] = "复制表格"; Text[ chinese_traditional ] = "複製表格"; Text[ arabic ] = " "; @@ -1257,13 +1257,13 @@ String STR_COPYTABLE_TITLE_COPY Text [ french ] = "Copier la table" ; Text [ dutch ] = "Tabel kopiren" ; Text[ chinese_simplified ] = "复制表格"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ polish ] = "Kopiuj tabel"; Text[ japanese ] = "テーブルのコピー"; Text[ chinese_traditional ] = "複製表格"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "시트 복사"; + Text[ korean ] = "테이블 복사"; Text[ turkish ] = "Tabloyu kopyala"; Text[ catalan ] = "Copia taula"; Text[ finnish ] = "Kopioi taulu"; @@ -1290,7 +1290,7 @@ String STR_COPYTABLE_TITLE_MOVE Text[ chinese_traditional ] = "移動表單"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "시트 이동"; + Text[ korean ] = "테이블 이동"; Text[ turkish ] = "Tabloyu ta"; Text[ catalan ] = "Mou la taula"; Text[ finnish ] = "Siirr taulu"; @@ -1317,7 +1317,7 @@ ErrorBox ERROR_INVALID_TABLE_NAME Message[ chinese_traditional ] = "使用中的資料庫無法接受這個無效的變更名稱。"; Message[ arabic ] = " ."; Message[ greek ] = " ."; - Message[ korean ] = "현재 데이터베이스에서 유효하지 않은 시트 이름입니다."; + Message[ korean ] = "현재 데이터베이스에서 유효하지 않은 테이블 이름입니다."; Message[ turkish ] = "Bu veritabannda bu ad geerli deil."; Message[ catalan ] = "Aquest nom de taula no s vlid en la base de dades actual."; Message[ finnish ] = "Tm taulun nimi ei ole kelvollinen nykyisess tietokannassa."; @@ -1343,7 +1343,7 @@ String STR_ERR_DUPL_TABLENAME Text[ chinese_traditional ] = "表格名稱 \'$name$\' 已經存在。\n您能夠輸入一個新名稱\n或者將資料附加在現存的表格內。"; Text[ arabic ] = " \'$name$\' .\n \n ."; Text[ greek ] = " \'$name$\' .\n \n ."; - Text[ korean ] = "시트 이름 \'$name$\'이(가) 이미 존재합니다.\n새 이름을 입력하거나\n데이터를 기존 시트에 추가할 수 있습니다."; + Text[ korean ] = "테이블 이름 \'$name$\'은(는) 이미 있습니다.\n새 이름을 입력하거나\n데이터를 기존 테이블에 추가할 수 있습니다."; Text[ turkish ] = "Tablo ad \'$name$\' mevcut durumda.\nBaka bir ad girebilir ya da verileri mevcut tabloya ekleyebilirsiniz."; Text[ language_user1 ] = " "; Text[ catalan ] = "El nom de taula \'$name$\' ja existeix.\nPot escriure un altre nom\no adjuntar les dades a la taula existent."; @@ -1369,7 +1369,7 @@ ErrorBox ERROR_INVALID_TABLE_NAME_LENGTH Message[ swedish ] = "ndra tabellnamnet. Det r fr lngt."; Message[ polish ] = "Please change the table name. It is too long."; Message[ japanese ] = "表名を変更してください。名前が長すぎます。"; - Message[ korean ] = "이름이 너무 깁니다. 테이블 이름을 바꿔주십시오."; + Message[ korean ] = "이름이 너무 깁니다. 테이블 이름을 변경해주십시오."; Message[ chinese_simplified ] = "请您更改表格的名称。当前的名称太长了。"; Message[ chinese_traditional ] = "請變更表格名稱。目前的名稱太長了。"; Message[ turkish ] = "Please change the table name. It is too long."; @@ -1408,3 +1408,9 @@ Image IMG_SORTDOWN_H + + + + + + diff --git a/dbaccess/source/ui/misc/charsets.cxx b/dbaccess/source/ui/misc/charsets.cxx index e8d11a87770e..f3f50e18b9ea 100644 --- a/dbaccess/source/ui/misc/charsets.cxx +++ b/dbaccess/source/ui/misc/charsets.cxx @@ -2,9 +2,9 @@ * * $RCSfile: charsets.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: oj $ $Date: 2002-08-19 07:51:10 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,6 +77,9 @@ #ifndef _TOOLS_RCID_H #include #endif +#ifndef _DBAUI_LOCALRESACCESS_HXX_ +#include "localresaccess.hxx" +#endif //......................................................................... namespace dbaui @@ -90,79 +93,63 @@ namespace dbaui //------------------------------------------------------------------------- OCharsetDisplay::OCharsetDisplay() :OCharsetMap() - ,Resource(RSC_CHARSETS) + ,SvxTextEncodingTable() { -#ifdef DBG_UTIL - sal_Bool bAlreadyAsserted = sal_False; -#endif - - sal_Int32 nSize = size(); - m_aDisplayNames.reserve( nSize ); - for (sal_Int32 i=1; i<=nSize; ++i) { - ResId aLocalId( (USHORT)i ); - - if ( IsAvailableRes( aLocalId.SetRT( RSC_STRING ) ) ) - m_aDisplayNames.push_back( String( aLocalId ) ); - else - { - DBG_ASSERT( bAlreadyAsserted, "OCharsetDisplay::OCharsetDisplay: invalid resources!" ); -#ifdef DBG_UTIL - bAlreadyAsserted = sal_True; -#endif - m_aDisplayNames.push_back( ::rtl::OUString::createFromAscii( "" ) ); - } + OLocalResourceAccess aCharsetStrings( RSC_CHARSETS, RSC_RESOURCE ); + m_aSystemDisplayName = String( ResId( 1 ) ); } + } + + //------------------------------------------------------------------------- + sal_Bool OCharsetDisplay::approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const + { + if ( !OCharsetMap::approveEncoding( _eEncoding, _rInfo ) ) + return sal_False; + + if ( RTL_TEXTENCODING_DONTKNOW == _eEncoding ) + return sal_True; - FreeResource(); + return 0 != GetTextString( _eEncoding ).Len(); } //------------------------------------------------------------------------- OCharsetDisplay::const_iterator OCharsetDisplay::begin() const { - return const_iterator(this, OCharsetMap::begin(), 0); + return const_iterator( this, OCharsetMap::begin() ); } //------------------------------------------------------------------------- OCharsetDisplay::const_iterator OCharsetDisplay::end() const { - return const_iterator(this, OCharsetMap::end(), size()); + return const_iterator( this, OCharsetMap::end() ); } //------------------------------------------------------------------------- OCharsetDisplay::const_iterator OCharsetDisplay::find(const rtl_TextEncoding _eEncoding) const { OCharsetMap::const_iterator aBaseIter = OCharsetMap::find(_eEncoding); - return const_iterator(this, aBaseIter, aBaseIter - OCharsetMap::begin()); + return const_iterator( this, aBaseIter ); } //------------------------------------------------------------------------- OCharsetDisplay::const_iterator OCharsetDisplay::find(const ::rtl::OUString& _rIanaName, const IANA&) const { OCharsetMap::const_iterator aBaseIter = OCharsetMap::find(_rIanaName, OCharsetMap::IANA()); - return const_iterator(this, aBaseIter, aBaseIter - OCharsetMap::begin()); - } - - //------------------------------------------------------------------------- - OCharsetDisplay::const_iterator OCharsetDisplay::find(const ::rtl::OUString& _rLogicalName, const Logical&) const - { - OCharsetMap::const_iterator aBaseIter = OCharsetMap::find(_rLogicalName, OCharsetMap::Logical()); - return const_iterator(this, aBaseIter, aBaseIter - OCharsetMap::begin()); + return const_iterator( this, aBaseIter ); } //------------------------------------------------------------------------- OCharsetDisplay::const_iterator OCharsetDisplay::find(const ::rtl::OUString& _rDisplayName, const Display&) const { - OCharsetMap::CharsetIterator aBasePos = OCharsetMap::begin(); - sal_Int32 nIndex = 0; - for ( ConstStringVectorIterator aSearch = m_aDisplayNames.begin(); - aSearch != m_aDisplayNames.end(); - ++aSearch, ++aBasePos, ++nIndex - ) - if (*aSearch == _rDisplayName) - break; - - return const_iterator(this, aBasePos, nIndex); + rtl_TextEncoding eEncoding = RTL_TEXTENCODING_DONTKNOW; + if ( _rDisplayName != m_aSystemDisplayName ) + { + eEncoding = GetTextEncoding( _rDisplayName ); + OSL_ENSURE( RTL_TEXTENCODING_DONTKNOW != eEncoding, + "OCharsetDisplay::find: non-empty display name, but DONTKNOW!" ); + } + return const_iterator( this, OCharsetMap::find( eEncoding ) ); } //========================================================================= @@ -180,6 +167,7 @@ namespace dbaui :CharsetDisplayDerefHelper_Base(_rBase) ,m_sDisplayName(_rDisplayName) { + DBG_ASSERT( m_sDisplayName.getLength(), "CharsetDisplayDerefHelper::CharsetDisplayDerefHelper: invalid display name!" ); } //------------------------------------------------------------------------- @@ -191,82 +179,57 @@ namespace dbaui //= OCharsetDisplay::ExtendedCharsetIterator //========================================================================= //------------------------------------------------------------------------- - OCharsetDisplay::ExtendedCharsetIterator::ExtendedCharsetIterator(const OCharsetDisplay* _pContainer, const base_iterator& _rPosition, const sal_Int32 _nPosition) + OCharsetDisplay::ExtendedCharsetIterator::ExtendedCharsetIterator( const OCharsetDisplay* _pContainer, const base_iterator& _rPosition ) :m_pContainer(_pContainer) ,m_aPosition(_rPosition) - ,m_nPosition(_nPosition) { DBG_ASSERT(m_pContainer, "OCharsetDisplay::ExtendedCharsetIterator::ExtendedCharsetIterator : invalid container!"); } //------------------------------------------------------------------------- OCharsetDisplay::ExtendedCharsetIterator::ExtendedCharsetIterator(const ExtendedCharsetIterator& _rSource) - :m_pContainer(_rSource.m_pContainer) - ,m_aPosition(_rSource.m_aPosition) - ,m_nPosition(_rSource.m_nPosition) + :m_pContainer( _rSource.m_pContainer ) + ,m_aPosition( _rSource.m_aPosition ) { } //------------------------------------------------------------------------- CharsetDisplayDerefHelper OCharsetDisplay::ExtendedCharsetIterator::operator*() const { - DBG_ASSERT(m_nPosition < (sal_Int32)m_pContainer->m_aDisplayNames.size(), "OCharsetDisplay::ExtendedCharsetIterator::operator* : invalid position!"); - return CharsetDisplayDerefHelper(*m_aPosition, m_pContainer->m_aDisplayNames[m_nPosition]); + DBG_ASSERT( m_aPosition != m_pContainer->OCharsetDisplay_Base::end(), "OCharsetDisplay::ExtendedCharsetIterator::operator* : invalid position!"); + + rtl_TextEncoding eEncoding = (*m_aPosition).getEncoding(); + return CharsetDisplayDerefHelper( + *m_aPosition, + RTL_TEXTENCODING_DONTKNOW == eEncoding ? m_pContainer->m_aSystemDisplayName : (::rtl::OUString)m_pContainer->GetTextString( eEncoding ) + ); } //------------------------------------------------------------------------- const OCharsetDisplay::ExtendedCharsetIterator& OCharsetDisplay::ExtendedCharsetIterator::operator++() { - DBG_ASSERT(m_nPosition < (sal_Int32)m_pContainer->m_aDisplayNames.size(), "OCharsetDisplay::ExtendedCharsetIterator::operator++ : invalid position!"); - if (m_nPosition < (sal_Int32)m_pContainer->m_aDisplayNames.size()) - { - ++m_nPosition; + DBG_ASSERT( m_aPosition != m_pContainer->OCharsetDisplay_Base::end(), "OCharsetDisplay::ExtendedCharsetIterator::operator++ : invalid position!"); + if ( m_aPosition != m_pContainer->OCharsetDisplay_Base::end() ) ++m_aPosition; - } return *this; } //------------------------------------------------------------------------- const OCharsetDisplay::ExtendedCharsetIterator& OCharsetDisplay::ExtendedCharsetIterator::operator--() { - DBG_ASSERT(m_nPosition >= 0, "OCharsetDisplay::ExtendedCharsetIterator::operator-- : invalid position!"); - if (m_nPosition >= 0) - { - --m_nPosition; + DBG_ASSERT( m_aPosition != m_pContainer->OCharsetDisplay_Base::begin(), "OCharsetDisplay::ExtendedCharsetIterator::operator-- : invalid position!"); + if ( m_aPosition != m_pContainer->OCharsetDisplay_Base::begin() ) --m_aPosition; - } return *this; } //------------------------------------------------------------------------- bool operator==(const OCharsetDisplay::ExtendedCharsetIterator& lhs, const OCharsetDisplay::ExtendedCharsetIterator& rhs) { - return (lhs.m_pContainer == rhs.m_pContainer) && (lhs.m_nPosition == rhs.m_nPosition); + return (lhs.m_pContainer == rhs.m_pContainer) && (lhs.m_aPosition == rhs.m_aPosition); } //......................................................................... } // namespace dbaui //......................................................................... -/************************************************************************* - * history: - * $Log: not supported by cvs2svn $ - * Revision 1.5 2002/03/14 08:54:05 fs - * #97788# assertion for invalid character set maps corrected - * - * Revision 1.4 2001/10/15 13:38:09 fs - * #93204# new supported charset IBM866 (cyrillic) - * - * Revision 1.3 2001/05/10 12:02:10 fs - * #86849# be a little more tolerant when display names are missing - * - * Revision 1.2 2000/11/29 22:26:32 fs - * #80003# re-implemented, now base on dbtools::OCharsetMap - * - * Revision 1.1 2000/10/05 10:08:39 fs - * initial checkin - * - * - * Revision 1.0 26.09.00 12:18:36 fs - ************************************************************************/ - diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx index aa9134620192..2ad500fdc3f3 100644 --- a/dbaccess/source/ui/misc/datasourceconnector.cxx +++ b/dbaccess/source/ui/misc/datasourceconnector.cxx @@ -2,9 +2,9 @@ * * $RCSfile: datasourceconnector.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: fs $ $Date: 2001-08-15 06:48:59 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -258,16 +258,3 @@ namespace dbaui } // namespace dbaui //......................................................................... -/************************************************************************* - * history: - * $Log: not supported by cvs2svn $ - * Revision 1.2 2001/05/11 08:29:30 fs - * solaris needs complete types to catch them - * - * Revision 1.1 2001/05/10 12:17:59 fs - * initial checkin - helper class for creating a connection for a data source - * - * - * Revision 1.0 10.05.01 09:44:48 fs - ************************************************************************/ - diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src index be3fbfc42dc6..ca52902409ea 100644 --- a/dbaccess/source/ui/misc/dbumiscres.src +++ b/dbaccess/source/ui/misc/dbumiscres.src @@ -1,63 +1,63 @@ /************************************************************************* - * - * $RCSfile: dbumiscres.src,v $ - * - * $Revision: 1.52 $ - * - * last change: $Author: vg $ $Date: 2002-12-09 09:52:15 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses - * - * - GNU Lesser General Public License Version 2.1 - * - Sun Industry Standards Source License Version 1.1 - * - * Sun Microsystems Inc., October, 2000 - * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2000 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - * - * Sun Industry Standards Source License Version 1.1 - * ================================================= - * The contents of this file are subject to the Sun Industry Standards - * Source License Version 1.1 (the "License"); You may not use this file - * except in compliance with the License. You may obtain a copy of the - * License at http://www.openoffice.org/license.html. - * - * Software provided under this License is provided on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, - * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, - * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. - * See the License for the specific provisions governing your rights and - * obligations concerning the Software. - * - * The Initial Developer of the Original Code is: Sun Microsystems, Inc.. - * - * Copyright: 2000 by Sun Microsystems, Inc. - * - * All Rights Reserved. - * - * Contributor(s): _______________________________________ - * - * - ************************************************************************/ +* +* $RCSfile: dbumiscres.src,v $ +* +* $Revision: 1.53 $ +* +* last change: $Author: hr $ $Date: 2003-03-19 17:52:53 $ +* +* The Contents of this file are made available subject to the terms of +* either of the following licenses +* +* - GNU Lesser General Public License Version 2.1 +* - Sun Industry Standards Source License Version 1.1 +* +* Sun Microsystems Inc., October, 2000 +* +* GNU Lesser General Public License Version 2.1 +* ============================================= +* Copyright 2000 by Sun Microsystems, Inc. +* 901 San Antonio Road, Palo Alto, CA 94303, USA +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License version 2.1, as published by the Free Software Foundation. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* MA 02111-1307 USA +* +* +* Sun Industry Standards Source License Version 1.1 +* ================================================= +* The contents of this file are subject to the Sun Industry Standards +* Source License Version 1.1 (the "License"); You may not use this file +* except in compliance with the License. You may obtain a copy of the +* License at http://www.openoffice.org/license.html. +* +* Software provided under this License is provided on an "AS IS" basis, +* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, +* WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, +* MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. +* See the License for the specific provisions governing your rights and +* obligations concerning the Software. +* +* The Initial Developer of the Original Code is: Sun Microsystems, Inc.. +* +* Copyright: 2000 by Sun Microsystems, Inc. +* +* All Rights Reserved. +* +* Contributor(s): _______________________________________ +* +* +************************************************************************/ #ifndef _DBU_MISC_HRC_ #include "dbu_misc.hrc" @@ -69,587 +69,287 @@ //------------------------------------------------------------------------- Resource RSC_DATASOURCE_TYPES { - String STR_CONNTYPES - { - Text = "sdbc:mysql:odbc:;sdbc:mysql:jdbc:;sdbc:adabas:;jdbc:;sdbc:odbc:;sdbc:dbase:;sdbc:ado:;sdbc:flat:;sdbc:calc:;sdbc:address:" ; - }; - String STR_CONNUINAMES - { - Text = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;Text;Tabellendokument;Adressbuch" ; - Text [ english ] = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;Text;Spreadsheet;Addressbook" ; - Text [ english_us ] = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;Text;Spreadsheet;Address book" ; - Text[ language_user1 ] = "Please be carefull with the number/ordering of (semicolon-separated) tokens in the string."; - Text[ russian ] = "Adabas;JDBC;ODBC;dBase;ADO;; ; "; - Text[ finnish ] = "Adabas;JDBC;ODBC;dBase;ADO;Teksti;Laskentataulut;Osoitteisto"; - }; +String STR_CONNTYPES +{ + Text = "sdbc:mysql:odbc:;sdbc:mysql:jdbc:;sdbc:adabas:;jdbc:;sdbc:odbc:;sdbc:dbase:;sdbc:ado:;sdbc:flat:;sdbc:calc:;sdbc:address:" ; +}; +String STR_CONNUINAMES +{ + Text = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;Text;Tabellendokument;Adressbuch" ; + Text [ english ] = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;Text;Spreadsheet;Addressbook" ; + Text [ english_us ] = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;Text;Spreadsheet;Address book" ; + Text[ language_user1 ] = "Please be carefull with the number/ordering of (semicolon-separated) tokens in the string."; + Text[ russian ] = "Adabas;JDBC;ODBC;dBase;ADO;; ; "; + Text[ finnish ] = "Adabas;JDBC;ODBC;dBase;ADO;Teksti;Laskentataulut;Osoitteisto"; + Text[ portuguese ] = "Adabas;JDBC;ODBC;dBase;ADO;Texto;FolhaClculo;LivroEndereos"; + Text[ greek ] = "Adabas;JDBC;ODBC;dBase;ADO;; ; "; + Text[ dutch ] = "Adabas;JDBC;ODBC;dBase;ADO;Tekst;Werkbladdocument;Adresboek"; + Text[ french ] = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;Texte;Classeur;Carnet d'adresses"; + Text[ spanish ] = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;Texto;Hoja de clculo;Libreta de direcciones"; + Text[ italian ] = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;Testo;Foglio elettronico;Rubrica"; + Text[ danish ] = "Adabas;JDBC;ODBC;dBase;ADO;Tekst;Regneark;Adressekartotek"; + Text[ swedish ] = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;Text;Tabelldokument;Adressbok"; + Text[ polish ] = "Adabas;JDBC;ODBC;dBase;ADO;Tekst;Arkusz kalkulacyjny;Ksika adresowa"; + Text[ japanese ] = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;テキストファイル;表計算ドキュメント;アドレス帳"; + Text[ korean ] = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;텍스트;스프레드시트;주소록"; + Text[ chinese_simplified ] = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;文字;工作表;通讯簿"; + Text[ chinese_traditional ] = "MySQL;MySQL;Adabas;JDBC;ODBC;dBase;ADO;文字;工作表文件;通訊錄"; + Text[ turkish ] = "Adabas;JDBC;ODBC;dBase;Text"; + Text[ arabic ] = "Adabas;JDBC;ODBC;dBase;ADO;; "; + Text[ catalan ] = "Adabas;JDBC;ODBC;dBase;ADO;Text;Spreadsheet"; + Text[ thai ] = "Adabas;JDBC;ODBC;ดีเบส;ADO;ข้อความ;กระดาษคำนวณ;สมุดที่อยู่"; +}; }; Resource RSC_CHARSETS { - String 1 - { - Text = "Ansi"; - Text [ english ] = "Ansi"; - Text [ english_us ] = "Ansi"; - Text[ portuguese ] = "Ansi"; - Text[ russian ] = "Ansi"; - Text[ greek ] = "Ansi"; - Text[ dutch ] = "Ansi"; - Text[ french ] = "Ansi"; - Text[ spanish ] = "Ansi"; - Text[ finnish ] = "Ansi"; - Text[ italian ] = "Ansi"; - Text[ danish ] = "Ansi"; - Text[ swedish ] = "Ansi"; - Text[ polish ] = "Ansi"; - Text[ portuguese_brazilian ] = "Ansi"; - Text[ japanese ] = "Ansi"; - Text[ korean ] = "Ansi"; - Text[ chinese_simplified ] = "Ansi"; - Text[ chinese_traditional ] = "Ansi"; - Text[ turkish ] = "Ansi"; - Text[ arabic ] = "Ansi"; - Text[ catalan ] = "Ansi"; - Text[ thai ] = "Ansi"; - }; - String 2 - { - Text = "Mac"; - Text [ english ] = "Mac"; - Text [ english_us ] = "Mac"; - Text[ portuguese ] = "Mac"; - Text[ russian ] = "Mac"; - Text[ greek ] = "Mac"; - Text[ dutch ] = "Mac"; - Text[ french ] = "Mac"; - Text[ spanish ] = "Mac"; - Text[ finnish ] = "Mac"; - Text[ italian ] = "Mac"; - Text[ danish ] = "Mac"; - Text[ swedish ] = "Mac"; - Text[ polish ] = "Mac"; - Text[ portuguese_brazilian ] = "Mac"; - Text[ japanese ] = "Mac"; - Text[ korean ] = "Mac"; - Text[ chinese_simplified ] = "Mac"; - Text[ chinese_traditional ] = "Mac"; - Text[ turkish ] = "Mac"; - Text[ arabic ] = "Mac"; - Text[ catalan ] = "Mac"; - Text[ thai ] = "Mac"; - }; - String 3 - { - Text = "IBMPC (437)"; - Text [ english ] = "IBMPC (437)"; - Text [ english_us ] = "IBMPC (437)"; - Text[ portuguese ] = "IBMPC (437)"; - Text[ russian ] = "IBMPC (437)"; - Text[ greek ] = "IBMPC (437)"; - Text[ dutch ] = "IBMPC (437)"; - Text[ french ] = "IBMPC (437)"; - Text[ spanish ] = "IBMPC (437)"; - Text[ finnish ] = "IBMPC (437)"; - Text[ italian ] = "IBMPC (437)"; - Text[ danish ] = "IBMPC (437)"; - Text[ swedish ] = "IBMPC (437)"; - Text[ polish ] = "IBMPC (437)"; - Text[ portuguese_brazilian ] = "IBMPC (437)"; - Text[ japanese ] = "IBMPC (437)"; - Text[ korean ] = "IBMPC (437)"; - Text[ chinese_simplified ] = "IBMPC (437)"; - Text[ chinese_traditional ] = "IBMPC (437)"; - Text[ turkish ] = "IBMPC (437)"; - Text[ arabic ] = "IBMPC (437)"; - Text[ catalan ] = "IBMPC (437)"; - Text[ thai ] = "IBMPC (437)"; - }; - String 4 - { - Text = "IBMPC (850) / DOS"; - Text [ english ] = "IBMPC (850) / DOS"; - Text [ english_us ] = "IBMPC (850) / DOS"; - Text[ portuguese ] = "IBMPC (850) / DOS"; - Text[ russian ] = "IBMPC (850) / DOS"; - Text[ greek ] = "IBMPC (850) / DOS"; - Text[ dutch ] = "IBMPC (850) / DOS"; - Text[ french ] = "IBMPC (850) / DOS"; - Text[ spanish ] = "IBMPC (850) / DOS"; - Text[ finnish ] = "IBMPC (850) / DOS"; - Text[ italian ] = "IBMPC (850) / DOS"; - Text[ danish ] = "IBMPC (850) / DOS"; - Text[ swedish ] = "IBMPC (850)/DOS"; - Text[ polish ] = "IBMPC (850) / DOS"; - Text[ portuguese_brazilian ] = "IBMPC (850) / DOS"; - Text[ japanese ] = "IBMPC (850) / DOS"; - Text[ korean ] = "IBMPC (850) / DOS"; - Text[ chinese_simplified ] = "IBMPC (850) / DOS"; - Text[ chinese_traditional ] = "IBMPC (850) / DOS"; - Text[ turkish ] = "IBMPC (850) / DOS"; - Text[ arabic ] = "IBMPC (850) / DOS"; - Text[ catalan ] = "IBMPC (850) / DOS"; - Text[ thai ] = "IBMPC (850) / DOS"; - }; - String 5 - { - Text = "IBMPC (860)"; - Text [ english ] = "IBMPC (860)"; - Text [ english_us ] = "IBMPC (860)"; - Text[ portuguese ] = "IBMPC (860)"; - Text[ russian ] = "IBMPC (860)"; - Text[ greek ] = "IBMPC (860)"; - Text[ dutch ] = "IBMPC (860)"; - Text[ french ] = "IBMPC (860)"; - Text[ spanish ] = "IBMPC (860)"; - Text[ finnish ] = "IBMPC (860)"; - Text[ italian ] = "IBMPC (860)"; - Text[ danish ] = "IBMPC (860)"; - Text[ swedish ] = "IBMPC (860)"; - Text[ polish ] = "IBMPC (860)"; - Text[ portuguese_brazilian ] = "IBMPC (860)"; - Text[ japanese ] = "IBMPC (860)"; - Text[ korean ] = "IBMPC (860)"; - Text[ chinese_simplified ] = "IBMPC (860)"; - Text[ chinese_traditional ] = "IBMPC (860)"; - Text[ turkish ] = "IBMPC (860)"; - Text[ arabic ] = "IBMPC (860)"; - Text[ catalan ] = "IBMPC (860)"; - Text[ thai ] = "IBMPC (860)"; - }; - String 6 - { - Text = "IBMPC (861)"; - Text [ english ] = "IBMPC (861)"; - Text [ english_us ] = "IBMPC (861)"; - Text[ portuguese ] = "IBMPC (861)"; - Text[ russian ] = "IBMPC (861)"; - Text[ greek ] = "IBMPC (861)"; - Text[ dutch ] = "IBMPC (861)"; - Text[ french ] = "IBMPC (861)"; - Text[ spanish ] = "IBMPC (861)"; - Text[ finnish ] = "IBMPC (861)"; - Text[ italian ] = "IBMPC (861)"; - Text[ danish ] = "IBMPC (861)"; - Text[ swedish ] = "IBMPC (861)"; - Text[ polish ] = "IBMPC (861)"; - Text[ portuguese_brazilian ] = "IBMPC (861)"; - Text[ japanese ] = "IBMPC (861)"; - Text[ korean ] = "IBMPC (861)"; - Text[ chinese_simplified ] = "IBMPC (861)"; - Text[ chinese_traditional ] = "IBMPC (861)"; - Text[ turkish ] = "IBMPC (861)"; - Text[ arabic ] = "IBMPC (861)"; - Text[ catalan ] = "IBMPC (861)"; - Text[ thai ] = "IBMPC (861)"; - }; - String 7 - { - Text = "IBMPC (863)"; - Text [ english ] = "IBMPC (863)"; - Text [ english_us ] = "IBMPC (863)"; - Text[ portuguese ] = "IBMPC (863)"; - Text[ russian ] = "IBMPC (863)"; - Text[ greek ] = "IBMPC (863)"; - Text[ dutch ] = "IBMPC (863)"; - Text[ french ] = "IBMPC (863)"; - Text[ spanish ] = "IBMPC (863)"; - Text[ finnish ] = "IBMPC (863)"; - Text[ italian ] = "IBMPC (863)"; - Text[ danish ] = "IBMPC (863)"; - Text[ swedish ] = "IBMPC (863)"; - Text[ polish ] = "IBMPC (863)"; - Text[ portuguese_brazilian ] = "IBMPC (863)"; - Text[ japanese ] = "IBMPC (863)"; - Text[ korean ] = "IBMPC (863)"; - Text[ chinese_simplified ] = "IBMPC (863)"; - Text[ chinese_traditional ] = "IBMPC (863)"; - Text[ turkish ] = "IBMPC (863)"; - Text[ arabic ] = "IBMPC (863)"; - Text[ catalan ] = "IBMPC (863)"; - Text[ thai ] = "IBMPC (863)"; - }; - String 8 - { - Text = "IBMPC (865)"; - Text [ english ] = "IBMPC (865)"; - Text [ english_us ] = "IBMPC (865)"; - Text[ portuguese ] = "IBMPC (865)"; - Text[ russian ] = "IBMPC (865)"; - Text[ greek ] = "IBMPC (865)"; - Text[ dutch ] = "IBMPC (865)"; - Text[ french ] = "IBMPC (865)"; - Text[ spanish ] = "IBMPC (865)"; - Text[ finnish ] = "IBMPC (865)"; - Text[ italian ] = "IBMPC (865)"; - Text[ danish ] = "IBMPC (865)"; - Text[ swedish ] = "IBMPC (865)"; - Text[ polish ] = "IBMPC (865)"; - Text[ portuguese_brazilian ] = "IBMPC (865)"; - Text[ japanese ] = "IBMPC (865)"; - Text[ korean ] = "IBMPC (865)"; - Text[ chinese_simplified ] = "IBMPC (865)"; - Text[ chinese_traditional ] = "IBMPC (865)"; - Text[ turkish ] = "IBMPC (865)"; - Text[ arabic ] = "IBMPC (865)"; - Text[ catalan ] = "IBMPC (865)"; - Text[ thai ] = "IBMPC (865)"; - }; - String 9 - { - Text = "IBMPC (866)"; - Text [ english ] = "IBMPC (866)"; - Text [ english_us ] = "IBMPC (866)"; - Text[ portuguese ] = "IBMPC (866)"; - Text[ russian ] = "IBMPC (866)"; - Text[ greek ] = "IBMPC (866)"; - Text[ dutch ] = "IBMPC (866)"; - Text[ french ] = "IBMPC (866)"; - Text[ spanish ] = "IBMPC (866)"; - Text[ finnish ] = "IBMPC (866)"; - Text[ italian ] = "IBMPC (866)"; - Text[ danish ] = "IBMPC (866)"; - Text[ swedish ] = "IBMPC (866)"; - Text[ polish ] = "IBMPC (866)"; - Text[ portuguese_brazilian ] = "IBMPC (866)"; - Text[ japanese ] = "IBMPC (866)"; - Text[ korean ] = "IBMPC (866)"; - Text[ chinese_simplified ] = "IBMPC (866)"; - Text[ chinese_traditional ] = "IBMPC (866)"; - Text[ turkish ] = "IBMPC (866)"; - Text[ arabic ] = "IBMPC (866)"; - Text[ catalan ] = "IBMPC (866)"; - Text[ thai ] = "IBMPC (866)"; - }; - String 10 - { - Text = "System"; - Text [ english ] = "System"; - Text [ english_us ] = "System"; - Text[ portuguese ] = "Sistema"; - Text[ russian ] = "System"; - Text[ greek ] = ""; - Text[ dutch ] = "Systeem"; - Text[ french ] = "Systme"; - Text[ spanish ] = "Sistema"; - Text[ finnish ] = "Jrjestelm"; - Text[ italian ] = "Sistema"; - Text[ danish ] = "System"; - Text[ swedish ] = "System"; - Text[ polish ] = "System"; - Text[ portuguese_brazilian ] = "System"; - Text[ japanese ] = "システム"; - Text[ korean ] = "시스템"; - Text[ chinese_simplified ] = "系统"; - Text[ chinese_traditional ] = "系統"; - Text[ turkish ] = "Sistem"; - Text[ arabic ] = ""; - Text[ catalan ] = "System"; - Text[ thai ] = "ระบบ"; - }; - String 11 - { - Text = "UTF-8"; - Text [ english ] = "UTF-8"; - Text [ english_us ] = "UTF-8"; - Text[ portuguese ] = "UTF-8"; - Text[ russian ] = "UTF-8"; - Text[ greek ] = "UTF-8"; - Text[ dutch ] = "UTF-8"; - Text[ french ] = "UTF-8"; - Text[ spanish ] = "UTF-8"; - Text[ finnish ] = "UTF-8"; - Text[ italian ] = "UTF-8"; - Text[ danish ] = "UTF-8"; - Text[ swedish ] = "UTF-8"; - Text[ polish ] = "UTF-8"; - Text[ portuguese_brazilian ] = "UTF-8"; - Text[ japanese ] = "UTF-8"; - Text[ korean ] = "UTF-8"; - Text[ chinese_simplified ] = "UTF-8"; - Text[ chinese_traditional ] = "UTF-8"; - Text[ turkish ] = "UTF-8"; - Text[ arabic ] = "UTF-8"; - Text[ catalan ] = "UTF-8"; - Text[ thai ] = "UTF-8"; - }; - String 12 - { - Text = "Big5-HKSCS"; - Text [ english ] = "Big5-HKSCS"; - Text [ english_us ] = "Big5-HKSCS"; - Text[ portuguese ] = "Big5-HKSCS"; - Text[ russian ] = "Big5-HKSCS"; - Text[ greek ] = "Big5-HKSCS"; - Text[ dutch ] = "Big5-HKSCS"; - Text[ french ] = "Big5-HKSCS"; - Text[ spanish ] = "Big5 HKSCS"; - Text[ finnish ] = "Big5-HKSCS"; - Text[ italian ] = "Big5-HKSCS"; - Text[ danish ] = "Big5-HKSCS"; - Text[ swedish ] = "Big5-HKSCS"; - Text[ polish ] = "Big5-HKSCS"; - Text[ portuguese_brazilian ] = "Big5-HKSCS"; - Text[ japanese ] = "Big5-HKSCS"; - Text[ korean ] = "Big5-HKSCS"; - Text[ chinese_simplified ] = "Big5-HKSCS"; - Text[ chinese_traditional ] = "Big5-HKSCS"; - Text[ turkish ] = "Big5-HKSCS"; - Text[ arabic ] = "Big5-HKSCS"; - Text[ catalan ] = "Big5-HKSCS"; - Text[ thai ] = "Big5-HKSCS"; - }; +String 1 +{ + Text = "System"; + Text [ english ] = "System"; + Text [ english_us ] = "System"; + Text[ portuguese ] = "Sistema"; + Text[ russian ] = "Ansi"; + Text[ greek ] = ""; + Text[ dutch ] = "Ansi"; + Text[ french ] = "Systme"; + Text[ spanish ] = "Sistema"; + Text[ finnish ] = "Ansi"; + Text[ italian ] = "Sistema"; + Text[ danish ] = "Ansi"; + Text[ swedish ] = "System"; + Text[ polish ] = "Ansi"; + Text[ portuguese_brazilian ] = "System"; + Text[ japanese ] = "Ansi"; + Text[ korean ] = "시스템"; + Text[ chinese_simplified ] = "系统"; + Text[ chinese_traditional ] = "系統"; + Text[ turkish ] = "Sistem"; + Text[ arabic ] = ""; + Text[ catalan ] = "Ansi"; + Text[ thai ] = "ระบบ"; +}; }; //------------------------------------------------------------------------- String STR_GENERAL_SDB_ERROR { - Text = "Fehler bei der Verbindung mit der Datenquelle"; - Text [ english ] = "Error while connecting to the data source"; - Text [ english_us ] = "Error while connecting to the data source"; - Text[ portuguese ] = "Erro na ligao fonte de dados"; - Text[ russian ] = " "; - Text[ greek ] = " "; - Text[ dutch ] = "Fout bij verbinding met gegevensbron"; - Text[ french ] = "Erreur lors de la connexion la source de donnes"; - Text[ spanish ] = "Error durante la conexin con la fuente de datos"; - Text[ italian ] = "Errore durante il collegamento alla sorgente dati"; - Text[ danish ] = "Fejl under forbindelsen med datakilden"; - Text[ swedish ] = "Fel vid anslutningen till datakllan"; - Text[ polish ] = "Bd w czeniu ze rdem danych"; - Text[ portuguese_brazilian ] = "Error while connecting to the data source"; - Text[ japanese ] = "データソースへ接続時のエラー"; - Text[ korean ] = "데이터 소스에 연결시에 오류"; - Text[ chinese_simplified ] = "在和数据源连接时发生一个错误"; - Text[ chinese_traditional ] = "連線到資料源時發生一個錯誤"; - Text[ turkish ] = "Error while connecting to the data source"; - Text[ arabic ] = " "; - Text[ finnish ] = "On ilmennyt virhe muodostettaessa yhteytt tietolhteeseen"; - Text[ catalan ] = "S'ha produt un error en connectar amb la font de dades"; - Text[ thai ] = "ผิดพลาดขณะกำลังเชื่อมต่อกับแหล่งข้อมูล"; +Text = "Fehler bei der Verbindung mit der Datenquelle"; +Text [ english ] = "Error while connecting to the data source"; +Text [ english_us ] = "Error while connecting to the data source"; +Text[ portuguese ] = "Erro na ligao fonte de dados"; +Text[ russian ] = " "; +Text[ greek ] = " "; +Text[ dutch ] = "Fout bij verbinding met gegevensbron"; +Text[ french ] = "Erreur lors de la connexion la source de donnes"; +Text[ spanish ] = "Error durante la conexin con la fuente de datos"; +Text[ italian ] = "Errore durante il collegamento alla sorgente dati"; +Text[ danish ] = "Fejl under forbindelsen med datakilden"; +Text[ swedish ] = "Fel vid anslutningen till datakllan"; +Text[ polish ] = "Bd w czeniu ze rdem danych"; +Text[ portuguese_brazilian ] = "Error while connecting to the data source"; +Text[ japanese ] = "データソースへ接続時のエラー"; +Text[ korean ] = "데이터 원본으로 연결하던 중 오류"; +Text[ chinese_simplified ] = "在和数据源连接时发生一个错误"; +Text[ chinese_traditional ] = "連線到資料源時發生一個錯誤"; +Text[ turkish ] = "Error while connecting to the data source"; +Text[ arabic ] = " "; +Text[ finnish ] = "On ilmennyt virhe muodostettaessa yhteytt tietolhteeseen"; +Text[ catalan ] = "S'ha produt un error en connectar amb la font de dades"; +Text[ thai ] = "ผิดพลาดขณะกำลังเชื่อมต่อกับแหล่งข้อมูล"; }; String STR_OBJECT_ALREADY_EXSISTS { - Text = "Fehler beim Erzeugen!"; - Text [ english ] = "Error while creating!"; - Text [ english_us ] = "Error during creation!"; - Text[ portuguese ] = "Erro ao criar objecto!"; - Text[ russian ] = " !"; - Text[ greek ] = " !"; - Text[ dutch ] = "Fout bij definiren!"; - Text[ french ] = "Erreur durant le processus de cration !"; - Text[ spanish ] = "Error al crear el objeto!"; - Text[ italian ] = "Errore nella creazione dell'oggetto"; - Text[ danish ] = "Fejl under genereringen!"; - Text[ swedish ] = "Fel nr objekt skulle skapas!"; - Text[ polish ] = "Bd w trakcie tworzenia!"; - Text[ portuguese_brazilian ] = "Error while creating!"; - Text[ japanese ] = "作成するときのエラー。"; - Text[ korean ] = "작성 오류!"; - Text[ chinese_simplified ] = "在生成时发生一个错误！"; - Text[ chinese_traditional ] = "在建立時發生錯誤"; - Text[ turkish ] = "Error while creating!"; - Text[ arabic ] = " !"; - Text[ finnish ] = "Virhe luonnin aikana."; - Text[ catalan ] = "S'ha produt un error durant el procs de creaci"; - Text[ thai ] = "ผิดพลาดในระหว่างการสร้าง!"; +Text = "Fehler beim Erzeugen!"; +Text [ english ] = "Error while creating!"; +Text [ english_us ] = "Error during creation!"; +Text[ portuguese ] = "Erro ao criar objecto!"; +Text[ russian ] = " !"; +Text[ greek ] = " !"; +Text[ dutch ] = "Fout bij definiren!"; +Text[ french ] = "Erreur durant le processus de cration !"; +Text[ spanish ] = "Error al crear el objeto!"; +Text[ italian ] = "Errore nella creazione dell'oggetto"; +Text[ danish ] = "Fejl under genereringen!"; +Text[ swedish ] = "Fel nr objekt skulle skapas!"; +Text[ polish ] = "Bd w trakcie tworzenia!"; +Text[ portuguese_brazilian ] = "Error while creating!"; +Text[ japanese ] = "作成するときのエラー。"; +Text[ korean ] = "만드는 중 오류"; +Text[ chinese_simplified ] = "在生成时发生一个错误！"; +Text[ chinese_traditional ] = "在建立時發生錯誤"; +Text[ turkish ] = "Error while creating!"; +Text[ arabic ] = " !"; +Text[ finnish ] = "Virhe luonnin aikana."; +Text[ catalan ] = "S'ha produt un error durant el procs de creaci"; +Text[ thai ] = "ผิดพลาดในระหว่างการสร้าง!"; }; String STR_UNEXPECTED_ERROR { - Text = "Ein unerwarteter Fehler ist aufgetreten. Die operation kann nicht ausgefhrt werden."; - Text [ english ] = "An unexpected error occured. The operation could not be completed."; - Text [ english_us ] = "An unexpected error occurred. The operation could not be performed."; - Text[ portuguese ] = "Ocorreu um erro imprevisto. impossvel executar a operao."; - Text[ russian ] = " . ."; - Text[ greek ] = " . ."; - Text[ dutch ] = "Er is een onverwachte fout opgetreden. De opdracht kan niet worden uitgevoerd."; - Text[ french ] = "Une erreur imprvue s'est produite : impossible d'excuter l'opration !"; - Text[ spanish ] = "Se ha producido un error. Imposible ejecutar la operacin."; - Text[ finnish ] = "On ilmennyt odottamaton virhe. Toimintoa ei voitu suorittaa."; - Text[ italian ] = "Si verificato un errore inaspettato. Impossibile terminare l'operazione."; - Text[ danish ] = "Der er opstet en uventet fejl. Operationen kan ikke udfres."; - Text[ swedish ] = "Ett ovntat fel har uppsttt. Det gr inte att utfra operationen."; - Text[ polish ] = "Wystpi nieoczekiwany bd. Operacji nie mona wykona."; - Text[ portuguese_brazilian ] = "An unexpected error occured. The operation could not be completed."; - Text[ japanese ] = "予期しないエラーが発生しました。操作の実行はできません。"; - Text[ korean ] = "예상치 못했던 오류가 발생했습니다. 작업을 실행할 수 없습니다"; - Text[ chinese_simplified ] = "发生一个意外的错误。无法执行这个操作。"; - Text[ chinese_traditional ] = "發生一個意外的錯誤。無法執行這個動作。"; - Text[ turkish ] = "An unexpected error occured. The operation could not be completed."; - Text[ arabic ] = "An unexpected error occured. The operation could not be completed."; - Text[ catalan ] = "S'ha produt un error inesperat. L'operaci no s'ha pogut realitzar."; - Text[ thai ] = "เกิดข้อผิดพลาดที่ไม่คาดคิด ไม่สามารถแสดงปฏิบัติการได้"; +Text = "Ein unerwarteter Fehler ist aufgetreten. Die operation kann nicht ausgefhrt werden."; +Text [ english ] = "An unexpected error occured. The operation could not be completed."; +Text [ english_us ] = "An unexpected error occurred. The operation could not be performed."; +Text[ portuguese ] = "Ocorreu um erro imprevisto. impossvel executar a operao."; +Text[ russian ] = " . ."; +Text[ greek ] = " . ."; +Text[ dutch ] = "Er is een onverwachte fout opgetreden. De opdracht kan niet worden uitgevoerd."; +Text[ french ] = "Une erreur imprvue s'est produite : impossible d'excuter l'opration !"; +Text[ spanish ] = "Se ha producido un error. Imposible ejecutar la operacin."; +Text[ finnish ] = "On ilmennyt odottamaton virhe. Toimintoa ei voitu suorittaa."; +Text[ italian ] = "Si verificato un errore inaspettato. Impossibile terminare l'operazione."; +Text[ danish ] = "Der er opstet en uventet fejl. Operationen kan ikke udfres."; +Text[ swedish ] = "Ett ovntat fel har uppsttt. Det gr inte att utfra operationen."; +Text[ polish ] = "Wystpi nieoczekiwany bd. Operacji nie mona wykona."; +Text[ portuguese_brazilian ] = "An unexpected error occured. The operation could not be completed."; +Text[ japanese ] = "予期しないエラーが発生しました。操作の実行はできません。"; +Text[ korean ] = "예상치 못했던 오류가 발생했습니다. 작업을 실행할 수 없습니다."; +Text[ chinese_simplified ] = "发生一个意外的错误。无法执行这个操作。"; +Text[ chinese_traditional ] = "發生一個意外的錯誤。無法執行這個動作。"; +Text[ turkish ] = "An unexpected error occured. The operation could not be completed."; +Text[ arabic ] = "An unexpected error occured. The operation could not be completed."; +Text[ catalan ] = "S'ha produt un error inesperat. L'operaci no s'ha pogut realitzar."; +Text[ thai ] = "เกิดข้อผิดพลาดที่ไม่คาดคิด ไม่สามารถแสดงปฏิบัติการได้"; }; String STR_COULDNOTOPEN_LINKEDDOC { - Text = "Das Dokument\n\n$file$\n\nkonnte nicht geffnet werden."; - Text [ english ] = "Th document\n\n$file$\n\ncould not be opened."; - Text [ english_us ] = "The document\n\n$file$\n\ncould not be opened."; - Text[ portuguese ] = "Foi impossvel abrir o documento\n\n$file$\n\n."; - Text[ russian ] = " \n\n$file$\n\n."; - Text[ greek ] = " \n\n$file$."; - Text[ dutch ] = "Het document\n\n$file$\n\nkan niet worden geopend."; - Text[ french ] = "Impossible d'ouvrir\n\nle document\n\n$file$ !"; - Text[ spanish ] = "No se pudo abrir el documento\n\n$file$\n\n."; - Text[ finnish ] = "Asiakirjan\n\n$file$\n\navaaminen ei onnistunut."; - Text[ italian ] = "Impossibile\naprire il documento\n\n$file$."; - Text[ danish ] = "Dokumentet\n\n$file$\n\nkunne ikke bnes."; - Text[ swedish ] = "Det gick inte att ppna dokumentet\n\n$file$\n\n."; - Text[ polish ] = "Otwarcie dokumentu\n\n$file$\n\nnie powiodo si."; - Text[ portuguese_brazilian ] = "Th document\n\n$file$\n\ncould not be opened."; - Text[ japanese ] = "ドキュメント\n\n$file$ は\n\n開けませんでした。"; - Text[ korean ] = "\n\n$파일$\n\n문서를 열수 없었습니다"; - Text[ chinese_simplified ] = "这个文档\n\n$file$\n\n无法被打开。"; - Text[ chinese_traditional ] = "這個文件\n\n$file$\n\n無法開啟。"; - Text[ turkish ] = "Th document\n\n$file$\n\ncould not be opened."; - Text[ arabic ] = "Th document\n\n$file$\n\ncould not be opened."; - Text[ catalan ] = "No s'ha pogut obrir el document\n\n$file$.\n\n"; - Text[ thai ] = "ไม่สามารถเปิดเอกสาร\n\n$file$\n\nได้"; +Text = "Das Dokument\n\n$file$\n\nkonnte nicht geffnet werden."; +Text [ english ] = "Th document\n\n$file$\n\ncould not be opened."; +Text [ english_us ] = "The document\n\n$file$\n\ncould not be opened."; +Text[ portuguese ] = "Foi impossvel abrir o documento\n\n$file$\n\n."; +Text[ russian ] = " \n\n$file$\n\n."; +Text[ greek ] = " \n\n$file$."; +Text[ dutch ] = "Het document\n\n$file$\n\nkan niet worden geopend."; +Text[ french ] = "Impossible d'ouvrir\n\nle document\n\n$file$ !"; +Text[ spanish ] = "No se pudo abrir el documento\n\n$file$\n\n."; +Text[ finnish ] = "Asiakirjan\n\n$file$\n\navaaminen ei onnistunut."; +Text[ italian ] = "Impossibile\naprire il documento\n\n$file$."; +Text[ danish ] = "Dokumentet\n\n$file$\n\nkunne ikke bnes."; +Text[ swedish ] = "Det gick inte att ppna dokumentet\n\n$file$\n\n."; +Text[ polish ] = "Otwarcie dokumentu\n\n$file$\n\nnie powiodo si."; +Text[ portuguese_brazilian ] = "Th document\n\n$file$\n\ncould not be opened."; +Text[ japanese ] = "ドキュメント\n\n$file$ は\n\n開けませんでした。"; +Text[ korean ] = "\n\n$file$\n\n문서를 열지 못했습니다."; +Text[ chinese_simplified ] = "这个文档\n\n$file$\n\n无法被打开。"; +Text[ chinese_traditional ] = "這個文件\n\n$file$\n\n無法開啟。"; +Text[ turkish ] = "Th document\n\n$file$\n\ncould not be opened."; +Text[ arabic ] = "Th document\n\n$file$\n\ncould not be opened."; +Text[ catalan ] = "No s'ha pogut obrir el document\n\n$file$.\n\n"; +Text[ thai ] = "ไม่สามารถเปิดเอกสาร\n\n$file$\n\nได้"; }; String STR_MISSING_TABLES_XDROP { - Text = "Die Tabelle kann nicht gelscht werden, da die Datenbankverbindung diese nicht untersttzt."; - Text [ english ] = "The table can't be dropped, 'cause the database connection does not support this."; - Text [ english_us ] = "The table cannot be deleted because the database connection does not support this."; - Text[ portuguese ] = "A tabela no tem suporte na ligao da base de dados e por isso impossvel de eliminar."; - Text[ russian ] = " , ."; - Text[ greek ] = " , ."; - Text[ dutch ] = "De tabel kan niet worden gewist omdat deze niet wordt ondersteund door de database."; - Text[ french ] = "Impossible de supprimer la table : elle n'est pas supporte par la connexion de BD."; - Text[ spanish ] = "No se puede eliminar la tabla porque la conexin con la base de datos no apoya esta operacin."; - Text[ finnish ] = "Taulua ei voi poistaa, koska tietokantayhteys ei tue poistamista."; - Text[ italian ] = "Impossibile eliminare la tabella perch non supportata dal collegamento al database."; - Text[ danish ] = "Tabellen kan ikke slettes, da databaseforbindelsen ikke understtter den."; - Text[ swedish ] = "Det gr inte att radera tabellen eftersom databasfrbindelsen inte stdjer den."; - Text[ polish ] = "Tabeli nie mona usun, poniewa nie jest ona osugiwana przez poczenie z baz danych."; - Text[ portuguese_brazilian ] = "The table can't be dropped, 'cause the database connection does not support this."; - Text[ japanese ] = "テーブルはデータベースの接続がこれを支援しないため削除できません。"; - Text[ korean ] = "데이터베이스 연결에서 지원되지 않기 때문에 시트을 삭제할 수 없습니다"; - Text[ chinese_simplified ] = "因为数据库的连接不支持这个功能而无法删除这个表格。"; - Text[ chinese_traditional ] = "因為資料庫連線不支援這個動作而無法刪除這個表格。"; - Text[ turkish ] = "The table can't be dropped, 'cause the database connection does not support this."; - Text[ arabic ] = "The table can't be dropped, 'cause the database connection does not support this."; - Text[ catalan ] = "No es pot suprimir la taula perqu la connexi de la base de dades no ho permet."; - Text[ thai ] = "ไม่สามารถลบตารางได้เนื่องจากการเชื่อมต่อฐานข้อมูลไม่สนับสนุนสิ่งนี้"; +Text = "Die Tabelle kann nicht gelscht werden, da die Datenbankverbindung diese nicht untersttzt."; +Text [ english ] = "The table can't be dropped, 'cause the database connection does not support this."; +Text [ english_us ] = "The table cannot be deleted because the database connection does not support this."; +Text[ portuguese ] = "A tabela no tem suporte na ligao da base de dados e por isso impossvel de eliminar."; +Text[ russian ] = " , ."; +Text[ greek ] = " , ."; +Text[ dutch ] = "De tabel kan niet worden gewist omdat deze niet wordt ondersteund door de database."; +Text[ french ] = "Impossible de supprimer la table : elle n'est pas supporte par la connexion de BD."; +Text[ spanish ] = "No se puede borrar la tabla porque la conexin con la base de datos no admite esta operacin."; +Text[ finnish ] = "Taulua ei voi poistaa, koska tietokantayhteys ei tue poistamista."; +Text[ italian ] = "Impossibile eliminare la tabella perch non supportata dal collegamento al database."; +Text[ danish ] = "Tabellen kan ikke slettes, da databaseforbindelsen ikke understtter den."; +Text[ swedish ] = "Det gr inte att radera tabellen eftersom databasfrbindelsen inte stdjer den."; +Text[ polish ] = "Tabeli nie mona usun, poniewa nie jest ona osugiwana przez poczenie z baz danych."; +Text[ portuguese_brazilian ] = "The table can't be dropped, 'cause the database connection does not support this."; +Text[ japanese ] = "テーブルはデータベースの接続がこれを支援しないため削除できません。"; +Text[ korean ] = "테이블을 데이터베이스 연결에서 지원되지 않기 때문에 삭제할 수 없습니다."; +Text[ chinese_simplified ] = "因为数据库的连接不支持这个功能而无法删除这个表格。"; +Text[ chinese_traditional ] = "因為資料庫連線不支援這個動作而無法刪除這個表格。"; +Text[ turkish ] = "The table can't be dropped, 'cause the database connection does not support this."; +Text[ arabic ] = "The table can't be dropped, 'cause the database connection does not support this."; +Text[ catalan ] = "No es pot suprimir la taula perqu la connexi de la base de dades no ho permet."; +Text[ thai ] = "ไม่สามารถลบตารางได้เนื่องจากการเชื่อมต่อฐานข้อมูลไม่สนับสนุนสิ่งนี้"; }; String STR_BUTTON_TEXT_ALL { - Text = "~Alle"; - Text [ english ] = "~All"; - Text [ english_us ] = "~All"; +Text = "~Alle"; +Text [ english ] = "~All"; +Text [ english_us ] = "~All"; - Text[ language_user1 ] = "This will be a button text in a dialog asking for confirmation. Something like 'Yes/All/No/Cancel'"; - Text[ portuguese ] = "~Tudo"; - Text[ russian ] = "~"; - Text[ greek ] = "~"; - Text[ dutch ] = "~Alle"; - Text[ french ] = "~Tout"; - Text[ spanish ] = "~Todos"; - Text[ finnish ] = "~Kaikki"; - Text[ italian ] = "~Tutti"; - Text[ danish ] = "~Alle"; - Text[ swedish ] = "~Alla"; - Text[ polish ] = "~Wszystkie"; - Text[ portuguese_brazilian ] = "~All"; - Text[ japanese ] = "すべて(~A)"; - Text[ korean ] = "모두(~A)"; - Text[ chinese_simplified ] = "全部(~A)"; - Text[ chinese_traditional ] = "全部(~A)"; - Text[ turkish ] = "~All"; - Text[ arabic ] = "~All"; - Text[ catalan ] = "~Tots"; - Text[ thai ] = "~ทั้งหมด"; +Text[ language_user1 ] = "This will be a button text in a dialog asking for confirmation. Something like 'Yes/All/No/Cancel'"; +Text[ portuguese ] = "~Tudo"; +Text[ russian ] = "~"; +Text[ greek ] = "~"; +Text[ dutch ] = "~Alle"; +Text[ french ] = "~Tout"; +Text[ spanish ] = "~Todos"; +Text[ finnish ] = "~Kaikki"; +Text[ italian ] = "~Tutti"; +Text[ danish ] = "~Alle"; +Text[ swedish ] = "~Alla"; +Text[ polish ] = "~Wszystkie"; +Text[ portuguese_brazilian ] = "~All"; +Text[ japanese ] = "すべて(~A)"; +Text[ korean ] = "모두(~A)"; +Text[ chinese_simplified ] = "全部(~A)"; +Text[ chinese_traditional ] = "全部(~A)"; +Text[ turkish ] = "~All"; +Text[ arabic ] = "~All"; +Text[ catalan ] = "~Tots"; +Text[ thai ] = "~ทั้งหมด"; }; String STR_UNDO_COLON { - Text = "Rckgngig:" ; - Text [ ENGLISH ] = "Undo:" ; - Text[ english_us ] = "Undo:"; - Text[ portuguese ] = "Anular:"; - Text[ russian ] = ""; - Text[ greek ] = ""; - Text[ dutch ] = "Ongedaan"; - Text[ french ] = "Annuler:"; - Text[ spanish ] = "Deshacer:"; - Text[ italian ] = "Annulla:"; - Text[ danish ] = "Fortryd:"; - Text[ swedish ] = "ngra:"; - Text[ polish ] = "Cofnij"; - Text[ portuguese_brazilian ] = "Undo:"; - Text[ japanese ] = "元に戻す:"; - Text[ korean ] = "실행 취소:"; - Text[ chinese_simplified ] = "撤消命令："; - Text[ chinese_traditional ] = "復原："; - Text[ turkish ] = "Undo"; - Text[ arabic ] = ""; - Text[ catalan ] = "Desfs:"; - Text[ finnish ] = "Peruuta:"; - Text[ thai ] = "เลิกทำ"; +Text = "Rckgngig:" ; +Text [ ENGLISH ] = "Undo:" ; +Text[ english_us ] = "Undo:"; +Text[ portuguese ] = "Anular:"; +Text[ russian ] = ""; +Text[ greek ] = ""; +Text[ dutch ] = "Ongedaan"; +Text[ french ] = "Annuler :"; +Text[ spanish ] = "Deshacer:"; +Text[ italian ] = "Annulla:"; +Text[ danish ] = "Fortryd:"; +Text[ swedish ] = "ngra:"; +Text[ polish ] = "Cofnij"; +Text[ portuguese_brazilian ] = "Undo:"; +Text[ japanese ] = "元に戻す:"; +Text[ korean ] = "실행 취소:"; +Text[ chinese_simplified ] = "撤消命令："; +Text[ chinese_traditional ] = "復原："; +Text[ turkish ] = "Undo"; +Text[ arabic ] = ""; +Text[ catalan ] = "Desfs:"; +Text[ finnish ] = "Peruuta:"; +Text[ thai ] = "เลิกทำ"; }; String STR_REDO_COLON { - Text = "Wiederherstellen:" ; - Text [ ENGLISH ] = "Redo:" ; - Text[ english_us ] = "Redo:"; - Text[ portuguese ] = "Restaurar:"; - Text[ russian ] = ""; - Text[ greek ] = ""; - Text[ dutch ] = "Herstellen:"; - Text[ french ] = "Restaurer:"; - Text[ spanish ] = "Restaurar:"; - Text[ italian ] = "Ripristina:"; - Text[ danish ] = "Gendan:"; - Text[ swedish ] = "terstll:"; - Text[ polish ] = "Przywr"; - Text[ portuguese_brazilian ] = "Redo:"; - Text[ japanese ] = "やり直し:"; - Text[ korean ] = "다시 실행:"; - Text[ chinese_simplified ] = "恢复撤消命令："; - Text[ chinese_traditional ] = "恢復撤消指令:"; - Text[ turkish ] = "Redo"; - Text[ arabic ] = ""; - Text[ catalan ] = "Refs"; - Text[ finnish ] = "Toista "; - Text[ thai ] = "ทำซ้ำ"; +Text = "Wiederherstellen:" ; +Text [ ENGLISH ] = "Redo:" ; +Text[ english_us ] = "Redo:"; +Text[ portuguese ] = "Restaurar:"; +Text[ russian ] = ""; +Text[ greek ] = ""; +Text[ dutch ] = "Herstellen:"; +Text[ french ] = "Restaurer :"; +Text[ spanish ] = "Restaurar:"; +Text[ italian ] = "Ripristina:"; +Text[ danish ] = "Gendan:"; +Text[ swedish ] = "terstll:"; +Text[ polish ] = "Przywr"; +Text[ portuguese_brazilian ] = "Redo:"; +Text[ japanese ] = "やり直し:"; +Text[ korean ] = "다시 실행:"; +Text[ chinese_simplified ] = "恢复撤消命令："; +Text[ chinese_traditional ] = "恢復撤消指令:"; +Text[ turkish ] = "Redo"; +Text[ arabic ] = ""; +Text[ catalan ] = "Refs"; +Text[ finnish ] = "Toista "; +Text[ thai ] = "ทำซ้ำ"; }; -/************************************************************************* - * history: - * $Log: not supported by cvs2svn $ - * Revision 1.51 2002/12/05 10:31:17 kz - * Merge SRX644: 05.12.02 - 11:27:53 - * - * Revision 1.50 2002/11/25 15:12:13 kz - * Merge SRX644: 25.11.02 - 16:08:20 - * - * Revision 1.49 2002/11/21 15:27:11 oj - * #105213# impl new feature of rown mysql driver page - * - * Revision 1.48 2002/09/05 10:53:01 kz - * Merge SRX643: 05.09.02 - 12:49:41 - * - * Revision 1.47 2002/08/19 07:51:10 oj - * #99473# change string resource files - * - * Revision 1.46 2002/08/01 20:27:29 kz - * Merge SRX643: 01.08.02 - 22:24:17 - * - * Revision 1.45 2002/07/22 07:39:28 oj - * #101514# remove resource entries for PLUS and MINUS - * - * Revision 1.0 26.09.00 08:26:13 fs - ************************************************************************/ - - - - - diff --git a/dbaccess/source/ui/misc/dsntypes.cxx b/dbaccess/source/ui/misc/dsntypes.cxx index 26768a6f5e66..3c0dfc1c2c41 100644 --- a/dbaccess/source/ui/misc/dsntypes.cxx +++ b/dbaccess/source/ui/misc/dsntypes.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dsntypes.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: oj $ $Date: 2002-11-21 15:24:07 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,12 +71,19 @@ #ifndef _DBU_MISCRES_HRC_ #include "dbumiscres.hrc" #endif - +#ifndef _UNOTOOLS_CONFIGNODE_HXX_ +#include +#endif +#ifndef DBAUI_TOOLS_HXX +#include "UITools.hxx" +#endif //......................................................................... namespace dbaui { //......................................................................... + using namespace ::com::sun::star::uno; + using namespace ::com::sun::star::lang; //========================================================================= //= ODsnTypeCollection //========================================================================= @@ -115,11 +122,54 @@ ODsnTypeCollection::~ODsnTypeCollection() DBG_ASSERT(0 == m_nLivingIterators, "ODsnTypeCollection::~ODsnTypeCollection : there are still living iterator objects!"); DBG_DTOR(ODsnTypeCollection,NULL); } +// ----------------------------------------------------------------------------- +void ODsnTypeCollection::initUserDriverTypes(const Reference< XMultiServiceFactory >& _rxORB) +{ + // read the user driver out of the configuration + // the config node where all pooling relevant info are stored under + ::utl::OConfigurationTreeRoot aUserDefinedDriverRoot = ::utl::OConfigurationTreeRoot::createWithServiceFactory( + _rxORB, ::dbaui::getUserDefinedDriverNodeName(), -1, ::utl::OConfigurationTreeRoot::CM_READONLY); + + if ( aUserDefinedDriverRoot.isValid() ) + { + Sequence< ::rtl::OUString > aDriverKeys = aUserDefinedDriverRoot.getNodeNames(); + const ::rtl::OUString* pDriverKeys = aDriverKeys.getConstArray(); + const ::rtl::OUString* pDriverKeysEnd = pDriverKeys + aDriverKeys.getLength(); + for (sal_Int32 i=0;pDriverKeys != pDriverKeysEnd && i <= DST_USERDEFINE10; ++pDriverKeys) + { + ::utl::OConfigurationNode aThisDriverSettings = aUserDefinedDriverRoot.openNode(*pDriverKeys); + if ( aUserDefinedDriverRoot.isValid() ) + { + // read the needed information + ::rtl::OUString sDsnPrefix,sDsnTypeDisplayName; + aThisDriverSettings.getNodeValue(getDriverTypeDisplayNodeName()) >>= sDsnTypeDisplayName; + aThisDriverSettings.getNodeValue(getDriverDsnPrefixNodeName()) >>= sDsnPrefix; + + m_aDsnTypesDisplayNames.push_back(sDsnTypeDisplayName); + m_aDsnPrefixes.push_back(sDsnPrefix); + m_aDsnTypes.push_back(static_cast(DST_USERDEFINE1 + i++)); + } + } + } +} //------------------------------------------------------------------------- DATASOURCE_TYPE ODsnTypeCollection::getType(const String& _rDsn) { - return implDetermineType(_rDsn); + DATASOURCE_TYPE eType = DST_UNKNOWN; + // look for user defined driver types + StringVector::iterator aIter = m_aDsnPrefixes.begin(); + StringVector::iterator aEnd = m_aDsnPrefixes.end(); + for (; aIter != aEnd; ++aIter) + { + if ( aIter->EqualsIgnoreCaseAscii(_rDsn,0, ::std::min(static_cast(_rDsn.Len()),aIter->Len())) ) + { + size_t nPos = (aIter - m_aDsnPrefixes.begin()); + if ( nPos < m_aDsnTypes.size() ) + eType = m_aDsnTypes[nPos]; + } + } + return eType; } //------------------------------------------------------------------------- @@ -156,7 +206,7 @@ String ODsnTypeCollection::cutPrefix(const String& _rDsn) //------------------------------------------------------------------------- String ODsnTypeCollection::getTypeDisplayName(const String& _rDsn) { - return getTypeDisplayName(implDetermineType(_rDsn)); + return getTypeDisplayName(getType(_rDsn)); } //------------------------------------------------------------------------- @@ -179,6 +229,16 @@ sal_Bool ODsnTypeCollection::hasAuthentication(DATASOURCE_TYPE _eType) { switch (_eType) { + case DST_USERDEFINE1: /// first user defined driver + case DST_USERDEFINE2: + case DST_USERDEFINE3: + case DST_USERDEFINE4: + case DST_USERDEFINE5: + case DST_USERDEFINE6: + case DST_USERDEFINE7: + case DST_USERDEFINE8: + case DST_USERDEFINE9: + case DST_USERDEFINE10: case DST_ADABAS: case DST_JDBC: case DST_MYSQL_ODBC: @@ -295,7 +355,7 @@ sal_Int32 ODsnTypeCollection::implDetermineTypeIndex(DATASOURCE_TYPE _eType) //------------------------------------------------------------------------- sal_Int32 ODsnTypeCollection::implDetermineTypeIndex(const String& _rDsn) { - return implDetermineTypeIndex(implDetermineType(_rDsn)); + return implDetermineTypeIndex(getType(_rDsn)); } //------------------------------------------------------------------------- @@ -456,52 +516,3 @@ ADDRESSBOOK_TYPE AddressBookTypes::getAddressType( const String& _rAddressURL ) } // namespace dbaui //......................................................................... -/************************************************************************* - * history: - * $Log: not supported by cvs2svn $ - * Revision 1.14 2002/08/19 07:51:11 oj - * #99473# change string resource files - * - * Revision 1.13 2001/08/16 13:00:02 hr - * #65293#: syntax - * - * Revision 1.12 2001/08/15 13:16:25 oj - * #88644# insert some DBG's - * - * Revision 1.11 2001/08/07 15:55:24 fs - * #88431# +isFileSystemBased - * - * Revision 1.10 2001/08/01 08:32:49 fs - * #88530# getAddressType: allow for invalid URLs without assertion - * - * Revision 1.9 2001/07/31 15:59:13 fs - * #88530# +AddressBookType(s) - * - * Revision 1.8 2001/05/29 13:11:51 oj - * #87149# addressbook ui impl - * - * Revision 1.7 2001/05/23 14:16:41 oj - * #87149# new helpids - * - * Revision 1.6 2001/01/29 16:02:05 nn - * added DST_CALC - * - * Revision 1.5 2001/01/04 11:20:23 fs - * #81485# +DST_ADO - * - * Revision 1.4 2000/11/21 15:02:06 oj - * #80549# wrong dsn for text - * - * Revision 1.3 2000/10/30 07:59:18 fs - * + hasAuthentification(DATASOURCE_TYPE) - * - * Revision 1.2 2000/10/20 07:01:39 fs - * sdbc:text -> sdbc:flat:file - * - * Revision 1.1 2000/10/05 10:09:11 fs - * initial checkin - * - * - * Revision 1.0 26.09.00 08:05:35 fs - ************************************************************************/ - diff --git a/dbaccess/source/ui/misc/indexcollection.cxx b/dbaccess/source/ui/misc/indexcollection.cxx index 9a56f64db72a..dc5b83e60049 100644 --- a/dbaccess/source/ui/misc/indexcollection.cxx +++ b/dbaccess/source/ui/misc/indexcollection.cxx @@ -2,9 +2,9 @@ * * $RCSfile: indexcollection.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: oj $ $Date: 2001-03-30 14:12:19 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -450,20 +450,3 @@ namespace dbaui } // namespace dbaui //...................................................................... - -/************************************************************************* - * history: - * $Log: not supported by cvs2svn $ - * Revision 1.3 2001/03/30 13:56:42 avy - * Temporary variable added because of error during compiling under the Lunux - * - * Revision 1.2 2001/03/19 06:03:23 fs - * ensure that no fields occure twice when committing - * - * Revision 1.1 2001/03/16 16:22:20 fs - * initial checkin - non-UNO index collection - * - * - * Revision 1.0 07.03.01 15:09:42 fs - ************************************************************************/ - diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index fb4e6e30b167..36f98127d935 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -2,9 +2,9 @@ * * $RCSfile: linkeddocuments.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: oj $ $Date: 2002-10-15 06:32:30 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -655,25 +655,3 @@ namespace dbaui } // namespace dbaui //...................................................................... -/************************************************************************* - * history: - * $Log: not supported by cvs2svn $ - * Revision 1.5 2002/08/19 07:51:11 oj - * #99473# change string resource files - * - * Revision 1.4 2002/07/25 06:53:40 oj - * #100280# new method to start report autopilot - * - * Revision 1.3 2001/08/16 14:10:12 fs - * #88813# +newFormWithPilot - * - * Revision 1.2 2001/08/07 14:37:48 fs - * #87029# use the new template dialog for selecting a template - * - * Revision 1.1 2001/04/26 11:54:33 fs - * initial checkin - access to the data source associated bookmarks - * - * - * Revision 1.0 24.04.01 14:56:54 fs - ************************************************************************/ - diff --git a/dbaccess/source/ui/misc/moduledbu.cxx b/dbaccess/source/ui/misc/moduledbu.cxx index b00aa2dcb66a..30b5ed5e03a1 100644 --- a/dbaccess/source/ui/misc/moduledbu.cxx +++ b/dbaccess/source/ui/misc/moduledbu.cxx @@ -2,9 +2,9 @@ * * $RCSfile: moduledbu.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: fs $ $Date: 2000-10-05 10:09:28 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -168,10 +168,3 @@ void OModule::ensureImpl() } // namespace dbaui //......................................................................... -/************************************************************************* - * history: - * $Log: not supported by cvs2svn $ - * - * Revision 1.0 20.09.00 16:16:54 fs - ************************************************************************/ - diff --git a/dbaccess/source/ui/misc/propertysetitem.cxx b/dbaccess/source/ui/misc/propertysetitem.cxx index f4f094dcbfdc..36e74102b865 100644 --- a/dbaccess/source/ui/misc/propertysetitem.cxx +++ b/dbaccess/source/ui/misc/propertysetitem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: propertysetitem.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: fs $ $Date: 2001-02-05 14:00:50 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -115,10 +115,3 @@ namespace dbaui } // namespace dbaui //......................................................................... -/************************************************************************* - * history: - * $Log: not supported by cvs2svn $ - * - * Revision 1.0 05.02.01 13:45:48 fs - ************************************************************************/ - diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx index f376dc766040..de5bf92468c6 100644 --- a/dbaccess/source/ui/misc/singledoccontroller.cxx +++ b/dbaccess/source/ui/misc/singledoccontroller.cxx @@ -2,9 +2,9 @@ * * $RCSfile: singledoccontroller.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: fs $ $Date: 2002-11-08 13:18:58 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -576,34 +576,3 @@ namespace dbaui } // namespace dbaui //........................................................................ -/************************************************************************* - * history: - * $Log: not supported by cvs2svn $ - * Revision 1.8 2002/08/19 07:51:11 oj - * #99473# change string resource files - * - * Revision 1.7 2002/07/08 08:15:44 oj - * #97156# check if we are already suspended - * - * Revision 1.6 2002/05/06 08:50:00 oj - * #96363# impl new interface - * - * Revision 1.5 2001/09/07 10:03:53 fs - * ::disposing: don't reconnect if we're InDispose - * - * Revision 1.4 2001/08/16 13:00:02 hr - * #65293#: syntax - * - * Revision 1.3 2001/08/15 13:36:51 fs - * #88637# add a separator above the toolbox - * - * Revision 1.2 2001/08/15 13:16:25 oj - * #88644# insert some DBG's - * - * Revision 1.1 2001/08/14 12:00:02 fs - * initial checkin - base class for controller which work on one single object belonging to a data source connection - * - * - * Revision 1.0 14.08.01 09:45:39 fs - ************************************************************************/ - diff --git a/dbaccess/source/ui/misc/stringlistitem.cxx b/dbaccess/source/ui/misc/stringlistitem.cxx index d6d041258282..305dc1cd2be3 100644 --- a/dbaccess/source/ui/misc/stringlistitem.cxx +++ b/dbaccess/source/ui/misc/stringlistitem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: stringlistitem.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: fs $ $Date: 2000-10-05 10:09:37 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -116,10 +116,3 @@ SfxPoolItem* OStringListItem::Clone(SfxItemPool* /* _pPool */) const } // namespace dbaui //......................................................................... -/************************************************************************* - * history: - * $Log: not supported by cvs2svn $ - * - * Revision 1.0 02.10.00 11:02:21 fs - ************************************************************************/ - -- cgit