Tag: cws_dev300_hr50 User: hr Date: 2008-04-11 12:26:42+0000 Modified: dba/dbaccess/source/core/dataaccess/databasecontext.cxx dba/dbaccess/source/filter/xml/xmlStyleImport.cxx dba/dbaccess/source/ui/browser/dsEntriesNoExp.cxx dba/dbaccess/source/ui/browser/unodatbr.cxx dba/dbaccess/source/ui/control/curledit.cxx dba/dbaccess/source/ui/dlg/DbAdminImpl.cxx dba/dbaccess/source/ui/dlg/paramdialog.cxx dba/dbaccess/source/ui/dlg/queryfilter.cxx dba/dbaccess/source/ui/querydesign/TableWindowData.cxx
Log: #i86574#: fix warning (gcc-4.2.3) File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: databasecontext.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasecontext.cxx?r1=1.37&r2=1.37.6.1 Delta lines: +5 -4 ------------------- --- databasecontext.cxx 2008-01-30 08:33:08+0000 1.37 +++ databasecontext.cxx 2008-04-11 12:26:37+0000 1.37.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: databasecontext.cxx,v $ * - * $Revision: 1.37 $ + * $Revision: 1.37.6.1 $ * - * last change: $Author: rt $ $Date: 2008/01/30 08:33:08 $ + * last change: $Author: hr $ $Date: 2008/04/11 12:26:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -419,9 +419,10 @@ DBG_ERROR("ODatabaseContext::setTransientProperties: could not set a session-persistent property on the data source!"); } } - else + else { DBG_ERROR("ODatabaseContext::setTransientProperties: missing an interface!"); } + } } //------------------------------------------------------------------------------ Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: xmlStyleImport.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlStyleImport.cxx?r1=1.7&r2=1.7.134.1 Delta lines: +5 -4 ------------------- --- xmlStyleImport.cxx 2007-09-26 14:44:42+0000 1.7 +++ xmlStyleImport.cxx 2008-04-11 12:26:37+0000 1.7.134.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlStyleImport.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.7.134.1 $ * - * last change: $Author: hr $ $Date: 2007/09/26 14:44:42 $ + * last change: $Author: hr $ $Date: 2008/04/11 12:26:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -161,9 +161,10 @@ if ( pMyStyles ) pStyle = PTR_CAST(SvXMLNumFormatContext,pMyStyles-> FindStyleChildContext(XML_STYLE_FAMILY_DATA_STYLE, m_sDataStyleName, sal_True)); - else + else { DBG_ERROR("not possible to get style"); } + } if ( pStyle ) { uno::Any aNumberFormat; Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: dsEntriesNoExp.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/dsEntriesNoExp.cxx?r1=1.20&r2=1.20.96.1 Delta lines: +7 -5 ------------------- --- dsEntriesNoExp.cxx 2007-11-21 16:58:34+0000 1.20 +++ dsEntriesNoExp.cxx 2008-04-11 12:26:38+0000 1.20.96.1 @@ -4,9 +4,9 @@ * * $RCSfile: dsEntriesNoExp.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.20.96.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/21 16:58:34 $ + * last change: $Author: hr $ $Date: 2008/04/11 12:26:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -137,8 +137,9 @@ static_cast<OBoldListboxString*>(pTextItem)->emphasize(_bSelect); m_pTreeModel->InvalidateEntry(_pEntry); } - else + else { DBG_ERROR("SbaTableQueryBrowser::select: invalid entry!"); + } } //------------------------------------------------------------------------------ @@ -156,8 +157,9 @@ SvLBoxItem* pTextItem = _pEntry ? _pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING) : NULL; if (pTextItem) return static_cast<OBoldListboxString*>(pTextItem)->isEmphasized(); - else + else { DBG_ERROR("SbaTableQueryBrowser::isSelected: invalid entry!"); + } return sal_False; } //------------------------------------------------------------------------------ File [changed]: unodatbr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/unodatbr.cxx?r1=1.193&r2=1.193.6.1 Delta lines: +9 -6 ------------------- --- unodatbr.cxx 2008-01-30 08:43:13+0000 1.193 +++ unodatbr.cxx 2008-04-11 12:26:38+0000 1.193.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: unodatbr.cxx,v $ * - * $Revision: 1.193 $ + * $Revision: 1.193.6.1 $ * - * last change: $Author: rt $ $Date: 2008/01/30 08:43:13 $ + * last change: $Author: hr $ $Date: 2008/04/11 12:26:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -528,8 +528,9 @@ Reference< XContainer > xDatasourceContainer(m_xDatabaseContext, UNO_QUERY); if (xDatasourceContainer.is()) xDatasourceContainer->addContainerListener(this); - else + else { DBG_ERROR("SbaTableQueryBrowser::Construct: the DatabaseContext should allow us to be a listener!"); + } // the collator for the string compares m_xCollator = Reference< XCollator >(getORB()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.i18n.Collator")), UNO_QUERY); @@ -2256,9 +2257,10 @@ pEntryData->xContainer = xQueryDefs; bSuccess = pEntryData->xContainer.is(); } - else + else { DBG_ERROR("SbaTableQueryBrowser::ensureEntryObject: no XQueryDefinitionsSupplier interface!"); } + } catch(Exception&) { DBG_ERROR("SbaTableQueryBrowser::ensureEntryObject: caught an exception while retrieving the queries container!"); @@ -2781,8 +2783,9 @@ delete pData; m_pTreeModel->Remove(pDSLoop); } - else + else { DBG_ERROR("SbaTableQueryBrowser::elementRemoved: unknown datasource name!"); + } // maybe the object which is part of the document data source has been removed checkDocumentDataSource(); Directory: /dba/dbaccess/source/ui/control/ =========================================== File [changed]: curledit.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/control/curledit.cxx?r1=1.12&r2=1.12.194.1 Delta lines: +5 -4 ------------------- --- curledit.cxx 2007-05-10 10:20:26+0000 1.12 +++ curledit.cxx 2008-04-11 12:26:38+0000 1.12.194.1 @@ -4,9 +4,9 @@ * * $RCSfile: curledit.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.12.194.1 $ * - * last change: $Author: kz $ $Date: 2007/05/10 10:20:26 $ + * last change: $Author: hr $ $Date: 2008/04/11 12:26:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -120,9 +120,10 @@ // and the prefix belonging to this type if (DST_UNKNOWN != eType) sPrefix = m_aTypeCollection.getDatasourcePrefix(eType); - else + else { DBG_ERROR("OConnectionURLEdit::SetText : the new text is no valid connection URL!"); } + } // the fixed text gets the prefix if ( m_pForcedPrefix ) Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: DbAdminImpl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DbAdminImpl.cxx?r1=1.22&r2=1.22.6.1 Delta lines: +11 -7 -------------------- --- DbAdminImpl.cxx 2008-01-30 08:43:26+0000 1.22 +++ DbAdminImpl.cxx 2008-04-11 12:26:39+0000 1.22.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: DbAdminImpl.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.22.6.1 $ * - * last change: $Author: rt $ $Date: 2008/01/30 08:43:26 $ + * last change: $Author: hr $ $Date: 2008/04/11 12:26:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -982,13 +982,14 @@ _rValue >>= sValue; _rSet.Put(SfxStringItem(nId, sValue.getStr())); } - else + else { DBG_ERROR( ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) += ::rtl::OString( translatePropertyId( _nId ) ) += ::rtl::OString( " should be no string)!" ) ).getStr() ); + } break; case TypeClass_BOOLEAN: @@ -998,13 +999,14 @@ _rValue >>= bVal; _rSet.Put(SfxBoolItem(nId, bVal)); } - else + else { DBG_ERROR( ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) += ::rtl::OString( translatePropertyId( _nId ) ) += ::rtl::OString( " should be no boolean)!" ) ).getStr() ); + } break; case TypeClass_LONG: @@ -1014,13 +1016,14 @@ _rValue >>= nValue; _rSet.Put( SfxInt32Item( nId, nValue ) ); } - else + else { DBG_ERROR( ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) += ::rtl::OString( translatePropertyId( _nId ) ) += ::rtl::OString( " should be no int)!" ) ).getStr() ); + } break; case TypeClass_SEQUENCE: @@ -1046,13 +1049,14 @@ DBG_ERROR("ODbDataSourceAdministrationHelper::implTranslateProperty: unsupported property value type!"); } } - else + else { DBG_ERROR( ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) += ::rtl::OString( translatePropertyId( _nId ) ) += ::rtl::OString( " should be no string sequence)!" ) ).getStr() ); + } break; case TypeClass_VOID: File [changed]: paramdialog.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/paramdialog.cxx?r1=1.17&r2=1.17.178.1 Delta lines: +5 -4 ------------------- --- paramdialog.cxx 2007-07-06 08:18:49+0000 1.17 +++ paramdialog.cxx 2008-04-11 12:26:39+0000 1.17.178.1 @@ -4,9 +4,9 @@ * * $RCSfile: paramdialog.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.17.178.1 $ * - * last change: $Author: rt $ $Date: 2007/07/06 08:18:49 $ + * last change: $Author: hr $ $Date: 2008/04/11 12:26:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -128,8 +128,9 @@ if (_rxORB.is()) m_xFormatter = Reference< XNumberFormatter>(_rxORB->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatter"))), UNO_QUERY); - else + else { DBG_ERROR("OParameterDialog::OParameterDialog: need a service factory!"); + } Reference< XNumberFormatsSupplier > xNumberFormats = ::dbtools::getNumberFormats(m_xConnection, sal_True); if (!xNumberFormats.is()) File [changed]: queryfilter.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/queryfilter.cxx?r1=1.34&r2=1.34.178.1 Delta lines: +5 -4 ------------------- --- queryfilter.cxx 2007-07-06 08:19:08+0000 1.34 +++ queryfilter.cxx 2008-04-11 12:26:39+0000 1.34.178.1 @@ -4,9 +4,9 @@ * * $RCSfile: queryfilter.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.34.178.1 $ * - * last change: $Author: rt $ $Date: 2007/07/06 08:19:08 $ + * last change: $Author: hr $ $Date: 2008/04/11 12:26:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -484,8 +484,9 @@ { sField = aLB_WHEREFIELD3.GetSelectEntry(); } - else + else { DBG_ERROR( "DlgFilterCrit::getMatchingColumn: invalid event source!" ); + } // the field itself return getColumn( sField ); Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: TableWindowData.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/TableWindowData.cxx?r1=1.12&r2=1.12.98.1 Delta lines: +4 -3 ------------------- --- TableWindowData.cxx 2007-11-29 14:27:29+0000 1.12 +++ TableWindowData.cxx 2008-04-11 12:26:39+0000 1.12.98.1 @@ -4,9 +4,9 @@ * * $RCSfile: TableWindowData.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.12.98.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/29 14:27:29 $ + * last change: $Author: hr $ $Date: 2008/04/11 12:26:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -128,8 +128,9 @@ m_xTable.set( xQueries->getByName( m_sComposedName ), UNO_QUERY_THROW ); else if ( bIsKnownTable ) m_xTable.set( xTables->getByName( m_sComposedName ), UNO_QUERY_THROW ); - else + else { DBG_ERROR( "OTableWindow::Init: this is neither a query (or no queries are allowed) nor a table!" ); + } // if we survived so far, we know whether it's a query m_bIsQuery = bIsKnownQuery; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
