[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - connectivity/source

[Julien Nabet]

 connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 62280beffe7f0c25c9d6a45fd5135a622f5ef4d4
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Tue Dec 30 13:36:58 2014 +0100

    Related fdo#87789: groups should appear like views and not like tables
    
    Cherry-picked from 84e3c5acb07937a073fedbe3d5389fc72123923a
    
    Change-Id: I4f8d7e2bec006e6d0a0041e2145aa0920f64aa57
    Reviewed-on: https://gerrit.libreoffice.org/13698
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx
index c4a239a..5c530d8 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx
@@ -106,8 +106,15 @@ bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon,
 
             SAL_INFO("connectivity.mork", "TableName: " << aTableName);
 
-            aRow.push_back( new ORowSetValueDecorator( aTableName ) ); // Table name
-            aRow.push_back( new ORowSetValueDecorator( OUString("TABLE") ) ); // Table type
+            aRow.push_back( new ORowSetValueDecorator( aTableName ) ); // Table/View name
+            if ((aTableName == "AddressBook") || (aTableName == "CollectedAddressBook"))
+            {
+                aRow.push_back( new ORowSetValueDecorator( OUString("TABLE") ) ); // Table type
+            }
+            else
+            {
+                aRow.push_back( new ORowSetValueDecorator( OUString("VIEW") ) ); // View type
+            }
             aRow.push_back( ODatabaseMetaDataResultSet::getEmptyValue() ); // Remarks
             aRows.push_back(aRow);
         }