From 18a9e9e844d2f3ebad52e6c45095e3c50422db1a Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 20 Apr 2012 23:37:14 +0200
Subject: Various clean up of previous commit

---
 cppuhelper/source/defaultbootstrap.cxx      | 6 +++---
 cppuhelper/source/servicefactory.cxx        | 2 +-
 cppuhelper/source/servicefactory_detail.hxx | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'cppuhelper')

diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx
index 8698f25b5695..4921011d54c3 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -1268,7 +1268,7 @@ void ServiceManager::readRdbFile(rtl::OUString const & uri, bool optional) {
     try {
         Parser(
             uri, css::uno::Reference< css::uno::XComponentContext >(), &data_);
-    } catch (css::container::NoSuchElementException &SB) {
+    } catch (css::container::NoSuchElementException &) {
         if (!optional) {
             throw css::uno::DeploymentException(
                 uri + ": no such file",
@@ -1279,7 +1279,7 @@ void ServiceManager::readRdbFile(rtl::OUString const & uri, bool optional) {
         throw css::uno::DeploymentException(
             "InvalidRegistryException: " + e.Message,
             static_cast< cppu::OWeakObject * >(this));
-    } catch (css::uno::RuntimeException &SB) {
+    } catch (css::uno::RuntimeException &) {
         if (!readLegacyRdbFile(uri)) {
             throw;
         }
@@ -1593,7 +1593,7 @@ bool ServiceManager::removeLegacyFactory(
     css::uno::Reference< css::lang::XComponent > comp;
     {
         osl::MutexGuard g(rBHelper.rMutex);
-        DynamicImplementations::const_iterator i(
+        DynamicImplementations::iterator i(
             data_.dynamicImplementations.find(factoryInfo));
         if (i == data_.dynamicImplementations.end()) {
             return isDisposed();
diff --git a/cppuhelper/source/servicefactory.cxx b/cppuhelper/source/servicefactory.cxx
index 2b7c9ede87c2..062e7ffe2d58 100644
--- a/cppuhelper/source/servicefactory.cxx
+++ b/cppuhelper/source/servicefactory.cxx
@@ -374,7 +374,7 @@ void addFactories(
 
 } // namespace
 
-SAL_DLLPUBLIC_EXPORT Reference< lang::XMultiComponentFactory > bootstrapInitialSF(
+Reference< lang::XMultiComponentFactory > bootstrapInitialSF(
     OUString const & rBootstrapPath )
     SAL_THROW( (Exception) )
 {
diff --git a/cppuhelper/source/servicefactory_detail.hxx b/cppuhelper/source/servicefactory_detail.hxx
index 89485b537d94..607bb58c36ac 100644
--- a/cppuhelper/source/servicefactory_detail.hxx
+++ b/cppuhelper/source/servicefactory_detail.hxx
@@ -53,6 +53,7 @@ void add_access_control_entries(
     rtl::Bootstrap const & bootstrap)
     SAL_THROW((com::sun::star::uno::Exception));
 
+SAL_DLLPUBLIC_EXPORT
 com::sun::star::uno::Reference< com::sun::star::lang::XMultiComponentFactory >
 bootstrapInitialSF(rtl::OUString const & rBootstrapPath)
     SAL_THROW((com::sun::star::uno::Exception));
-- 
cgit