[Libreoffice-commits] .: Branch 'feature/cmclayout' - 2 commits - sw/source vcl/source

[Caolán McNamara]

 sw/source/ui/misc/outline.hrc |    4 ++--
 vcl/source/window/builder.cxx |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 125cecd8fa6036986f1d442bc7d902b547c11e75
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 12 13:07:20 2012 +0100

    FT_CHARFMT and LB_CHARFMT shared the same resource id

diff --git a/sw/source/ui/misc/outline.hrc b/sw/source/ui/misc/outline.hrc
index 2f8a4a4..17dd319 100644
--- a/sw/source/ui/misc/outline.hrc
+++ b/sw/source/ui/misc/outline.hrc
@@ -84,7 +84,7 @@
 #define MN_FORM9        119
 #define MN_SAVE         120
 
-#define FL_LEVEL                130
+#define FL_LEVEL        130
 #define LB_LEVEL        131
 #define WIN_PREVIEW     132
 #define FT_SUFFIX       134
@@ -95,4 +95,4 @@
 
 #define ST_FORM         140
 #define FT_CHARFMT      141
-#define LB_CHARFMT      141
+#define LB_CHARFMT      142
commit 2e304c8d65a6a286a78074e40b7d66777cfe3cc3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 12 13:05:14 2012 +0100

    import placeholders as empty pages for tabcontrols

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 4877ebd..563322b 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -368,12 +368,12 @@ void VclBuilder::handleTabChild(Window *pParent, xmlreader::XmlReader &reader)
             break;
     }
 
+    TabControl *pTabControl = static_cast<TabControl*>(pParent);
     VclBuilder::stringmap::iterator aFind = aProperties.find(rtl::OString(RTL_CONSTASCII_STRINGPARAM("label")));
     if (aFind != aProperties.end())
-    {
-        TabControl *pTabControl = static_cast<TabControl*>(pParent);
         pTabControl->SetPageText(pTabControl->GetCurPageId(), rtl::OStringToOUString(aFind->second, RTL_TEXTENCODING_UTF8));
-    }
+    else
+        pTabControl->RemovePage(pTabControl->GetCurPageId());
 }
 
 void VclBuilder::handleChild(Window *pParent, xmlreader::XmlReader &reader)
@@ -407,7 +407,7 @@ void VclBuilder::handleChild(Window *pParent, xmlreader::XmlReader &reader)
 
         if (res == xmlreader::XmlReader::RESULT_BEGIN)
         {
-            if (name.equals(RTL_CONSTASCII_STRINGPARAM("object")))
+            if (name.equals(RTL_CONSTASCII_STRINGPARAM("object")) || name.equals(RTL_CONSTASCII_STRINGPARAM("placeholder")))
             {
                 pCurrentChild = handleObject(pParent, reader);