convert hard-coded layout of char name tabpage to .ui

Change-Id: I20829b6a0835bf96489d67b6f7effcfa84650328

6 files changed, 14 insertions, 13 deletions

diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index 364e75211792..bd5cd6e535d8 100644
--- a/vcl/inc/vcl/builder.hxx
+++ b/vcl/inc/vcl/builder.hxx
@@ -42,7 +42,7 @@ class VCL_DLLPUBLIC VclBuilder
 {
 public:
     typedef std::map<rtl::OString, rtl::OString> stringmap;
-    typedef Window* (*customMakeWidget)(Window *pParent);
+    typedef Window* (*customMakeWidget)(Window *pParent, stringmap &rVec);
 private:
     struct WinAndId
     {
@@ -236,6 +236,10 @@ public:
     }
 };
 
+/*
+ * @return true if rValue is "True", "true", "1", etc.
+ */
+bool VCL_DLLPUBLIC toBool(const rtl::OString &rValue);
 
 #endif
 
diff --git a/vcl/inc/vcl/combobox.hxx b/vcl/inc/vcl/combobox.hxx
index 78fd8a83c12e..ccfb8c935839 100644
--- a/vcl/inc/vcl/combobox.hxx
+++ b/vcl/inc/vcl/combobox.hxx
@@ -114,7 +114,8 @@ public:
     Rectangle       GetDropDownPosSizePixel() const;
 
     void            SetDropDownLineCount( sal_uInt16 nLines );
-    sal_uInt16          GetDropDownLineCount() const;
+    sal_uInt16      GetDropDownLineCount() const;
+    void            SetBestDropDownLineCount() { SetDropDownLineCount(16); }
 
     void            EnableAutoSize( sal_Bool bAuto );
     sal_Bool            IsAutoSizeEnabled() const               { return mbDDAutoSize; }
diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx
index 278379dbe9f7..1b007159965c 100644
--- a/vcl/inc/vcl/layout.hxx
+++ b/vcl/inc/vcl/layout.hxx
@@ -471,11 +471,6 @@ private:
 };
 
 
-/*
- * @return true if rValue is "True", "true", "1", etc.
- */
-bool toBool(const rtl::OString &rValue);
-
 // retro-fitting utilities //
 
 //Get a Size which is large enough to contain all children with
diff --git a/vcl/inc/vcl/lstbox.hxx b/vcl/inc/vcl/lstbox.hxx
index 314f8d78a3a9..669f55ce7e22 100644
--- a/vcl/inc/vcl/lstbox.hxx
+++ b/vcl/inc/vcl/lstbox.hxx
@@ -111,7 +111,8 @@ public:
     Rectangle           GetDropDownPosSizePixel() const;
 
     void                SetDropDownLineCount( sal_uInt16 nLines );
-    sal_uInt16              GetDropDownLineCount() const;
+    sal_uInt16          GetDropDownLineCount() const;
+    void                SetBestDropDownLineCount() { SetDropDownLineCount(16);  }
 
     void                EnableAutoSize( sal_Bool bAuto );
     sal_Bool                IsAutoSizeEnabled() const { return mbDDAutoSize; }
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index e7ee11b3c821..d3fa857dc9ee 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -496,14 +496,14 @@ Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, const
     {
         extractModel(id, rMap);
         ListBox *pListBox = new ListBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK);
-        pListBox->SetDropDownLineCount(16); //arbitrary
+        pListBox->SetBestDropDownLineCount();
         pWindow = pListBox;
     }
     else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkComboBoxText")))
     {
         extractModel(id, rMap);
         ComboBox* pComboBox = new ComboBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK);
-        pComboBox->SetDropDownLineCount(16); //arbitrary
+        pComboBox->SetBestDropDownLineCount();
         pWindow = pComboBox;
     }
     else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkTreeView")))
@@ -549,7 +549,7 @@ Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, const
             aModule.loadRelative(&thisModule, sModule.makeStringAndClear());
             customMakeWidget pFunction = (customMakeWidget)aModule.getFunctionSymbol(sFunction);
             if (pFunction)
-                pWindow = (*pFunction)(pParent);
+                pWindow = (*pFunction)(pParent, rMap);
         }
     }
     if (!pWindow)
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index e8b9367ba53d..ad80b51f1500 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -62,12 +62,12 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::container;
 using namespace com::sun::star::beans;
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makePrintPreviewWindow(Window *pParent)
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makePrintPreviewWindow(Window *pParent, VclBuilder::stringmap &)
 {
     return new PrintDialog::PrintPreviewWindow(pParent);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeShowNupOrderWindow(Window *pParent)
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeShowNupOrderWindow(Window *pParent, VclBuilder::stringmap &)
 {
     return new PrintDialog::ShowNupOrderWindow(pParent);
 }