Tag: cws_dev300_dba31b User: fs Date: 2008-08-11 19:55:35+0000 Modified: dba/dbaccess/source/inc/dsntypes.hxx dba/dbaccess/source/ui/app/AppController.cxx dba/dbaccess/source/ui/app/app.src dba/dbaccess/source/ui/app/dbu_app.hrc dba/dbaccess/source/ui/misc/dsntypes.cxx
Log: #i89662# re-introduce the 'Embedded database' type which got lost since 2.4 File Changes: Directory: /dba/dbaccess/source/inc/ ==================================== File [changed]: dsntypes.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/inc/dsntypes.hxx?r1=1.3&r2=1.3.68.1 Delta lines: +5 -2 ------------------- --- dsntypes.hxx 2008-04-11 10:36:45+0000 1.3 +++ dsntypes.hxx 2008-08-11 19:55:32+0000 1.3.68.1 @@ -8,7 +8,7 @@ * * $RCSfile: dsntypes.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.68.1 $ * * This file is part of OpenOffice.org. * @@ -148,6 +148,9 @@ /// check if the given data source tyoe is based on the file system - i.e. the URL is a prefix plus a file URL sal_Bool isFileSystemBased(DATASOURCE_TYPE _eType) const; + /// checks if the given data source type embeds its data into the database document + bool isEmbeddedDatabase( DATASOURCE_TYPE _eType ) const; + /** returns default settings for newly created databases of the given type. Currently implemented (and used) for DST_EMBEDDED_HSQLDB only Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.cxx?r1=1.63.20.1&r2=1.63.20.2 Delta lines: +11 -3 -------------------- --- AppController.cxx 2008-08-04 07:24:15+0000 1.63.20.1 +++ AppController.cxx 2008-08-11 19:55:32+0000 1.63.20.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AppController.cxx,v $ - * $Revision: 1.63.20.1 $ + * $Revision: 1.63.20.2 $ * * This file is part of OpenOffice.org. * @@ -1024,7 +1024,15 @@ if ( aReturn.bEnabled ) { DATASOURCE_TYPE eType = m_aTypeCollection.getType(::comphelper::getString(m_xDataSource->getPropertyValue(PROPERTY_URL))); - ::rtl::OUString sDSTypeName = m_aTypeCollection.getTypeDisplayName(eType); + ::rtl::OUString sDSTypeName; + if ( m_aTypeCollection.isEmbeddedDatabase( eType ) ) + { + sDSTypeName = String( ModuleRes( RID_STR_EMBEDDED_DATABASE ) ); + } + else + { + sDSTypeName = m_aTypeCollection.getTypeDisplayName(eType); + } aReturn.sTitle = sDSTypeName; } break; File [changed]: app.src Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/app.src?r1=1.17&r2=1.17.68.1 Delta lines: +7 -2 ------------------- --- app.src 2008-04-10 14:02:27+0000 1.17 +++ app.src 2008-08-11 19:55:32+0000 1.17.68.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: app.src,v $ - * $Revision: 1.17 $ + * $Revision: 1.17.68.1 $ * * This file is part of OpenOffice.org. * @@ -465,3 +465,8 @@ "Note that you won't be able to embed macros or scripts into the database document until " "this migration is done. "; }; + +String RID_STR_EMBEDDED_DATABASE +{ + Text [ en-US ] = "Embedded database"; +}; File [changed]: dbu_app.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/dbu_app.hrc?r1=1.5&r2=1.5.68.1 Delta lines: +4 -3 ------------------- --- dbu_app.hrc 2008-04-10 14:02:42+0000 1.5 +++ dbu_app.hrc 2008-08-11 19:55:32+0000 1.5.68.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dbu_app.hrc,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.68.1 $ * * This file is part of OpenOffice.org. * @@ -67,11 +67,12 @@ #define RID_STR_TABLES_HELP_TEXT_WIZARD RID_STR_APP_START + 28 #define RID_STR_FORMS_HELP_TEXT_WIZARD RID_STR_APP_START + 29 #define RID_STR_REPORT_HELP_TEXT RID_STR_APP_START + 30 +#define RID_STR_EMBEDDED_DATABASE RID_STR_APP_START + 31 // please adjust checking before insert new strings -#if RID_STR_REPORT_HELP_TEXT > RID_STR_APP_END +#if RID_STR_EMBEDDED_DATABASE > RID_STR_APP_END #error Resource-Id Ueberlauf in #file, #line #endif Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: dsntypes.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/dsntypes.cxx?r1=1.41&r2=1.41.68.1 Delta lines: +9 -2 ------------------- --- dsntypes.cxx 2008-04-10 16:07:04+0000 1.41 +++ dsntypes.cxx 2008-08-11 19:55:33+0000 1.41.68.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dsntypes.cxx,v $ - * $Revision: 1.41 $ + * $Revision: 1.41.68.1 $ * * This file is part of OpenOffice.org. * @@ -377,7 +377,14 @@ } } +//------------------------------------------------------------------------- +bool ODsnTypeCollection::isEmbeddedDatabase( DATASOURCE_TYPE _eType ) const +{ + // the only known embedded type so far is DST_EMBEDDED_HSQLDB + return ( _eType == DST_EMBEDDED_HSQLDB ); +} +//------------------------------------------------------------------------- sal_Bool ODsnTypeCollection::supportsTableCreation(DATASOURCE_TYPE _eType) { BOOL bSupportsTableCreation; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
