Tag: cws_src680_warnings01 User: sb Date: 06/05/29 04:19:16 Modified: /dba/dbaccess/source/core/api/ RowSet.cxx, RowSetBase.cxx /dba/dbaccess/source/core/dataaccess/ connection.cxx /dba/dbaccess/source/ui/browser/ genericcontroller.cxx /dba/dbaccess/source/ui/control/ toolboxcontroller.cxx /dba/dbaccess/source/ui/inc/ HtmlReader.hxx, TypeInfo.hxx /dba/dbaccess/source/ui/misc/ DExport.cxx, HtmlReader.cxx, TableCopyHelper.cxx, UpdateHelperImpl.hxx, WCopyTable.cxx
Log: #i53898# Made code warning-free and/or compile at all after resync to SRC680m170. File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: RowSet.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSet.cxx?r1=1.139.26.4&r2=1.139.26.5 Delta lines: +4 -4 ------------------- --- RowSet.cxx 23 May 2006 23:42:29 -0000 1.139.26.4 +++ RowSet.cxx 29 May 2006 11:19:10 -0000 1.139.26.5 @@ -4,9 +4,9 @@ * * $RCSfile: RowSet.cxx,v $ * - * $Revision: 1.139.26.4 $ + * $Revision: 1.139.26.5 $ * - * last change: $Author: sb $ $Date: 2006/05/23 23:42:29 $ + * last change: $Author: sb $ $Date: 2006/05/29 11:19:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1471,7 +1471,7 @@ return ORowSetBase::getCharacterStream(columnIndex); } // ------------------------------------------------------------------------- -Any SAL_CALL ORowSet::getObject( sal_Int32 /*columnIndex*/, const Reference< XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +Any SAL_CALL ORowSet::getObject( sal_Int32 columnIndex, const Reference< XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( *m_pMutex ); return getInsertValue(columnIndex).makeAny(); File [changed]: RowSetBase.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSetBase.cxx?r1=1.81.6.4&r2=1.81.6.5 Delta lines: +4 -4 ------------------- --- RowSetBase.cxx 23 May 2006 23:42:44 -0000 1.81.6.4 +++ RowSetBase.cxx 29 May 2006 11:19:11 -0000 1.81.6.5 @@ -4,9 +4,9 @@ * * $RCSfile: RowSetBase.cxx,v $ * - * $Revision: 1.81.6.4 $ + * $Revision: 1.81.6.5 $ * - * last change: $Author: sb $ $Date: 2006/05/23 23:42:44 $ + * last change: $Author: sb $ $Date: 2006/05/29 11:19:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -400,7 +400,7 @@ return getBinaryStream(columnIndex); } // ------------------------------------------------------------------------- -Any SAL_CALL ORowSetBase::getObject( sal_Int32 /*columnIndex*/, const Reference< XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +Any SAL_CALL ORowSetBase::getObject( sal_Int32 columnIndex, const Reference< XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: connection.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/connection.cxx?r1=1.45.54.2&r2=1.45.54.3 Delta lines: +4 -4 ------------------- --- connection.cxx 23 May 2006 23:44:04 -0000 1.45.54.2 +++ connection.cxx 29 May 2006 11:19:11 -0000 1.45.54.3 @@ -4,9 +4,9 @@ * * $RCSfile: connection.cxx,v $ * - * $Revision: 1.45.54.2 $ + * $Revision: 1.45.54.3 $ * - * last change: $Author: sb $ $Date: 2006/05/23 23:44:04 $ + * last change: $Author: sb $ $Date: 2006/05/29 11:19:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -331,9 +331,9 @@ ,m_aTableTypeFilter(_rDB.m_pImpl->m_aTableTypeFilter) ,m_xORB(_rxORB) ,m_xMasterConnection(_rxMaster) - ,m_aWarnings( Reference< XWarningsSupplier >( _rxMaster, UNO_QUERY ) ) ,m_pTables(NULL) ,m_pViews(NULL) + ,m_aWarnings( Reference< XWarningsSupplier >( _rxMaster, UNO_QUERY ) ) ,m_bSupportsViews(sal_False) ,m_bSupportsUsers(sal_False) ,m_bSupportsGroups(sal_False) Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: genericcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/genericcontroller.cxx?r1=1.66.72.2&r2=1.66.72.3 Delta lines: +6 -6 ------------------- --- genericcontroller.cxx 23 May 2006 23:48:42 -0000 1.66.72.2 +++ genericcontroller.cxx 29 May 2006 11:19:11 -0000 1.66.72.3 @@ -4,9 +4,9 @@ * * $RCSfile: genericcontroller.cxx,v $ * - * $Revision: 1.66.72.2 $ + * $Revision: 1.66.72.3 $ * - * last change: $Author: sb $ $Date: 2006/05/23 23:48:42 $ + * last change: $Author: sb $ $Date: 2006/05/29 11:19:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -157,6 +157,9 @@ // ------------------------------------------------------------------------- OGenericUnoController::OGenericUnoController(const Reference< XMultiServiceFactory >& _rM) :OGenericUnoController_COMPBASE(m_aMutex) +#ifdef DBG_UTIL + ,m_bDescribingSupportedFeatures( false ) +#endif ,m_aAsyncInvalidateAll(LINK(this, OGenericUnoController, OnAsyncInvalidateAll)) ,m_aAsyncCloseTask(LINK(this, OGenericUnoController, OnAsyncCloseTask)) ,m_xMultiServiceFacatory(_rM) @@ -165,9 +168,6 @@ ,m_bReadOnly(sal_False) ,m_bFrameUiActive(sal_False) ,m_bCurrentlyModified(sal_False) -#ifdef DBG_UTIL - ,m_bDescribingSupportedFeatures( false ) -#endif { DBG_CTOR(OGenericUnoController,NULL); Directory: /dba/dbaccess/source/ui/control/ =========================================== File [changed]: toolboxcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/control/toolboxcontroller.cxx?r1=1.8.74.2&r2=1.8.74.3 Delta lines: +3 -4 ------------------- --- toolboxcontroller.cxx 23 May 2006 23:50:21 -0000 1.8.74.2 +++ toolboxcontroller.cxx 29 May 2006 11:19:12 -0000 1.8.74.3 @@ -4,9 +4,9 @@ * * $RCSfile: toolboxcontroller.cxx,v $ * - * $Revision: 1.8.74.2 $ + * $Revision: 1.8.74.3 $ * - * last change: $Author: sb $ $Date: 2006/05/23 23:50:21 $ + * last change: $Author: sb $ $Date: 2006/05/29 11:19:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -237,7 +237,6 @@ { pMenu.reset( new PopupMenu( ModuleRes( RID_MENU_APP_NEW ) ) ); - ToolBox* pToolBox = static_cast<ToolBox*>(VCLUnoHelper::GetWindow(getParent())); sal_Bool bHighContrast = isHighContrast(); try Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: HtmlReader.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/HtmlReader.hxx?r1=1.11&r2=1.11.20.1 Delta lines: +4 -4 ------------------- --- HtmlReader.hxx 4 May 2006 08:42:52 -0000 1.11 +++ HtmlReader.hxx 29 May 2006 11:19:12 -0000 1.11.20.1 @@ -4,9 +4,9 @@ * * $RCSfile: HtmlReader.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.11.20.1 $ * - * last change: $Author: rt $ $Date: 2006/05/04 08:42:52 $ + * last change: $Author: sb $ $Date: 2006/05/29 11:19:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -73,7 +73,7 @@ */ virtual OWizTypeSelect* createPage(Window* _pParent); - void TableDataOn(SvxCellHorJustify& eVal,String *pValue,int nToken); + void TableDataOn(SvxCellHorJustify& eVal,int nToken); void TableFontOn(::com::sun::star::awt::FontDescriptor& _rFont,sal_Int32 &_rTextColor); sal_Int16 GetWidthPixel( const HTMLOption* pOption ); rtl_TextEncoding GetEncodingByMIME( const String& rMime ); File [changed]: TypeInfo.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/TypeInfo.hxx?r1=1.7.48.2&r2=1.7.48.3 Delta lines: +4 -4 ------------------- --- TypeInfo.hxx 23 May 2006 23:55:26 -0000 1.7.48.2 +++ TypeInfo.hxx 29 May 2006 11:19:12 -0000 1.7.48.3 @@ -4,9 +4,9 @@ * * $RCSfile: TypeInfo.hxx,v $ * - * $Revision: 1.7.48.2 $ + * $Revision: 1.7.48.3 $ * - * last change: $Author: sb $ $Date: 2006/05/23 23:55:26 $ + * last change: $Author: sb $ $Date: 2006/05/29 11:19:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -116,9 +116,9 @@ OTypeInfo() :nPrecision(0) + ,nType(::com::sun::star::sdbc::DataType::OTHER) ,nMaximumScale(0) ,nMinimumScale(0) - ,nType(::com::sun::star::sdbc::DataType::OTHER) ,nSearchType(::com::sun::star::sdbc::ColumnSearch::FULL) ,bCurrency(sal_False) ,bAutoIncrement(sal_False) 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.28.4.2&r2=1.28.4.3 Delta lines: +11 -13 --------------------- --- DExport.cxx 23 May 2006 23:57:30 -0000 1.28.4.2 +++ DExport.cxx 29 May 2006 11:19:13 -0000 1.28.4.3 @@ -4,9 +4,9 @@ * * $RCSfile: DExport.cxx,v $ * - * $Revision: 1.28.4.2 $ + * $Revision: 1.28.4.3 $ * - * last change: $Author: sb $ $Date: 2006/05/23 23:57:30 $ + * last change: $Author: sb $ $Date: 2006/05/29 11:19:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -413,25 +413,25 @@ try { - nNumberFormat = m_xFormatter->detectNumberFormat(xNumType->getStandardFormat(NumberFormat::DATETIME,m_nLocale),m_sTextToken); + nNumberFormat = m_xFormatter->detectNumberFormat(xNumType->getStandardFormat(NumberFormat::DATETIME,m_aLocale),m_sTextToken); } catch(Exception&) { try { - nNumberFormat = m_xFormatter->detectNumberFormat(xNumType->getStandardFormat(NumberFormat::DATE,m_nLocale),m_sTextToken); + nNumberFormat = m_xFormatter->detectNumberFormat(xNumType->getStandardFormat(NumberFormat::DATE,m_aLocale),m_sTextToken); } catch(Exception&) { try { - nNumberFormat = m_xFormatter->detectNumberFormat(xNumType->getStandardFormat(NumberFormat::TIME,m_nLocale),m_sTextToken); + nNumberFormat = m_xFormatter->detectNumberFormat(xNumType->getStandardFormat(NumberFormat::TIME,m_aLocale),m_sTextToken); } catch(Exception&) { try { - nNumberFormat = m_xFormatter->detectNumberFormat(xNumType->getStandardFormat(NumberFormat::NUMBER,m_nLocale),m_sTextToken); + nNumberFormat = m_xFormatter->detectNumberFormat(xNumType->getStandardFormat(NumberFormat::NUMBER,m_aLocale),m_sTextToken); } catch(Exception&) { @@ -443,7 +443,6 @@ } try { - Reference< XNumberFormatsSupplier > xSupplier = m_xFormatter->getNumberFormatsSupplier(); Reference< XNumberFormats > xFormats = xSupplier->getNumberFormats(); Reference<XPropertySet> xProp = xFormats->getByKey(nNumberFormat); sal_Int16 nType = 0; @@ -497,7 +496,7 @@ else { Reference<XNumberFormatTypes> xNumType(xFormats,UNO_QUERY); - nFormat = m_xFormatter->detectNumberFormat(xNumType->getStandardFormat(NumberFormat::ALL,m_nLocale),aCheckToken); + nFormat = m_xFormatter->detectNumberFormat(xNumType->getStandardFormat(NumberFormat::ALL,m_aLocale),aCheckToken); fOutNumber = m_xFormatter->convertStringToNumber(nFormat,aCheckToken); Reference<XPropertySet> xProp = xFormats->getByKey(nFormat); @@ -860,7 +859,7 @@ if ( m_sTextToken.Len() ) { sal_Int32 nColPos = m_vColumns[m_bIsAutoIncrement ? m_nColumnPos+1 : m_nColumnPos].first; - if( nColPos != CONTAINER_ENTRY_NOTFOUND) + if( nColPos != sal::static_int_cast< long >(CONTAINER_ENTRY_NOTFOUND)) { --nColPos; m_vFormatKey[nColPos] = CheckString(m_sTextToken,m_vFormatKey[nColPos]); @@ -883,7 +882,7 @@ { Reference< XNumberFormatsSupplier > xSupplier = m_xFormatter->getNumberFormatsSupplier(); Reference< XUnoTunnel > xTunnel(xSupplier,UNO_QUERY); - SvNumberFormatsSupplierObj* pSupplierImpl = (SvNumberFormatsSupplierObj*)xTunnel->getSomething(SvNumberFormatsSupplierObj::getUnoTunnelId()); + SvNumberFormatsSupplierObj* pSupplierImpl = (SvNumberFormatsSupplierObj*)sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething(SvNumberFormatsSupplierObj::getUnoTunnelId())); m_pFormatter = pSupplierImpl ? pSupplierImpl->GetNumberFormatter() : NULL; } } @@ -915,7 +914,6 @@ return Reference< XPreparedStatement > (); } const ::rtl::OUString* pIter = aDestColumnNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aDestColumnNames.getLength(); ::std::vector< ::rtl::OUString> aInsertList; aInsertList.resize(aDestColumnNames.getLength()+1); sal_Int32 i = 0; @@ -923,7 +921,7 @@ { ODatabaseExport::TPositions::const_iterator aFind = ::std::find_if(_rvColumns.begin(),_rvColumns.end(), ::std::compose1(::std::bind2nd(::std::equal_to<sal_Int32>(),i+1),::std::select2nd<ODatabaseExport::TPositions::value_type>())); - if ( _rvColumns.end() != aFind && aFind->second != CONTAINER_ENTRY_NOTFOUND && aFind->first != CONTAINER_ENTRY_NOTFOUND ) + if ( _rvColumns.end() != aFind && aFind->second != sal::static_int_cast< long >(CONTAINER_ENTRY_NOTFOUND) && aFind->first != sal::static_int_cast< long >(CONTAINER_ENTRY_NOTFOUND) ) { aInsertList[aFind->first] = ::dbtools::quoteName( aQuote,*(pIter+i)); } File [changed]: HtmlReader.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/HtmlReader.cxx?r1=1.22.4.2&r2=1.22.4.3 Delta lines: +8 -8 ------------------- --- HtmlReader.cxx 23 May 2006 23:57:43 -0000 1.22.4.2 +++ HtmlReader.cxx 29 May 2006 11:19:13 -0000 1.22.4.3 @@ -4,9 +4,9 @@ * * $RCSfile: HtmlReader.cxx,v $ * - * $Revision: 1.22.4.2 $ + * $Revision: 1.22.4.3 $ * - * last change: $Author: sb $ $Date: 2006/05/23 23:57:43 $ + * last change: $Author: sb $ $Date: 2006/05/29 11:19:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -410,11 +410,11 @@ void OHTMLReader::fetchOptions() { m_bInTbl = TRUE; - const HTMLOptions* pOptions = GetOptions(); - sal_Int16 nArrLen = pOptions->Count(); + const HTMLOptions* options = GetOptions(); + sal_Int16 nArrLen = options->Count(); for ( sal_Int16 i = 0; i < nArrLen; i++ ) { - const HTMLOption* pOption = (*pOptions)[i]; + const HTMLOption* pOption = (*options)[i]; switch( pOption->GetToken() ) { case HTML_O_SDVAL: @@ -431,7 +431,7 @@ } } //--------------------------------------------------------------------------------- -void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal,String *pValue,int nToken) +void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal,int nToken) { DBG_CHKTHIS(OHTMLReader,NULL); sal_Bool bHorJustifyCenterTH = (nToken == HTML_TABLEHEADER_ON); @@ -592,7 +592,7 @@ DELETEZ(pValue); eVal = SVX_HOR_JUSTIFY_STANDARD; } - TableDataOn(eVal,pValue,nTmpToken2); + TableDataOn(eVal,nTmpToken2); bTableHeader = TRUE; break; case HTML_TABLEDATA_OFF: File [changed]: TableCopyHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/TableCopyHelper.cxx?r1=1.5.6.2&r2=1.5.6.3 Delta lines: +5 -5 ------------------- --- TableCopyHelper.cxx 23 May 2006 23:58:14 -0000 1.5.6.2 +++ TableCopyHelper.cxx 29 May 2006 11:19:13 -0000 1.5.6.3 @@ -4,9 +4,9 @@ * * $RCSfile: TableCopyHelper.cxx,v $ * - * $Revision: 1.5.6.2 $ + * $Revision: 1.5.6.3 $ * - * last change: $Author: sb $ $Date: 2006/05/23 23:58:14 $ + * last change: $Author: sb $ $Date: 2006/05/29 11:19:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -152,11 +152,11 @@ // ----------------------------------------------------------------------------- #define FILL_PARAM(type,method) \ { \ - type nValue = xRow->g##method(i); \ + type nValue = xRow->g##method(column); \ if ( !xRow->wasNull() ) \ xParameter->s##method(nPos,nValue); \ else \ - xParameter->setNull(nPos,aColumnTypes[i]); \ + xParameter->setNull(nPos,aColumnTypes[column]); \ } // ----------------------------------------------------------------------------- namespace File [changed]: UpdateHelperImpl.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/UpdateHelperImpl.hxx?r1=1.2&r2=1.2.30.1 Delta lines: +3 -3 ------------------- --- UpdateHelperImpl.hxx 19 Apr 2006 13:23:24 -0000 1.2 +++ UpdateHelperImpl.hxx 29 May 2006 11:19:13 -0000 1.2.30.1 @@ -4,9 +4,9 @@ * * $RCSfile: UpdateHelperImpl.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.30.1 $ * - * last change: $Author: hr $ $Date: 2006/04/19 13:23:24 $ + * last change: $Author: sb $ $Date: 2006/05/29 11:19:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -78,7 +78,7 @@ { m_xRowUpdate->updateInt(_nPos, _nValue); } - virtual void updateNull(sal_Int32 _nPos, ::sal_Int32 sqlType) + virtual void updateNull(sal_Int32 _nPos, ::sal_Int32) { m_xRowUpdate->updateNull(_nPos); } File [changed]: WCopyTable.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/WCopyTable.cxx?r1=1.42.4.2&r2=1.42.4.3 Delta lines: +5 -5 ------------------- --- WCopyTable.cxx 23 May 2006 23:58:51 -0000 1.42.4.2 +++ WCopyTable.cxx 29 May 2006 11:19:13 -0000 1.42.4.3 @@ -4,9 +4,9 @@ * * $RCSfile: WCopyTable.cxx,v $ * - * $Revision: 1.42.4.2 $ + * $Revision: 1.42.4.3 $ * - * last change: $Author: sb $ $Date: 2006/05/23 23:58:51 $ + * last change: $Author: sb $ $Date: 2006/05/29 11:19:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -478,8 +478,8 @@ OCopyTable* pPage = reinterpret_cast<OCopyTable*>(GetPage(0)); m_bCreatePrimaryColumn = sal_True; m_aKeyName = pPage->GetKeyName(); - sal_Int32 nBreakPos = 0; - CheckColumns(nBreakPos); + sal_Int32 nBreakPos2 = 0; + CheckColumns(nBreakPos2); break; } case RET_CANCEL: --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
