Tag: cws_dev300_dba31b User: oj Date: 2008-08-12 10:23:44+0000 Modified: dba/dbaccess/source/core/inc/core_resource.hrc dba/dbaccess/source/core/inc/core_resource.hxx dba/dbaccess/source/core/misc/makefile.mk dba/dbaccess/source/core/resource/core_resource.cxx dba/dbaccess/source/core/resource/strings.src
Log: #i92092# new class File Changes: Directory: /dba/dbaccess/source/core/inc/ ========================================= File [changed]: core_resource.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/inc/core_resource.hrc?r1=1.16&r2=1.16.68.1 Delta lines: +6 -2 ------------------- --- core_resource.hrc 2008-04-10 12:54:17+0000 1.16 +++ core_resource.hrc 2008-08-12 10:23:40+0000 1.16.68.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: core_resource.hrc,v $ - * $Revision: 1.16 $ + * $Revision: 1.16.68.1 $ * * This file is part of OpenOffice.org. * @@ -37,6 +37,7 @@ //------------------------------------------------------------------------------ #define RID_CORE_STRINGS_START RID_DBACCESS_START +#define RID_CORE_OTHER_START RID_DBACCESS_START //------------------------------------------------------------------------------ //- String-IDs @@ -86,5 +87,8 @@ #define RID_STR_OBJECT_CONTAINER_MISMATCH ( RID_CORE_STRINGS_START + 43 ) #define RID_STR_OBJECT_ALREADY_CONTAINED ( RID_CORE_STRINGS_START + 44 ) +#define RSC_DATASOURCE_TYPES ( RID_CORE_OTHER_START + 1 ) +#define RSC_DATASOURCE_TYPE_UINAMES ( RID_CORE_OTHER_START + 2 ) + #endif // _DBA_CORE_RESOURCE_HRC_ File [changed]: core_resource.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/inc/core_resource.hxx?r1=1.5&r2=1.5.68.1 Delta lines: +6 -4 ------------------- --- core_resource.hxx 2008-04-10 12:54:33+0000 1.5 +++ core_resource.hxx 2008-08-12 10:23:40+0000 1.5.68.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: core_resource.hxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.68.1 $ * * This file is part of OpenOffice.org. * @@ -35,7 +35,7 @@ #include <rtl/ustring.hxx> #endif -class SimpleResMgr; +class ResMgr; //......................................................................... namespace dbaccess { @@ -52,7 +52,7 @@ //================================================================== class ResourceManager { - static SimpleResMgr* m_pImpl; + static ResMgr* m_pImpl; private: // no instantiation allowed @@ -91,6 +91,8 @@ const sal_Char* _pPlaceholderAscii, const ::rtl::OUString& _rReplace ); + + static ResMgr* getResManager(); }; //......................................................................... Directory: /dba/dbaccess/source/core/misc/ ========================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/misc/makefile.mk?r1=1.19&r2=1.19.68.1 Delta lines: +4 -2 ------------------- --- makefile.mk 2008-04-10 13:01:42+0000 1.19 +++ makefile.mk 2008-08-12 10:23:41+0000 1.19.68.1 @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.19 $ +# $Revision: 1.19.68.1 $ # # This file is part of OpenOffice.org. # @@ -39,6 +39,7 @@ # --- Settings ---------------------------------- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files ------------------------------------- @@ -53,6 +54,7 @@ $(SLO)$/warnings.obj \ $(SLO)$/DatabaseDataProvider.obj \ $(SLO)$/module_dba.obj \ + $(SLO)$/dsntypes.obj \ $(SLO)$/veto.obj # --- Targets ---------------------------------- Directory: /dba/dbaccess/source/core/resource/ ============================================== File [changed]: core_resource.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/resource/core_resource.cxx?r1=1.11&r2=1.11.68.1 Delta lines: +13 -10 --------------------- --- core_resource.cxx 2008-04-10 13:04:20+0000 1.11 +++ core_resource.cxx 2008-08-12 10:23:41+0000 1.11.68.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: core_resource.cxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.68.1 $ * * This file is part of OpenOffice.org. * @@ -33,9 +33,7 @@ #include "core_resource.hxx" -#ifndef _TOOLS_SIMPLERESMGR_HXX_ -#include <tools/simplerm.hxx> -#endif +#include <tools/resmgr.hxx> // ---- needed as long as we have no contexts for components --- #ifndef _SV_SVAPP_HXX @@ -54,7 +52,7 @@ //================================================================== //= ResourceManager //================================================================== - SimpleResMgr* ResourceManager::m_pImpl = NULL; + ResMgr* ResourceManager::m_pImpl = NULL; //------------------------------------------------------------------ ResourceManager::EnsureDelete::~EnsureDelete() @@ -72,7 +70,7 @@ ByteString sFileName("dba"); - m_pImpl = SimpleResMgr::Create(sFileName.GetBuffer(), aLocale); + m_pImpl = ResMgr::CreateResMgr(sFileName.GetBuffer(), aLocale); if (m_pImpl) { @@ -88,7 +86,7 @@ ensureImplExists(); if (m_pImpl) - sReturn = m_pImpl->ReadString(_nResId); + sReturn = String(ResId(_nResId,*m_pImpl)); return sReturn; } @@ -100,7 +98,12 @@ sString.SearchAndReplaceAscii( _pPlaceholderAscii, _rReplace ); return sString; } - + //------------------------------------------------------------------ + ResMgr* ResourceManager::getResManager() + { + ensureImplExists(); + return m_pImpl; + } //......................................................................... } //......................................................................... File [changed]: strings.src Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/resource/strings.src?r1=1.55&r2=1.55.68.1 Delta lines: +204 -2 --------------------- --- strings.src 2008-04-10 13:05:16+0000 1.55 +++ strings.src 2008-08-12 10:23:41+0000 1.55.68.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: strings.src,v $ - * $Revision: 1.55 $ + * $Revision: 1.55.68.1 $ * * This file is part of OpenOffice.org. * @@ -29,6 +29,7 @@ ************************************************************************/ #include "core_resource.hrc" +#include "dbamiscres.hrc" String RID_STR_TRIED_OPEN_TABLE { @@ -230,3 +231,204 @@ Text [ en-US ] = "The object already is, with a different name, part of the container."; }; +//------------------------------------------------------------------------- +Resource RSC_DATASOURCE_TYPES +{ + String STR_MYSQL_ODBC + { + Text ="sdbc:mysql:odbc:"; + }; + String STR_MYSQL_JDBC + { + Text ="sdbc:mysql:jdbc:"; + }; + String STR_ADABAS + { + Text ="sdbc:adabas:"; + }; + String STR_ORACLE_JDBC + { + Text ="jdbc:oracle:thin:"; + }; + String STR_JDBC + { + Text ="jdbc:"; + }; + String STR_ODBC + { + Text ="sdbc:odbc:"; + }; + String STR_DBASE + { + Text ="sdbc:dbase:"; + }; + String STR_MSACCESS + { + Text ="sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE="; + }; + String STR_MSACCESS2007 + { + Text ="sdbc:ado:access:Provider=Microsoft.ACE.OLEDB.12.0;DATA SOURCE="; + }; + String STR_ADO + { + Text ="sdbc:ado:"; + }; + String STR_FLAT + { + Text ="sdbc:flat:"; + }; + String STR_CALC + { + Text ="sdbc:calc:"; + }; + String STR_MOZILLA + { + Text ="sdbc:address:mozilla:"; + }; + String STR_LDAP + { + Text ="sdbc:address:ldap:"; + }; + String STR_OUTLOOK + { + Text ="sdbc:address:outlook"; + }; + String STR_OUTLOOKEXP + { + Text ="sdbc:address:outlookexp"; + }; + String STR_EVOLUTION + { + Text ="sdbc:address:evolution:local"; + }; + String STR_EVOLUTION_GROUPWISE + { + Text ="sdbc:address:evolution:groupwise"; + }; + String STR_EVOLUTION_LDAP + { + Text ="sdbc:address:evolution:ldap"; + }; + String STR_KAB + { + Text ="sdbc:address:kab"; + }; + String STR_EMBEDDED_HSQLDB + { + Text = "sdbc:embedded:hsqldb"; + }; + String STR_MACAB + { + Text ="sdbc:address:macab"; + }; + String STR_THUNDERBIRD + { + Text ="sdbc:address:thunderbird:"; + }; + String STR_MYSQL_NATIVE + { + Text ="sdbc:mysqlc:"; + }; +}; + +Resource RSC_DATASOURCE_TYPE_UINAMES +{ + String STR_MYSQL_ODBC + { + Text[ en-US ] = "MySQL (ODBC)"; + }; + String STR_MYSQL_JDBC + { + Text[ en-US ] = "MySQL (JDBC)"; + }; + String STR_ADABAS + { + Text[ en-US ] = "Adabas D"; + }; + String STR_ORACLE_JDBC + { + Text[ en-US ] = "Oracle JDBC"; + }; + + String STR_JDBC + { + Text[ en-US ] = "JDBC"; + }; + String STR_ODBC + { + Text[ en-US ] = "ODBC"; + }; + String STR_DBASE + { + Text[ en-US ] = "dBASE"; + }; + String STR_MSACCESS + { + Text[ en-US ] = "Microsoft Access"; + }; + String STR_MSACCESS2007 + { + Text[ en-US ] = "Microsoft Access 2007"; + }; + String STR_ADO + { + Text[ en-US ] = "ADO"; + }; + String STR_FLAT + { + Text[ en-US ] = "Text"; + }; + String STR_CALC + { + Text[ en-US ] = "Spreadsheet"; + }; + String STR_MOZILLA + { + Text[ en-US ] = "Mozilla Address Book"; + }; + String STR_LDAP + { + Text[ en-US ] = "LDAP Address Book"; + }; + String STR_OUTLOOK + { + Text[ en-US ] = "Microsoft Outlook Address Book"; + }; + String STR_OUTLOOKEXP + { + Text[ en-US ] = "Microsoft Windows Address Book"; + }; + String STR_EVOLUTION + { + Text[ en-US ] = "Evolution Local"; + }; + String STR_EVOLUTION_GROUPWISE + { + Text[ en-US ] = "Groupwise"; + }; + String STR_EVOLUTION_LDAP + { + Text[ en-US ] = "Evolution LDAP"; + }; + String STR_KAB + { + Text[ en-US ] = "KDE Address Book"; + }; + String STR_MACAB + { + Text[ en-US ] = "Mac OS X Address Book"; + }; + String STR_EMBEDDED_HSQLDB + { + Text[ en-US ] = "HSQL database engine"; + }; + String STR_THUNDERBIRD + { + Text[ en-US ] = "Thunderbird Address Book"; + }; + String STR_MYSQL_NATIVE + { + Text[ en-US ] = "MySQL (Native)"; + }; +}; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
