[Libreoffice-commits] core.git: 4 commits - basctl/source basic/source compilerplugins/clang connectivity/source cui/source dbaccess/source desktop/source formula/source include/vcl scripting/source sc/source sfx2/source svtools/source svx/source sw/source vcl/source vcl/unx
Stephan Bergmann
sbergman at redhat.com
Tue Jul 4 06:15:37 UTC 2017
basctl/source/basicide/register.cxx | 4
basctl/source/dlged/dlgedfunc.cxx | 3
basic/source/classes/sbunoobj.cxx | 4
basic/source/inc/rtlproto.hxx | 647 +++++++++-----------
basic/source/runtime/inputbox.cxx | 5
basic/source/runtime/methods.cxx | 549 +++-------------
basic/source/runtime/methods1.cxx | 420 ++----------
basic/source/runtime/props.cxx | 481 ++------------
compilerplugins/clang/casttovoid.cxx | 17
connectivity/source/drivers/firebird/Services.cxx | 3
cui/source/customize/acccfg.cxx | 2
cui/source/customize/cfg.cxx | 4
cui/source/dialogs/SpellDialog.cxx | 3
cui/source/dialogs/screenshotannotationdlg.cxx | 4
cui/source/options/optcolor.cxx | 3
cui/source/tabpages/autocdlg.cxx | 2
cui/source/tabpages/backgrnd.cxx | 3
dbaccess/source/ui/control/curledit.cxx | 3
dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 3
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 3
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 3
formula/source/ui/dlg/funcutl.cxx | 3
include/vcl/builderfactory.hxx | 10
sc/source/ui/cctrl/editfield.cxx | 2
sc/source/ui/dbgui/validate.cxx | 3
sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 2
sc/source/ui/pagedlg/tphfedit.cxx | 3
scripting/source/protocolhandler/scripthandler.cxx | 4
sfx2/source/appl/newhelp.cxx | 11
sfx2/source/doc/new.cxx | 3
sfx2/source/sidebar/SidebarToolBox.cxx | 4
svtools/source/contnr/fileview.cxx | 2
svtools/source/control/ctrlbox.cxx | 8
svtools/source/control/inettbc.cxx | 3
svtools/source/control/urlcontrol.cxx | 3
svx/source/dialog/dlgctrl.cxx | 10
svx/source/dialog/frmdirlbox.cxx | 3
svx/source/dialog/frmsel.cxx | 3
svx/source/dialog/langbox.cxx | 4
svx/source/dialog/relfld.cxx | 2
svx/source/dialog/txencbox.cxx | 2
svx/source/tbxctrls/tbcontrl.cxx | 3
sw/source/ui/config/optload.cxx | 2
sw/source/ui/dbui/createaddresslistdialog.cxx | 3
sw/source/ui/fldui/fldvar.cxx | 2
sw/source/uibase/cctrl/actctrl.cxx | 2
sw/source/uibase/misc/numberingtypelistbox.cxx | 3
sw/source/uibase/utlui/condedit.cxx | 2
sw/source/uibase/utlui/numfmtlb.cxx | 2
vcl/source/control/button.cxx | 3
vcl/source/window/printdlg.cxx | 6
vcl/unx/generic/gdi/gdiimpl.cxx | 11
vcl/unx/gtk3/gtk3gtkframe.cxx | 3
53 files changed, 702 insertions(+), 1591 deletions(-)
New commits:
commit dfc0dc4801707b2d8080af1540625b43bd463e17
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jul 4 08:14:20 2017 +0200
loplugin:casttovoid: fix containsPreprocessingConditionalInclusion()
...and re-enable plugin
Change-Id: I0b42cfc0f0b45711e714e6661ae9dd39f05f8960
diff --git a/compilerplugins/clang/casttovoid.cxx b/compilerplugins/clang/casttovoid.cxx
index 37608adcdc3f..01d1e65e3363 100644
--- a/compilerplugins/clang/casttovoid.cxx
+++ b/compilerplugins/clang/casttovoid.cxx
@@ -390,8 +390,21 @@ private:
}
bool containsPreprocessingConditionalInclusion(SourceRange range) {
+ auto const begin = compiler.getSourceManager().getExpansionLoc(
+ range.getBegin());
+ auto const end = compiler.getSourceManager().getExpansionLoc(
+ range.getEnd());
+ assert(begin.isFileID() && end.isFileID());
+ if (!(begin == end
+ || compiler.getSourceManager().isBeforeInTranslationUnit(
+ begin, end)))
+ {
+ // Conservatively assume "yes" if lexing fails (e.g., due to
+ // macros):
+ return true;
+ }
auto hash = false;
- for (auto loc = range.getBegin();;) {
+ for (auto loc = begin;;) {
Token tok;
if (Lexer::getRawToken(
loc, tok, compiler.getSourceManager(),
@@ -487,7 +500,7 @@ private:
}
};
-static loplugin::Plugin::Registration<Visitor> reg("casttovoid", false);
+static loplugin::Plugin::Registration<Visitor> reg("casttovoid");
}
commit f1cef09fcda11e321f8b01ab4600c28339dec45a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jul 4 08:13:10 2017 +0200
loplugin:casttovoid
...cases that were initially missed due to the broken
containsProcessingConditionalInclusion()
Change-Id: Ib7d801ab5173ee590ef35a9e075d3ce4d4aa06da
diff --git a/basctl/source/basicide/register.cxx b/basctl/source/basicide/register.cxx
index 30e06909c618..22d06f80bb2d 100644
--- a/basctl/source/basicide/register.cxx
+++ b/basctl/source/basicide/register.cxx
@@ -34,10 +34,8 @@ extern "C" {
SAL_DLLPUBLIC_EXPORT void* SAL_CALL basctl_component_getFactory( const sal_Char* pImplementationName,
void* pServiceManager,
- void* pRegistryKey )
+ void* )
{
- (void)pRegistryKey;
-
// Set default return value for this operation - if it failed.
void* pReturn = nullptr ;
diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx
index 3da94728b3bc..d0bb7dc6e6b4 100644
--- a/basctl/source/dlged/dlgedfunc.cxx
+++ b/basctl/source/dlged/dlgedfunc.cxx
@@ -27,9 +27,8 @@
namespace basctl
{
-IMPL_LINK( DlgEdFunc, ScrollTimeout, Timer *, pTimer, void )
+IMPL_LINK_NOARG( DlgEdFunc, ScrollTimeout, Timer *, void )
{
- (void)pTimer;
vcl::Window& rWindow = rParent.GetWindow();
Point aPos = rWindow.ScreenToOutputPixel( rWindow.GetPointerPosPixel() );
aPos = rWindow.PixelToLogic( aPos );
diff --git a/connectivity/source/drivers/firebird/Services.cxx b/connectivity/source/drivers/firebird/Services.cxx
index 5a55c0f0703f..5f2c2e2fc9d5 100644
--- a/connectivity/source/drivers/firebird/Services.cxx
+++ b/connectivity/source/drivers/firebird/Services.cxx
@@ -80,9 +80,8 @@ struct ProviderRequest
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL firebird_sdbc_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
- void* pRegistryKey)
+ void*)
{
- (void) pRegistryKey;
void* pRet = nullptr;
if (pServiceManager)
{
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index a02a4d713243..d4788d7bf6ed 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -5128,10 +5128,8 @@ uno::Reference< graphic::XGraphic> SvxIconSelectorDialog::GetSelectedIcon()
return result;
}
-IMPL_LINK( SvxIconSelectorDialog, SelectHdl, ToolBox *, pToolBox, void )
+IMPL_LINK_NOARG( SvxIconSelectorDialog, SelectHdl, ToolBox *, void )
{
- (void)pToolBox;
-
ToolBox::ImplToolItems::size_type nCount = pTbSymbol->GetItemCount();
for (ToolBox::ImplToolItems::size_type n = 0; n < nCount; ++n )
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx
index eee87b28d7ed..d29e6995f7a4 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -312,10 +312,8 @@ ScreenshotAnnotationDlg_Impl::~ScreenshotAnnotationDlg_Impl()
mpVirtualBufferDevice.disposeAndClear();
}
-IMPL_LINK(ScreenshotAnnotationDlg_Impl, saveButtonHandler, Button*, pButton, void)
+IMPL_LINK_NOARG(ScreenshotAnnotationDlg_Impl, saveButtonHandler, Button*, void)
{
- (void)pButton;
-
// 'save screenshot...' pressed, offer to save maParentDialogBitmap
// as PNG image, use *.id file name as screenshot file name offering
OString aDerivedFileName;
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index 0dadac6520fb..08c226a62ad6 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -475,10 +475,8 @@ extern "C"
{
SAL_DLLPUBLIC_EXPORT void* SAL_CALL protocolhandler_component_getFactory( const sal_Char * pImplementationName ,
void * pServiceManager ,
- void * pRegistryKey )
+ void * )
{
- (void)pRegistryKey;
-
// Set default return value for this operation - if it failed.
void * pReturn = nullptr ;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 648c8b0cff7c..7f9e0523056c 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3293,9 +3293,8 @@ void SvxColorListBox::ShowPreview(const NamedColor &rColor)
SetText(rColor.second);
}
-IMPL_LINK(SvxColorListBox, MenuActivateHdl, MenuButton *, pBtn, void)
+IMPL_LINK_NOARG(SvxColorListBox, MenuActivateHdl, MenuButton *, void)
{
- (void)pBtn;
if (!m_xColorWindow || m_xColorWindow->isDisposed())
createColorWindow();
}
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index 421bab8dcc61..f218ef2d95c7 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -910,14 +910,13 @@ bool X11SalGraphicsImpl::drawAlphaBitmap( const SalTwoRect& rTR,
}
bool X11SalGraphicsImpl::drawTransformedBitmap(
- const basegfx::B2DPoint& rNull,
- const basegfx::B2DPoint& rX,
- const basegfx::B2DPoint& rY,
- const SalBitmap& rSourceBitmap,
- const SalBitmap* pAlphaBitmap)
+ const basegfx::B2DPoint&,
+ const basegfx::B2DPoint&,
+ const basegfx::B2DPoint&,
+ const SalBitmap&,
+ const SalBitmap*)
{
// here direct support for transformed bitmaps can be implemented
- (void)rNull; (void)rX; (void)rY; (void)rSourceBitmap; (void)pAlphaBitmap;
return false;
}
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 5236ee407f04..a5d05e40bc21 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -2396,9 +2396,8 @@ void GtkSalFrame::SetParent( SalFrame* pNewParent )
);
}
-bool GtkSalFrame::SetPluginParent( SystemParentData* pSysParent )
+bool GtkSalFrame::SetPluginParent( SystemParentData* )
{
- (void)pSysParent;
//FIXME: no SetPluginParent impl. for gtk3
return false;
}
commit 0cc53919440f150f4bfedb7a5b88cdb0cf3317dc
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jul 4 08:12:27 2017 +0200
loplugin:casttovoid in VCL_BUILDER_DECL_FACTORY
Change-Id: I4b0dd08963cf50daa41901975c6f92fe21db2048
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);
}
commit 56dcc7b65f0d9d0dd02486d0e9e6be366248c3f5
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jul 3 21:10:28 2017 +0200
loplugin:casttovoid in RTLFUNC
Change-Id: I810278640936e9b3c73f56a37e8c4786fd2790e3
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 0a74cf022eea..ee745c711848 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -4017,10 +4017,8 @@ sal_Bool SAL_CALL InvocationToAllListenerMapper::hasProperty(const OUString& Nam
// create Uno-Service
// 1. Parameter == Prefix-Name of the macro
// 2. Parameter == fully qualified name of the listener
-RTLFUNC(CreateUnoListener)
+void SbRtl_CreateUnoListener(StarBASIC * pBasic, SbxArray & rPar, bool)
{
- (void)bWrite;
-
// We need 2 parameters
if ( rPar.Count() != 3 )
{
diff --git a/basic/source/inc/rtlproto.hxx b/basic/source/inc/rtlproto.hxx
index aceff7393dfe..69119342a716 100644
--- a/basic/source/inc/rtlproto.hxx
+++ b/basic/source/inc/rtlproto.hxx
@@ -22,340 +22,339 @@
#include <basic/sbstar.hxx>
-#define RTLFUNC( name ) void SbRtl_##name( StarBASIC* pBasic, SbxArray& rPar, bool bWrite )
#define RTLNAME( name ) &SbRtl_##name
typedef void( *RtlCall ) ( StarBASIC* p, SbxArray& rArgs, bool bWrite );
// Properties
-extern RTLFUNC(Date);
-extern RTLFUNC(Err);
-extern RTLFUNC(Erl);
-extern RTLFUNC(False);
-extern RTLFUNC(Empty);
-extern RTLFUNC(Nothing);
-extern RTLFUNC(Null);
-extern RTLFUNC(True);
-
-extern RTLFUNC(ATTR_NORMAL);
-extern RTLFUNC(ATTR_READONLY);
-extern RTLFUNC(ATTR_HIDDEN);
-extern RTLFUNC(ATTR_SYSTEM);
-extern RTLFUNC(ATTR_VOLUME);
-extern RTLFUNC(ATTR_DIRECTORY);
-extern RTLFUNC(ATTR_ARCHIVE);
-
-extern RTLFUNC(V_EMPTY);
-extern RTLFUNC(V_NULL);
-extern RTLFUNC(V_INTEGER);
-extern RTLFUNC(V_LONG);
-extern RTLFUNC(V_SINGLE);
-extern RTLFUNC(V_DOUBLE);
-extern RTLFUNC(V_CURRENCY);
-extern RTLFUNC(V_DATE);
-extern RTLFUNC(V_STRING);
-
-extern RTLFUNC(MB_OK);
-extern RTLFUNC(MB_OKCANCEL);
-extern RTLFUNC(MB_ABORTRETRYIGNORE);
-extern RTLFUNC(MB_YESNOCANCEL);
-extern RTLFUNC(MB_YESNO);
-extern RTLFUNC(MB_RETRYCANCEL);
-extern RTLFUNC(MB_ICONSTOP);
-extern RTLFUNC(MB_ICONQUESTION);
-extern RTLFUNC(MB_ICONEXCLAMATION);
-extern RTLFUNC(MB_ICONINFORMATION);
-extern RTLFUNC(MB_DEFBUTTON1);
-extern RTLFUNC(MB_DEFBUTTON2);
-extern RTLFUNC(MB_DEFBUTTON3);
-extern RTLFUNC(MB_APPLMODAL);
-extern RTLFUNC(MB_SYSTEMMODAL);
-
-extern RTLFUNC(IDOK);
-extern RTLFUNC(IDCANCEL);
-extern RTLFUNC(IDABORT);
-extern RTLFUNC(IDRETRY);
-extern RTLFUNC(IDYES);
-extern RTLFUNC(IDNO);
-
-extern RTLFUNC(CF_TEXT);
-extern RTLFUNC(CF_BITMAP);
-extern RTLFUNC(CF_METAFILEPICT);
-
-extern RTLFUNC(PI);
-
-extern RTLFUNC(SET_OFF);
-extern RTLFUNC(SET_ON);
-extern RTLFUNC(TOGGLE);
-
-extern RTLFUNC(TYP_AUTHORFLD);
-extern RTLFUNC(TYP_CHAPTERFLD);
-extern RTLFUNC(TYP_CONDTXTFLD);
-extern RTLFUNC(TYP_DATEFLD);
-extern RTLFUNC(TYP_DBFLD);
-extern RTLFUNC(TYP_DBNAMEFLD);
-extern RTLFUNC(TYP_DBNEXTSETFLD);
-extern RTLFUNC(TYP_DBNUMSETFLD);
-extern RTLFUNC(TYP_DBSETNUMBERFLD);
-extern RTLFUNC(TYP_DDEFLD);
-extern RTLFUNC(TYP_DOCINFOFLD);
-extern RTLFUNC(TYP_DOCSTATFLD);
-extern RTLFUNC(TYP_EXTUSERFLD);
-extern RTLFUNC(TYP_FILENAMEFLD);
-extern RTLFUNC(TYP_FIXDATEFLD);
-extern RTLFUNC(TYP_FIXTIMEFLD);
-extern RTLFUNC(TYP_FORMELFLD);
-extern RTLFUNC(TYP_GETFLD);
-extern RTLFUNC(TYP_GETREFFLD);
-extern RTLFUNC(TYP_HIDDENPARAFLD);
-extern RTLFUNC(TYP_HIDDENTXTFLD);
-extern RTLFUNC(TYP_INPUTFLD);
-extern RTLFUNC(TYP_MACROFLD);
-extern RTLFUNC(TYP_NEXTPAGEFLD);
-extern RTLFUNC(TYP_PAGENUMBERFLD);
-extern RTLFUNC(TYP_POSTITFLD);
-extern RTLFUNC(TYP_PREVPAGEFLD);
-extern RTLFUNC(TYP_SEQFLD);
-extern RTLFUNC(TYP_SETFLD);
-extern RTLFUNC(TYP_SETINPFLD);
-extern RTLFUNC(TYP_SETREFFLD);
-extern RTLFUNC(TYP_TEMPLNAMEFLD);
-extern RTLFUNC(TYP_TIMEFLD);
-extern RTLFUNC(TYP_USERFLD);
-extern RTLFUNC(TYP_USRINPFLD);
-extern RTLFUNC(TYP_SETREFPAGEFLD);
-extern RTLFUNC(TYP_GETREFPAGEFLD);
-extern RTLFUNC(TYP_INTERNETFLD);
-extern RTLFUNC(TYP_JUMPEDITFLD);
-
-extern RTLFUNC(FRAMEANCHORPAGE);
-extern RTLFUNC(FRAMEANCHORPARA);
-extern RTLFUNC(FRAMEANCHORCHAR);
-
-extern RTLFUNC(CLEAR_ALLTABS);
-extern RTLFUNC(CLEAR_TAB);
-extern RTLFUNC(SET_TAB);
+extern void SbRtl_Date(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Err(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Erl(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_False(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Empty(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Nothing(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Null(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_True(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+
+extern void SbRtl_ATTR_NORMAL(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_ATTR_READONLY(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_ATTR_HIDDEN(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_ATTR_SYSTEM(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_ATTR_VOLUME(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_ATTR_DIRECTORY(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_ATTR_ARCHIVE(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+
+extern void SbRtl_V_EMPTY(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_V_NULL(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_V_INTEGER(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_V_LONG(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_V_SINGLE(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_V_DOUBLE(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_V_CURRENCY(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_V_DATE(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_V_STRING(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+
+extern void SbRtl_MB_OK(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_MB_OKCANCEL(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_MB_ABORTRETRYIGNORE(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_MB_YESNOCANCEL(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_MB_YESNO(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_MB_RETRYCANCEL(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_MB_ICONSTOP(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_MB_ICONQUESTION(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_MB_ICONEXCLAMATION(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_MB_ICONINFORMATION(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_MB_DEFBUTTON1(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_MB_DEFBUTTON2(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_MB_DEFBUTTON3(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_MB_APPLMODAL(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_MB_SYSTEMMODAL(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+
+extern void SbRtl_IDOK(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_IDCANCEL(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_IDABORT(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_IDRETRY(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_IDYES(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_IDNO(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+
+extern void SbRtl_CF_TEXT(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_CF_BITMAP(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_CF_METAFILEPICT(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+
+extern void SbRtl_PI(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+
+extern void SbRtl_SET_OFF(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_SET_ON(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TOGGLE(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+
+extern void SbRtl_TYP_AUTHORFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_CHAPTERFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_CONDTXTFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_DATEFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_DBFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_DBNAMEFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_DBNEXTSETFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_DBNUMSETFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_DBSETNUMBERFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_DDEFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_DOCINFOFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_DOCSTATFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_EXTUSERFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_FILENAMEFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_FIXDATEFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_FIXTIMEFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_FORMELFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_GETFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_GETREFFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_HIDDENPARAFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_HIDDENTXTFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_INPUTFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_MACROFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_NEXTPAGEFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_PAGENUMBERFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_POSTITFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_PREVPAGEFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_SEQFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_SETFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_SETINPFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_SETREFFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_TEMPLNAMEFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_TIMEFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_USERFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_USRINPFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_SETREFPAGEFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_GETREFPAGEFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_INTERNETFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TYP_JUMPEDITFLD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+
+extern void SbRtl_FRAMEANCHORPAGE(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_FRAMEANCHORPARA(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_FRAMEANCHORCHAR(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+
+extern void SbRtl_CLEAR_ALLTABS(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_CLEAR_TAB(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_SET_TAB(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
// Methoden
-extern RTLFUNC(CreateObject);
-extern RTLFUNC(Error);
-extern RTLFUNC(Sin);
-extern RTLFUNC(Abs);
-extern RTLFUNC(Asc);
-extern RTLFUNC(Atn);
-extern RTLFUNC(Chr);
-extern RTLFUNC(ChrW);
-extern RTLFUNC(Cos);
-extern RTLFUNC(CurDir);
-extern RTLFUNC(ChDir); // JSM
-extern RTLFUNC(ChDrive); // JSM
-extern RTLFUNC(FileCopy); // JSM
-extern RTLFUNC(Kill); // JSM
-extern RTLFUNC(MkDir); // JSM
-extern RTLFUNC(RmDir); // JSM
-extern RTLFUNC(SendKeys); // JSM
-extern RTLFUNC(DDB);
-extern RTLFUNC(DimArray);
-extern RTLFUNC(Dir);
-extern RTLFUNC(DoEvents);
-extern RTLFUNC(Exp);
-extern RTLFUNC(FileLen);
-extern RTLFUNC(Fix);
-extern RTLFUNC(FV);
-extern RTLFUNC(Hex);
-extern RTLFUNC(Input);
-extern RTLFUNC(InStr);
-extern RTLFUNC(InStrRev);
-extern RTLFUNC(Int);
-extern RTLFUNC(IPmt);
-extern RTLFUNC(IRR);
-extern RTLFUNC(Join);
-extern RTLFUNC(LCase);
-extern RTLFUNC(Left);
-extern RTLFUNC(Log);
-extern RTLFUNC(LTrim);
-extern RTLFUNC(Mid);
-extern RTLFUNC(MIRR);
-extern RTLFUNC(NPer);
-extern RTLFUNC(NPV);
-extern RTLFUNC(Oct);
-extern RTLFUNC(Pmt);
-extern RTLFUNC(PPmt);
-extern RTLFUNC(PV);
-extern RTLFUNC(Rate);
-extern RTLFUNC(Replace);
-extern RTLFUNC(Right);
-extern RTLFUNC(RTrim);
-extern RTLFUNC(RTL);
-extern RTLFUNC(Sgn);
-extern RTLFUNC(SLN);
-extern RTLFUNC(Space);
-extern RTLFUNC(Split);
-extern RTLFUNC(Sqr);
-extern RTLFUNC(Str);
-extern RTLFUNC(StrComp);
-extern RTLFUNC(String);
-extern RTLFUNC(StrReverse);
-extern RTLFUNC(SYD);
-extern RTLFUNC(Tab);
-extern RTLFUNC(Tan);
-extern RTLFUNC(UCase);
-extern RTLFUNC(Val);
-extern RTLFUNC(Len);
-extern RTLFUNC(Spc);
-extern RTLFUNC(DateSerial);
-extern RTLFUNC(TimeSerial);
-extern RTLFUNC(DateValue);
-extern RTLFUNC(TimeValue);
-extern RTLFUNC(Day);
-extern RTLFUNC(Hour);
-extern RTLFUNC(Minute);
-extern RTLFUNC(Month);
-extern RTLFUNC(MonthName);
-extern RTLFUNC(Now);
-extern RTLFUNC(Second);
-extern RTLFUNC(Time);
-extern RTLFUNC(Timer);
-extern RTLFUNC(Weekday);
-extern RTLFUNC(WeekdayName);
-extern RTLFUNC(Year);
-extern RTLFUNC(InputBox);
-extern RTLFUNC(Me);
-extern RTLFUNC(MsgBox);
-extern RTLFUNC(IsArray);
-extern RTLFUNC(IsDate);
-extern RTLFUNC(IsEmpty);
-extern RTLFUNC(IsError);
-extern RTLFUNC(IsNull);
-extern RTLFUNC(IsNumeric);
-extern RTLFUNC(IsObject);
-extern RTLFUNC(IsUnoStruct);
-
-extern RTLFUNC(FileDateTime);
-extern RTLFUNC(Format);
-extern RTLFUNC(GetAttr);
-extern RTLFUNC(Randomize); // JSM
-extern RTLFUNC(Round);
-extern RTLFUNC(Frac);
-extern RTLFUNC(Rnd);
-extern RTLFUNC(Shell);
-extern RTLFUNC(VarType);
-extern RTLFUNC(TypeName);
-extern RTLFUNC(TypeLen);
-
-extern RTLFUNC(EOF);
-extern RTLFUNC(FileAttr);
-extern RTLFUNC(Loc);
-extern RTLFUNC(Lof);
-extern RTLFUNC(Seek);
-extern RTLFUNC(SetAttr); // JSM
-extern RTLFUNC(Reset); // JSM
-
-extern RTLFUNC(DDEInitiate);
-extern RTLFUNC(DDETerminate);
-extern RTLFUNC(DDETerminateAll);
-extern RTLFUNC(DDERequest);
-extern RTLFUNC(DDEExecute);
-extern RTLFUNC(DDEPoke);
-
-extern RTLFUNC(FreeFile);
-extern RTLFUNC(IsMissing);
-extern RTLFUNC(LBound);
-extern RTLFUNC(UBound);
-extern RTLFUNC(RGB);
-extern RTLFUNC(QBColor);
-extern RTLFUNC(StrConv);
-
-extern RTLFUNC(Beep);
-
-extern RTLFUNC(Load);
-extern RTLFUNC(Unload);
-extern RTLFUNC(LoadPicture);
-extern RTLFUNC(SavePicture);
-
-extern RTLFUNC(CallByName);
-extern RTLFUNC(CBool); // JSM
-extern RTLFUNC(CByte); // JSM
-extern RTLFUNC(CCur); // JSM
-extern RTLFUNC(CDate); // JSM
-extern RTLFUNC(CDbl); // JSM
-extern RTLFUNC(CInt); // JSM
-extern RTLFUNC(CLng); // JSM
-extern RTLFUNC(CSng); // JSM
-extern RTLFUNC(CStr); // JSM
-extern RTLFUNC(CVar); // JSM
-extern RTLFUNC(CVErr); // JSM
-
-extern RTLFUNC(Iif); // JSM
-
-extern RTLFUNC(DumpAllObjects);
-
-extern RTLFUNC(GetSystemType);
-extern RTLFUNC(GetGUIType);
-extern RTLFUNC(Red);
-extern RTLFUNC(Green);
-extern RTLFUNC(Blue);
-
-extern RTLFUNC(Switch);
-extern RTLFUNC(Wait);
+extern void SbRtl_CreateObject(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Error(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Sin(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Abs(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Asc(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Atn(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Chr(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_ChrW(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Cos(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_CurDir(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_ChDir(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); // JSM
+extern void SbRtl_ChDrive(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); // JSM
+extern void SbRtl_FileCopy(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); // JSM
+extern void SbRtl_Kill(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); // JSM
+extern void SbRtl_MkDir(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); // JSM
+extern void SbRtl_RmDir(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); // JSM
+extern void SbRtl_SendKeys(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); // JSM
+extern void SbRtl_DDB(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_DimArray(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Dir(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_DoEvents(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Exp(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_FileLen(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Fix(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_FV(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Hex(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Input(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_InStr(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_InStrRev(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Int(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_IPmt(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_IRR(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Join(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_LCase(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Left(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Log(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_LTrim(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Mid(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_MIRR(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_NPer(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_NPV(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Oct(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Pmt(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_PPmt(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_PV(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Rate(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Replace(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Right(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_RTrim(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_RTL(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Sgn(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_SLN(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Space(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Split(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Sqr(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Str(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_StrComp(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_String(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_StrReverse(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_SYD(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Tab(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Tan(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_UCase(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Val(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Len(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Spc(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_DateSerial(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TimeSerial(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_DateValue(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TimeValue(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Day(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Hour(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Minute(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Month(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_MonthName(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Now(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Second(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Time(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Timer(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Weekday(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_WeekdayName(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Year(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_InputBox(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Me(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_MsgBox(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_IsArray(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_IsDate(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_IsEmpty(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_IsError(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_IsNull(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_IsNumeric(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_IsObject(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_IsUnoStruct(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+
+extern void SbRtl_FileDateTime(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Format(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_GetAttr(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Randomize(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); // JSM
+extern void SbRtl_Round(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Frac(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Rnd(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Shell(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_VarType(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TypeName(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TypeLen(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+
+extern void SbRtl_EOF(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_FileAttr(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Loc(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Lof(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Seek(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_SetAttr(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); // JSM
+extern void SbRtl_Reset(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); // JSM
+
+extern void SbRtl_DDEInitiate(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_DDETerminate(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_DDETerminateAll(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_DDERequest(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_DDEExecute(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_DDEPoke(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+
+extern void SbRtl_FreeFile(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_IsMissing(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_LBound(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_UBound(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_RGB(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_QBColor(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_StrConv(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+
+extern void SbRtl_Beep(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+
+extern void SbRtl_Load(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Unload(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_LoadPicture(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_SavePicture(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+
+extern void SbRtl_CallByName(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_CBool(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); // JSM
+extern void SbRtl_CByte(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); // JSM
+extern void SbRtl_CCur(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); // JSM
+extern void SbRtl_CDate(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); // JSM
+extern void SbRtl_CDbl(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); // JSM
+extern void SbRtl_CInt(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); // JSM
+extern void SbRtl_CLng(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); // JSM
+extern void SbRtl_CSng(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); // JSM
+extern void SbRtl_CStr(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); // JSM
+extern void SbRtl_CVar(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); // JSM
+extern void SbRtl_CVErr(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); // JSM
+
+extern void SbRtl_Iif(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); // JSM
+
+extern void SbRtl_DumpAllObjects(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+
+extern void SbRtl_GetSystemType(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_GetGUIType(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Red(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Green(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Blue(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+
+extern void SbRtl_Switch(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Wait(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
//i#64882# add new WaitUntil
-extern RTLFUNC(WaitUntil);
-extern RTLFUNC(FuncCaller);
-
-extern RTLFUNC(GetGUIVersion);
-extern RTLFUNC(Choose);
-extern RTLFUNC(Trim);
-
-extern RTLFUNC(DateAdd);
-extern RTLFUNC(DateDiff);
-extern RTLFUNC(DatePart);
-extern RTLFUNC(FormatDateTime);
-extern RTLFUNC(GetSolarVersion);
-extern RTLFUNC(TwipsPerPixelX);
-extern RTLFUNC(TwipsPerPixelY);
-extern RTLFUNC(FreeLibrary);
-extern RTLFUNC(Array);
-extern RTLFUNC(FindObject);
-extern RTLFUNC(FindPropertyObject);
-extern RTLFUNC(EnableReschedule);
-
-extern RTLFUNC(Put);
-extern RTLFUNC(Get);
-extern RTLFUNC(Environ);
-extern RTLFUNC(GetDialogZoomFactorX);
-extern RTLFUNC(GetDialogZoomFactorY);
-extern RTLFUNC(GetSystemTicks);
-extern RTLFUNC(GetPathSeparator);
-extern RTLFUNC(ResolvePath);
-extern RTLFUNC(CreateUnoStruct);
-extern RTLFUNC(CreateUnoService);
-extern RTLFUNC(CreateUnoServiceWithArguments);
-extern RTLFUNC(CreateUnoValue);
-extern RTLFUNC(GetProcessServiceManager);
-extern RTLFUNC(GetDefaultContext);
-extern RTLFUNC(CreatePropertySet);
-extern RTLFUNC(CreateUnoListener);
-extern RTLFUNC(HasUnoInterfaces);
-extern RTLFUNC(EqualUnoObjects);
-extern RTLFUNC(CreateUnoDialog);
-extern RTLFUNC(GlobalScope);
-extern RTLFUNC(FileExists);
-extern RTLFUNC(ConvertToUrl);
-extern RTLFUNC(ConvertFromUrl);
-extern RTLFUNC(CDateToUnoDate);
-extern RTLFUNC(CDateFromUnoDate);
-extern RTLFUNC(CDateToUnoTime);
-extern RTLFUNC(CDateFromUnoTime);
-extern RTLFUNC(CDateToUnoDateTime);
-extern RTLFUNC(CDateFromUnoDateTime);
-extern RTLFUNC(CDateToIso);
-extern RTLFUNC(CDateFromIso);
-extern RTLFUNC(CompatibilityMode);
-extern RTLFUNC(CDec);
-
-extern RTLFUNC(Partition); // Fong
+extern void SbRtl_WaitUntil(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_FuncCaller(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+
+extern void SbRtl_GetGUIVersion(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Choose(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Trim(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+
+extern void SbRtl_DateAdd(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_DateDiff(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_DatePart(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_FormatDateTime(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_GetSolarVersion(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TwipsPerPixelX(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_TwipsPerPixelY(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_FreeLibrary(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Array(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_FindObject(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_FindPropertyObject(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_EnableReschedule(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+
+extern void SbRtl_Put(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Get(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_Environ(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_GetDialogZoomFactorX(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_GetDialogZoomFactorY(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_GetSystemTicks(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_GetPathSeparator(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_ResolvePath(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_CreateUnoStruct(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_CreateUnoService(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_CreateUnoServiceWithArguments(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_CreateUnoValue(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_GetProcessServiceManager(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_GetDefaultContext(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_CreatePropertySet(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_CreateUnoListener(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_HasUnoInterfaces(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_EqualUnoObjects(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_CreateUnoDialog(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_GlobalScope(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_FileExists(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_ConvertToUrl(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_ConvertFromUrl(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_CDateToUnoDate(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_CDateFromUnoDate(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_CDateToUnoTime(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_CDateFromUnoTime(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_CDateToUnoDateTime(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_CDateFromUnoDateTime(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_CDateToIso(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_CDateFromIso(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_CompatibilityMode(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern void SbRtl_CDec(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+
+extern void SbRtl_Partition(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); // Fong
extern double Now_Impl();
extern void Wait_Impl( bool bDurationBased, SbxArray& rPar );
diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index 69d42a664aef..8f7fbb128eb5 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -147,11 +147,8 @@ IMPL_LINK_NOARG( SvRTLInputBox, CancelHdl, Button *, void )
// Syntax: String InputBox( Prompt, [Title], [Default] [, nXpos, nYpos ] )
-RTLFUNC(InputBox)
+void SbRtl_InputBox(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
sal_uInt32 nArgCount = rPar.Count();
if ( nArgCount < 2 )
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index aca8c7be6ae7..fcc14f684e73 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -179,10 +179,8 @@ static uno::Reference< ucb::XSimpleFileAccess3 > const & getFileAccess()
// CreateObject( class )
-RTLFUNC(CreateObject)
+void SbRtl_CreateObject(StarBASIC * pBasic, SbxArray & rPar, bool)
{
- (void)bWrite;
-
OUString aClass( rPar.Get( 1 )->GetOUString() );
SbxObjectRef p = SbxBase::CreateObject( aClass );
if( !p.is() )
@@ -197,10 +195,8 @@ RTLFUNC(CreateObject)
// Error( n )
-RTLFUNC(Error)
+void SbRtl_Error(StarBASIC * pBasic, SbxArray & rPar, bool)
{
- (void)bWrite;
-
if( !pBasic )
StarBASIC::Error( ERRCODE_BASIC_INTERNAL_ERROR );
else
@@ -254,11 +250,8 @@ RTLFUNC(Error)
// Sinus
-RTLFUNC(Sin)
+void SbRtl_Sin(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
else
@@ -269,11 +262,8 @@ RTLFUNC(Sin)
}
-RTLFUNC(Cos)
+void SbRtl_Cos(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
else
@@ -284,11 +274,8 @@ RTLFUNC(Cos)
}
-RTLFUNC(Atn)
+void SbRtl_Atn(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
else
@@ -299,11 +286,8 @@ RTLFUNC(Atn)
}
-RTLFUNC(Abs)
+void SbRtl_Abs(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -316,11 +300,8 @@ RTLFUNC(Abs)
}
-RTLFUNC(Asc)
+void SbRtl_Asc(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -367,23 +348,17 @@ void implChr( SbxArray& rPar, bool bChrW )
}
}
-RTLFUNC(Chr)
+void SbRtl_Chr(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
implChr( rPar, false/*bChrW*/ );
}
-RTLFUNC(ChrW)
+void SbRtl_ChrW(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
implChr( rPar, true/*bChrW*/ );
}
-RTLFUNC(CurDir)
+void SbRtl_CurDir(StarBASIC * pBasic, SbxArray & rPar, bool bWrite)
{
(void)pBasic;
(void)bWrite;
@@ -452,10 +427,8 @@ RTLFUNC(CurDir)
#endif
}
-RTLFUNC(ChDir)
+void SbRtl_ChDir(StarBASIC * pBasic, SbxArray & rPar, bool)
{
- (void)bWrite;
-
rPar.Get(0)->PutEmpty();
if (rPar.Count() == 2)
{
@@ -471,11 +444,8 @@ RTLFUNC(ChDir)
}
}
-RTLFUNC(ChDrive)
+void SbRtl_ChDrive(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
rPar.Get(0)->PutEmpty();
if (rPar.Count() != 2)
{
@@ -526,11 +496,8 @@ void implStepRenameOSL( const OUString& aSource, const OUString& aDest )
}
}
-RTLFUNC(FileCopy)
+void SbRtl_FileCopy(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
rPar.Get(0)->PutEmpty();
if (rPar.Count() == 3)
{
@@ -564,11 +531,8 @@ RTLFUNC(FileCopy)
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
}
-RTLFUNC(Kill)
+void SbRtl_Kill(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
rPar.Get(0)->PutEmpty();
if (rPar.Count() == 2)
{
@@ -606,7 +570,7 @@ RTLFUNC(Kill)
}
}
-RTLFUNC(MkDir)
+void SbRtl_MkDir(StarBASIC * pBasic, SbxArray & rPar, bool bWrite)
{
rPar.Get(0)->PutEmpty();
if (rPar.Count() == 2)
@@ -725,11 +689,8 @@ void implRemoveDirRecursive( const OUString& aDirPath )
}
-RTLFUNC(RmDir)
+void SbRtl_RmDir(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
rPar.Get(0)->PutEmpty();
if (rPar.Count() == 2)
{
@@ -778,20 +739,14 @@ RTLFUNC(RmDir)
}
}
-RTLFUNC(SendKeys)
+void SbRtl_SendKeys(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
rPar.Get(0)->PutEmpty();
StarBASIC::Error(ERRCODE_BASIC_NOT_IMPLEMENTED);
}
-RTLFUNC(Exp)
+void SbRtl_Exp(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if( rPar.Count() < 2 )
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
else
@@ -803,11 +758,8 @@ RTLFUNC(Exp)
}
}
-RTLFUNC(FileLen)
+void SbRtl_FileLen(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -845,11 +797,8 @@ RTLFUNC(FileLen)
}
-RTLFUNC(Hex)
+void SbRtl_Hex(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -867,10 +816,8 @@ RTLFUNC(Hex)
}
}
-RTLFUNC(FuncCaller)
+void SbRtl_FuncCaller(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
if ( SbiRuntime::isVBAEnabled() && GetSbData()->pInst && GetSbData()->pInst->pRun )
{
if ( GetSbData()->pInst->pRun->GetExternalCaller() )
@@ -889,11 +836,8 @@ RTLFUNC(FuncCaller)
}
// InStr( [start],string,string,[compare] )
-RTLFUNC(InStr)
+void SbRtl_InStr(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
std::size_t nArgCount = rPar.Count()-1;
if ( nArgCount < 2 )
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -962,11 +906,8 @@ RTLFUNC(InStr)
// InstrRev(string1, string2[, start[, compare]])
-RTLFUNC(InStrRev)
+void SbRtl_InStrRev(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
std::size_t nArgCount = rPar.Count()-1;
if ( nArgCount < 2 )
{
@@ -1046,11 +987,8 @@ RTLFUNC(InStrRev)
Fix( -2.8 ) = -2.0 <- !!
*/
-RTLFUNC(Int)
+void SbRtl_Int(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
else
@@ -1067,11 +1005,8 @@ RTLFUNC(Int)
}
-RTLFUNC(Fix)
+void SbRtl_Fix(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
else
@@ -1087,11 +1022,8 @@ RTLFUNC(Fix)
}
-RTLFUNC(LCase)
+void SbRtl_LCase(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -1105,11 +1037,8 @@ RTLFUNC(LCase)
}
}
-RTLFUNC(Left)
+void SbRtl_Left(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 3 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -1132,11 +1061,8 @@ RTLFUNC(Left)
}
}
-RTLFUNC(Log)
+void SbRtl_Log(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -1157,11 +1083,8 @@ RTLFUNC(Log)
}
}
-RTLFUNC(LTrim)
+void SbRtl_LTrim(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -1176,10 +1099,8 @@ RTLFUNC(LTrim)
// Mid( String, nStart, nLength )
-RTLFUNC(Mid)
+void SbRtl_Mid(StarBASIC *, SbxArray & rPar, bool bWrite)
{
- (void)pBasic;
-
int nArgCount = rPar.Count()-1;
if ( nArgCount < 2 )
{
@@ -1296,11 +1217,8 @@ RTLFUNC(Mid)
}
}
-RTLFUNC(Oct)
+void SbRtl_Oct(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -1323,11 +1241,8 @@ RTLFUNC(Oct)
// Replace(expression, find, replace[, start[, count[, compare]]])
-RTLFUNC(Replace)
+void SbRtl_Replace(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
std::size_t nArgCount = rPar.Count()-1;
if ( nArgCount < 3 || nArgCount > 6 )
{
@@ -1416,11 +1331,8 @@ RTLFUNC(Replace)
}
}
-RTLFUNC(Right)
+void SbRtl_Right(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 3 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -1444,18 +1356,13 @@ RTLFUNC(Right)
}
}
-RTLFUNC(RTL)
+void SbRtl_RTL(StarBASIC * pBasic, SbxArray & rPar, bool)
{
- (void)bWrite;
-
rPar.Get( 0 )->PutObject( pBasic->getRTL().get() );
}
-RTLFUNC(RTrim)
+void SbRtl_RTrim(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -1467,11 +1374,8 @@ RTLFUNC(RTrim)
}
}
-RTLFUNC(Sgn)
+void SbRtl_Sgn(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -1492,11 +1396,8 @@ RTLFUNC(Sgn)
}
}
-RTLFUNC(Space)
+void SbRtl_Space(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -1509,11 +1410,8 @@ RTLFUNC(Space)
}
}
-RTLFUNC(Spc)
+void SbRtl_Spc(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -1526,11 +1424,8 @@ RTLFUNC(Spc)
}
}
-RTLFUNC(Sqr)
+void SbRtl_Sqr(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -1549,11 +1444,8 @@ RTLFUNC(Sqr)
}
}
-RTLFUNC(Str)
+void SbRtl_Str(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -1613,11 +1505,8 @@ RTLFUNC(Str)
}
}
-RTLFUNC(StrComp)
+void SbRtl_StrComp(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 3 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -1680,11 +1569,8 @@ RTLFUNC(StrComp)
rPar.Get(0)->PutInteger( sal::static_int_cast< sal_Int16 >( nRetValue ) );
}
-RTLFUNC(String)
+void SbRtl_String(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -1712,11 +1598,8 @@ RTLFUNC(String)
}
}
-RTLFUNC(Tab)
+void SbRtl_Tab(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
else
@@ -1727,11 +1610,8 @@ RTLFUNC(Tab)
}
}
-RTLFUNC(Tan)
+void SbRtl_Tan(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -1743,11 +1623,8 @@ RTLFUNC(Tan)
}
}
-RTLFUNC(UCase)
+void SbRtl_UCase(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -1762,7 +1639,7 @@ RTLFUNC(UCase)
}
-RTLFUNC(Val)
+void SbRtl_Val(StarBASIC * pBasic, SbxArray & rPar, bool bWrite)
{
(void)pBasic;
(void)bWrite;
@@ -1865,11 +1742,8 @@ void SbxDateFromUNODate( SbxValue *pVal, const css::util::Date& aUnoDate)
}
// Function to convert date to UNO date (com.sun.star.util.Date)
-RTLFUNC(CDateToUnoDate)
+void SbRtl_CDateToUnoDate(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() != 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -1880,11 +1754,8 @@ RTLFUNC(CDateToUnoDate)
}
// Function to convert date from UNO date (com.sun.star.util.Date)
-RTLFUNC(CDateFromUnoDate)
+void SbRtl_CDateFromUnoDate(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() != 2 || rPar.Get(1)->GetType() != SbxOBJECT )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -1918,11 +1789,8 @@ void SbxDateFromUNOTime( SbxValue *pVal, const css::util::Time& aUnoTime)
}
// Function to convert date to UNO time (com.sun.star.util.Time)
-RTLFUNC(CDateToUnoTime)
+void SbRtl_CDateToUnoTime(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() != 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -1933,11 +1801,8 @@ RTLFUNC(CDateToUnoTime)
}
// Function to convert date from UNO time (com.sun.star.util.Time)
-RTLFUNC(CDateFromUnoTime)
+void SbRtl_CDateFromUnoTime(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() != 2 || rPar.Get(1)->GetType() != SbxOBJECT )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -1980,11 +1845,8 @@ void SbxDateFromUNODateTime( SbxValue *pVal, const css::util::DateTime& aUnoDT)
}
// Function to convert date to UNO date (com.sun.star.util.Date)
-RTLFUNC(CDateToUnoDateTime)
+void SbRtl_CDateToUnoDateTime(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() != 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -1995,11 +1857,8 @@ RTLFUNC(CDateToUnoDateTime)
}
// Function to convert date from UNO date (com.sun.star.util.Date)
-RTLFUNC(CDateFromUnoDateTime)
+void SbRtl_CDateFromUnoDateTime(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() != 2 || rPar.Get(1)->GetType() != SbxOBJECT )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -2015,11 +1874,8 @@ RTLFUNC(CDateFromUnoDateTime)
}
// Function to convert date to ISO 8601 date format YYYYMMDD
-RTLFUNC(CDateToIso)
+void SbRtl_CDateToIso(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() == 2 )
{
double aDate = rPar.Get(1)->GetDate();
@@ -2042,11 +1898,8 @@ RTLFUNC(CDateToIso)
// Function to convert date from ISO 8601 date format YYYYMMDD or YYYY-MM-DD
// And even YYMMDD for compatibility, sigh..
-RTLFUNC(CDateFromIso)
+void SbRtl_CDateFromIso(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() == 2 )
{
do
@@ -2129,11 +1982,8 @@ RTLFUNC(CDateFromIso)
}
}
-RTLFUNC(DateSerial)
+void SbRtl_DateSerial(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 4 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -2150,11 +2000,8 @@ RTLFUNC(DateSerial)
}
}
-RTLFUNC(TimeSerial)
+void SbRtl_TimeSerial(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 4 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -2178,11 +2025,8 @@ RTLFUNC(TimeSerial)
rPar.Get(0)->PutDate( implTimeSerial(nHour, nMinute, nSecond) ); // JSM
}
-RTLFUNC(DateValue)
+void SbRtl_DateValue(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -2249,11 +2093,8 @@ RTLFUNC(DateValue)
}
}
-RTLFUNC(TimeValue)
+void SbRtl_TimeValue(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -2294,11 +2135,8 @@ RTLFUNC(TimeValue)
}
}
-RTLFUNC(Day)
+void SbRtl_Day(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -2313,11 +2151,8 @@ RTLFUNC(Day)
}
}
-RTLFUNC(Year)
+void SbRtl_Year(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -2338,11 +2173,8 @@ sal_Int16 implGetHour( double dDate )
return nHour;
}
-RTLFUNC(Hour)
+void SbRtl_Hour(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -2355,11 +2187,8 @@ RTLFUNC(Hour)
}
}
-RTLFUNC(Minute)
+void SbRtl_Minute(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -2372,11 +2201,8 @@ RTLFUNC(Minute)
}
}
-RTLFUNC(Month)
+void SbRtl_Month(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -2402,11 +2228,8 @@ sal_Int16 implGetSecond( double dDate )
return nRet;
}
-RTLFUNC(Second)
+void SbRtl_Second(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -2435,19 +2258,15 @@ double Now_Impl()
// Date Now()
-RTLFUNC(Now)
+void SbRtl_Now(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
rPar.Get(0)->PutDate( Now_Impl() );
}
// Date Time()
-RTLFUNC(Time)
+void SbRtl_Time(StarBASIC *, SbxArray & rPar, bool bWrite)
{
- (void)pBasic;
-
if ( !bWrite )
{
tools::Time aTime( tools::Time::SYSTEM );
@@ -2499,11 +2318,8 @@ RTLFUNC(Time)
}
}
-RTLFUNC(Timer)
+void SbRtl_Timer(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
tools::Time aTime( tools::Time::SYSTEM );
long nSeconds = aTime.GetHour();
nSeconds *= 3600;
@@ -2513,10 +2329,8 @@ RTLFUNC(Timer)
}
-RTLFUNC(Date)
+void SbRtl_Date(StarBASIC *, SbxArray & rPar, bool bWrite)
{
- (void)pBasic;
-
if ( !bWrite )
{
Date aToday( Date::SYSTEM );
@@ -2559,11 +2373,8 @@ RTLFUNC(Date)
}
}
-RTLFUNC(IsArray)
+void SbRtl_IsArray(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -2574,11 +2385,8 @@ RTLFUNC(IsArray)
}
}
-RTLFUNC(IsObject)
+void SbRtl_IsObject(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -2605,11 +2413,8 @@ RTLFUNC(IsObject)
}
}
-RTLFUNC(IsDate)
+void SbRtl_IsDate(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -2642,11 +2447,8 @@ RTLFUNC(IsDate)
}
}
-RTLFUNC(IsEmpty)
+void SbRtl_IsEmpty(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -2670,11 +2472,8 @@ RTLFUNC(IsEmpty)
}
}
-RTLFUNC(IsError)
+void SbRtl_IsError(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -2706,11 +2505,8 @@ RTLFUNC(IsError)
}
}
-RTLFUNC(IsNull)
+void SbRtl_IsNull(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -2733,11 +2529,8 @@ RTLFUNC(IsNull)
}
}
-RTLFUNC(IsNumeric)
+void SbRtl_IsNumeric(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -2749,11 +2542,8 @@ RTLFUNC(IsNumeric)
}
-RTLFUNC(IsMissing)
+void SbRtl_IsMissing(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -2875,11 +2665,8 @@ bool isRootDir( const OUString& aDirURLStr )
return bRoot;
}
-RTLFUNC(Dir)
+void SbRtl_Dir(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
OUString aPath;
sal_uInt16 nParCount = rPar.Count();
@@ -3156,7 +2943,7 @@ RTLFUNC(Dir)
}
-RTLFUNC(GetAttr)
+void SbRtl_GetAttr(StarBASIC * pBasic, SbxArray & rPar, bool bWrite)
{
(void)pBasic;
(void)bWrite;
@@ -3261,11 +3048,8 @@ RTLFUNC(GetAttr)
}
-RTLFUNC(FileDateTime)
+void SbRtl_FileDateTime(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() != 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -3341,11 +3125,8 @@ RTLFUNC(FileDateTime)
}
-RTLFUNC(EOF)
+void SbRtl_EOF(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
// No changes for UCB
if ( rPar.Count() != 2 )
{
@@ -3381,11 +3162,8 @@ RTLFUNC(EOF)
}
}
-RTLFUNC(FileAttr)
+void SbRtl_FileAttr(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
// No changes for UCB
// #57064 Although this function doesn't operate with DirEntry, it is
// not touched by the adjustment to virtual URLs, as it only works on
@@ -3417,11 +3195,8 @@ RTLFUNC(FileAttr)
rPar.Get(0)->PutInteger( nRet );
}
}
-RTLFUNC(Loc)
+void SbRtl_Loc(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
// No changes for UCB
if ( rPar.Count() != 2 )
{
@@ -3465,11 +3240,8 @@ RTLFUNC(Loc)
}
}
-RTLFUNC(Lof)
+void SbRtl_Lof(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
// No changes for UCB
if ( rPar.Count() != 2 )
{
@@ -3494,11 +3266,8 @@ RTLFUNC(Lof)
}
-RTLFUNC(Seek)
+void SbRtl_Seek(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
// No changes for UCB
int nArgs = (int)rPar.Count();
if ( nArgs < 2 || nArgs > 3 )
@@ -3545,11 +3314,8 @@ RTLFUNC(Seek)
}
}
-RTLFUNC(Format)
+void SbRtl_Format(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
sal_uInt16 nArgCount = rPar.Count();
if ( nArgCount < 2 || nArgCount > 3 )
{
@@ -3603,11 +3369,8 @@ class theRandomNumberGenerator : public rtl::Static<RandomNumberGenerator, theRa
}
-RTLFUNC(Randomize)
+void SbRtl_Randomize(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() > 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -3620,11 +3383,8 @@ RTLFUNC(Randomize)
// without parameter, no need to do anything - RNG is seeded at first use
}
-RTLFUNC(Rnd)
+void SbRtl_Rnd(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() > 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -3647,11 +3407,8 @@ RTLFUNC(Rnd)
// Application::StartApp in Creator. Format: "xxxx2"
-RTLFUNC(Shell)
+void SbRtl_Shell(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
std::size_t nArgCount = rPar.Count();
if ( nArgCount < 2 || nArgCount > 5 )
{
@@ -3818,11 +3575,8 @@ RTLFUNC(Shell)
}
}
-RTLFUNC(VarType)
+void SbRtl_VarType(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() != 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -3954,11 +3708,8 @@ OUString getObjectTypeName( SbxVariable* pVar )
return sRet;
}
-RTLFUNC(TypeName)
+void SbRtl_TypeName(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() != 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -3985,11 +3736,8 @@ RTLFUNC(TypeName)
}
}
-RTLFUNC(Len)
+void SbRtl_Len(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() != 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -4001,11 +3749,8 @@ RTLFUNC(Len)
}
}
-RTLFUNC(DDEInitiate)
+void SbRtl_DDEInitiate(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
int nArgs = (int)rPar.Count();
if ( nArgs != 3 )
{
@@ -4028,11 +3773,8 @@ RTLFUNC(DDEInitiate)
}
}
-RTLFUNC(DDETerminate)
+void SbRtl_DDETerminate(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
rPar.Get(0)->PutEmpty();
int nArgs = (int)rPar.Count();
if ( nArgs != 2 )
@@ -4049,11 +3791,8 @@ RTLFUNC(DDETerminate)
}
}
-RTLFUNC(DDETerminateAll)
+void SbRtl_DDETerminateAll(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
rPar.Get(0)->PutEmpty();
int nArgs = (int)rPar.Count();
if ( nArgs != 1 )
@@ -4070,11 +3809,8 @@ RTLFUNC(DDETerminateAll)
}
}
-RTLFUNC(DDERequest)
+void SbRtl_DDERequest(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
int nArgs = (int)rPar.Count();
if ( nArgs != 3 )
{
@@ -4096,11 +3832,8 @@ RTLFUNC(DDERequest)
}
}
-RTLFUNC(DDEExecute)
+void SbRtl_DDEExecute(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
rPar.Get(0)->PutEmpty();
int nArgs = (int)rPar.Count();
if ( nArgs != 3 )
@@ -4118,11 +3851,8 @@ RTLFUNC(DDEExecute)
}
}
-RTLFUNC(DDEPoke)
+void SbRtl_DDEPoke(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
rPar.Get(0)->PutEmpty();
int nArgs = (int)rPar.Count();
if ( nArgs != 4 )
@@ -4142,11 +3872,8 @@ RTLFUNC(DDEPoke)
}
-RTLFUNC(FreeFile)
+void SbRtl_FreeFile(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() != 1 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -4167,11 +3894,8 @@ RTLFUNC(FreeFile)
StarBASIC::Error( ERRCODE_BASIC_TOO_MANY_FILES );
}
-RTLFUNC(LBound)
+void SbRtl_LBound(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
sal_uInt16 nParCount = rPar.Count();
if ( nParCount != 3 && nParCount != 2 )
{
@@ -4193,11 +3917,8 @@ RTLFUNC(LBound)
StarBASIC::Error( ERRCODE_BASIC_MUST_HAVE_DIMS );
}
-RTLFUNC(UBound)
+void SbRtl_UBound(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
sal_uInt16 nParCount = rPar.Count();
if ( nParCount != 3 && nParCount != 2 )
{
@@ -4220,11 +3941,8 @@ RTLFUNC(UBound)
StarBASIC::Error( ERRCODE_BASIC_MUST_HAVE_DIMS );
}
-RTLFUNC(RGB)
+void SbRtl_RGB(StarBASIC *, SbxArray & rPar, bool)
{
- (void)pBasic;
- (void)bWrite;
-
if ( rPar.Count() != 4 )
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list