diff options
| author | Carsten Driesner <cd@openoffice.org> | 2010-06-24 11:35:00 +0200 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2010-06-24 11:35:00 +0200 |
| commit | 2a40b4b78143f09358c1f319e8608dbd61bbe2d6 (patch) | |
| tree | 60668145121dc3e45a60d569f9c2947afda15e30 /connectivity/source/drivers/dbase | |
| parent | 2b1c9f5c63f4d90db0137b1c8c91340bb2559115 (diff) | |
| parent | 34dd33af79caf3a13ec3a4e7098616ac0b16cf50 (diff) | |
Merge changes
Diffstat (limited to 'connectivity/source/drivers/dbase')
| -rw-r--r-- | connectivity/source/drivers/dbase/DTable.cxx | 2 | ||||
| -rw-r--r-- | connectivity/source/drivers/dbase/dbase.map | 10 | ||||
| -rw-r--r--[-rwxr-xr-x] | connectivity/source/drivers/dbase/dbase.xcu | 5 | ||||
| -rw-r--r-- | connectivity/source/drivers/dbase/makefile.mk | 2 |
4 files changed, 8 insertions, 11 deletions
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index d19f419f17ae9..8544e4affda78 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -449,6 +449,7 @@ OSL_TRACE("column type: %c",aDBFColumn.db_typ); Reference< XPropertySet> xCol = new sdbcx::OColumn(aColumnName, aTypeName, ::rtl::OUString(), + ::rtl::OUString(), ColumnValue::NULLABLE, nPrecision, aDBFColumn.db_dez, @@ -1527,6 +1528,7 @@ BOOL ODbaseTable::InsertRow(OValueRefVector& rRow, BOOL bFlush,const Reference<X // Buffer mit Leerzeichen fuellen AllocBuffer(); memset(m_pBuffer, 0, m_aHeader.db_slng); + m_pBuffer[0] = ' '; // Gesamte neue Row uebernehmen: // ... und am Ende als neuen Record hinzufuegen: diff --git a/connectivity/source/drivers/dbase/dbase.map b/connectivity/source/drivers/dbase/dbase.map deleted file mode 100644 index 2c620b4f3620d..0000000000000 --- a/connectivity/source/drivers/dbase/dbase.map +++ /dev/null @@ -1,10 +0,0 @@ -DBASE_2_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; - - diff --git a/connectivity/source/drivers/dbase/dbase.xcu b/connectivity/source/drivers/dbase/dbase.xcu index 5e6e7596c3fe8..f5de1d53ab0ef 100755..100644 --- a/connectivity/source/drivers/dbase/dbase.xcu +++ b/connectivity/source/drivers/dbase/dbase.xcu @@ -50,6 +50,11 @@ <value>false</value> </prop> </node> + <node oor:name="AddIndexAppendix" oor:op="replace"> + <prop oor:name="Value" oor:type="xs:boolean"> + <value>false</value> + </prop> + </node> </node> <node oor:name="Features"> <node oor:name="UseSQL92NamingConstraints" oor:op="replace"> diff --git a/connectivity/source/drivers/dbase/makefile.mk b/connectivity/source/drivers/dbase/makefile.mk index dded9086bcb11..f855cf1f4554d 100644 --- a/connectivity/source/drivers/dbase/makefile.mk +++ b/connectivity/source/drivers/dbase/makefile.mk @@ -89,7 +89,7 @@ EXCEPTIONSFILES +=\ .ENDIF -SHL1VERSIONMAP=$(TARGET).map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map # --- Library ----------------------------------- |