diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:02:39 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:02:39 +0200 |
commit | 38d077596d93bb547b5b5d4209328787f53c5a20 (patch) | |
tree | 4eafd01032528bcac3508c6accfa7a3a5cc270b6 /dbaccess/source/ui/tabledesign/TableRow.cxx | |
parent | 7302529f5102a9b9e02f66bbd5a1201a486de8e6 (diff) |
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit 79a72f2305cadc82947c92ba4fbba3fe5536b9ae (tag: refs/tags/OOO_BUILD_3_2_98_1)
Author: Petr Mladek <pmladek@walk.suse.cz>
Date: Wed Sep 15 19:03:23 2010 +0200
Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1)
commit da0499fda565b1f105c96b3a386670c0ad0a2c2b
Merge: 5eb7688 2ee0e40
Author: Jan Holesovsky <kendy@suse.cz>
Date: Wed Sep 8 11:33:59 2010 +0200
Merge commit 'ooo/OOO330_m7'
commit 2ee0e40b14191b4933e87cd85cee82d9ace2c800 (tag: refs/tags/ooo/OOO330_m7)
Merge: 4022fd7 f391dff
Author: Kurt Zenker <kz@openoffice.org>
Date: Fri Sep 3 14:39:55 2010 +0200
CWS-TOOLING: integrate CWS fs33a
commit f391dff52596dca6d1944f115a8e166ccea48f1f
Author: Ocke Janssen [oj] <Ocke.Janssen@oracle.com>
Date: Thu Sep 2 10:54:17 2010 +0200
fs33a: #i113583# use the categorie column as well to build table
.../source/filter/xml/xmlExportDocumentHandler.cxx | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
commit 9bac46bf7bebcadfdbf4ee03a1e64650c950e036
Author: Ocke Janssen [oj] <Ocke.Janssen@oracle.com>
Date: Wed Sep 1 13:09:46 2010 +0200
dba33h: #i114246# use correct table name
dbaccess/source/core/api/KeySet.cxx | 31 +++++++++++++++++++++++++------
dbaccess/source/core/api/KeySet.hxx | 1 -
2 files changed, 25 insertions(+), 7 deletions(-)
commit bf76cc893df69ecb3408e4fcf1321c171a039c57
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date: Fri Aug 27 13:19:56 2010 +0200
fs33a: reverting the fix for i112671. No string changes allowed in this phase.
.../source/ext/macromigration/macromigration.src | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 5521d0e17eccd263a154ad11066f07e1575eb806
Author: Ocke Janssen [oj] <Ocke.Janssen@oracle.com>
Date: Tue Aug 24 15:36:19 2010 +0200
fs33a: #i113631# use m_sUpdateTableName
dbaccess/source/core/api/KeySet.cxx | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
commit 8fe8d81132d3b307e318afc1720dafe4b8fc8b3f
Author: Ocke Janssen [oj] <Ocke.Janssen@oracle.com>
Date: Tue Aug 24 15:00:36 2010 +0200
fs33a: #i113744# check length of value
dbaccess/source/core/api/KeySet.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 54b57355495353aadd18c1846dec503c3d474b05
Author: Ocke Janssen [oj] <Ocke.Janssen@oracle.com>
Date: Tue Aug 24 14:32:12 2010 +0200
fs33a: #i113583# handle column names from complex descriptions
.../source/core/dataaccess/documentdefinition.cxx | 17 ++--
dbaccess/source/core/inc/DatabaseDataProvider.hxx | 27 +++++-
dbaccess/source/core/misc/DatabaseDataProvider.cxx | 95 ++++++++++++++++++--
.../source/filter/xml/xmlExportDocumentHandler.cxx | 28 +++++-
4 files changed, 143 insertions(+), 24 deletions(-)
commit adaa62d63307602bfb940d42a8ad7d960d3fc0b2
Merge: 2fbec17 4022fd7
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date: Tue Aug 10 14:53:21 2010 +0200
merging in latest changes from OOO330(m3)
commit 2fbec17c655c59232ba4b9f3ea3665507ba99d53
Merge: 8c9b117 5c75695
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Tue Jul 6 15:24:32 2010 +0200
Automated merge with ssh://hg@hg.services.openoffice.org/cws/unoawt2
commit 5c756956da3e5b218f63022430527bc3780afbcf
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Wed Jun 23 13:31:43 2010 +0200
fs33a: #i112617# fixed typo (thanks sophie)
.../source/ext/macromigration/macromigration.src | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Notes
Notes:
split repo tag: base_OOO_BUILD_3_2_98_1
Diffstat (limited to 'dbaccess/source/ui/tabledesign/TableRow.cxx')
-rw-r--r-- | dbaccess/source/ui/tabledesign/TableRow.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx index 33f358b6e408..17456ba8c896 100644 --- a/dbaccess/source/ui/tabledesign/TableRow.cxx +++ b/dbaccess/source/ui/tabledesign/TableRow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,14 +49,14 @@ using namespace ::com::sun::star::beans; //======================================================================== DBG_NAME(OTableRow) //------------------------------------------------------------------------------ -OTableRow::OTableRow() +OTableRow::OTableRow() :m_pActFieldDescr( NULL ) ,m_nPos( -1 ) ,m_bReadOnly( false ) ,m_bOwnsDescriptions(false) { DBG_CTOR(OTableRow,NULL); -} +} //------------------------------------------------------------------------------ OTableRow::OTableRow(const Reference< XPropertySet >& xAffectedCol) :m_pActFieldDescr( NULL ) @@ -89,7 +89,7 @@ OTableRow::~OTableRow() { DBG_DTOR(OTableRow,NULL); if(m_bOwnsDescriptions) - delete m_pActFieldDescr; + delete m_pActFieldDescr; } //------------------------------------------------------------------------------ @@ -145,7 +145,7 @@ namespace dbaui _rStr << sal_Int32(1); _rStr << nValue; } - else + else { _rStr << sal_Int32(2); _rStr.WriteByteString(::comphelper::getString(aValue)); @@ -173,13 +173,13 @@ namespace dbaui sal_Int32 nValue = 0; _rStr >> nValue; if ( nValue ) - { + { OFieldDescription* pFieldDesc = new OFieldDescription(); _rRow.m_pActFieldDescr = pFieldDesc; String sValue; _rStr.ReadByteString(sValue); pFieldDesc->SetName(sValue); - + _rStr.ReadByteString(sValue); pFieldDesc->SetDescription(sValue); _rStr.ReadByteString(sValue); @@ -204,7 +204,7 @@ namespace dbaui pFieldDesc->SetControlDefault(aControlDefault); - + _rStr >> nValue; pFieldDesc->SetTypeValue(nValue); |