[Libreoffice-commits] .: 2 commits - starmath/qa sw/source

[Caolán McNamara]

 starmath/qa/cppunit/test_starmath.cxx |    2 ++
 sw/source/filter/ww8/writerhelper.cxx |    2 +-
 sw/source/filter/ww8/wrtw8esh.cxx     |    4 ++--
 sw/source/filter/ww8/wrtww8.cxx       |    2 +-
 sw/source/filter/ww8/wrtww8gr.cxx     |    2 +-
 sw/source/filter/ww8/ww8par.cxx       |   12 ++++++------
 sw/source/filter/ww8/ww8toolbar.cxx   |    2 +-
 7 files changed, 14 insertions(+), 12 deletions(-)

New commits:
commit 831ffd6829f066e1c1b75bfad8181d9510075d56
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jun 13 14:07:29 2011 +0100

    catch by const reference

diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 22ff650..8060bb6 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -315,7 +315,7 @@ namespace sw
                     if ( xClose.is() )
                         xClose->close(sal_True);
                 }
-                catch ( com::sun::star::util::CloseVetoException& )
+                catch ( const com::sun::star::util::CloseVetoException& )
                 {
                 }
 
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 77e44c9..2023d7f 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -220,7 +220,7 @@ void WW8Export::DoComboBox(uno::Reference<beans::XPropertySet> xPropSet)
             if (pStr)
                 sHelp = *pStr;
         }
-        catch( uno::Exception& )
+        catch( const uno::Exception& )
         {}
     }
 
@@ -1583,7 +1583,7 @@ sal_Int32 SwBasicEscherEx::WriteOLEFlyFrame(const SwFrmFmt& rFmt, sal_uInt32 nSh
                 aRect.Height = aSize.Height;
                 bRectIsSet = sal_True;
             }
-            catch( uno::Exception& )
+            catch( const uno::Exception& )
             {}
         }
 
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 70de2b2..732b8f2 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3518,7 +3518,7 @@ void WW8Export::RestoreMacroCmds()
 
         delete pStream;
     }
-    catch ( uno::Exception& )
+    catch ( const uno::Exception& )
     {
     }
 
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 439d15d..fa040bc 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -176,7 +176,7 @@ bool WW8Export::TestOleNeedsGraphic(const SwAttrSet& rSet,
                     pGraphicStream =
                             ::utl::UcbStreamHelper::CreateStream( aCnt.GetGraphicStream( xPersist->getEntryName() ) );
                 }
-                catch( uno::Exception& )
+                catch( const uno::Exception& )
                 {}
 
                 OSL_ENSURE( pGraphicStream && !pGraphicStream->GetError(), "No graphic stream available!" );
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index be2c2b0..b876f3c 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -234,7 +234,7 @@ bool BasicProjImportHelper::import( const uno::Sequence< beans::NamedValue >& aA
         uno::Reference< document::XFilter > xFilter( xImporter, uno::UNO_QUERY_THROW );
         bRet = xFilter->filter( aMediaDesc.getAsConstPropertyValueList() );
     }
-    catch( uno::Exception& )
+    catch( const uno::Exception& )
     {
         bRet = false;
     }
@@ -253,7 +253,7 @@ rtl::OUString BasicProjImportHelper::getProjectName()
             sProjName = xVBA->getProjectName();
 
         }
-        catch( uno::Exception& )
+        catch( const uno::Exception& )
         {
         }
     }
@@ -4074,7 +4074,7 @@ void SwWW8ImplReader::StoreMacroCmds()
             delete[] pBuffer;
             delete pStream;
         }
-        catch ( uno::Exception& )
+        catch ( const uno::Exception& )
         {
         }
     }
@@ -4110,7 +4110,7 @@ void SwWW8ImplReader::ReadDocVars()
                 xUserDefinedProps->addProperty( name,
                     beans::PropertyAttribute::REMOVEABLE,
                     aValue );
-            } catch (uno::Exception &) {
+            } catch (const uno::Exception &) {
                 // ignore
             }
         }
@@ -4198,7 +4198,7 @@ void lcl_createTemplateToProjectEntry( const uno::Reference< container::XNameCon
                 xPrjNameCache->insertByName( templateName, uno::makeAny( sVBAProjName ) );
             }
         }
-        catch( uno::Exception& )
+        catch( const uno::Exception& )
         {
         }
     }
@@ -4815,7 +4815,7 @@ namespace
                         aPassw = pRequest->getPassword();
                 }
             }
-            catch( uno::Exception& )
+            catch( const uno::Exception& )
             {
             }
         }
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index 0f4a644..66c6fea 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -592,7 +592,7 @@ bool CTB::ImportCustomToolBar( CTBWrapper& rWrapper, CustomToolBarImportHelper&
 #endif
         bRes = true;
     }
-    catch( uno::Exception& e )
+    catch( const uno::Exception& e )
     {
         OSL_TRACE("***** For some reason we have an exception %s", rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
         bRes = false;
commit 0f63177ba2e719ec6c6b65e3a35db7077c242a6f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jun 13 14:05:42 2011 +0100

    enter and leave registrations to keep asserts happy

diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx
index b19ead0..40e058b 100644
--- a/starmath/qa/cppunit/test_starmath.cxx
+++ b/starmath/qa/cppunit/test_starmath.cxx
@@ -132,7 +132,9 @@ void Test::setUp()
 
     m_pDispatcher = new SfxDispatcher(pViewFrame);
     m_aBindings.SetDispatcher(m_pDispatcher);
+    m_aBindings.EnterRegistrations();
     m_pSmCmdBoxWindow = new SmCmdBoxWindow(&m_aBindings, NULL, NULL);
+    m_aBindings.LeaveRegistrations();
     m_pEditWindow = new SmEditWindow(*m_pSmCmdBoxWindow);
     m_pViewShell = m_pEditWindow->GetView();
     CPPUNIT_ASSERT_MESSAGE("Should have a SmViewShell", m_pViewShell);