summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-06-13 15:17:59 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-06-14 09:57:33 +0100
commitf85076ca48e27c81cf4ce36f9b09fb55733db4ec (patch)
tree6e00adaf93aa6b5d5cc6b5087cb58fad880dc3c9
parent0d51eab31fa305a702218203e9683c102cfe83a2 (diff)
catch by const reference
-rw-r--r--sal/osl/all/loadmodulerelative.cxx2
-rw-r--r--sal/qa/osl/file/osl_File.cxx2
-rw-r--r--sal/qa/rtl/logfile/rtl_logfile.cxx2
-rw-r--r--sal/qa/rtl/uri/rtl_testuri.cxx2
-rw-r--r--sal/qa/systools/test_comtools.cxx4
-rw-r--r--sal/rtl/source/bootstrap.cxx2
-rw-r--r--sal/test/unloading/samplelib1.cxx2
7 files changed, 8 insertions, 8 deletions
diff --git a/sal/osl/all/loadmodulerelative.cxx b/sal/osl/all/loadmodulerelative.cxx
index 341bc56d81a6..52637a3573cd 100644
--- a/sal/osl/all/loadmodulerelative.cxx
+++ b/sal/osl/all/loadmodulerelative.cxx
@@ -57,7 +57,7 @@ oslModule SAL_CALL osl_loadModuleRelative(
::rtl::OUString abs;
try {
abs = ::rtl::Uri::convertRelToAbs(base, relativePath);
- } catch (::rtl::MalformedUriException & e) {
+ } catch (const ::rtl::MalformedUriException & e) {
(void) e; // avoid warnings
OSL_TRACE(
"rtl::MalformedUriException <%s>",
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index fbec99218d46..5787a746bdc6 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -6323,7 +6323,7 @@ class GlobalObject
#endif
}
- catch (CppUnit::Exception &e)
+ catch (const CppUnit::Exception &e)
{
printf("Exception caught in GlobalObject dtor(). Exception message: '%s'. Source line: %d\n", e.what(), e.sourceLine().lineNumber());
}
diff --git a/sal/qa/rtl/logfile/rtl_logfile.cxx b/sal/qa/rtl/logfile/rtl_logfile.cxx
index 3360fc34d8cf..2b669478d010 100644
--- a/sal/qa/rtl/logfile/rtl_logfile.cxx
+++ b/sal/qa/rtl/logfile/rtl_logfile.cxx
@@ -237,7 +237,7 @@ public:
printf("Please remove logfile* manully! Error is Permision denied!");
#endif
}
- catch (CppUnit::Exception &e)
+ catch (const CppUnit::Exception &e)
{
printf("Exception caught in GlobalObject dtor(). Exception message: '%s'. Source line: %d\n", e.what(), e.sourceLine().lineNumber());
}
diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx
index ceb573f70b15..b5cc1caa5a73 100644
--- a/sal/qa/rtl/uri/rtl_testuri.cxx
+++ b/sal/qa/rtl/uri/rtl_testuri.cxx
@@ -368,7 +368,7 @@ void Test::test_Uri() {
aAbs = rtl::Uri::convertRelToAbs(
rtl::OUString::createFromAscii(aRelToAbsTest[i].pBase),
rtl::OUString::createFromAscii(aRelToAbsTest[i].pRel));
- } catch (rtl::MalformedUriException &) {
+ } catch (const rtl::MalformedUriException &) {
bMalformed = true;
}
if (bMalformed
diff --git a/sal/qa/systools/test_comtools.cxx b/sal/qa/systools/test_comtools.cxx
index 9f39b854c06d..f09a7b4189f7 100644
--- a/sal/qa/systools/test_comtools.cxx
+++ b/sal/qa/systools/test_comtools.cxx
@@ -198,7 +198,7 @@ namespace test_comtools
sal::systools::COMReference<IUnknown> r2 = r1.QueryInterface<IUnknown>(IID_IUnknown);
CPPUNIT_ASSERT_MESSAGE("Wrong reference count, 2 is expected", reinterpret_cast<COMObject*>(r2.get())->GetRefCount() == 2);
}
- catch(sal::systools::ComError& ex)
+ catch(const sal::systools::ComError& ex)
{
CPPUNIT_ASSERT_MESSAGE("Exception should not have been thrown", false);
}
@@ -211,7 +211,7 @@ namespace test_comtools
sal::systools::COMReference<IUnknown> r1 = comObjectSource();
sal::systools::COMReference<IPersistFile> r2 = r1.QueryInterface<IPersistFile>(IID_IPersistFile);
}
- catch(sal::systools::ComError& ex)
+ catch(const sal::systools::ComError& ex)
{
return;
}
diff --git a/sal/rtl/source/bootstrap.cxx b/sal/rtl/source/bootstrap.cxx
index ff42be9ec90b..6e3836b08356 100644
--- a/sal/rtl/source/bootstrap.cxx
+++ b/sal/rtl/source/bootstrap.cxx
@@ -993,7 +993,7 @@ rtl::OUString expandMacros(
try {
buf.append(
rtl::Uri::convertRelToAbs(seg[1], url));
- } catch (rtl::MalformedUriException &) {}
+ } catch (const rtl::MalformedUriException &) {}
}
} else {
buf.append(
diff --git a/sal/test/unloading/samplelib1.cxx b/sal/test/unloading/samplelib1.cxx
index 305ae0c23d48..7f25869156a8 100644
--- a/sal/test/unloading/samplelib1.cxx
+++ b/sal/test/unloading/samplelib1.cxx
@@ -170,7 +170,7 @@ extern "C" {
xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME4)));
return sal_True;
}
- catch (InvalidRegistryException &)
+ catch (const InvalidRegistryException &)
{
OSL_FAIL( "### InvalidRegistryException!" );
}