[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - vcl/source

[Libreoffice Gerrit user]

 vcl/source/window/builder.cxx |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 9b1439436bb39042e771c491cc9eaa5d014f8d90
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 5 14:27:59 2012 +0100

    want to be able to find tabpages by name
    
    Change-Id: I4e08ded38a4d1d9d193d5d7731c7ac667c70048c

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 7eb5d44..e7ad8a4 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -365,7 +365,8 @@ Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, const
         //ids and positive numbers for the handleTabChild
         //derived ids
         TabControl *pTabControl = static_cast<TabControl*>(pParent);
-        sal_uInt16 nNewPageId = -(pTabControl->GetPageCount()+1);
+        sal_uInt16 nNewPageCount = pTabControl->GetPageCount()+1;
+        sal_uInt16 nNewPageId = -nNewPageCount;
         pTabControl->InsertPage(nNewPageId, rtl::OUString());
         pTabControl->SetCurPageId(nNewPageId);
 
@@ -373,7 +374,13 @@ Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, const
         {
             TabPage* pPage = new TabPage(pTabControl);
             pPage->Show();
-            m_aChildren.push_back(WinAndId(rtl::OString(), pPage));
+
+            //Make up a name for it
+            rtl::OString sTabPageId = get_by_window(pParent) +
+                rtl::OString("-page") +
+                rtl::OString::valueOf(static_cast<sal_Int32>(nNewPageCount));
+            m_aChildren.push_back(WinAndId(sTabPageId, pPage));
+            pPage->SetHelpId(m_sHelpRoot + sTabPageId);
 
             //And give the page one container as a child to make it a layout enabled
             //tab page