[Libreoffice-commits] core.git: Branch 'feature/vclptr' - sw/source

[Noel Grandin]

 sw/source/uibase/utlui/condedit.cxx |    6 ++++++
 sw/source/uibase/utlui/numfmtlb.cxx |   19 +++++++++++++++++++
 2 files changed, 25 insertions(+)

New commits:
commit 5459c4a7312ce7bc0326978f4164441e76e5d5a4
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Apr 17 13:52:23 2015 +0200

    restore these extern methods, they are used by VclBuilder
    
    Change-Id: I4c20e941975b6eb872729b351eb1af901adba649

diff --git a/sw/source/uibase/utlui/condedit.cxx b/sw/source/uibase/utlui/condedit.cxx
index ca0c252..b15694b 100644
--- a/sw/source/uibase/utlui/condedit.cxx
+++ b/sw/source/uibase/utlui/condedit.cxx
@@ -34,6 +34,12 @@ ConditionEdit::ConditionEdit(vcl::Window* pParent, WinBits nStyle)
 {
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeConditionEdit(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+{
+    VclBuilder::ensureDefaultWidthChars(rMap);
+    return new ConditionEdit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK);
+}
+
 // Drop possible, respectively format known?
 
 sal_Int8 ConditionEdit::AcceptDrop( const AcceptDropEvent& /*rEvt*/ )
diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx
index 7710c70..64590d8 100644
--- a/sw/source/uibase/utlui/numfmtlb.cxx
+++ b/sw/source/uibase/utlui/numfmtlb.cxx
@@ -68,6 +68,25 @@ NumFormatListBox::NumFormatListBox(vcl::Window* pWin, WinBits nStyle) :
     Init(css::util::NumberFormat::NUMBER, true);
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeNumFormatListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
+{
+    WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK;
+
+    bool bDropdown = VclBuilder::extractDropdown(rMap);
+
+    if (bDropdown)
+        nBits |= WB_DROPDOWN;
+    else
+        nBits |= WB_BORDER;
+
+    NumFormatListBox* pListBox = new NumFormatListBox(pParent, nBits|WB_SIMPLEMODE);
+
+    if (bDropdown)
+        pListBox->EnableAutoSize(true);
+
+    return pListBox;
+}
+
 void NumFormatListBox::Init(short nFormatType, bool bUsrFmts)
 {
     SwView *pView = GetView();