loplugin:unuseddefaultparam in framework

Change-Id: I4c5baa6f524e3382794c4844b7444904cc38584a

3 files changed, 5 insertions, 14 deletions

diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx
index e3b5b78b801f..3a8bcfbe9935 100644
--- a/framework/inc/dispatch/menudispatcher.hxx
+++ b/framework/inc/dispatch/menudispatcher.hxx
@@ -160,7 +160,7 @@ class MenuDispatcher   :        public  ::cppu::WeakImplHelper<
         /*-****************************************************************************************************
         *//*-*****************************************************************************************************/
 
-        bool impl_setMenuBar( MenuBar* pMenuBar, bool bMenuFromResource = false );
+        bool impl_setMenuBar( MenuBar* pMenuBar );
 
         /*-****************************************************************************************************
         *//*-*****************************************************************************************************/
diff --git a/framework/inc/threadhelp/gate.hxx b/framework/inc/threadhelp/gate.hxx
index 9ba5db898c56..f4eaec8f79f4 100644
--- a/framework/inc/threadhelp/gate.hxx
+++ b/framework/inc/threadhelp/gate.hxx
@@ -107,10 +107,8 @@ class Gate : private boost::noncopyable
             @seealso    method wait()
             @seealso    method open()
 
-            @param      "pTimeOut", optional parameter to wait a certain time
-
         *//*-*****************************************************************************************************/
-        void wait(const TimeValue* pTimeOut = nullptr)
+        void wait()
         {
             // We must safe access to our internal member!
             ::osl::ClearableMutexGuard aLock( m_aAccessLock );
@@ -122,7 +120,7 @@ class Gate : private boost::noncopyable
                 // and if we hold the access lock nobody else can use this object without a deadlock!
                 aLock.clear();
                 // Wait for opening gate...
-                m_aPassage.wait( pTimeOut );
+                m_aPassage.wait();
             }
         }
 
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index 90c9e6333d7d..739b30cb336c 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -209,7 +209,7 @@ void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAcce
     }
 }
 
-bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, bool bMenuFromResource )
+bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar )
 {
     uno::Reference< XFrame > xFrame( m_xOwnerWeak.get(), UNO_QUERY );
     if ( xFrame.is() )
@@ -261,14 +261,7 @@ bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, bool bMenuFromResource
                 }
 
                 // set new menu on our system window and create new menu manager
-                if ( bMenuFromResource )
-                {
-                    m_pMenuManager = new MenuManager( m_xContext, xFrame, pMenuBar, true, false );
-                }
-                else
-                {
-                    m_pMenuManager = new MenuManager( m_xContext, xFrame, pMenuBar, true, true );
-                }
+                m_pMenuManager = new MenuManager( m_xContext, xFrame, pMenuBar, true, true );
 
                 pSysWindow->SetMenuBar( pMenuBar );
             }