[Libreoffice-commits] .: 2 commits - cui/source cui/uiconfig formula/source sd/source sfx2/inc

[Libreoffice Gerrit user]

 cui/source/tabpages/backgrnd.cxx  |    4 +---
 cui/uiconfig/ui/backgroundpage.ui |    2 --
 formula/source/ui/dlg/formula.cxx |    5 ++---
 sd/source/ui/dlg/animobjs.cxx     |    3 +++
 sfx2/inc/sfx2/basedlgs.hxx        |   10 ++++++++++
 5 files changed, 16 insertions(+), 8 deletions(-)

New commits:
commit 08706f37737a2b5c92ef3c6e492b152e75fcd11b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 24 16:08:10 2013 +0000

    restore the helpid for impress animation dialog after initialization
    
    Document and centralize the uses of undoing the helpid clear after
    helpid->uniqueid hack
    
    Change-Id: I4e651235407a0eca26dc0acfc089ef8f8ce57b13

diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index dc58a5a..f76feaa 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -1744,9 +1744,8 @@ FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
                                             , this, _pFunctionMgr, _pDlg))
 {
     FreeResource();
-    if(GetHelpId().isEmpty())    //Hack which hides the HelpId for a model Dialog in SfxModelessDialog
-        SetHelpId(GetUniqueId());   //and will be changed in a UniqueId,
-                                    //at this point we reverse it.
+    //undo SfxModelessDialog HelpId clear hack
+    reverseUniqueHelpIdHack(*this);
     SetText(m_pImpl->aTitle1);
 }
 
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 7dde8b4..0c26014 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -24,6 +24,7 @@
 #include <svl/eitem.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdogrp.hxx>
+#include <sfx2/basedlgs.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/progress.hxx>
 #include <vcl/msgbox.hxx>
@@ -162,6 +163,8 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings,
 {
     aCtlDisplay.SetAccessibleName(String (SdResId(STR_DISPLAY)));
     FreeResource();
+    //undo SfxDockingWindow HelpId clear hack
+    reverseUniqueHelpIdHack(*this);
 
     // neues Dokument mit Seite erzeugen
     pMyDoc = new SdDrawDocument(DOCUMENT_TYPE_IMPRESS, NULL);
diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx
index c3684e5..fe86e3d 100644
--- a/sfx2/inc/sfx2/basedlgs.hxx
+++ b/sfx2/inc/sfx2/basedlgs.hxx
@@ -40,6 +40,16 @@ class HelpButton;
 class Button;
 class FixedLine;
 
+//There is a hack which hides the HelpId for a Dialog in SfxModelessDialog
+//and SfxDockingWindow, where it is changed into a UniqueId and cleared
+//This reverses the clear of the HelpId
+
+SFX2_DLLPUBLIC inline void reverseUniqueHelpIdHack(Window &rWindow)
+{
+    if (rWindow.GetHelpId().isEmpty())
+        rWindow.SetHelpId(rWindow.GetUniqueId());
+}
+
 // class SfxModalDialog --------------------------------------------------
 
 class SFX2_DLLPUBLIC SfxModalDialog: public ModalDialog
commit eeecaf597ae2fb45ab575fd6aab5fcbe3428c033
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 24 15:55:29 2013 +0000

    set mnemonic widgets in background page
    
    Change-Id: I6af5f5580ad0f1acb202484bf56593c332997fe8

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 74fa10d..afad498 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1530,7 +1530,6 @@ void SvxBackgroundTabPage::ShowTblControl()
     m_pTblLBox->SelectEntryPos(0);
     m_pTblDesc->Show();
     m_pTblLBox->Show();
-    m_pTblDesc->set_mnemonic_widget(m_pTblLBox);
 }
 
 //-----------------------------------------------------------------------
@@ -1539,11 +1538,10 @@ void SvxBackgroundTabPage::ShowParaControl(sal_Bool bCharOnly)
 {
     m_pParaLBox->SetSelectHdl(HDL(ParaDestinationHdl_Impl));
     m_pParaLBox->SelectEntryPos(0);
-    if (!bCharOnly)
+    if(!bCharOnly)
     {
         m_pTblDesc->Show();
         m_pParaLBox->Show();
-        m_pTblDesc->set_mnemonic_widget(m_pParaLBox);
     }
     m_pParaLBox->SetData(m_pParaLBox); // here it can be recognized that this mode is turned on
 }
diff --git a/cui/uiconfig/ui/backgroundpage.ui b/cui/uiconfig/ui/backgroundpage.ui
index b0fc516..462cb13 100644
--- a/cui/uiconfig/ui/backgroundpage.ui
+++ b/cui/uiconfig/ui/backgroundpage.ui
@@ -27,7 +27,6 @@
             <property name="no_show_all">True</property>
             <property name="label" translatable="yes">A_s</property>
             <property name="use_underline">True</property>
-            <property name="mnemonic_widget">selectlb</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -174,7 +173,6 @@
                         <property name="no_show_all">True</property>
                         <property name="label" translatable="yes">_Transparency</property>
                         <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">transparencymf:0%</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>