Tag: cws_src680_warnings01
User: fs      
Date: 06/06/08 02:46:19

Modified:
 /dba/connectivity/source/drivers/adabas/
  BColumns.cxx, BIndex.cxx, BIndexes.cxx, BKey.cxx, BKeys.cxx

Log:
 #136883# renaming getMetaData was a bad idea - it's a overridden virtual method

File Changes:

Directory: /dba/connectivity/source/drivers/adabas/
===================================================

File [changed]: BColumns.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/adabas/BColumns.cxx?r1=1.17.30.2&r2=1.17.30.3
Delta lines:  +5 -5
-------------------
--- BColumns.cxx        21 Nov 2005 10:07:40 -0000      1.17.30.2
+++ BColumns.cxx        8 Jun 2006 09:46:16 -0000       1.17.30.3
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: BColumns.cxx,v $
  *
- *  $Revision: 1.17.30.2 $
+ *  $Revision: 1.17.30.3 $
  *
- *  last change: $Author: fs $ $Date: 2005/11/21 10:07:40 $
+ *  last change: $Author: fs $ $Date: 2006/06/08 09:46:16 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -89,7 +89,7 @@
 
 sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName)
 {
-    Reference< XResultSet > xResult = 
m_pTable->getConnectionMetaData()->getColumns(Any(),
+    Reference< XResultSet > xResult = 
m_pTable->getMetaData()->getColumns(Any(),
                                                                                
                                        
m_pTable->getSchema(),m_pTable->getTableName(),_rName);
 
     sdbcx::ObjectType xRet = NULL;
@@ -150,7 +150,7 @@
        if(descriptor.is() && !m_pTable->isNew())
        {
         ::rtl::OUString aSql(RTL_CONSTASCII_USTRINGPARAM("ALTER TABLE "));
-               ::rtl::OUString sQuote  = 
m_pTable->getConnectionMetaData()->getIdentifierQuoteString(  );
+               ::rtl::OUString sQuote  = 
m_pTable->getMetaData()->getIdentifierQuoteString(  );
                const ::rtl::OUString& sDot = OAdabasCatalog::getDot();
 
                m_pTable->beginTransAction();
@@ -187,7 +187,7 @@
        if(!m_pTable->isNew())
        {
         ::rtl::OUString aSql(RTL_CONSTASCII_USTRINGPARAM("ALTER TABLE "));
-               ::rtl::OUString sQuote  = 
m_pTable->getConnectionMetaData()->getIdentifierQuoteString(  );
+               ::rtl::OUString sQuote  = 
m_pTable->getMetaData()->getIdentifierQuoteString(  );
                const ::rtl::OUString& sDot = OAdabasCatalog::getDot();
 
                aSql += ::dbtools::quoteName(sQuote,m_pTable->getSchema()) + 
sDot + ::dbtools::quoteName(sQuote,m_pTable->getTableName());

File [changed]: BIndex.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/adabas/BIndex.cxx?r1=1.12.30.1&r2=1.12.30.2
Delta lines:  +3 -3
-------------------
--- BIndex.cxx  21 Nov 2005 10:07:41 -0000      1.12.30.1
+++ BIndex.cxx  8 Jun 2006 09:46:16 -0000       1.12.30.2
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: BIndex.cxx,v $
  *
- *  $Revision: 1.12.30.1 $
+ *  $Revision: 1.12.30.2 $
  *
- *  last change: $Author: fs $ $Date: 2005/11/21 10:07:41 $
+ *  last change: $Author: fs $ $Date: 2006/06/08 09:46:16 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -93,7 +93,7 @@
        TStringVector aVector;
        if(!isNew())
        {
-               Reference< XResultSet > xResult = 
m_pTable->getConnectionMetaData()->getIndexInfo(Any(),
+               Reference< XResultSet > xResult = 
m_pTable->getMetaData()->getIndexInfo(Any(),
                
m_pTable->getSchema(),m_pTable->getTableName(),sal_False,sal_False);
 
                if(xResult.is())

File [changed]: BIndexes.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/adabas/BIndexes.cxx?r1=1.20.30.2&r2=1.20.30.3
Delta lines:  +5 -5
-------------------
--- BIndexes.cxx        21 Nov 2005 10:07:41 -0000      1.20.30.2
+++ BIndexes.cxx        8 Jun 2006 09:46:17 -0000       1.20.30.3
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: BIndexes.cxx,v $
  *
- *  $Revision: 1.20.30.2 $
+ *  $Revision: 1.20.30.3 $
  *
- *  last change: $Author: fs $ $Date: 2005/11/21 10:07:41 $
+ *  last change: $Author: fs $ $Date: 2006/06/08 09:46:17 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -91,7 +91,7 @@
                aName           = _rName;
        
 
-       Reference< XResultSet > xResult = 
m_pTable->getConnectionMetaData()->getIndexInfo(Any(),
+       Reference< XResultSet > xResult = 
m_pTable->getMetaData()->getIndexInfo(Any(),
                
m_pTable->getSchema(),m_pTable->getTableName(),sal_False,sal_False);
 
        sdbcx::ObjectType xRet = NULL;
@@ -142,7 +142,7 @@
        if(!m_pTable->isNew())
        {
                ::rtl::OUString aSql    = 
::rtl::OUString::createFromAscii("CREATE ");
-               ::rtl::OUString aQuote  = 
m_pTable->getConnectionMetaData()->getIdentifierQuoteString(  );
+               ::rtl::OUString aQuote  = 
m_pTable->getMetaData()->getIdentifierQuoteString(  );
                const ::rtl::OUString& sDot = OAdabasCatalog::getDot();
 
                
if(getBOOL(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISUNIQUE))))
@@ -210,7 +210,7 @@
                aName   = _sElementName.copy(nLen+1);
 
                ::rtl::OUString aSql    = 
::rtl::OUString::createFromAscii("DROP INDEX ");
-               ::rtl::OUString aQuote  = 
m_pTable->getConnectionMetaData()->getIdentifierQuoteString(  );
+               ::rtl::OUString aQuote  = 
m_pTable->getMetaData()->getIdentifierQuoteString(  );
                const ::rtl::OUString& sDot = OAdabasCatalog::getDot();
 
                if (aSchema.getLength())

File [changed]: BKey.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/adabas/BKey.cxx?r1=1.10.30.1&r2=1.10.30.2
Delta lines:  +4 -4
-------------------
--- BKey.cxx    21 Nov 2005 10:07:42 -0000      1.10.30.1
+++ BKey.cxx    8 Jun 2006 09:46:17 -0000       1.10.30.2
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: BKey.cxx,v $
  *
- *  $Revision: 1.10.30.1 $
+ *  $Revision: 1.10.30.2 $
  *
- *  last change: $Author: fs $ $Date: 2005/11/21 10:07:42 $
+ *  last change: $Author: fs $ $Date: 2006/06/08 09:46:17 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -92,7 +92,7 @@
        {
                if(m_Name.getLength()) // foreign key
                {
-                       Reference< XResultSet > xResult = 
m_pTable->getConnectionMetaData()->getImportedKeys(Any(),
+                       Reference< XResultSet > xResult = 
m_pTable->getMetaData()->getImportedKeys(Any(),
                                m_pTable->getSchema(),m_pTable->getTableName());
 
                        if(xResult.is())
@@ -108,7 +108,7 @@
                }
                else
                {
-                       Reference< XResultSet > xResult = 
m_pTable->getConnectionMetaData()->getPrimaryKeys(Any(),
+                       Reference< XResultSet > xResult = 
m_pTable->getMetaData()->getPrimaryKeys(Any(),
                                m_pTable->getSchema(),m_pTable->getTableName());
 
                        if(xResult.is())

File [changed]: BKeys.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/adabas/BKeys.cxx?r1=1.20.30.1&r2=1.20.30.2
Delta lines:  +6 -6
-------------------
--- BKeys.cxx   21 Nov 2005 10:07:42 -0000      1.20.30.1
+++ BKeys.cxx   8 Jun 2006 09:46:17 -0000       1.20.30.2
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: BKeys.cxx,v $
  *
- *  $Revision: 1.20.30.1 $
+ *  $Revision: 1.20.30.2 $
  *
- *  last change: $Author: fs $ $Date: 2005/11/21 10:07:42 $
+ *  last change: $Author: fs $ $Date: 2006/06/08 09:46:17 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -83,7 +83,7 @@
 
        if(_rName.getLength())
        {
-               Reference< XResultSet > xResult = 
m_pTable->getConnectionMetaData()->getImportedKeys(Any(),
+               Reference< XResultSet > xResult = 
m_pTable->getMetaData()->getImportedKeys(Any(),
                        m_pTable->getSchema(),m_pTable->getTableName());
 
                if(xResult.is())
@@ -138,7 +138,7 @@
                sal_Int32 nKeyType              = 
getINT32(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)));
 
                ::rtl::OUString aSql    = 
::rtl::OUString::createFromAscii("ALTER TABLE ");
-               ::rtl::OUString aQuote  = 
m_pTable->getConnectionMetaData()->getIdentifierQuoteString(  );
+               ::rtl::OUString aQuote  = 
m_pTable->getMetaData()->getIdentifierQuoteString(  );
                const ::rtl::OUString& sDot = OAdabasCatalog::getDot();
 
                aSql = aSql + aQuote + m_pTable->getSchema() + aQuote + sDot + 
aQuote + m_pTable->getTableName() + aQuote;
@@ -211,7 +211,7 @@
                // we need a name for the insertion
                if(nKeyType == KeyType::FOREIGN)
                {
-                       Reference< XResultSet > xResult = 
m_pTable->getConnectionMetaData()->getImportedKeys(Any(),m_pTable->getSchema(),m_pTable->getTableName());
+                       Reference< XResultSet > xResult = 
m_pTable->getMetaData()->getImportedKeys(Any(),m_pTable->getSchema(),m_pTable->getTableName());
                        if(xResult.is())
                        {
                                Reference< XRow > xRow(xResult,UNO_QUERY);
@@ -236,7 +236,7 @@
        if(!m_pTable->isNew())
        {
                ::rtl::OUString aSql    = 
::rtl::OUString::createFromAscii("ALTER TABLE ");
-               ::rtl::OUString aQuote  = 
m_pTable->getConnectionMetaData()->getIdentifierQuoteString(  );
+               ::rtl::OUString aQuote  = 
m_pTable->getMetaData()->getIdentifierQuoteString(  );
                const ::rtl::OUString& sDot = OAdabasCatalog::getDot();
 
                Reference<XPropertySet> xKey(getObject(_nPos),UNO_QUERY);




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

Reply via email to