[Libreoffice-commits] .: embeddedobj/source embeddedobj/test framework/source
Julien Nabet
serval2412 at kemper.freedesktop.org
Sun Jul 31 09:11:05 PDT 2011
embeddedobj/source/msole/olecomponent.cxx | 4 +-
embeddedobj/test/MainThreadExecutor/xexecutor.hxx | 2 -
framework/source/fwe/xml/saxnamespacefilter.cxx | 6 ++--
framework/source/fwe/xml/toolboxdocumenthandler.cxx | 2 -
framework/source/uielement/newmenucontroller.cxx | 2 -
framework/source/uielement/spinfieldtoolbarcontroller.cxx | 21 ++++++--------
framework/source/uielement/toolbarmanager.cxx | 2 -
7 files changed, 17 insertions(+), 22 deletions(-)
New commits:
commit 74529c51cd05859fa7f6614b7b4a72bdb61df9c9
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sun Jul 31 18:11:19 2011 +0200
Some cppcheck cleaning
diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index e6ccd6a..e1cf3fb 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -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);
diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.hxx b/embeddedobj/test/MainThreadExecutor/xexecutor.hxx
index c3da32d..a189eab 100644
--- a/embeddedobj/test/MainThreadExecutor/xexecutor.hxx
+++ b/embeddedobj/test/MainThreadExecutor/xexecutor.hxx
@@ -81,7 +81,7 @@ public:
DECL_LINK( executor, void* );
- sal_Bool isExecuted() { return m_bExecuted; }
+ sal_Bool isExecuted() const { return m_bExecuted; }
};
#endif
diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx
index a44524e..9ffbdbe 100644
--- a/framework/source/fwe/xml/saxnamespacefilter.cxx
+++ b/framework/source/fwe/xml/saxnamespacefilter.cxx
@@ -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 );
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index 9f93e76..05b04db 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -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 )
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index fee14bf..ead1811 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -531,7 +531,7 @@ void NewMenuController::impl_setPopupMenu()
}
catch ( RuntimeException& e )
{
- throw e;
+ throw;
}
catch ( Exception& )
{
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index 003a89b..6d04e65 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -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 );
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index a3f431b..0d69840 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1584,7 +1584,7 @@ void ToolBarManager::notifyRegisteredControllers( const rtl::OUString& aUIElemen
}
catch ( RuntimeException& e )
{
- throw e;
+ throw;
}
catch ( Exception& )
{
More information about the Libreoffice-commits
mailing list