From fbb7a4cd4c90471ab9582b799e04a6c1023d507e Mon Sep 17 00:00:00 2001
From: "Ocke Janssen [oj]" <Ocke.Janssen@sun.com>
Date: Wed, 13 Jan 2010 08:44:34 +0100
Subject: dba33f: #i20615# new feature to allow server side column
 descrriptions to be visible and changeable in the table designer.

---
 connectivity/source/drivers/calc/CTable.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'connectivity/source/drivers/calc')

diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index ba6d20ac70f5..f9bd071496f8 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -528,7 +528,7 @@ void OCalcTable::fillColumns()
             aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase);
         }
 
-        sdbcx::OColumn* pColumn = new sdbcx::OColumn( aAlias, aTypeName, ::rtl::OUString(),
+        sdbcx::OColumn* pColumn = new sdbcx::OColumn( aAlias, aTypeName, ::rtl::OUString(),::rtl::OUString(),
                                                 ColumnValue::NULLABLE, nPrecision, nDecimals,
                                                 eType, sal_False, sal_False, bCurrency,
                                                 bStoresMixedCaseQuotedIdentifiers);
-- 
cgit 


From ec0ee57607a1e8a800bb4809a0be6921df1f2e19 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Fri, 29 Jan 2010 17:01:54 +0100
Subject: sb118: #i108776# changed addsym.awk to also export STLport num_put
 symbols, and simplified it by requiring that first section is labeled
 UDK_3_0_0; adapted map files accordingly, replacing many individual ones with
 solenv/src templates

---
 connectivity/source/drivers/calc/calc.map    | 8 --------
 connectivity/source/drivers/calc/makefile.mk | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 connectivity/source/drivers/calc/calc.map

(limited to 'connectivity/source/drivers/calc')

diff --git a/connectivity/source/drivers/calc/calc.map b/connectivity/source/drivers/calc/calc.map
deleted file mode 100644
index bcab8e6c9101..000000000000
--- a/connectivity/source/drivers/calc/calc.map
+++ /dev/null
@@ -1,8 +0,0 @@
-CALC_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk
index f4019564ed30..465e9ff5d742 100644
--- a/connectivity/source/drivers/calc/makefile.mk
+++ b/connectivity/source/drivers/calc/makefile.mk
@@ -61,7 +61,7 @@ SLOFILES=\
     $(SLO)$/Cservices.obj			\
     $(SLO)$/CDriver.obj
 
-SHL1VERSIONMAP= $(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 # --- Library -----------------------------------
 
-- 
cgit 


From 24706bb307e38aea2a8c4b0344c5601d7d134db2 Mon Sep 17 00:00:00 2001
From: Niklas Nebel <nn@openoffice.org>
Date: Mon, 26 Apr 2010 14:26:49 +0200
Subject: calc53: #i25840# null result in text column only for empty cells, not
 values

---
 connectivity/source/drivers/calc/CTable.cxx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'connectivity/source/drivers/calc')

diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index 1d19c05a46c0..d95c6263b7ed 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -347,14 +347,15 @@ void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& xSheet,
         switch (nType)
         {
             case DataType::VARCHAR:
-                if ( eCellType == CellContentType_TEXT )
+                if ( eCellType == CellContentType_EMPTY )
+                    rValue.setNull();
+                else
                 {
+                    // #i25840# still let Calc convert numbers to text
                     const Reference<XText> xText( xCell, UNO_QUERY );
                     if ( xText.is() )
                         rValue = xText->getString();
-                } // if ( eCellType == CellContentType_TEXT )
-                else
-                    rValue.setNull();
+                }
                 break;
             case DataType::DECIMAL:
                 if ( eCellType == CellContentType_VALUE )
-- 
cgit