diff options
37 files changed, 53 insertions, 78 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 73ed7747c48a..c1c2104b26ee 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -656,7 +656,7 @@ void SfxAccCfgLBoxString_Impl::Paint(const Point& aPos, SvTreeListBox& /*rDevice } -VCL_BUILDER_DECL_FACTORY(SfxAccCfgTabListBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSfxAccCfgTabListBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { WinBits nWinBits = WB_TABSTOP; diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 6ecf295bb80b..1fb06ab73da0 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -1164,9 +1164,8 @@ SentenceEditWindow_Impl::~SentenceEditWindow_Impl() disposeOnce(); } -VCL_BUILDER_DECL_FACTORY(SentenceEditWindow) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSentenceEditWindow(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { - (void)rMap; rRet = VclPtr<SentenceEditWindow_Impl>::Create(pParent, WB_BORDER|WB_VSCROLL|WB_IGNORETAB); } diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 27203a99ac7d..33ea45e806c0 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -898,9 +898,8 @@ void ColorConfigCtrl_Impl::dispose() VclVBox::dispose(); } -VCL_BUILDER_DECL_FACTORY(ColorConfigCtrl) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeColorConfigCtrl(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { - (void)rMap; rRet = VclPtr<ColorConfigCtrl_Impl>::Create(pParent); } diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 4353d654d5f9..e4037f7c0ae1 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -2446,7 +2446,7 @@ bool OfaAutoCompleteTabPage::AutoCompleteMultiListBox::PreNotify( return bHandled; } -VCL_BUILDER_DECL_FACTORY(AutoCompleteMultiListBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeAutoCompleteMultiListBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { WinBits nWinBits = WB_TABSTOP; diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 98ae9a091dcf..13ccc5e014d2 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -178,9 +178,8 @@ BackgroundPreviewImpl::BackgroundPreviewImpl(vcl::Window* pParent) Invalidate(aDrawRect); } -VCL_BUILDER_DECL_FACTORY(BackgroundPreview) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeBackgroundPreview(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { - (void)rMap; rRet = VclPtr<BackgroundPreviewImpl>::Create(pParent); } diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx index 3ce810781cdf..4f9329dcede0 100644 --- a/dbaccess/source/ui/control/curledit.cxx +++ b/dbaccess/source/ui/control/curledit.cxx @@ -34,9 +34,8 @@ OConnectionURLEdit::OConnectionURLEdit(vcl::Window* _pParent, WinBits _nBits,boo { } -VCL_BUILDER_DECL_FACTORY(ConnectionURLEdit) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeConnectionURLEdit(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { - (void)rMap; rRet = VclPtr<OConnectionURLEdit>::Create(pParent, WB_BORDER, false); } diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 7ee609eb94dd..b04ed9814cba 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -76,9 +76,8 @@ namespace dbaui { } - VCL_BUILDER_DECL_FACTORY(DbaIndexFieldsControl) + extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeDbaIndexFieldsControl(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { - (void)rMap; rRet = VclPtr<IndexFieldsControl>::Create(pParent, WB_BORDER | WB_NOTABSTOP); } diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index ce45a2b6ab79..f5c1f5f07c1c 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -150,9 +150,8 @@ void ExtBoxWithBtns_Impl::InitFromDialog(ExtMgrDialog *pParentDialog) m_pParent = pParentDialog; } -VCL_BUILDER_DECL_FACTORY(ExtBoxWithBtns) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeExtBoxWithBtns(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { - (void)rMap; rRet = VclPtr<ExtBoxWithBtns_Impl>::Create(pParent); } diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index b92485f4c44d..38db5652b192 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -754,9 +754,8 @@ Size ExtensionBox_Impl::GetOptimalSize() const return LogicToPixel(Size(250, 150), MapUnit::MapAppFont); } -VCL_BUILDER_DECL_FACTORY(ExtensionBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeExtensionBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { - (void)rMap; rRet = VclPtr<ExtensionBox_Impl>::Create(pParent); } diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index 295a7b78ad93..510af07d5597 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -411,9 +411,8 @@ RefEdit::RefEdit( vcl::Window* _pParent, vcl::Window* pShrinkModeLabel, WinBits aIdle.SetPriority( TaskPriority::LOW ); } -VCL_BUILDER_DECL_FACTORY(RefEdit) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeRefEdit(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { - (void)rMap; rRet = VclPtr<RefEdit>::Create(pParent, nullptr, WB_BORDER); } diff --git a/include/vcl/builderfactory.hxx b/include/vcl/builderfactory.hxx index fbb53cc5f89f..c2bada89ffe2 100644 --- a/include/vcl/builderfactory.hxx +++ b/include/vcl/builderfactory.hxx @@ -13,26 +13,22 @@ #include <vcl/vclptr.hxx> #include <vcl/builder.hxx> -#define VCL_BUILDER_DECL_FACTORY(typeName) \ - extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL \ - make##typeName(VclPtr<vcl::Window> &rRet, VclPtr<vcl::Window> &pParent, VclBuilder::stringmap &rMap) - #define VCL_BUILDER_FACTORY(typeName) \ - VCL_BUILDER_DECL_FACTORY(typeName) \ + extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL make##typeName(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) \ { \ (void)rMap; \ rRet = VclPtr<typeName>::Create(pParent); \ } #define VCL_BUILDER_FACTORY_ARGS(typeName,arg1) \ - VCL_BUILDER_DECL_FACTORY(typeName) \ + extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL make##typeName(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) \ { \ (void)rMap; \ rRet = VclPtr<typeName>::Create(pParent,arg1); \ } #define VCL_BUILDER_FACTORY_CONSTRUCTOR(typeName,arg2) \ - VCL_BUILDER_DECL_FACTORY(typeName) \ + extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL make##typeName(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) \ { \ OUString sBorder = VclBuilder::extractCustomProperty(rMap); \ WinBits wb = arg2; \ diff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx index ea8f112a83d6..1bbb5d649294 100644 --- a/sc/source/ui/cctrl/editfield.cxx +++ b/sc/source/ui/cctrl/editfield.cxx @@ -46,7 +46,7 @@ ScDoubleField::ScDoubleField( vcl::Window* pParent, WinBits nStyle ) : { } -VCL_BUILDER_DECL_FACTORY(ScDoubleField) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeScDoubleField(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { VclBuilder::ensureDefaultWidthChars(rMap); rRet = VclPtr<ScDoubleField>::Create(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index b2f690c73a70..6d04a06745f6 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -929,9 +929,8 @@ bool ScValidationDlg::RemoveRefDlg( bool bRestoreModal /* = true */ ) return true; } -VCL_BUILDER_DECL_FACTORY(ScRefButtonEx) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeScRefButtonEx(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { - (void)rMap; rRet = VclPtr<ScTPValidationValue::ScRefButtonEx>::Create(pParent, 0); } diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index 4cde7ff415ca..69f6a4e5a7d0 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -146,7 +146,7 @@ void ScTabBgColorDlg::ScTabBgColorValueSet::dispose() SvxColorValueSet::dispose(); } -VCL_BUILDER_DECL_FACTORY(ScTabBgColorValueSet) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeScTabBgColorValueSet(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { WinBits nWinBits = WB_TABSTOP; diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index a0a73ce8cae8..9c5cac6a5692 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -129,9 +129,8 @@ void ScEditWindow::dispose() Control::dispose(); } -VCL_BUILDER_DECL_FACTORY(ScEditWindow) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeScEditWindow(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { - (void)rMap; rRet = VclPtr<ScEditWindow>::Create(pParent, WB_BORDER|WB_TABSTOP, Left); } diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index d9ef75019f07..c7f10c300465 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -284,7 +284,7 @@ ContentListBox_Impl::ContentListBox_Impl(vcl::Window* pParent, WinBits nStyle) InitRoot(); } -VCL_BUILDER_DECL_FACTORY(ContentListBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeContentListBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { WinBits nWinStyle = WB_TABSTOP; OUString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -471,7 +471,7 @@ IndexBox_Impl::IndexBox_Impl(vcl::Window* pParent, WinBits nStyle) EnableUserDraw(true); } -VCL_BUILDER_DECL_FACTORY(IndexBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeIndexBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK; OUString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -847,9 +847,8 @@ void IndexTabPage_Impl::OpenKeyword() // class SearchBox_Impl -------------------------------------------------- -VCL_BUILDER_DECL_FACTORY(SearchBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSearchBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { - (void)rMap; WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_DROPDOWN; VclPtrInstance<SearchBox_Impl> pComboBox(pParent, nWinBits); pComboBox->EnableAutoSize(true); @@ -879,7 +878,7 @@ void SearchBox_Impl::Select() // class SearchResultsBox_Impl ------------------------------------------- -VCL_BUILDER_DECL_FACTORY(SearchResultsBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSearchResultsBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK; OUString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -1140,7 +1139,7 @@ BookmarksBox_Impl::BookmarksBox_Impl(vcl::Window* pParent, WinBits nStyle) { } -VCL_BUILDER_DECL_FACTORY(BookmarksBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeBookmarksBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; OUString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index e10986bf6111..d6eab23ca041 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -115,9 +115,8 @@ void SfxPreviewWin_Impl::Paint(vcl::RenderContext& rRenderContext, const tools:: ImpPaint(rRenderContext, rRect, xMetaFile.get()); } -VCL_BUILDER_DECL_FACTORY(SfxPreviewWin) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSfxPreviewWin(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { - (void) rMap; rRet = VclPtr<SfxPreviewWin_Impl>::Create(pParent, 0); } diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index 2dc0c5910c62..1145f6b9e9ba 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -323,14 +323,14 @@ public: } }; -VCL_BUILDER_DECL_FACTORY(SidebarToolBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSidebarToolBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { VclPtrInstance<SidebarToolBox> pBox(pParent); pBox->InitToolBox(rMap); rRet = pBox; } -VCL_BUILDER_DECL_FACTORY(NotebookbarToolBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeNotebookbarToolBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { VclPtrInstance<NotebookbarToolBox> pBox(pParent); pBox->InitToolBox(rMap); diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index ba399b819d11..b711fff48d79 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -985,7 +985,7 @@ void SvtFileView::dispose() Control::dispose(); } -VCL_BUILDER_DECL_FACTORY(SvtFileView) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSvtFileView(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { WinBits nBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK; diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index ee034242c89a..3adf8c22f3f8 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -503,7 +503,7 @@ LineListBox::LineListBox( vcl::Window* pParent, WinBits nWinStyle ) : ImplInit(); } -VCL_BUILDER_DECL_FACTORY(LineListBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeLineListBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; @@ -703,7 +703,7 @@ FontNameBox::FontNameBox( vcl::Window* pParent, WinBits nWinStyle ) : InitFontMRUEntriesFile(); } -VCL_BUILDER_DECL_FACTORY(FontNameBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeFontNameBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; @@ -1093,7 +1093,7 @@ Size FontStyleBox::GetOptimalSize() const return ComboBox::GetOptimalSize(); } -VCL_BUILDER_DECL_FACTORY(FontStyleBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeFontStyleBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; @@ -1289,7 +1289,7 @@ FontSizeBox::FontSizeBox( vcl::Window* pParent, WinBits nWinSize ) : ImplInit(); } -VCL_BUILDER_DECL_FACTORY(FontSizeBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeFontSizeBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 94280239a044..2e0cb2b79c23 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -844,9 +844,8 @@ SvtURLBox::SvtURLBox( vcl::Window* pParent, WinBits _nStyle, INetProtocol eSmart Init(bSetDefaultHelpID); } -VCL_BUILDER_DECL_FACTORY(SvtURLBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSvtURLBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { - (void)rMap; WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP| WB_DROPDOWN|WB_AUTOSIZE|WB_AUTOHSCROLL; VclPtrInstance<SvtURLBox> pListBox(pParent, nWinBits, INetProtocol::NotValid, false); diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx index 75dbf99815e8..ec253542c6b8 100644 --- a/svtools/source/control/urlcontrol.cxx +++ b/svtools/source/control/urlcontrol.cxx @@ -31,9 +31,8 @@ namespace svt DisableHistory(); } - VCL_BUILDER_DECL_FACTORY(OFileURLControl) + extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeOFileURLControl(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { - (void)rMap; WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP| WB_DROPDOWN|WB_AUTOSIZE|WB_AUTOHSCROLL; VclPtrInstance<OFileURLControl> pListBox(pParent, nWinBits); diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 6926e8e268dc..09dffac31784 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -1032,7 +1032,7 @@ HatchingLB::HatchingLB( vcl::Window* pParent, WinBits nWinStyle) SetEdgeBlending(true); } -VCL_BUILDER_DECL_FACTORY(HatchingLB) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeHatchingLB(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; OUString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -1072,7 +1072,7 @@ GradientLB::GradientLB( vcl::Window* pParent, WinBits aWB) SetEdgeBlending(true); } -VCL_BUILDER_DECL_FACTORY(GradientLB) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeGradientLB(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; OUString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -1112,7 +1112,7 @@ BitmapLB::BitmapLB( vcl::Window* pParent, WinBits aWB) SetEdgeBlending(true); } -VCL_BUILDER_DECL_FACTORY(BitmapLB) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeBitmapLB(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; OUString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -1246,7 +1246,7 @@ LineLB::LineLB(vcl::Window* pParent, WinBits aWB) // No EdgeBlending for LineStyle/Dash SetEdgeBlending(true); } -VCL_BUILDER_DECL_FACTORY(LineLB) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeLineLB(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_TABSTOP; @@ -1344,7 +1344,7 @@ LineEndLB::LineEndLB( vcl::Window* pParent, WinBits aWB ) // No EdgeBlending for LineEnds SetEdgeBlending(true); } -VCL_BUILDER_DECL_FACTORY(LineEndLB) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeLineEndLB(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_TABSTOP; diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx index d4fccb836360..a2d3eaa7075a 100644 --- a/svx/source/dialog/frmdirlbox.cxx +++ b/svx/source/dialog/frmdirlbox.cxx @@ -41,9 +41,8 @@ FrameDirectionListBox::FrameDirectionListBox( vcl::Window* pParent, WinBits nBit { } -VCL_BUILDER_DECL_FACTORY(FrameDirectionListBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeFrameDirectionListBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { - (void)rMap; VclPtrInstance<FrameDirectionListBox> pListBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP); pListBox->EnableAutoSize(true); rRet = pListBox; diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index c2bdd0c6d655..7886c117ddf8 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -810,9 +810,8 @@ FrameSelector::~FrameSelector() disposeOnce(); } -VCL_BUILDER_DECL_FACTORY(SvxFrameSelector) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSvxFrameSelector(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { - (void)rMap; rRet = VclPtr<FrameSelector>::Create(pParent); } diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 2cb2ec5e7d7a..b6ef358e6a9d 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -110,7 +110,7 @@ static bool lcl_SeqHasLang( const Sequence< sal_Int16 > & rLangSeq, sal_Int16 nL return i >= 0 && i < nLen; } -VCL_BUILDER_DECL_FACTORY(SvxLanguageBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSvxLanguageBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; bool bDropdown = VclBuilder::extractDropdown(rMap); @@ -123,7 +123,7 @@ VCL_BUILDER_DECL_FACTORY(SvxLanguageBox) rRet = pLanguageBox; } -VCL_BUILDER_DECL_FACTORY(SvxLanguageComboBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSvxLanguageComboBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; bool bDropdown = VclBuilder::extractDropdown(rMap); diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index 867086467d8d..b99bc88aad80 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -36,7 +36,7 @@ SvxRelativeField::SvxRelativeField( SetMax( 9999 ); } -VCL_BUILDER_DECL_FACTORY(SvxRelativeField) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSvxRelativeField(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { OUString const custom(VclBuilder::extractCustomProperty(rMap)); FieldUnit const eUnit(VclBuilder::detectUnit(custom)); diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 72250ca8eb8a..7434c5e1e3e3 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -39,7 +39,7 @@ SvxTextEncodingBox::SvxTextEncodingBox( vcl::Window* pParent, WinBits nBits ) m_pEncTable = new SvxTextEncodingTable; } -VCL_BUILDER_DECL_FACTORY(SvxTextEncodingBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSvxTextEncodingBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; bool bDropdown = VclBuilder::extractDropdown(rMap); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index ff98cdd0cf58..2a542d3b7da0 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -980,7 +980,7 @@ void CaptionComboBox::KeyInput(const KeyEvent& rEvt) ComboBox::KeyInput(rEvt); } -VCL_BUILDER_DECL_FACTORY(CaptionComboBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeCaptionComboBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { WinBits nBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK; bool bDropdown = VclBuilder::extractDropdown(rMap); diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 403594c84add..4ed69955cde8 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -110,9 +110,8 @@ SwAddressControl_Impl::SwAddressControl_Impl(vcl::Window* pParent, WinBits nBits m_pScrollBar->EnableDrag(); } -VCL_BUILDER_DECL_FACTORY(SwAddressControlImpl) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSwAddressControlImpl(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { - (void)rMap; rRet = VclPtr<SwAddressControl_Impl>::Create(pParent, WB_BORDER | WB_DIALOGCONTROL); } diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index b9dbc7541054..a421c24d6e93 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -1256,7 +1256,7 @@ SelectionListBox::SelectionListBox(vcl::Window* pParent, WinBits nStyle) { } -VCL_BUILDER_DECL_FACTORY(SelectionListBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSelectionListBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK; diff --git a/sw/source/uibase/cctrl/actctrl.cxx b/sw/source/uibase/cctrl/actctrl.cxx index e71f49a94ccc..1a8c5ece9efb 100644 --- a/sw/source/uibase/cctrl/actctrl.cxx +++ b/sw/source/uibase/cctrl/actctrl.cxx @@ -56,7 +56,7 @@ void ReturnActionEdit::KeyInput( const KeyEvent& rEvt) Edit::KeyInput(rEvt); } -VCL_BUILDER_DECL_FACTORY(ReturnActionEdit) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeReturnActionEdit(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { VclBuilder::ensureDefaultWidthChars(rMap); rRet = VclPtr<ReturnActionEdit>::Create(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx index 7d5c066cbf73..38f836e9ea88 100644 --- a/sw/source/uibase/misc/numberingtypelistbox.cxx +++ b/sw/source/uibase/misc/numberingtypelistbox.cxx @@ -58,9 +58,8 @@ bool SwNumberingTypeListBox::set_property(const OString &rKey, const OUString &r return true; } -VCL_BUILDER_DECL_FACTORY(SwNumberingTypeListBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSwNumberingTypeListBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { - (void)rMap; VclPtrInstance<SwNumberingTypeListBox> pListBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP); pListBox->EnableAutoSize(true); rRet = pListBox; diff --git a/sw/source/uibase/utlui/condedit.cxx b/sw/source/uibase/utlui/condedit.cxx index 5b910de5373b..a44d2af15ecb 100644 --- a/sw/source/uibase/utlui/condedit.cxx +++ b/sw/source/uibase/utlui/condedit.cxx @@ -34,7 +34,7 @@ ConditionEdit::ConditionEdit(vcl::Window* pParent, WinBits nStyle) { } -VCL_BUILDER_DECL_FACTORY(ConditionEdit) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeConditionEdit(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { VclBuilder::ensureDefaultWidthChars(rMap); rRet = VclPtr<ConditionEdit>::Create(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx index eb3ba32b892b..47aaa7b5fa7e 100644 --- a/sw/source/uibase/utlui/numfmtlb.cxx +++ b/sw/source/uibase/utlui/numfmtlb.cxx @@ -66,7 +66,7 @@ NumFormatListBox::NumFormatListBox(vcl::Window* pWin, WinBits nStyle) : Init(); } -VCL_BUILDER_DECL_FACTORY(NumFormatListBox) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeNumFormatListBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK; diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index a5e64593cdee..c8769355051b 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -3882,9 +3882,8 @@ void DisclosureButton::KeyInput( const KeyEvent& rKEvt ) CheckBox::KeyInput( rKEvt ); } -VCL_BUILDER_DECL_FACTORY(SmallButton) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSmallButton(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { - (void)rMap; rRet = VclPtr<PushButton>::Create(pParent, WB_CLIPCHILDREN|WB_CENTER|WB_VCENTER|WB_FLATBUTTON|WB_SMALLSTYLE); } diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 07c26f5c24ab..7c03f58eee8c 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -54,15 +54,13 @@ using namespace com::sun::star::lang; using namespace com::sun::star::container; using namespace com::sun::star::beans; -VCL_BUILDER_DECL_FACTORY(PrintPreviewWindow) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makePrintPreviewWindow(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { - (void)rMap; rRet = VclPtr<PrintDialog::PrintPreviewWindow>::Create(pParent); } -VCL_BUILDER_DECL_FACTORY(ShowNupOrderWindow) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeShowNupOrderWindow(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) { - (void)rMap; rRet = VclPtr<PrintDialog::ShowNupOrderWindow>::Create(pParent); } |