Tag: cws_src680_dba22b User: fs Date: 2006/12/05 01:37:04 Modified: dba/dbaccess/source/ui/querydesign/QueryDesignView.cxx
Log: #i72252# isDataSourcePropertyEnabled -> getBooleanDataSourceSetting File Changes: 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.84.42.1&r2=1.84.42.2 Delta lines: +8 -6 ------------------- --- QueryDesignView.cxx 4 Dec 2006 22:41:16 -0000 1.84.42.1 +++ QueryDesignView.cxx 5 Dec 2006 09:37:01 -0000 1.84.42.2 @@ -4,9 +4,9 @@ * * $RCSfile: QueryDesignView.cxx,v $ * - * $Revision: 1.84.42.1 $ + * $Revision: 1.84.42.2 $ * - * last change: $Author: fs $ $Date: 2006/12/04 22:41:16 $ + * last change: $Author: fs $ $Date: 2006/12/05 09:37:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -470,10 +470,12 @@ ::rtl::OUString aTableListStr = ::dbtools::composeTableNameForSelect( _xConnection, sCatalog, sSchema, sTable ); ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString(); - if ( isAppendTableAliasEnabled(_xConnection) ) + if ( isAppendTableAliasEnabled( _xConnection ) ) { - aTableListStr += ::rtl::OUString::createFromAscii(" AS "); - aTableListStr += ::dbtools::quoteName(aQuote, pEntryTab->GetAliasName()); + aTableListStr += ::rtl::OUString::createFromAscii(" "); + if ( generateAsBeforeTableAlias( _xConnection ) ) + aTableListStr += ::rtl::OUString::createFromAscii("AS "); + aTableListStr += ::dbtools::quoteName( aQuote, pEntryTab->GetAliasName() ); } aDBName = aTableListStr; } @@ -1155,7 +1157,7 @@ aTableNames[sTabName] = sal_True; // create join - sal_Bool bUseEscape = ::dbtools::isDataSourcePropertyEnabled(_xConnection,PROPERTY_OUTERJOINESCAPE,sal_True); + sal_Bool bUseEscape = ::dbtools::getBooleanDataSourceSetting( _xConnection, PROPERTY_OUTERJOINESCAPE ); ::rtl::OUString aStr; if ( bUseEscape ) aStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("{ OJ ")); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
