Tag: cws_src680_dba24d User: fs Date: 2007-11-16 12:56:44+0000 Modified: dba/dbaccess/source/core/dataaccess/documentdefinition.cxx dba/dbaccess/source/inc/stringconstants.hrc dba/dbaccess/source/shared/stringconstants.cxx dba/dbaccess/source/ui/browser/brwctrlr.cxx dba/dbaccess/source/ui/inc/dbu_resource.hrc dba/dbaccess/source/ui/uno/makefile.mk
Log: RESYNC: (1.48-1.49); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: documentdefinition.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentdefinition.cxx?r1=1.48.6.1&r2=1.48.6.2 Delta lines: +4 -4 ------------------- --- documentdefinition.cxx 2007-11-08 14:09:22+0000 1.48.6.1 +++ documentdefinition.cxx 2007-11-16 12:56:17+0000 1.48.6.2 @@ -463,7 +463,7 @@ ::rtl::OUString aMediaType; try { - Any aAny = xPropSet->getPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ) ); + Any aAny = xPropSet->getPropertyValue( INFO_MEDIATYPE ); aAny >>= aMediaType; } catch ( Exception& ) Directory: /dba/dbaccess/source/inc/ ==================================== File [changed]: stringconstants.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/inc/stringconstants.hrc?r1=1.45.2.1&r2=1.45.2.2 Delta lines: +4 -3 ------------------- --- stringconstants.hrc 2007-11-08 14:06:06+0000 1.45.2.1 +++ stringconstants.hrc 2007-11-16 12:56:20+0000 1.45.2.2 @@ -421,6 +421,7 @@ DECLARE_CONSTASCII_USTRING(INFO_CONN_LDAP_BASEDN); DECLARE_CONSTASCII_USTRING(INFO_CONN_LDAP_ROWCOUNT); DECLARE_CONSTASCII_USTRING(INFO_PREVIEW); +DECLARE_CONSTASCII_USTRING(INFO_MEDIATYPE); // other DECLARE_CONSTASCII_USTRING(INFO_POOLURL); Directory: /dba/dbaccess/source/shared/ ======================================= File [changed]: stringconstants.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/shared/stringconstants.cxx?r1=1.42.2.1&r2=1.42.2.2 Delta lines: +4 -3 ------------------- --- stringconstants.cxx 2007-11-08 14:06:52+0000 1.42.2.1 +++ stringconstants.cxx 2007-11-16 12:56:23+0000 1.42.2.2 @@ -272,6 +272,7 @@ IMPLEMENT_CONSTASCII_USTRING(INFO_CONN_LDAP_BASEDN,"BaseDN"); IMPLEMENT_CONSTASCII_USTRING(INFO_CONN_LDAP_ROWCOUNT,"MaxRowCount"); IMPLEMENT_CONSTASCII_USTRING(INFO_PREVIEW,"Preview"); +IMPLEMENT_CONSTASCII_USTRING(INFO_MEDIATYPE,"MediaType"); // other IMPLEMENT_CONSTASCII_USTRING(INFO_POOLURL,"PoolURL"); Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: brwctrlr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/brwctrlr.cxx?r1=1.100.54.1&r2=1.100.54.2 Delta lines: +5 -5 ------------------- --- brwctrlr.cxx 2007-11-08 14:15:25+0000 1.100.54.1 +++ brwctrlr.cxx 2007-11-16 12:56:26+0000 1.100.54.2 @@ -1902,7 +1902,7 @@ break; ::rtl::OUString sOldSort = m_xParser->getOrder(); - sal_Bool bParserSuccess; + sal_Bool bParserSuccess = sal_False; HANDLE_SQL_ERRORS( m_xParser->setOrder(::rtl::OUString()); m_xParser->appendOrderByColumn(xField, bSortUp), bParserSuccess, @@ -1953,7 +1953,7 @@ DO_SAFE( (bHaving ? m_xParser->setHavingClause(::rtl::OUString()) : m_xParser->setFilter(::rtl::OUString())), "SbaXDataBrowserController::Execute : caught an exception while resetting the new filter !" ); } - sal_Bool bParserSuccess; + sal_Bool bParserSuccess = sal_False; if ( bHaving ) Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: dbu_resource.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/dbu_resource.hrc?r1=1.97.70.2&r2=1.97.70.3 Delta lines: +3 -3 ------------------- --- dbu_resource.hrc 2007-11-06 10:59:49+0000 1.97.70.2 +++ dbu_resource.hrc 2007-11-16 12:56:29+0000 1.97.70.3 @@ -78,13 +78,13 @@ #define RID_STR_REL_END RID_STR_REL_START + 10 // 330 - 349 #define RID_STR_UNO_START RID_STR_REL_END -#define RID_STR_UNO_END RID_STR_UNO_START + 5 // 350 - 354 +#define RID_STR_UNO_END RID_STR_UNO_START + 20 // 350 - 369 #define RID_STR_GEN_START RID_STR_UNO_END -#define RID_STR_GEN_END RID_STR_GEN_START + 55 // 355 - 409 +#define RID_STR_GEN_END RID_STR_GEN_START + 55 // 370 - 424 #define RID_STR_APP_START RID_STR_GEN_END -#define RID_STR_APP_END RID_STR_APP_START + 40 // 409 - 449 +#define RID_STR_APP_END RID_STR_APP_START + 40 // 425 - 464 #if RID_STR_GEN_END > RID_DBACCESS_END Directory: /dba/dbaccess/source/ui/uno/ ======================================= File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/makefile.mk?r1=1.12.70.1&r2=1.12.70.2 Delta lines: +5 -4 ------------------- --- makefile.mk 2007-11-08 14:18:24+0000 1.12.70.1 +++ makefile.mk 2007-11-16 12:56:32+0000 1.12.70.2 @@ -51,7 +51,8 @@ SRS1NAME=$(TARGET) SRC1FILES = \ - dbinteraction.src + dbinteraction.src \ + copytablewizard.src # ... object files ............................ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
