Tag: cws_src680_rptchart01 User: oj Date: 2008-02-18 13:01:52+0000 Modified: dba/connectivity/source/commontools/dbtools.cxx dba/connectivity/source/commontools/makefile.mk
Log: RESYNC: (1.70-1.71); FILE MERGED File Changes: Directory: /dba/connectivity/source/commontools/ ================================================ File [changed]: dbtools.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/dbtools.cxx?r1=1.70.30.1&r2=1.70.30.2 Delta lines: +36 -15 --------------------- --- dbtools.cxx 2008-01-24 14:47:19+0000 1.70.30.1 +++ dbtools.cxx 2008-02-18 13:01:30+0000 1.70.30.2 @@ -1427,25 +1427,42 @@ } return nSearchFlag; } + // ----------------------------------------------------------------------------- -::rtl::OUString createUniqueName(const Reference<XNameAccess>& _rxContainer,const ::rtl::OUString& _rBaseName,sal_Bool _bStartWithNumber) +::rtl::OUString createUniqueName( const Sequence< ::rtl::OUString >& _rNames, const ::rtl::OUString& _rBaseName, sal_Bool _bStartWithNumber ) { - ::rtl::OUString sName(_rBaseName); + ::std::set< ::rtl::OUString > aUsedNames; + ::std::copy( + _rNames.getConstArray(), + _rNames.getConstArray() + _rNames.getLength(), + ::std::insert_iterator< ::std::set< ::rtl::OUString > >( aUsedNames, aUsedNames.end() ) + ); + + ::rtl::OUString sName( _rBaseName ); sal_Int32 nPos = 1; if ( _bStartWithNumber ) - sName += ::rtl::OUString::valueOf(nPos); + sName += ::rtl::OUString::valueOf( nPos ); - OSL_ENSURE( _rxContainer.is() ,"No valid container!"); - if ( _rxContainer.is() ) - { - while(_rxContainer->hasByName(sName)) + while ( aUsedNames.find( sName ) != aUsedNames.end() ) { sName = _rBaseName; - sName += ::rtl::OUString::valueOf(++nPos); - } + sName += ::rtl::OUString::valueOf( ++nPos ); } return sName; } + +// ----------------------------------------------------------------------------- +::rtl::OUString createUniqueName(const Reference<XNameAccess>& _rxContainer,const ::rtl::OUString& _rBaseName,sal_Bool _bStartWithNumber) +{ + Sequence< ::rtl::OUString > aElementNames; + + OSL_ENSURE( _rxContainer.is(), "createUniqueName: invalid container!" ); + if ( _rxContainer.is() ) + aElementNames = _rxContainer->getElementNames(); + + return createUniqueName( aElementNames, _rBaseName, _bStartWithNumber ); +} + // ----------------------------------------------------------------------------- void showError(const SQLExceptionInfo& _rInfo, const Reference< XWindow>& _xParent, @@ -1754,10 +1771,14 @@ { switch(sqlType) { - case DataType::CHAR: - case DataType::VARCHAR: case DataType::DECIMAL: case DataType::NUMERIC: + _xParams->setObjectWithInfo(parameterIndex,x,sqlType,0); + break; + case DataType::CHAR: + case DataType::VARCHAR: + //case DataType::DECIMAL: + //case DataType::NUMERIC: case DataType::LONGVARCHAR: _xParams->setString(parameterIndex,::comphelper::getString(x)); break; Directory: /dba/connectivity/source/commontools/ ================================================ File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/makefile.mk?r1=1.32.32.1&r2=1.32.32.2 Delta lines: +12 -3 -------------------- --- makefile.mk 2008-01-24 14:47:19+0000 1.32.32.1 +++ makefile.mk 2008-02-18 13:01:33+0000 1.32.32.2 @@ -44,6 +44,14 @@ .ENDIF .INCLUDE : settings.mk + +# Disable optimization for SunCC SPARC and MACOSX (funny loops +# when parsing e.g. "x+width/2"), +# also http://gcc.gnu.org/PR22392 +.IF ("$(OS)$(CPU)"=="SOLARISS" && "$(COM)"!="GCC") || "$(OS)"=="MACOSX" || ("$(OS)"=="LINUX" && "$(CPU)"=="P") +NOOPTFILES= $(SLO)$/RowFunctionParser.obj +.ENDIF + # --- Files -------------------------------------------------------- EXCEPTIONSFILES=\ $(SLO)$/predicateinput.obj \ @@ -75,6 +83,7 @@ $(SLO)$/FValue.obj \ $(SLO)$/paramwrapper.obj \ $(SLO)$/statementcomposer.obj \ + $(SLO)$/RowFunctionParser.obj \ $(SLO)$/sqlerror.obj \ $(SLO)$/filtermanager.obj \ $(SLO)$/parameters.obj \ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
