[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - 3 commits - sc/UI_scalc.mk vcl/inc vcl/source vcl/uiconfig

[Libreoffice Gerrit user]

 sc/UI_scalc.mk                 |    2 +-
 vcl/inc/svids.hrc              |    2 --
 vcl/source/window/builder.cxx  |    1 +
 vcl/source/window/printdlg.cxx |    6 +++++-
 vcl/uiconfig/ui/printdialog.ui |    2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 3683ab3083f98a9744952042218d55036d5748a7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 11 10:35:03 2012 +0100

    missing helpids on brochure toggle
    
    Change-Id: I565ffdd359740198aeb2ed661383ba86c6f7a39e

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index d097d39..e8b9367 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -976,7 +976,6 @@ void PrintDialog::setupOptionalUI()
         {
             maNUpPage.mpBrochureBtn->SetText( aText );
             maNUpPage.mpBrochureBtn->Show();
-            setHelpText( maNUpPage.mpBrochureBtn, aHelpTexts, 0 );
 
             sal_Bool bVal = sal_False;
             PropertyValue* pVal = maPController->getValue( aPropertyName );
@@ -988,6 +987,11 @@ void PrintDialog::setupOptionalUI()
 
             maPropertyToWindowMap[ aPropertyName ].push_back( maNUpPage.mpBrochureBtn );
             maControlToPropertyMap[maNUpPage.mpBrochureBtn] = aPropertyName;
+
+            // set help id
+            setHelpId( maNUpPage.mpBrochureBtn, aHelpIds, 0 );
+            // set help text
+            setHelpText( maNUpPage.mpBrochureBtn, aHelpTexts, 0 );
         }
         else if (aCtrlType == "Bool")
         {
commit 1a2d12753503ef4388bfc53220ae32ab800198db
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 11 10:31:34 2012 +0100

    set a helpid on the tabpage container
    
    Change-Id: Ice461f5de76ecb5628682572c0b40736a29b9381

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 55e10ad..7125ca5 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -387,6 +387,7 @@ Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, const
             VclBin* pContainer = new VclBin(pPage);
             pContainer->Show();
             m_aChildren.push_back(WinAndId(rtl::OString(), pContainer));
+            pContainer->SetHelpId(m_sHelpRoot + sTabPageId + rtl::OString("-bin"));
             pParent = pContainer;
 
             pTabControl->SetTabPage(nNewPageId, pPage);
commit 729e8ef366f2541c4b4f67dedf3174f61ebecb95
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 11 08:48:24 2012 +0100

    rename expander for help and remove now unused hids
    
    Change-Id: I9c5b01efb0a233621732350f8aff432343931be8

diff --git a/sc/UI_scalc.mk b/sc/UI_scalc.mk
index c2b21a9..d5696e1 100644
--- a/sc/UI_scalc.mk
+++ b/sc/UI_scalc.mk
@@ -10,7 +10,7 @@
 $(eval $(call gb_UI_UI,modules/scalc))
 
 $(eval $(call gb_UI_add_uifiles,modules/scalc,\
-	sw/uiconfig/scalc/ui/printeroptions \
+	sc/uiconfig/scalc/ui/printeroptions \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index d7577bc..502e8ef 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -230,6 +230,4 @@
 #define SV_ICON_ID_FORMULA                     13
 #define SV_ICON_ID_PRINTERADMIN               501
 
-#define HID_PRINTDLG                        HID_VCL_START
-
 #endif  // _SV_SVIDS_HRC
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 26a2fad..7eb61ec 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -217,7 +217,7 @@
                                 <property name="hexpand">True</property>
                                 <property name="vexpand">True</property>
                                 <child>
-                                  <object class="GtkExpander" id="expander1">
+                                  <object class="GtkExpander" id="expander">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="hexpand">True</property>