[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Aug 31 00:36:51 PDT 2012
vcl/source/window/builder.cxx | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
New commits:
commit 360b532ed5562c9831cb8d43852641c4a0f041c5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 30 13:03:44 2012 +0100
drop autoshow of all widgets, and honour visibility flag
Change-Id: I752c8be2830441114b747a809eb1a331ac19472a
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 50e6b94..d85966f 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -126,17 +126,6 @@ VclBuilder::VclBuilder(Window *pParent, rtl::OUString sUIDir, rtl::OUString sUIF
//drop maps, etc. now
delete m_pParserState;
-
- //auto-show (really necessary ?, maybe drop it when complete)
- for (std::vector<WinAndId>::iterator aI = m_aChildren.begin(),
- aEnd = m_aChildren.end(); aI != aEnd; ++aI)
- {
- Window *pWindow = aI->m_pWindow;
- if (pWindow)
- {
- pWindow->Show();
- }
- }
}
VclBuilder::~VclBuilder()
@@ -375,11 +364,13 @@ Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, const
if (!bIsPlaceHolder)
{
TabPage* pPage = new TabPage(pTabControl);
+ pPage->Show();
m_aChildren.push_back(WinAndId(rtl::OString(), pPage));
//And give the page one container as a child to make it a layout enabled
//tab page
VclBin* pContainer = new VclBin(pPage);
+ pContainer->Show();
m_aChildren.push_back(WinAndId(rtl::OString(), pContainer));
pParent = pContainer;
@@ -789,8 +780,6 @@ void VclBuilder::handleRow(xmlreader::XmlReader &reader, const rtl::OString &rID
{
int nLevel = 1;
- fprintf(stderr, "handleRow for %s\n", rID.getStr());
-
ListStore::row aRow;
while(1)
More information about the Libreoffice-commits
mailing list