[Libreoffice-commits] .: 2 commits - sfx2/source

[Caolán McNamara]

 sfx2/source/appl/sfxhelp.cxx  |    2 +-
 sfx2/source/menu/virtmenu.cxx |    1 -
 sfx2/source/view/viewfrm.cxx  |    1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 22678414434901fb56993ee581f96c112a268d3c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 18 20:58:26 2011 +0000

    we seem to have lost the use of rLang after the merge

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 78272e7..da8b027 100755
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -704,7 +704,7 @@ XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* pWindow
 static bool impl_hasHelpInstalled( const rtl::OUString &rLang = rtl::OUString() )
 {
     String aHelpRootURL( DEFINE_CONST_OUSTRING("vnd.sun.star.help://") );
-    AppendConfigToken( aHelpRootURL, sal_True );
+    AppendConfigToken( aHelpRootURL, sal_True, rLang );
     Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aHelpRootURL );
 
     return ( aFactories.getLength() != 0 );
commit a45fc40179f43d976038c4f6ecd783f15a4d2709
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 18 20:49:01 2011 +0000

    unused variables

diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index fe1e30a..4eb3ca4 100755
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -324,7 +324,6 @@ void SfxVirtualMenu::CreateFromSVMenu()
 
     // Merge Addon popup menus into the SV Menu
     SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame();
-    SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool();
     Reference< com::sun::star::frame::XFrame > xFrame( pViewFrame->GetFrame().GetFrameInterface() );
 
     if ( pSVMenu->IsMenuBar() )
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 5a3ff89..630e450 100755
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -2916,7 +2916,6 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
 void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
 {
     DBG_MEMTEST();
-    bool bDone = false;
     switch ( rReq.GetSlot() )
     {
         case SID_STOP_RECORDING :