Tag: cws_src680_dbodf11 User: oj Date: 2008-04-01 11:13:05+0000 Removed: dba/dbaccess/source/core/misc/propertybag.cxx dba/dbaccess/source/core/misc/propertybag.hxx dba/dbaccess/source/inc/dba_reghelper.hxx dba/dbaccess/source/shared/dba_reghelper.cxx dba/dbaccess/source/ui/inc/componentclientmonitor.hxx dba/dbaccess/source/ui/misc/componentclientmonitor.cxx dba/dbaccess/uiconfig/dbbrowser/menubar/menubar.xml dba/dbaccess/uiconfig/dbbrowser/toolbar/browserobjectbar.xml dba/dbaccess/uiconfig/dbbrowser/toolbar/copyobjectbar.xml
Modified: dba/dbaccess/prj/build.lst dba/dbaccess/source/filter/xml/makefile.mk dba/dbaccess/source/filter/xml/xmlExport.cxx dba/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx dba/dbaccess/source/ui/misc/dsntypes.cxx Log: RESYNC: (1.12-1.14); FILE MERGED File Changes: Directory: /dba/dbaccess/prj/ ============================= File [changed]: build.lst Url: http://dba.openoffice.org/source/browse/dba/dbaccess/prj/build.lst?r1=1.12.44.1&r2=1.12.44.2 Delta lines: +3 -1 ------------------- --- build.lst 2008-01-31 07:47:45+0000 1.12.44.1 +++ build.lst 2008-04-01 11:11:14+0000 1.12.44.2 @@ -12,6 +12,8 @@ ba dbaccess\source\sdbtools\connection nmake - all ba_conntools ba_inc NULL ba dbaccess\source\sdbtools\misc nmake - all ba_misctools ba_inc NULL ba dbaccess\source\sdbtools\resource nmake - all ba_miscres ba_inc NULL +ba dbaccess\source\ext\macromigration nmake - all ba_extmm ba_inc NULL +ba dbaccess\source\ext\adabas nmake - all ba_ext_adabasui ba_inc NULL ba dbaccess\source\ui\app nmake - all ba_uiapp ba_uiinc ba_inc NULL ba dbaccess\source\ui\browser nmake - all ba_uibrowser ba_uiinc ba_inc NULL ba dbaccess\source\ui\dlg nmake - all ba_uidlg ba_uiinc ba_inc NULL @@ -22,5 +24,5 @@ ba dbaccess\source\ui\tabledesign nmake - all ba_uitabledesign ba_uiinc ba_inc NULL ba dbaccess\source\ui\uno nmake - all ba_uiuno ba_uimisc ba_inc NULL ba dbaccess\source\ui\imagelists nmake - all ba_uiimglst ba_inc NULL -ba dbaccess\util nmake - all ba_util ba_uiimglst ba_capi ba_shared ba_uibrowser ba_uiapp ba_uicontrol ba_uidlg ba_uimisc ba_uiquery ba_uitabledesign ba_uirelationdesign ba_uiuno ba_conntools ba_misctools ba_miscres NULL +ba dbaccess\util nmake - all ba_util ba_uiimglst ba_capi ba_shared ba_uibrowser ba_uiapp ba_uicontrol ba_uidlg ba_uimisc ba_uiquery ba_uitabledesign ba_uirelationdesign ba_uiuno ba_conntools ba_misctools ba_miscres ba_ext_adabasui NULL ba dbaccess\win32\source\odbcconfig nmake - w ba_odbcconfig ba_inc NULL Directory: /dba/dbaccess/source/core/misc/ ========================================== File [removed]: propertybag.cxx Directory: /dba/dbaccess/source/core/misc/ ========================================== File [removed]: propertybag.hxx Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/makefile.mk?r1=1.7.22.1&r2=1.7.22.2 Delta lines: +4 -4 ------------------- --- makefile.mk 2008-01-31 07:47:45+0000 1.7.22.1 +++ makefile.mk 2008-04-01 11:11:25+0000 1.7.22.2 @@ -80,7 +80,7 @@ $(SLB)$/fltshared.lib \ $(SLB)$/$(TARGET).lib -SHL1TARGET=$(TARGET)$(UPD)$(DLLPOSTFIX) +SHL1TARGET=$(TARGET)$(DLLPOSTFIX) SHL1STDLIBS=\ $(XMLOFFLIB) \ Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: xmlExport.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlExport.cxx?r1=1.14.76.6&r2=1.14.76.7 Delta lines: +15 -4 -------------------- --- xmlExport.cxx 2008-01-31 07:47:45+0000 1.14.76.6 +++ xmlExport.cxx 2008-04-01 11:11:30+0000 1.14.76.7 @@ -698,6 +698,14 @@ AddAttribute(XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_IS_LIST,bIsSequence ? XML_TRUE : XML_FALSE); AddAttribute(XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_NAME,aValue.Name); ::rtl::OUString sTypeName = lcl_implGetPropertyXMLType(aSimpleType); + if ( bIsSequence && aSimpleType.getTypeClass() == TypeClass_ANY ) + { + Sequence<Any> aSeq; + aValue.Value >>= aSeq; + if ( aSeq.getLength() ) + sTypeName = lcl_implGetPropertyXMLType(aSeq[0].getValueType()); + } + AddAttribute(XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_TYPE,sTypeName); SvXMLElementExport aDataSourceSetting(*this,XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING, sal_True, sal_True); @@ -732,6 +740,9 @@ case TypeClass_LONG: pSequenceIterator.reset(new OSequenceIterator< sal_Int32 >(aValue.Value)); break; + case TypeClass_ANY: + pSequenceIterator.reset(new OSequenceIterator< Any >(aValue.Value)); + break; default: OSL_ENSURE(sal_False, "unsupported sequence type !"); break; Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: xmlFileBasedDatabase.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx?r1=1.2.22.3&r2=1.2.22.4 Delta lines: +3 -8 ------------------- --- xmlFileBasedDatabase.cxx 2008-01-31 07:47:45+0000 1.2.22.3 +++ xmlFileBasedDatabase.cxx 2008-04-01 11:11:33+0000 1.2.22.4 @@ -139,11 +139,6 @@ DBG_DTOR(OXMLFileBasedDatabase,NULL); } // ----------------------------------------------------------------------------- -ODBFilter& OXMLFileBasedDatabase::GetOwnImport() -{ - return static_cast<ODBFilter&>(GetImport()); -} -// ----------------------------------------------------------------------------- //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- Directory: /dba/dbaccess/source/inc/ ==================================== File [removed]: dba_reghelper.hxx Directory: /dba/dbaccess/source/shared/ ======================================= File [removed]: dba_reghelper.cxx Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [removed]: componentclientmonitor.hxx Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [removed]: componentclientmonitor.cxx 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.38.20.1&r2=1.38.20.2 Delta lines: +8 -5 ------------------- --- dsntypes.cxx 2008-01-31 07:47:46+0000 1.38.20.1 +++ dsntypes.cxx 2008-04-01 11:11:50+0000 1.38.20.2 @@ -326,6 +326,7 @@ _rsHostname = sUrl.GetToken(0,':'); _sDatabaseName = sUrl.GetToken(sUrl.GetTokenCount(':') - 1,':'); break; + case DST_MYSQL_NATIVE: case DST_MYSQL_JDBC: { lcl_extractHostAndPort(sUrl,_rsHostname,_nPortNumber); @@ -407,6 +408,7 @@ case DST_MYSQL_ODBC: case DST_ODBC: case DST_MYSQL_JDBC: + case DST_MYSQL_NATIVE: case DST_ORACLE_JDBC: case DST_LDAP: case DST_JDBC: @@ -435,6 +437,7 @@ case DST_THUNDERBIRD: bEnableBrowseButton = TRUE; break; + case DST_MYSQL_NATIVE: case DST_MYSQL_JDBC: case DST_ORACLE_JDBC: case DST_LDAP: @@ -510,6 +513,8 @@ return DST_FLAT; if (_rDsn.EqualsIgnoreCaseAscii("sdbc:calc:", 0, nSeparator)) return DST_CALC; + if ( ( 11 <= nSeparator) && _rDsn.EqualsIgnoreCaseAscii("sdbc:mysqlc:", 0, nSeparator)) + return DST_MYSQL_NATIVE; if (_rDsn.EqualsIgnoreCaseAscii("sdbc:embedded:hsqldb", 0, _rDsn.Len())) return DST_EMBEDDED_HSQLDB; @@ -552,8 +557,6 @@ if (_rDsn.EqualsIgnoreCaseAscii("sdbc:mysql:jdbc", 0, nSeparator)) return DST_MYSQL_JDBC; - - DBG_ERROR("ODsnTypeCollection::implDetermineType : unrecognized data source type !"); return DST_UNKNOWN; } Directory: /dba/dbaccess/uiconfig/dbbrowser/menubar/ ==================================================== File [removed]: menubar.xml Directory: /dba/dbaccess/uiconfig/dbbrowser/toolbar/ ==================================================== File [removed]: browserobjectbar.xml Directory: /dba/dbaccess/uiconfig/dbbrowser/toolbar/ ==================================================== File [removed]: copyobjectbar.xml --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
