diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-07-15 11:06:05 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-07-15 11:06:05 +0000 |
commit | 0a14728df214246347e51cdc72a4314180845208 (patch) | |
tree | b01dd5f25403c2c587fb5d612a18279358f96412 /connectivity/source/drivers/mozab/MDatabaseMetaData.cxx | |
parent | #i10000# double merge fixed (diff) | |
download | core-0a14728df214246347e51cdc72a4314180845208.tar.gz core-0a14728df214246347e51cdc72a4314180845208.zip |
CWS-TOOLING: integrate CWS moz2seamonkey01
2009-06-18 20:56:43 +0200 fs r273133 : #i10000# corrected resolved of merge conflict
2009-06-18 20:55:34 +0200 fs r273132 : #i10000# corrected resolved of merge conflict
2009-06-18 10:49:26 +0200 fs r273105 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk@272827 (milestone: DEV300:m50)
2009-06-17 20:48:35 +0200 fs r273094 : #i84961# removed 'pointless and buggy' echo statement
2009-05-22 11:27:08 +0200 fs r272176 : #i101763#
provided by tono@openoffice.org
make compile with mingw
2009-05-22 11:22:25 +0200 fs r272175 : #i101763#
provided by tono@openoffice.org
allow compilation in with mingw
2009-04-15 12:09:28 +0200 fs r270830 : unconditionally disable moz executables
2009-03-27 12:29:38 +0100 fs r270149 : ignore some configure-related files
2009-03-27 11:47:35 +0100 fs r270145 : SolarisSparc needs libfreebl_32fpu_3.so
2009-03-27 11:38:09 +0100 fs r270141 : regxpcom call not needed nowadays / also pack libfreebl3 (needed for signature/encryption)
2009-03-26 21:40:17 +0100 fs r270108 : superseded by 1.1.14 version
2009-03-24 13:07:21 +0100 fs r269938 : xptitemp.dat seemingly not needed anymore
2009-03-23 12:56:29 +0100 fs r269869 : files with : in their name break the build
2009-03-23 12:22:01 +0100 fs r269866 : files with : in their name break the build
2009-03-21 23:12:06 +0100 fs r269843 : manual resync: merge the changes which happened on TRUNK in mozilla-source-1.7.5.patch herein
2009-03-21 21:58:17 +0100 fs r269841 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk@269781 (milestone: DEV300:m44)
2009-03-18 12:04:25 +0100 fs r269649 : in SunHH environment, use pre-requisites from /so/env
2009-03-16 12:33:18 +0100 pastea_p r269522 : correct makefile.mk sorry again
2009-03-15 17:32:43 +0100 pastea_p r269506 : last files about migration to 1.1.14
2009-03-15 17:19:39 +0100 pastea_p r269505 : Migrates some files to 1.1.14
2009-03-04 07:45:40 +0100 fs r268782 : also add pref.xpt
2009-02-27 09:57:37 +0100 fs r268555 : #i66338# for the moment, disable Mozilla-based code for unxlngx6
2009-02-23 10:56:28 +0100 fs r268346 : syntax
2009-02-19 14:14:56 +0100 fs r268283 : make PrintPDE compile in Sun's internal build environment by removing some unneeded stuff
2009-02-18 15:40:40 +0100 fs r268236 : #i66338# re-enable MozAB on Mac
2009-02-18 15:39:55 +0100 fs r268235 : #i66338#
2009-02-18 15:30:38 +0100 fs r268232 : #i66338# tar => $(TAR) (provided by hjs)
2009-02-18 15:28:45 +0100 fs r268231 : more build envs supported (thanks to hjs for all this work!)
2009-02-18 15:27:02 +0100 fs r268230 : #i66338#
2009-02-18 15:23:04 +0100 fs r268229 : #i66338# let it build on Solaris, in Sun Hamburg's build environment
2009-02-18 12:00:12 +0100 fs r268210 : #i10000#
2009-02-18 08:17:29 +0100 fs r268198 : #i66338# building Mozilla is not supported anymore, SeaMonkey is the way to go now
2009-02-18 08:16:50 +0100 fs r268197 : #i66338# building Mozilla is not supported anymore, SeaMonkey is the way to go now
2009-02-14 14:05:24 +0100 fs r267757 : redo the Windows related changes lost with recent resync
2009-02-14 00:06:33 +0100 ericb r267755 : #i94628# remove the config_office dir now
2009-02-14 00:04:59 +0100 ericb r267754 : #i94628# remove all files in config_office now
2009-02-14 00:01:26 +0100 ericb r267753 : #i94628# remove guw in config_office
2009-02-13 23:53:00 +0100 ericb r267752 : #i94628# remove files in config_office
2009-02-13 16:02:58 +0100 fs r267725 : #i10000#
2009-02-12 18:14:31 +0100 ericb r267685 : #i94628# new generated configure
2009-02-12 18:13:52 +0100 ericb r267684 : #i94628# fix a path issue for finding seamonkey01
2009-02-12 14:39:17 +0100 ericb r267662 : #i94628# removing seamonkey.1.1.12 patch
2009-02-12 14:21:04 +0100 ericb r267658 : #i94628# the new configure, after autoconf
2009-02-12 14:13:21 +0100 ericb r267656 : #i94628# other missing changes for Windows
2009-02-12 14:04:26 +0100 ericb r267655 : #i94628# recommit configure.in changes after config_office removing
2009-02-12 13:46:12 +0100 ericb r267653 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk@267171 (milestone: DEV300:m41)
2009-02-12 12:00:48 +0100 ericb r267643 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk@267171 (milestone: DEV300:m41)
2009-02-11 13:28:50 +0100 pl r267595 : #i94628# add MACDEVSDK variable for unxmacxi
2009-02-06 09:44:15 +0100 ericb r267446 : #i98957# provide the zipped archives too
2009-02-06 09:43:32 +0100 ericb r267445 : #i98957# make seamonkey buildable on OpenSolaris, adding the right options for configure
2009-02-06 09:42:45 +0100 ericb r267444 : #i98957# make seamonkey buildable on OpenSolaris
2009-02-02 09:41:57 +0100 fs r267252 : #i66338#
2009-02-02 09:41:43 +0100 fs r267251 : #i66338#
2009-01-30 15:12:03 +0100 fs r267200 : code consolidation - MQueryHelper now uses MLdapAttributeMap's fillCardFromResult and fillResultFromCard, which makes the code as such shorter, and eliminates information duplication
2009-01-30 11:53:31 +0100 fs r267189 : reworked the statement parsing / statement execution / result set creation: now we don't anymore create three result sets (two of them leaking) for a single prepared statement ...
2009-01-29 20:37:01 +0100 fs r267170 : #i10000#
2009-01-29 20:32:50 +0100 fs r267169 : more explicit return type of parseSql
2009-01-29 17:32:56 +0100 fs r267163 : slightly refactored the statement class hierarchy (basically remove OStatement_BASE2, and renamed the other base classes)
2009-01-29 17:14:58 +0100 fs r267161 : #i66338# first implementation to re-enable LDAP access. Still work in progress (but hey, you can see the data already :)
2009-01-12 11:25:56 +0100 fs r266138 : allow using a debug-enabled version of Mozilla/SeaMonkey when MOZILLA_ENABLE_DEBUG is set
2009-01-10 22:01:40 +0100 fs r266126 : #i95772# nsldap32v50.dll also needs an embedded manifest (the LDP configuration backend links directly against it)
2009-01-09 11:15:32 +0100 fs r266065 : manifests for DLLs need to have ID 2, not 1
2009-01-08 20:02:24 +0100 fs r266035 : #i95772# embed manifest file in shared libs built in directory/c-sdk, too
2009-01-05 20:45:38 +0100 ericb r265886 : #i66338# commiting the correct configure for the tinderboxes
2009-01-05 17:42:34 +0100 ericb r265883 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk@265758 (milestone: DEV300:m38)
2008-12-16 15:34:26 +0100 ericb r265550 : #i94628# change for seamonkey1.1.13 : do not forget to do autoconf in config_office before configure
2008-12-16 15:25:37 +0100 pastea_p r265547 : 1.1.12 to 1.1.13
2008-12-16 14:20:18 +0100 pastea_p r265540 : correct the hunk about no core_abspath which one broke linux build
2008-12-16 13:10:06 +0100 pastea_p r265535 : Change name of patch to 1.1.13
2008-12-15 23:32:54 +0100 pastea_p r265518 : 2008-12-12 18:43:36 +0100 pastea_p r265435 : update to 1.1.13
2008-12-12 10:56:38 +0100 fs r265398 : #i95772# embed .manifest files into SHARED_LIBRARYs built in nsprpub, too
2008-12-12 09:56:38 +0100 fs r265391 : #i95772# don't use regxpcomp on Windows, it's not needed
2008-12-11 11:22:43 +0100 fs r265269 : #i95772# Moz/SeaMonkey libs on Windows now link against msvc?80.dll
2008-12-10 13:45:51 +0100 fs r265182 : proper OSL_ENSURE message
2008-11-13 13:18:03 +0100 fs r263635 : #i95772# more patches
2008-11-13 12:14:41 +0100 fs r263630 : #i95772# building SeaMonkey on Windows is supported for MSVS2005 only at the moment, now requiring v8-moztools.zip instead of the previously needed wintools.zip/vc71*.zip
2008-11-13 12:13:33 +0100 fs r263629 : #i95772# building SeaMonkey on Windows is supported for MSVS2005 only at the moment, now requiring v8-moztools.zip instead of the previously needed wintools.zip/vc71*.zip
2008-11-13 12:08:22 +0100 fs r263628 : #i95772# building SeaMonkey on Windows is supported for MSVS2005 only at the moment, now requiring v8-moztools.zip instead of the previously needed wintools.zip/vc71*.zip
2008-11-13 12:04:15 +0100 fs r263627 : #i95772#
2008-11-12 08:23:20 +0100 fs r263575 : i95772# use xpcom_core on Windows, too
2008-11-11 21:02:14 +0100 fs r263574 : i95772# use xpcom_core.lib on Windows, too
2008-11-11 20:58:07 +0100 fs r263573 : i95772# use xpcom_core.lib on Windows, too
2008-11-11 15:05:42 +0100 fs r263564 : alternative fix for part 1 of #i94957#
2008-11-10 22:18:14 +0100 fs r263541 : #i95772# with MSVC2008, compile with -Zc:wchar_t- (shamelessly taken from https://bugzilla.mozilla.org/show_bug.cgi?id=324842)
2008-11-10 22:15:57 +0100 fs r263540 : #i95772# with MSVC2008, compile with -Zc:wchar_t- (shamelessly taken from https://bugzilla.mozilla.org/show_bug.cgi?id=324842)
2008-11-10 09:28:26 +0100 fs r263509 : #i95772# when building on WNT, embed the .manifest file into the .dll/.exe
2008-11-10 09:19:06 +0100 fs r263508 : collect single patches which comprise the complete patch
2008-11-06 09:10:21 +0100 fs r263360 : #i95772# core_abspath does not work on Windows, too (at least in security/nss/cmd/shlibsign). Replace with 'cygpath -d -a'
2008-11-02 22:51:27 +0100 fs r263277 : #i95772# sanitize INCLUDEDIR and GENHEADERS to use cygwin path notation - cygwin's make 1.81 doesn't cope with Windows path notation
2008-11-02 22:50:15 +0100 fs r263276 : #i95772# no --enable-system-cairo on Windows
2008-10-18 20:12:36 +0200 pastea_p r262297 : 2008-10-16 17:15:35 +0200 ericb r262267 : #i94957# fix the breakage in connectivity, for the seamonkey migration
2008-10-16 17:14:49 +0200 ericb r262266 : #i94957# fix the breakage in connectivity, for the seamonkey migration
2008-10-16 16:58:21 +0200 ericb r262263 : #i94957# fix the breakage in connectivity, for the seamonkey migration
2008-10-15 20:16:28 +0200 ericb r262242 : #i94628# use mac as default toolkit on mac
2008-10-14 18:54:13 +0200 ericb r262216 : #i90774# modify the configure.in for moz2seamonkey migration
2008-10-14 18:48:57 +0200 ericb r262215 : #i90774# commit moz2seamonkey changes for svn migration
2008-10-14 18:47:05 +0200 ericb r262214 : #i90774# commit moz2seamonkey changes for svn migration
Diffstat (limited to 'connectivity/source/drivers/mozab/MDatabaseMetaData.cxx')
-rw-r--r-- | connectivity/source/drivers/mozab/MDatabaseMetaData.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx index 55350e350474..3ba479abc764 100644 --- a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx @@ -157,7 +157,7 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( // COLUMN_NAME aRow[4] = new ORowSetValueDecorator( compare->first ); // ORDINAL_POSITION - aRow[17] = new ORowSetValueDecorator( static_cast< sal_Int32 >( compare->second.eProgrammaticNameIndex ) + 1 ); + aRow[17] = new ORowSetValueDecorator( static_cast< sal_Int32 >( compare->second.columnPosition ) + 1 ); aRows.push_back(aRow); } } |