mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS warnings01 (1.10.46); FILE MERGED

Browse Source 
2005/11/28 16:39:57 sb 1.10.46.5: #i53898# Made code warning-free.
2005/10/28 13:55:25 sb 1.10.46.4: #i53898# Fixed previous modification.
2005/09/22 15:40:29 sb 1.10.46.3: RESYNC: (1.10-1.11); FILE MERGED
2005/09/07 11:05:32 sb 1.10.46.2: #i53898# Made code warning-free.
2005/08/31 16:24:57 sb 1.10.46.1: #i53898# Made code warning-free.
This commit is contained in:
Jens-Heiner Rechtien
2006-06-19 09:35:30 +00:00
parent 4024d807f8
commit d924416d27
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cppuhelper/source/tdmgr.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: tdmgr.cxx,v $ * $RCSfile: tdmgr.cxx,v $
* *
* $Revision: 1.11 $ * $Revision: 1.12 $
* *
* last change: $Author: rt $ $Date: 2005-09-08 09:29:44 $ * last change: $Author: hr $ $Date: 2006-06-19 10:35:30 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -99,9 +99,10 @@ inline static sal_Int64 coerceToInt64( const Any & rVal )
return *(sal_uInt64 *)rVal.getValue(); return *(sal_uInt64 *)rVal.getValue();
case TypeClass_ENUM: case TypeClass_ENUM:
return *(int *)rVal.getValue(); return *(int *)rVal.getValue();
default:
OSL_ASSERT(false);
return 0;
} }
OSL_ENSURE( sal_False, "### cannot read union discriminant: no ordinal type!" );
return 0; // dummy
} }
//================================================================================================== //==================================================================================================
inline static typelib_TypeDescription * createCTD( inline static typelib_TypeDescription * createCTD(
@@ -649,6 +650,8 @@ static typelib_TypeDescription * createCTD(
case TypeClass_INTERFACE_ATTRIBUTE: case TypeClass_INTERFACE_ATTRIBUTE:
pRet = createCTD( Reference< XInterfaceAttributeTypeDescription >::query( xType ) ); pRet = createCTD( Reference< XInterfaceAttributeTypeDescription >::query( xType ) );
break; break;
default:
break;
} }
} }
@@ -686,6 +689,7 @@ static void SAL_CALL typelib_callback(
} }
catch (container::NoSuchElementException & exc) catch (container::NoSuchElementException & exc)
{ {
(void) exc; // avoid warning about unused variable
OSL_ENSURE( OSL_ENSURE(
0, OUStringToOString( 0, OUStringToOString(
OUString( RTL_CONSTASCII_USTRINGPARAM( OUString( RTL_CONSTASCII_USTRINGPARAM(
@@ -694,6 +698,7 @@ static void SAL_CALL typelib_callback(
} }
catch (Exception & exc) catch (Exception & exc)
{ {
(void) exc; // avoid warning about unused variable
OSL_ENSURE( OSL_ENSURE(
0, OUStringToOString( 0, OUStringToOString(
exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
@@ -724,7 +729,9 @@ public:
void EventListenerImpl::disposing( lang::EventObject const & rEvt ) void EventListenerImpl::disposing( lang::EventObject const & rEvt )
throw (RuntimeException) throw (RuntimeException)
{ {
OSL_ASSERT( rEvt.Source == m_xTDMgr ); if (rEvt.Source != m_xTDMgr) {
OSL_ASSERT(false);
}
// deregister of c typelib callback // deregister of c typelib callback
::typelib_typedescription_revokeCallback( m_xTDMgr.get(), typelib_callback ); ::typelib_typedescription_revokeCallback( m_xTDMgr.get(), typelib_callback );
} }