[Libreoffice-commits] core.git: connectivity/Library_tdeab1.mk connectivity/source

Jan-Marek Glogowski glogow at fbihome.de
Mon Jan 4 01:48:56 PST 2016


 connectivity/Library_tdeab1.mk               |    1 +
 connectivity/source/drivers/kab/KCatalog.cxx |    5 +----
 connectivity/source/drivers/kab/KTable.cxx   |   14 +++++++-------
 3 files changed, 9 insertions(+), 11 deletions(-)

New commits:
commit 29be1b06b8e63694d1ce60d8b7af3f21791bf697
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Mon Jan 4 10:42:33 2016 +0100

    TDE kab: fix dbgutil and clang werror build
    
    Change-Id: I37948ff77d060dc18a583389966b52c06a95bdaf

diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk
index 54c90a4..513d0953 100644
--- a/connectivity/Library_tdeab1.mk
+++ b/connectivity/Library_tdeab1.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_Library_use_libraries,tdeab1,\
 	dbtools \
 	sal \
 	salhelper \
+	tl \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,tdeab1,\
diff --git a/connectivity/source/drivers/kab/KCatalog.cxx b/connectivity/source/drivers/kab/KCatalog.cxx
index c9a48a1..63d0449 100644
--- a/connectivity/source/drivers/kab/KCatalog.cxx
+++ b/connectivity/source/drivers/kab/KCatalog.cxx
@@ -44,10 +44,7 @@ void KabCatalog::refreshTables()
     TStringVector aVector;
     Sequence< OUString > aTypes { "%" };
     Reference< XResultSet > xResult = m_xMetaData->getTables(
-        Any(),
-        OUString("%"),
-        OUString("%"),
-        aTypes);
+        Any(), "%", "%", aTypes);
 
     if (xResult.is())
     {
diff --git a/connectivity/source/drivers/kab/KTable.cxx b/connectivity/source/drivers/kab/KTable.cxx
index 0c4a5af..cdcd7d2 100644
--- a/connectivity/source/drivers/kab/KTable.cxx
+++ b/connectivity/source/drivers/kab/KTable.cxx
@@ -58,17 +58,17 @@ void KabTable::refreshColumns()
 
     if (!isNew())
     {
-        Reference< XResultSet > xResult = m_pConnection->getMetaData()->getColumns(
-                Any(),
-                m_SchemaName,
-                m_Name,
-                OUString("%"));
+        Reference< XResultSet > xResult =
+            m_pConnection->getMetaData()->getColumns(
+                Any(), m_SchemaName, m_Name, "%");
 
         if (xResult.is())
         {
-        Reference< XRow > xRow(xResult, UNO_QUERY);
-        while (xResult->next())
+            Reference< XRow > xRow(xResult, UNO_QUERY);
+            while (xResult->next())
+            {
                 aVector.push_back(xRow->getString(4));
+            }
         }
     }
 


More information about the Libreoffice-commits mailing list