Tag: cws_src680_qiq User: fs Date: 06/05/23 23:49:34 Removed: /dba/dbaccess/source/ui/misc/ namedvaluecollection.cxx
Modified: /dba/dbaccess/source/ui/app/ AppController.cxx, AppControllerGen.cxx, AppDetailPageHelper.cxx /dba/dbaccess/source/ui/browser/ unodatbr.cxx /dba/dbaccess/source/ui/dlg/ adtabdlg.cxx, dlgsave.cxx /dba/dbaccess/source/ui/inc/ genericcontroller.hxx /dba/dbaccess/source/ui/misc/ DExport.cxx, TableCopyHelper.cxx, UITools.cxx, WCopyTable.cxx, makefile.mk /dba/dbaccess/source/ui/querydesign/ QueryDesignView.cxx, querycontroller.cxx /dba/dbaccess/source/ui/relationdesign/ RelationController.cxx /dba/dbaccess/source/ui/tabledesign/ TableController.cxx Log: some refactoring of compose/quoteTableName and friends, in preparation of #i51143# File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.cxx?r1=1.29.12.2&r2=1.29.12.3 Delta lines: +4 -6 ------------------- --- AppController.cxx 18 May 2006 09:16:11 -0000 1.29.12.2 +++ AppController.cxx 24 May 2006 06:49:21 -0000 1.29.12.3 @@ -4,9 +4,9 @@ * * $RCSfile: AppController.cxx,v $ * - * $Revision: 1.29.12.2 $ + * $Revision: 1.29.12.3 $ * - * last change: $Author: fs $ $Date: 2006/05/18 09:16:11 $ + * last change: $Author: fs $ $Date: 2006/05/24 06:49:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1505,9 +1505,7 @@ { ensureConnection(); if ( xProp.is() && m_xMetaData.is() ) - { - sNewName = ::dbaui::composeTableName(m_xMetaData,xProp,sal_False,::dbtools::eInDataManipulation); - } + sNewName = ::dbaui::composeTableName( m_xMetaData, xProp, ::dbtools::eInDataManipulation, false, false, false ); } break; case E_FORM: @@ -1913,7 +1911,7 @@ ::rtl::OUString sCatalog = aDialog->getCatalog(); ::rtl::OUString sSchema = aDialog->getSchema(); - ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sName, sNewName, sal_False, ::dbtools::eInTableDefinitions ); + sNewName = ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sName, sal_False, ::dbtools::eInTableDefinitions ); } else sNewName = aDialog->getName(); File [changed]: AppControllerGen.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppControllerGen.cxx?r1=1.17.24.3&r2=1.17.24.4 Delta lines: +4 -4 ------------------- --- AppControllerGen.cxx 18 May 2006 09:16:12 -0000 1.17.24.3 +++ AppControllerGen.cxx 24 May 2006 06:49:21 -0000 1.17.24.4 @@ -4,9 +4,9 @@ * * $RCSfile: AppControllerGen.cxx,v $ * - * $Revision: 1.17.24.3 $ + * $Revision: 1.17.24.4 $ * - * last change: $Author: fs $ $Date: 2006/05/18 09:16:12 $ + * last change: $Author: fs $ $Date: 2006/05/24 06:49:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -176,8 +176,8 @@ ::rtl::OUString sName = aDlg.getName(); ::rtl::OUString sCatalog = aDlg.getCatalog(); ::rtl::OUString sSchema = aDlg.getSchema(); - ::rtl::OUString sNewName; - ::dbtools::composeTableName(xMeta,sCatalog,sSchema,sName,sNewName,sal_False,::dbtools::eInTableDefinitions); + ::rtl::OUString sNewName( + ::dbtools::composeTableName( xMeta, sCatalog, sSchema, sName, sal_False, ::dbtools::eInTableDefinitions ) ); Reference<XPropertySet> xView = ::dbaui::createView(sNewName,xConnection,xSourceObject); if ( !xView.is() ) throw SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*this,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")) ,0,Any()); File [changed]: AppDetailPageHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailPageHelper.cxx?r1=1.12&r2=1.12.18.1 Delta lines: +4 -4 ------------------- --- AppDetailPageHelper.cxx 31 Mar 2006 12:12:25 -0000 1.12 +++ AppDetailPageHelper.cxx 24 May 2006 06:49:22 -0000 1.12.18.1 @@ -4,9 +4,9 @@ * * $RCSfile: AppDetailPageHelper.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.12.18.1 $ * - * last change: $Author: vg $ $Date: 2006/03/31 12:12:25 $ + * last change: $Author: fs $ $Date: 2006/05/24 06:49:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -468,7 +468,7 @@ } sTable = rTree.GetEntryText(pEntry); - ::dbtools::composeTableName(_xMetaData,sCatalog,sSchema,sTable,sComposedName,sal_False,::dbtools::eInDataManipulation); + sComposedName = ::dbtools::composeTableName( _xMetaData, sCatalog, sSchema, sTable, sal_False, ::dbtools::eInDataManipulation ); } else { Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: unodatbr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/unodatbr.cxx?r1=1.174.10.1&r2=1.174.10.2 Delta lines: +3 -2 ------------------- --- unodatbr.cxx 12 May 2006 13:47:00 -0000 1.174.10.1 +++ unodatbr.cxx 24 May 2006 06:49:23 -0000 1.174.10.2 @@ -4,9 +4,9 @@ * * $RCSfile: unodatbr.cxx,v $ * - * $Revision: 1.174.10.1 $ + * $Revision: 1.174.10.2 $ * - * last change: $Author: fs $ $Date: 2006/05/12 13:47:00 $ + * last change: $Author: fs $ $Date: 2006/05/24 06:49:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -329,6 +329,7 @@ using namespace ::com::sun::star::view; using namespace ::com::sun::star::datatransfer; using namespace ::dbtools; +using namespace ::comphelper; using namespace ::svx; using ::com::sun::star::frame::XLayoutManager; // obsolete of interface is moved outside drafts Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: adtabdlg.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/adtabdlg.cxx?r1=1.22.68.1&r2=1.22.68.2 Delta lines: +4 -9 ------------------- --- adtabdlg.cxx 12 May 2006 11:09:27 -0000 1.22.68.1 +++ adtabdlg.cxx 24 May 2006 06:49:24 -0000 1.22.68.2 @@ -4,9 +4,9 @@ * * $RCSfile: adtabdlg.cxx,v $ * - * $Revision: 1.22.68.1 $ + * $Revision: 1.22.68.2 $ * - * last change: $Author: fs $ $Date: 2006/05/12 11:09:27 $ + * last change: $Author: fs $ $Date: 2006/05/24 06:49:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -163,13 +163,8 @@ aSchema = ::rtl::OUString(); } - ::dbtools::composeTableName(xMeta, - aCatalog, - aSchema, - aTableName, - aComposedName, - sal_False, - ::dbtools::eInDataManipulation); + aComposedName = ::dbtools::composeTableName( + xMeta, aCatalog, aSchema, aTableName, sal_False, ::dbtools::eInDataManipulation ); } catch ( const Exception& ) { File [changed]: dlgsave.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dlgsave.cxx?r1=1.26.124.1&r2=1.26.124.2 Delta lines: +3 -4 ------------------- --- dlgsave.cxx 17 May 2006 11:46:59 -0000 1.26.124.1 +++ dlgsave.cxx 24 May 2006 06:49:24 -0000 1.26.124.2 @@ -4,9 +4,9 @@ * * $RCSfile: dlgsave.cxx,v $ * - * $Revision: 1.26.124.1 $ + * $Revision: 1.26.124.2 $ * - * last change: $Author: fs $ $Date: 2006/05/17 11:46:59 $ + * last change: $Author: fs $ $Date: 2006/05/24 06:49:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -289,11 +289,10 @@ if ( m_nType == CommandType::TABLE ) { - ::dbtools::composeTableName( + m_aName = ::dbtools::composeTableName( m_xMetaData, getCatalog(), getSchema(), - m_aName, sNameToCheck, sal_False, // no quoting ::dbtools::eInDataManipulation Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: genericcontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/genericcontroller.hxx?r1=1.36.18.1&r2=1.36.18.2 Delta lines: +8 -6 ------------------- --- genericcontroller.hxx 12 May 2006 13:47:01 -0000 1.36.18.1 +++ genericcontroller.hxx 24 May 2006 06:49:25 -0000 1.36.18.2 @@ -4,9 +4,9 @@ * * $RCSfile: genericcontroller.hxx,v $ * - * $Revision: 1.36.18.1 $ + * $Revision: 1.36.18.2 $ * - * last change: $Author: fs $ $Date: 2006/05/12 13:47:01 $ + * last change: $Author: fs $ $Date: 2006/05/24 06:49:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -104,8 +104,8 @@ #ifndef DBAUI_ICONTROLLER_HXX #include "IController.hxx" #endif -#ifndef DBACCESS_SOURCE_UI_INC_NAMEDVALUECOLLECTION_HXX -#include "namedvaluecollection.hxx" +#ifndef COMPHELPER_NAMEDVALUECOLLECTION_HXX +#include <comphelper/namedvaluecollection.hxx> #endif class Window; @@ -201,7 +201,8 @@ { private: SupportedFeatures m_aSupportedFeatures; // look at the name - NamedValueCollection m_aInitParameters; + ::comphelper::NamedValueCollection + m_aInitParameters; #ifdef DBG_UTIL bool m_bDescribingSupportedFeatures; @@ -254,7 +255,8 @@ ::osl::Mutex& getMutex( ) { return OGenericUnoController_MBASE::m_aMutex; } ::cppu::OBroadcastHelper& getBroadcastHelper() { return OGenericUnoController_COMPBASE::rBHelper; } - const NamedValueCollection& getInitParams() const { return m_aInitParameters; } + const ::comphelper::NamedValueCollection& + getInitParams() const { return m_aInitParameters; } // ---------------------------------------------------------------- // methods Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: DExport.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/DExport.cxx?r1=1.31&r2=1.31.2.1 Delta lines: +6 -5 ------------------- --- DExport.cxx 4 May 2006 08:44:11 -0000 1.31 +++ DExport.cxx 24 May 2006 06:49:26 -0000 1.31.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: DExport.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.31.2.1 $ * - * last change: $Author: rt $ $Date: 2006/05/04 08:44:11 $ + * last change: $Author: fs $ $Date: 2006/05/24 06:49:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -747,7 +747,8 @@ Reference<XPropertySet > xProp(xDestSet,UNO_QUERY); if(xProp.is()) { - ::rtl::OUString sDestName = ::dbtools::composeTableName(m_xConnection->getMetaData(),m_xTable,sal_False,::dbtools::eInDataManipulation); + ::rtl::OUString sDestName = ::dbtools::composeTableName( + m_xConnection->getMetaData(), m_xTable, ::dbtools::eInDataManipulation, false, false, false ); xProp->setPropertyValue(PROPERTY_ACTIVECONNECTION,makeAny(m_xConnection.getTyped())); xProp->setPropertyValue(PROPERTY_COMMANDTYPE,makeAny(CommandType::TABLE)); @@ -904,7 +905,7 @@ ,const TPositions& _rvColumns) { ::rtl::OUString aSql(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INSERT INTO "))); - ::rtl::OUString sComposedTableName = ::dbtools::composeTableName(_xMetaData,_xDestTable,sal_True,::dbtools::eInDataManipulation); + ::rtl::OUString sComposedTableName = ::dbtools::composeTableName( _xMetaData, _xDestTable, ::dbtools::eInDataManipulation, false, false, true ); aSql += sComposedTableName; aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ( ")); File [changed]: TableCopyHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/TableCopyHelper.cxx?r1=1.6&r2=1.6.10.1 Delta lines: +5 -7 ------------------- --- TableCopyHelper.cxx 19 Apr 2006 13:23:14 -0000 1.6 +++ TableCopyHelper.cxx 24 May 2006 06:49:26 -0000 1.6.10.1 @@ -4,9 +4,9 @@ * * $RCSfile: TableCopyHelper.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.6.10.1 $ * - * last change: $Author: hr $ $Date: 2006/04/19 13:23:14 $ + * last change: $Author: fs $ $Date: 2006/05/24 06:49:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -183,7 +183,7 @@ } ::rtl::OUString aSql(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INSERT INTO "))); - ::rtl::OUString sComposedTableName = ::dbtools::composeTableName(_xMetaData,_xDestTable,sal_True,::dbtools::eInDataManipulation); + ::rtl::OUString sComposedTableName = ::dbtools::composeTableName( _xMetaData, _xDestTable, ::dbtools::eInDataManipulation, false, false, true ); aSql += sComposedTableName; aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ( ")); @@ -381,9 +381,7 @@ } sSql = sSql.replaceAt(sSql.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "))); sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FROM ")); - sal_Bool bUseCatalogInSelect = ::dbtools::isDataSourcePropertyEnabled(_xSrcConnection,PROPERTY_USECATALOGINSELECT,sal_True); - sal_Bool bUseSchemaInSelect = ::dbtools::isDataSourcePropertyEnabled(_xSrcConnection,PROPERTY_USESCHEMAINSELECT,sal_True); - ::rtl::OUString sComposedName = ::dbtools::composeTableName(_xSrcConnection->getMetaData(),xSourceObject,sal_True,::dbtools::eInDataManipulation,bUseCatalogInSelect,bUseSchemaInSelect); + ::rtl::OUString sComposedName = ::dbtools::composeTableNameForSelect( _xSrcConnection, xSourceObject ); sSql += sComposedName; xStmt = _xSrcConnection->createStatement(); if( xStmt.is() ) File [changed]: UITools.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/UITools.cxx?r1=1.59.66.3&r2=1.59.66.4 Delta lines: +4 -6 ------------------- --- UITools.cxx 17 May 2006 11:46:31 -0000 1.59.66.3 +++ UITools.cxx 24 May 2006 06:49:27 -0000 1.59.66.4 @@ -4,9 +4,9 @@ * * $RCSfile: UITools.cxx,v $ * - * $Revision: 1.59.66.3 $ + * $Revision: 1.59.66.4 $ * - * last change: $Author: fs $ $Date: 2006/05/17 11:46:31 $ + * last change: $Author: fs $ $Date: 2006/05/24 06:49:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -943,7 +943,7 @@ { sSchema = _xMetaData->getUserName(); } - ::dbtools::composeTableName(_xMetaData,sCatalog,sSchema,_sName,sCompsedName,sal_False,::dbtools::eInDataManipulation); + sCompsedName = ::dbtools::composeTableName( _xMetaData, sCatalog, sSchema, _sName, sal_False, ::dbtools::eInDataManipulation ); sDefaultName = ::dbtools::createUniqueName(_xTables,sCompsedName); } catch(const SQLException&) @@ -1755,9 +1755,7 @@ else { sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT * FROM ")); - sal_Bool bUseCatalogInSelect = ::dbtools::isDataSourcePropertyEnabled(_xConnection,PROPERTY_USECATALOGINSELECT,sal_True); - sal_Bool bUseSchemaInSelect = ::dbtools::isDataSourcePropertyEnabled(_xConnection,PROPERTY_USESCHEMAINSELECT,sal_True); - sCommand += ::dbaui::composeTableName(_xConnection->getMetaData(),_xSourceObject,sal_True,::dbtools::eInDataManipulation,bUseCatalogInSelect,bUseSchemaInSelect); + sCommand += composeTableNameForSelect( _xConnection, _xSourceObject ); } xView->setPropertyValue(PROPERTY_COMMAND,makeAny(sCommand)); File [changed]: WCopyTable.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/WCopyTable.cxx?r1=1.44&r2=1.44.2.1 Delta lines: +6 -6 ------------------- --- WCopyTable.cxx 4 May 2006 08:45:10 -0000 1.44 +++ WCopyTable.cxx 24 May 2006 06:49:27 -0000 1.44.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: WCopyTable.cxx,v $ * - * $Revision: 1.44 $ + * $Revision: 1.44.2.1 $ * - * last change: $Author: rt $ $Date: 2006/05/04 08:45:10 $ + * last change: $Author: fs $ $Date: 2006/05/24 06:49:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -179,7 +179,7 @@ m_xSourceColumns = xColSupp->getColumns(); if ( !m_xSourceObject->getPropertySetInfo()->hasPropertyByName(PROPERTY_COMMAND) ) - m_sSourceName = ::dbtools::composeTableName(m_xConnection->getMetaData(),m_xSourceObject,sal_False,::dbtools::eInDataManipulation); + m_sSourceName = ::dbtools::composeTableName( m_xConnection->getMetaData(), m_xSourceObject, ::dbtools::eInDataManipulation, false, false, false ); else _xSourceObject->getPropertyValue(PROPERTY_NAME) >>= m_sSourceName; if ( m_xSourceConnection == m_xConnection ) @@ -901,8 +901,8 @@ xTables->getByName(m_sName) >>= m_xDestObject; else { - ::rtl::OUString sComposedName; - sComposedName = ::dbtools::composeTableName(m_xConnection->getMetaData(),m_xDestObject,sal_False,::dbtools::eInDataManipulation); + ::rtl::OUString sComposedName( + ::dbtools::composeTableName( m_xConnection->getMetaData(), m_xDestObject, ::dbtools::eInDataManipulation, false, false, false ) ); if(xTables->hasByName(sComposedName)) { xTables->getByName(sComposedName) >>= m_xDestObject; File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/makefile.mk?r1=1.25.118.2&r2=1.25.118.3 Delta lines: +2 -3 ------------------- --- makefile.mk 17 May 2006 11:50:39 -0000 1.25.118.2 +++ makefile.mk 24 May 2006 06:49:28 -0000 1.25.118.3 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.25.118.2 $ +# $Revision: 1.25.118.3 $ # -# last change: $Author: fs $ $Date: 2006/05/17 11:50:39 $ +# last change: $Author: fs $ $Date: 2006/05/24 06:49:28 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -75,7 +75,6 @@ $(SLO)$/TableCopyHelper.obj \ $(SLO)$/moduledbu.obj \ $(SLO)$/documentcontroller.obj \ - $(SLO)$/namedvaluecollection.obj \ $(SLO)$/defaultobjectnamecheck.obj File [removed]: namedvaluecollection.cxx Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: QueryDesignView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/QueryDesignView.cxx?r1=1.78.16.3&r2=1.78.16.4 Delta lines: +6 -6 ------------------- --- QueryDesignView.cxx 17 May 2006 04:31:50 -0000 1.78.16.3 +++ QueryDesignView.cxx 24 May 2006 06:49:29 -0000 1.78.16.4 @@ -4,9 +4,9 @@ * * $RCSfile: QueryDesignView.cxx,v $ * - * $Revision: 1.78.16.3 $ + * $Revision: 1.78.16.4 $ * - * last change: $Author: fs $ $Date: 2006/05/17 04:31:50 $ + * last change: $Author: fs $ $Date: 2006/05/24 06:49:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -454,9 +454,9 @@ { Reference< XDatabaseMetaData > xMetaData = _xConnection->getMetaData(); - sal_Bool bUseCatalogInSelect = ::dbtools::isDataSourcePropertyEnabled(_xConnection,PROPERTY_USECATALOGINSELECT,sal_True); - sal_Bool bUseSchemaInSelect = ::dbtools::isDataSourcePropertyEnabled(_xConnection,PROPERTY_USESCHEMAINSELECT,sal_True); - ::rtl::OUString aTableListStr = ::dbtools::quoteTableName(xMetaData,aDBName,::dbtools::eInDataManipulation,bUseCatalogInSelect,bUseSchemaInSelect); + ::rtl::OUString sCatalog, sSchema, sTable; + ::dbtools::qualifiedNameComponents( xMetaData, aDBName, sCatalog, sSchema, sTable, ::dbtools::eInDataManipulation ); + ::rtl::OUString aTableListStr = ::dbtools::composeTableNameForSelect( _xConnection, sCatalog, sSchema, sTable ); ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString(); if ( isAppendTableAliasEnabled(_xConnection) ) @@ -1937,7 +1937,7 @@ OSL_VERIFY( xTableProps->getPropertyValue( PROPERTY_NAME ) >>= sComposedName ); else { - sComposedName = ::dbtools::composeTableName( xMetaData, xTableProps, sal_False, ::dbtools::eInDataManipulation ); + sComposedName = ::dbtools::composeTableName( xMetaData, xTableProps, ::dbtools::eInDataManipulation, false, false, false ); // if the alias is the complete (composed) table, then shorten it if ( aKeyComp( sComposedName, aIter->first ) ) File [changed]: querycontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/querycontroller.cxx?r1=1.103.4.6&r2=1.103.4.7 Delta lines: +3 -7 ------------------- --- querycontroller.cxx 18 May 2006 09:18:35 -0000 1.103.4.6 +++ querycontroller.cxx 24 May 2006 06:49:29 -0000 1.103.4.7 @@ -4,9 +4,9 @@ * * $RCSfile: querycontroller.cxx,v $ * - * $Revision: 1.103.4.6 $ + * $Revision: 1.103.4.7 $ * - * last change: $Author: fs $ $Date: 2006/05/18 09:18:35 $ + * last change: $Author: fs $ $Date: 2006/05/24 06:49:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1419,11 +1419,7 @@ if ( xElements->hasByName(m_sName) ) xProp2.set(xElements->getByName(m_sName),UNO_QUERY); if ( !xProp2.is() ) // correct name and try again - { - sal_Bool bUseCatalogInSelect = ::dbtools::isDataSourcePropertyEnabled(getDataSource(),PROPERTY_USECATALOGINSELECT,sal_True); - sal_Bool bUseSchemaInSelect = ::dbtools::isDataSourcePropertyEnabled(getDataSource(),PROPERTY_USESCHEMAINSELECT,sal_True); - m_sName = ::dbtools::composeTableName(getMetaData(),xQuery,sal_False,::dbtools::eInDataManipulation,bUseCatalogInSelect,bUseSchemaInSelect); - } + m_sName = ::dbtools::composeTableName( getMetaData(), xQuery, ::dbtools::eInDataManipulation, false, false, false ); // now check if our datasource has set a tablefilter and if append the new table name to it ::dbaui::appendToFilter(getConnection(),m_sName,getORB(),getView()); // we are not interessted in the return value } Directory: /dba/dbaccess/source/ui/relationdesign/ ================================================== File [changed]: RelationController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/relationdesign/RelationController.cxx?r1=1.42.118.2&r2=1.42.118.3 Delta lines: +3 -3 ------------------- --- RelationController.cxx 12 May 2006 13:47:02 -0000 1.42.118.2 +++ RelationController.cxx 24 May 2006 06:49:30 -0000 1.42.118.3 @@ -4,9 +4,9 @@ * * $RCSfile: RelationController.cxx,v $ * - * $Revision: 1.42.118.2 $ + * $Revision: 1.42.118.3 $ * - * last change: $Author: fs $ $Date: 2006/05/12 13:47:02 $ + * last change: $Author: fs $ $Date: 2006/05/24 06:49:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -471,7 +471,7 @@ ::rtl::OUString sSourceName,sReferencedTable; Reference<XPropertySet> xTableProp(xKeySup,UNO_QUERY); - sSourceName = ::dbtools::composeTableName(getConnection()->getMetaData(),xTableProp,sal_False,::dbtools::eInTableDefinitions); + sSourceName = ::dbtools::composeTableName( getConnection()->getMetaData(), xTableProp, ::dbtools::eInTableDefinitions, false, false, false ); xKey->getPropertyValue(PROPERTY_REFERENCEDTABLE) >>= sReferencedTable; ////////////////////////////////////////////////////////////////////// // insert windows Directory: /dba/dbaccess/source/ui/tabledesign/ =============================================== File [changed]: TableController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TableController.cxx?r1=1.103.2.3&r2=1.103.2.4 Delta lines: +4 -4 ------------------- --- TableController.cxx 18 May 2006 09:18:41 -0000 1.103.2.3 +++ TableController.cxx 24 May 2006 06:49:31 -0000 1.103.2.4 @@ -4,9 +4,9 @@ * * $RCSfile: TableController.cxx,v $ * - * $Revision: 1.103.2.3 $ + * $Revision: 1.103.2.4 $ * - * last change: $Author: fs $ $Date: 2006/05/18 09:18:41 $ + * last change: $Author: fs $ $Date: 2006/05/24 06:49:31 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -488,7 +488,7 @@ if(!m_xTable.is()) // correct name and try again { // it can be that someone inserted new data for us - m_sName = ::dbtools::composeTableName(getConnection()->getMetaData(),xTable,sal_False,::dbtools::eInDataManipulation); + m_sName = ::dbtools::composeTableName( getConnection()->getMetaData(), xTable, ::dbtools::eInDataManipulation, false, false, false ); assignTable(); } // now check if our datasource has set a tablefilter and if append the new table name to it @@ -1637,7 +1637,7 @@ if ( m_sName.getLength() && getConnection().is() ) { if ( m_xTable.is() ) - sTitle = ::dbtools::composeTableName(getConnection()->getMetaData(),m_xTable,sal_False,::dbtools::eInDataManipulation); + sTitle = ::dbtools::composeTableName( getConnection()->getMetaData(), m_xTable, ::dbtools::eInDataManipulation, false, false, false ); else sTitle = m_sName; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
