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

Some cppcheck cleaning

Browse Source
This commit is contained in:
Julien Nabet
2011-07-31 18:11:19 +02:00
parent 268fe75e33
commit 470b293417
7 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
embeddedobj/source/msole/olecomponent.cxx
View File

@@ -478,7 +478,7 @@ OleComponent::~OleComponent()
for ( FormatEtcList::iterator aIter = m_pNativeImpl->m_aFormatsList.begin();
aIter != m_pNativeImpl->m_aFormatsList.end();
aIter++ )
++aIter )
{
delete (*aIter);
(*aIter) = NULL;
@@ -500,7 +500,7 @@ FORMATETC* OleComponentNative_Impl::GetSupportedFormatForAspect( sal_uInt32 nReq
{
for ( FormatEtcList::iterator aIter = m_aFormatsList.begin();
aIter != m_aFormatsList.end();
aIter++ )
++aIter )
if ( (*aIter) && (*aIter)->dwAspect == nRequestedAspect )
return (*aIter);

2
embeddedobj/test/MainThreadExecutor/xexecutor.hxx
View File

@@ -81,7 +81,7 @@ public:
DECL_LINK( executor, void* );
sal_Bool isExecuted() { return m_bExecuted; }
sal_Bool isExecuted() const { return m_bExecuted; }
};
#endif

6
framework/source/fwe/xml/saxnamespacefilter.cxx
View File

@@ -117,7 +117,7 @@ void SAL_CALL SaxNamespaceFilter::startElement(
catch ( SAXException& e )
{
e.Message = ::rtl::OUString( getErrorLineString() + e.Message );
throw e;
throw;
}
::rtl::OUString aNamespaceElementName;
@@ -129,7 +129,7 @@ void SAL_CALL SaxNamespaceFilter::startElement(
catch ( SAXException& e )
{
e.Message = ::rtl::OUString( getErrorLineString() + e.Message );
throw e;
throw;
}
xDocumentHandler->startElement( aNamespaceElementName, pNewList );
@@ -148,7 +148,7 @@ void SAL_CALL SaxNamespaceFilter::endElement(const rtl::OUString& aName)
catch ( SAXException& e )
{
e.Message = ::rtl::OUString( getErrorLineString() + e.Message );
throw e;
throw;
}
xDocumentHandler->endElement( aNamespaceElementName );

2
framework/source/fwe/xml/toolboxdocumenthandler.cxx
View File

@@ -398,8 +398,6 @@ throw( SAXException, RuntimeException )
nItemBits |= ::com::sun::star::ui::ItemStyle::ALIGN_LEFT;
else if ( nHashCode == m_nHashCode_Style_AutoSize )
nItemBits |= ::com::sun::star::ui::ItemStyle::AUTO_SIZE;
else if ( nHashCode == m_nHashCode_Style_DropDown )
nItemBits |= ::com::sun::star::ui::ItemStyle::DROP_DOWN;
else if ( nHashCode == m_nHashCode_Style_Repeat )
nItemBits |= ::com::sun::star::ui::ItemStyle::REPEAT;
else if ( nHashCode == m_nHashCode_Style_DropDownOnly )

2
framework/source/uielement/newmenucontroller.cxx
View File

@@ -531,7 +531,7 @@ void NewMenuController::impl_setPopupMenu()
}
catch ( RuntimeException& e )
{
throw e;
throw;
}
catch ( Exception& )
{

21
framework/source/uielement/spinfieldtoolbarcontroller.cxx
View File

@@ -373,12 +373,11 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star::
{
for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ )
{
sal_Int32 nValue;
double fValue;
bool bFloat( false );
if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Step", 4 ))
{
sal_Int32 nValue;
double fValue;
bool bFloat( false );
if ( impl_getValue( rControlCommand.Arguments[i].Value, nValue, fValue, bFloat ))
aStep = bFloat ? ::rtl::OUString::valueOf( fValue ) :
::rtl::OUString::valueOf( nValue );
@@ -439,12 +438,11 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star::
{
for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ )
{
sal_Int32 nValue;
double fValue;
bool bFloat( false );
if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "LowerLimit", 10 ))
{
sal_Int32 nValue;
double fValue;
bool bFloat( false );
if ( impl_getValue( rControlCommand.Arguments[i].Value, nValue, fValue, bFloat ))
aMin = bFloat ? ::rtl::OUString::valueOf( fValue ) :
::rtl::OUString::valueOf( nValue );
@@ -456,12 +454,11 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star::
{
for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ )
{
sal_Int32 nValue;
double fValue;
bool bFloat( false );
if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "UpperLimit", 10 ))
{
sal_Int32 nValue;
double fValue;
bool bFloat( false );
if ( impl_getValue( rControlCommand.Arguments[i].Value, nValue, fValue, bFloat ))
aMax = bFloat ? ::rtl::OUString::valueOf( fValue ) :
::rtl::OUString::valueOf( nValue );

2
framework/source/uielement/toolbarmanager.cxx
View File

@@ -1584,7 +1584,7 @@ void ToolBarManager::notifyRegisteredControllers( const rtl::OUString& aUIElemen
}
catch ( RuntimeException& e )
{
throw e;
throw;
}
catch ( Exception& )
{