Tag: cws_dev300_dba30d
User: fs      
Date: 2008-06-10 07:21:23+0000
Modified:
   dba/dbaccess/source/ui/control/tabletree.cxx

Log:
 describeObject: always separate catalog and schema by a dot

File Changes:

Directory: /dba/dbaccess/source/ui/control/
===========================================

File [changed]: tabletree.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/control/tabletree.cxx?r1=1.37.10.1&r2=1.37.10.2
Delta lines:  +3 -16
--------------------
--- tabletree.cxx       2008-06-09 13:44:33+0000        1.37.10.1
+++ tabletree.cxx       2008-06-10 07:21:20+0000        1.37.10.2
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: tabletree.cxx,v $
- * $Revision: 1.37.10.1 $
+ * $Revision: 1.37.10.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -526,19 +526,6 @@
             ||  ( nEntryType == DatabaseObjectFolder::SCHEMA )
             )
     {
-        ::rtl::OUString sCatalogSeparator;
-        try
-        {
-            Reference< XConnection > xConnection( m_xConnection, UNO_SET_THROW 
);
-            Reference< XDatabaseMetaData > xMeta( xConnection->getMetaData(), 
UNO_SET_THROW );
-
-            sCatalogSeparator = xMeta->getCatalogSeparator();
-        }
-        catch( const Exception& )
-        {
-               DBG_UNHANDLED_EXCEPTION();
-        }
-
         SvLBoxEntry* pParent = GetParent( _pEntry );
         sal_Int32 nParentEntryType = pParent ? reinterpret_cast< sal_IntPtr >( 
pParent->GetUserData() ) : -1;
 
@@ -548,7 +535,7 @@
             if ( nParentEntryType == DatabaseObjectFolder::SCHEMA )
             {
                 buffer.append( GetEntryText( pParent ) );
-                buffer.append( sCatalogSeparator );
+                buffer.append( sal_Unicode( '.' ) );
             }
             buffer.append( GetEntryText( _pEntry ) );
         }
@@ -557,7 +544,7 @@
             if ( nParentEntryType == DatabaseObjectFolder::CATALOG )
             {
                 buffer.append( GetEntryText( pParent ) );
-                buffer.append( sCatalogSeparator );
+                buffer.append( sal_Unicode( '.' ) );
             }
             buffer.append( GetEntryText( _pEntry ) );
         }




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to