From f15b1d084eb026342e8d0440d5bfb3ac8f23f30c Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@gmail.com>
Date: Tue, 24 Jul 2012 13:03:22 -0400
Subject: It makes no sense to make these methods virtual.

LoadEnv doesn't have any child classes, and is not a UNO service.

Change-Id: I773324e10b755c6e5f1a29c07495b21f6a236a3e
---
 framework/source/inc/loadenv/loadenv.hxx | 20 ++++++++------------
 framework/source/loadenv/loadenv.cxx     |  4 ----
 2 files changed, 8 insertions(+), 16 deletions(-)

(limited to 'framework')

diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index 9ed683cdf887..75269e3c3f09 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -248,7 +248,7 @@ class LoadEnv : private ThreadHelpBase
 
         /** @short  deinitialize an instance of this class in the right way.
          */
-        virtual ~LoadEnv();
+        ~LoadEnv();
 
         //_______________________________________
 
@@ -315,14 +315,13 @@ class LoadEnv : private ThreadHelpBase
             @throw  A RuntimeException in case any internal process indicates, that
                     the whole runtime cant be used any longer.
          */
-        virtual void initializeLoading(const ::rtl::OUString&                                           sURL            ,
+        void initializeLoading(const ::rtl::OUString&                                           sURL            ,
                                        const css::uno::Sequence< css::beans::PropertyValue >&           lMediaDescriptor,
                                        const css::uno::Reference< css::frame::XFrame >&                 xBaseFrame      ,
                                        const ::rtl::OUString&                                           sTarget         ,
                                              sal_Int32                                                  nSearchFlags    ,
                                              EFeature                                                   eFeature        = E_NO_FEATURE         ,
-                                             EContentType                                               eContentType    = E_UNSUPPORTED_CONTENT)
-            throw(LoadEnvException, css::uno::RuntimeException);
+                                             EContentType                                               eContentType    = E_UNSUPPORTED_CONTENT);
 
         //_______________________________________
 
@@ -346,8 +345,7 @@ class LoadEnv : private ThreadHelpBase
             @throw  A RuntimeException in case any internal process indicates, that
                     the whole runtime cant be used any longer.
          */
-        virtual void startLoading()
-            throw(LoadEnvException, css::uno::RuntimeException);
+        void startLoading();
 
         //_______________________________________
 
@@ -371,21 +369,19 @@ class LoadEnv : private ThreadHelpBase
             @throw  A RuntimeException in case any internal process indicates, that
                     the whole runtime cant be used any longer.
          */
-        virtual sal_Bool waitWhileLoading(sal_uInt32 nTimeout = 0)
-            throw(LoadEnvException, css::uno::RuntimeException);
+        sal_Bool waitWhileLoading(sal_uInt32 nTimeout = 0);
 
         //_______________________________________
         /** TODO document me ... */
-        virtual void cancelLoading()
-            throw(LoadEnvException, css::uno::RuntimeException);
+        void cancelLoading();
 
         //_______________________________________
         /** TODO document me ... */
-        virtual css::uno::Reference< css::frame::XFrame > getTarget() const;
+        css::uno::Reference< css::frame::XFrame > getTarget() const;
 
         //_______________________________________
         /** TODO document me ... */
-        virtual css::uno::Reference< css::lang::XComponent > getTargetComponent() const;
+        css::uno::Reference< css::lang::XComponent > getTargetComponent() const;
 
 
     //___________________________________________
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index fc6e3138415f..35b85c5e6164 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -251,7 +251,6 @@ void LoadEnv::initializeLoading(const ::rtl::OUString&
                                       sal_Int32                                                  nSearchFlags    ,
                                       EFeature                                                   eFeature        , // => use default ...
                                       EContentType                                               eContentType    ) // => use default ...
-    throw(LoadEnvException, css::uno::RuntimeException)
 {
     // SAFE -> ----------------------------------
     WriteGuard aWriteLock(m_aLock);
@@ -377,7 +376,6 @@ void LoadEnv::initializeUIDefaults( const css::uno::Reference< css::lang::XMulti
 
 
 void LoadEnv::startLoading()
-    throw(LoadEnvException, css::uno::RuntimeException)
 {
     // SAFE ->
     ReadGuard aReadLock(m_aLock);
@@ -431,7 +429,6 @@ void LoadEnv::startLoading()
         Current implementation counts yield calls only ...
 -----------------------------------------------*/
 sal_Bool LoadEnv::waitWhileLoading(sal_uInt32 nTimeout)
-    throw(LoadEnvException, css::uno::RuntimeException)
 {
     // Because its not a good idea to block the main thread
     // (and we can't be sure that we are currently not used inside the
@@ -468,7 +465,6 @@ sal_Bool LoadEnv::waitWhileLoading(sal_uInt32 nTimeout)
 
 
 void LoadEnv::cancelLoading()
-    throw(LoadEnvException, css::uno::RuntimeException)
 {
     // PARTIAL(!) SAFE -> ------------------------------
     ReadGuard aReadLock(m_aLock);
-- 
cgit