Some cppcheck cleaning

5 files changed, 14 insertions, 19 deletions

diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx
index 18adde4faaf5..e306f554e10c 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 71cf378d65bf..c22599b11332 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 ea8eaa3afd44..668bcf2a1ffb 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 02f9ab5ab644..1830bd190523 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 62f6a06d98b7..8bce5fdc5bef 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& )
                     {