Tag: cws_src680_dba24d User: fs Date: 2007-11-08 14:15:28+0000 Modified: dba/dbaccess/source/ui/browser/brwctrlr.cxx dba/dbaccess/source/ui/browser/dbloader.cxx dba/dbaccess/source/ui/browser/unodatbr.cxx
Log: during #i81658#: string cleanup File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: brwctrlr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/brwctrlr.cxx?r1=1.100&r2=1.100.54.1 Delta lines: +5 -5 ------------------- --- brwctrlr.cxx 2007-07-31 14:01:29+0000 1.100 +++ brwctrlr.cxx 2007-11-08 14:15:25+0000 1.100.54.1 @@ -4,9 +4,9 @@ * * $RCSfile: brwctrlr.cxx,v $ * - * $Revision: 1.100 $ + * $Revision: 1.100.54.1 $ * - * last change: $Author: hr $ $Date: 2007/07/31 14:01:29 $ + * last change: $Author: fs $ $Date: 2007/11/08 14:15:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1706,7 +1706,7 @@ try { Reference< ::com::sun::star::sdbcx::XColumnsSupplier> xSup = getColumnsSupplier(); - Reference< XConnection> xCon(xFormSet->getPropertyValue(PROPERTY_ACTIVECONNECTION),UNO_QUERY); + Reference< XConnection> xCon(xFormSet->getPropertyValue(PROPERTY_ACTIVE_CONNECTION),UNO_QUERY); if(bFilter) { DlgFilterCrit aDlg( getBrowserView(), getORB(), xCon, m_xParser, xSup->getColumns() ); @@ -2465,7 +2465,7 @@ try { Reference< XPropertySet > xFormSet(getRowSet(), UNO_QUERY); - if (::comphelper::getBOOL(xFormSet->getPropertyValue(PROPERTY_USE_ESCAPE_PROCESSING))) + if (::comphelper::getBOOL(xFormSet->getPropertyValue(PROPERTY_ESCAPE_PROCESSING))) { // (only if the statement isn't native) // (it is allowed to use the PROPERTY_ISPASSTHROUGH : _after_ loading a form it is valid) Reference<XMultiServiceFactory> xFactory(::dbtools::getConnection(getRowSet()),UNO_QUERY); File [changed]: dbloader.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/dbloader.cxx?r1=1.31&r2=1.31.38.1 Delta lines: +4 -4 ------------------- --- dbloader.cxx 2007-08-17 13:34:32+0000 1.31 +++ dbloader.cxx 2007-11-08 14:15:25+0000 1.31.38.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbloader.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.31.38.1 $ * - * last change: $Author: ihi $ $Date: 2007/08/17 13:34:32 $ + * last change: $Author: fs $ $Date: 2007/11/08 14:15:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -305,7 +305,7 @@ xModel.set(getDataSourceOrModel(getDataSourceByName_displayError(xDatabaseContext,sDataSource,NULL,m_xServiceFactory,sal_False)),UNO_QUERY); break; } - else if ( 0 == pIter->Name.compareToAscii( PROPERTY_ACTIVECONNECTION ) ) + else if ( 0 == pIter->Name.compareToAscii( PROPERTY_ACTIVE_CONNECTION ) ) { Reference< XChild > xAsChild( pIter->Value, UNO_QUERY ); if ( xAsChild.is() ) File [changed]: unodatbr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/unodatbr.cxx?r1=1.191&r2=1.191.54.1 Delta lines: +23 -23 --------------------- --- unodatbr.cxx 2007-07-31 14:01:45+0000 1.191 +++ unodatbr.cxx 2007-11-08 14:15:25+0000 1.191.54.1 @@ -4,9 +4,9 @@ * * $RCSfile: unodatbr.cxx,v $ * - * $Revision: 1.191 $ + * $Revision: 1.191.54.1 $ * - * last change: $Author: hr $ $Date: 2007/07/31 14:01:45 $ + * last change: $Author: fs $ $Date: 2007/11/08 14:15:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -726,7 +726,7 @@ Reference<XConnection> xConnection; Reference<XPropertySet> xRowSetProps(getRowSet(),UNO_QUERY); - xRowSetProps->getPropertyValue( PROPERTY_ACTIVECONNECTION ) >>= xConnection; + xRowSetProps->getPropertyValue( PROPERTY_ACTIVE_CONNECTION ) >>= xConnection; OSL_ENSURE(xConnection.is(),"A ActiveConnection should normaly exists!"); Reference<XChild> xChild(xConnection,UNO_QUERY); @@ -1751,8 +1751,8 @@ if (xDataSource.is()) { - sal_Int32 nType = ::comphelper::getINT32(xDataSource->getPropertyValue(PROPERTY_COMMANDTYPE)); - aReturn.bEnabled = aReturn.bEnabled && ((::comphelper::getBOOL(xDataSource->getPropertyValue(PROPERTY_USE_ESCAPE_PROCESSING)) || (nType == ::com::sun::star::sdb::CommandType::QUERY))); + sal_Int32 nType = ::comphelper::getINT32(xDataSource->getPropertyValue(PROPERTY_COMMAND_TYPE)); + aReturn.bEnabled = aReturn.bEnabled && ((::comphelper::getBOOL(xDataSource->getPropertyValue(PROPERTY_ESCAPE_PROCESSING)) || (nType == ::com::sun::star::sdb::CommandType::QUERY))); } } catch(DisposedException&) @@ -1770,7 +1770,7 @@ { Reference<XPropertySet> xProp(getRowSet(),UNO_QUERY); sal_Int32 nCommandType = CommandType::TABLE; - xProp->getPropertyValue(PROPERTY_COMMANDTYPE) >>= nCommandType; + xProp->getPropertyValue(PROPERTY_COMMAND_TYPE) >>= nCommandType; String sTitle; switch (nCommandType) { @@ -1951,8 +1951,8 @@ aDescriptor.setDataSource(sDataSourceName); aDescriptor[daCommand] = xProp->getPropertyValue(PROPERTY_COMMAND); - aDescriptor[daCommandType] = xProp->getPropertyValue(PROPERTY_COMMANDTYPE); - aDescriptor[daConnection] = xProp->getPropertyValue(PROPERTY_ACTIVECONNECTION); + aDescriptor[daCommandType] = xProp->getPropertyValue(PROPERTY_COMMAND_TYPE); + aDescriptor[daConnection] = xProp->getPropertyValue(PROPERTY_ACTIVE_CONNECTION); aDescriptor[daCursor] <<= xCursorClone; if ( aSelection.getLength() ) { @@ -2300,12 +2300,12 @@ // the values allowing the RowSet to re-execute xProp->setPropertyValue(PROPERTY_DATASOURCENAME, makeAny(_rDataSourceName)); if(_rxConnection.is()) - xProp->setPropertyValue( PROPERTY_ACTIVECONNECTION, makeAny( _rxConnection.getTyped() ) ); + xProp->setPropertyValue( PROPERTY_ACTIVE_CONNECTION, makeAny( _rxConnection.getTyped() ) ); // set this _before_ setting the connection, else the rowset would rebuild it ... - xProp->setPropertyValue(PROPERTY_COMMANDTYPE, makeAny(_nCommandType)); + xProp->setPropertyValue(PROPERTY_COMMAND_TYPE, makeAny(_nCommandType)); xProp->setPropertyValue(PROPERTY_COMMAND, makeAny(_rCommand)); - xProp->setPropertyValue(PROPERTY_USE_ESCAPE_PROCESSING, ::cppu::bool2any(_bEscapeProcessing)); + xProp->setPropertyValue(PROPERTY_ESCAPE_PROCESSING, ::cppu::bool2any(_bEscapeProcessing)); if ( m_bPreview ) { // this be undone by the grid control in DbGridControl::RecalcRows @@ -2439,9 +2439,9 @@ ::rtl::OUString aOldName; xRowSetProps->getPropertyValue(PROPERTY_COMMAND) >>= aOldName; sal_Int32 nOldType = 0; - xRowSetProps->getPropertyValue(PROPERTY_COMMANDTYPE) >>= nOldType; + xRowSetProps->getPropertyValue(PROPERTY_COMMAND_TYPE) >>= nOldType; Reference<XConnection> xOldConnection; - ::cppu::extractInterface(xOldConnection,xRowSetProps->getPropertyValue(PROPERTY_ACTIVECONNECTION)); + ::cppu::extractInterface(xOldConnection,xRowSetProps->getPropertyValue(PROPERTY_ACTIVE_CONNECTION)); // the name of the table or query SvLBoxString* pString = (SvLBoxString*)_pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING); OSL_ENSURE(pString,"There must be a string item!"); @@ -2574,7 +2574,7 @@ showError(SQLExceptionInfo(e)); // reset the values xRowSetProps->setPropertyValue(PROPERTY_DATASOURCENAME,Any()); - xRowSetProps->setPropertyValue(PROPERTY_ACTIVECONNECTION,Any()); + xRowSetProps->setPropertyValue(PROPERTY_ACTIVE_CONNECTION,Any()); } catch(WrappedTargetException& e) { @@ -2585,13 +2585,13 @@ OSL_ENSURE(sal_False, "SbaTableQueryBrowser::OnSelectEntry: something strange happended!"); // reset the values xRowSetProps->setPropertyValue(PROPERTY_DATASOURCENAME,Any()); - xRowSetProps->setPropertyValue(PROPERTY_ACTIVECONNECTION,Any()); + xRowSetProps->setPropertyValue(PROPERTY_ACTIVE_CONNECTION,Any()); } catch(Exception&) { // reset the values xRowSetProps->setPropertyValue(PROPERTY_DATASOURCENAME,Any()); - xRowSetProps->setPropertyValue(PROPERTY_ACTIVECONNECTION,Any()); + xRowSetProps->setPropertyValue(PROPERTY_ACTIVE_CONNECTION,Any()); } } return 0L; @@ -2962,11 +2962,11 @@ // get the active connection. We need to dispose it. Reference< XPropertySet > xRowSetProps(getRowSet(),UNO_QUERY); Reference< XConnection > xConn; - xRowSetProps->getPropertyValue(PROPERTY_ACTIVECONNECTION) >>= xConn; + xRowSetProps->getPropertyValue(PROPERTY_ACTIVE_CONNECTION) >>= xConn; #if OSL_DEBUG_LEVEL > 1 { Reference< XComponent > xComp; - ::cppu::extractInterface(xComp, xRowSetProps->getPropertyValue(PROPERTY_ACTIVECONNECTION)); + ::cppu::extractInterface(xComp, xRowSetProps->getPropertyValue(PROPERTY_ACTIVE_CONNECTION)); } #endif @@ -3026,13 +3026,13 @@ const NamedValueCollection& rArguments( getInitParams() ); rArguments.get_ensureType( (::rtl::OUString)PROPERTY_DATASOURCENAME, sInitialDataSourceName ); - rArguments.get_ensureType( (::rtl::OUString)PROPERTY_COMMANDTYPE, nInitialDisplayCommandType ); + rArguments.get_ensureType( (::rtl::OUString)PROPERTY_COMMAND_TYPE, nInitialDisplayCommandType ); rArguments.get_ensureType( (::rtl::OUString)PROPERTY_COMMAND, sInitialCommand ); - rArguments.get_ensureType( (::rtl::OUString)PROPERTY_ACTIVECONNECTION, xForeignConnection ); + rArguments.get_ensureType( (::rtl::OUString)PROPERTY_ACTIVE_CONNECTION, xForeignConnection ); rArguments.get_ensureType( (::rtl::OUString)PROPERTY_UPDATE_CATALOGNAME, aCatalogName ); rArguments.get_ensureType( (::rtl::OUString)PROPERTY_UPDATE_SCHEMANAME, aSchemaName ); rArguments.get_ensureType( (::rtl::OUString)PROPERTY_UPDATE_TABLENAME, aTableName ); - rArguments.get_ensureType( (::rtl::OUString)PROPERTY_USE_ESCAPE_PROCESSING, bEsacpeProcessing ); + rArguments.get_ensureType( (::rtl::OUString)PROPERTY_ESCAPE_PROCESSING, bEsacpeProcessing ); rArguments.get_ensureType( "Frame", xFrame ); rArguments.get_ensureType( (::rtl::OUString)PROPERTY_SHOWMENU, m_bShowMenu ); @@ -3618,7 +3618,7 @@ if ( xQuery.is() ) { xQuery->getPropertyValue( PROPERTY_COMMAND ) >>= _rCommand; - _bEscapeProcessing = ::cppu::any2bool( xQuery->getPropertyValue( PROPERTY_USE_ESCAPE_PROCESSING ) ); + _bEscapeProcessing = ::cppu::any2bool( xQuery->getPropertyValue( PROPERTY_ESCAPE_PROCESSING ) ); return sal_True; } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
