From 3af500580b1c82eabd60335c9ebc458a3f68850c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 8 Dec 2017 15:58:41 +0200 Subject: loplugin:salcall fix functions since cdecl is the default calling convention on Windows for such functions, the annotation is redundant. Change-Id: I1a85fa27e5ac65ce0e04a19bde74c90800ffaa2d Reviewed-on: https://gerrit.libreoffice.org/46164 Tested-by: Jenkins Reviewed-by: Noel Grandin --- toolkit/source/awt/asynccallback.cxx | 2 +- toolkit/source/awt/vclxmenu.cxx | 4 +- toolkit/source/awt/vclxpointer.cxx | 2 +- toolkit/source/awt/vclxprinter.cxx | 2 +- toolkit/source/awt/vclxtoolkit.cxx | 10 +-- toolkit/source/controls/animatedimages.cxx | 4 +- toolkit/source/controls/dialogcontrol.cxx | 16 ++--- toolkit/source/controls/formattedcontrol.cxx | 4 +- .../controls/grid/defaultgridcolumnmodel.cxx | 2 +- .../source/controls/grid/defaultgriddatamodel.cxx | 2 +- toolkit/source/controls/grid/gridcolumn.cxx | 2 +- toolkit/source/controls/grid/gridcontrol.cxx | 4 +- .../source/controls/grid/sortablegriddatamodel.cxx | 2 +- toolkit/source/controls/roadmapcontrol.cxx | 4 +- toolkit/source/controls/spinningprogress.cxx | 2 +- toolkit/source/controls/stdtabcontroller.cxx | 2 +- toolkit/source/controls/stdtabcontrollermodel.cxx | 2 +- toolkit/source/controls/tabpagecontainer.cxx | 4 +- toolkit/source/controls/tabpagemodel.cxx | 4 +- toolkit/source/controls/tkscrollbar.cxx | 4 +- toolkit/source/controls/tkspinbutton.cxx | 4 +- toolkit/source/controls/tree/treecontrol.cxx | 4 +- toolkit/source/controls/tree/treedatamodel.cxx | 2 +- toolkit/source/controls/unocontrolcontainer.cxx | 2 +- .../source/controls/unocontrolcontainermodel.cxx | 2 +- toolkit/source/controls/unocontrols.cxx | 72 +++++++++++----------- toolkit/source/helper/accessibilityclient.cxx | 2 +- 27 files changed, 83 insertions(+), 83 deletions(-) (limited to 'toolkit/source') diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx index f83b390c2eb7..e9cc75f5f462 100644 --- a/toolkit/source/awt/asynccallback.cxx +++ b/toolkit/source/awt/asynccallback.cxx @@ -113,7 +113,7 @@ IMPL_STATIC_LINK( AsyncCallback, Notify_Impl, void*, p, void ) } // closing anonymous implementation namespace -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_awt_comp_AsyncCallback_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index 66510b1feba1..93e78e301e2c 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -849,7 +849,7 @@ VCLXMenuBar::VCLXMenuBar( MenuBar* pMenuBar ) : VCLXMenu( static_cast(pM { } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_VCLXMenuBar_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) @@ -867,7 +867,7 @@ VCLXPopupMenu::VCLXPopupMenu( PopupMenu* pPopMenu ) : VCLXMenu( static_cast const &) diff --git a/toolkit/source/awt/vclxpointer.cxx b/toolkit/source/awt/vclxpointer.cxx index a2427984761b..018c335afc18 100644 --- a/toolkit/source/awt/vclxpointer.cxx +++ b/toolkit/source/awt/vclxpointer.cxx @@ -63,7 +63,7 @@ css::uno::Sequence VCLXPointer::getSupportedServiceNames() "com.sun.star.awt.Pointer", "stardiv.vcl.Pointer"}; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_VCLXPointer_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index 6fe73f2ab59c..3c61ad7b5fbd 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -397,7 +397,7 @@ css::uno::Sequence VCLXPrinterServer::getSupportedServiceNames() "com.sun.star.awt.PrinterServer", "stardiv.vcl.PrinterServer"}; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_VCLXPrinterServer_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index e2df8b70f695..744306d01ec9 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -135,7 +135,7 @@ namespace { -extern "C" typedef vcl::Window* (SAL_CALL *FN_SvtCreateWindow)( +extern "C" typedef vcl::Window* (*FN_SvtCreateWindow)( VCLXWindow** ppNewComp, const css::awt::WindowDescriptor* pDescriptor, vcl::Window* pParent, @@ -508,7 +508,7 @@ static ComponentInfo aComponentInfos [] = extern "C" { -static int SAL_CALL ComponentInfoCompare( const void* pFirst, const void* pSecond) +static int ComponentInfoCompare( const void* pFirst, const void* pSecond) { return strcmp( static_cast(pFirst)->pName, static_cast(pSecond)->pName ); @@ -621,7 +621,7 @@ osl::Condition & getInitCondition() extern "C" { -static void SAL_CALL ToolkitWorkerFunction( void* pArgs ) +static void ToolkitWorkerFunction( void* pArgs ) { osl_setThreadName("VCLXToolkit VCL main thread"); @@ -1206,7 +1206,7 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, #ifndef DISABLE_DYNLOADING -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } #else @@ -1997,7 +1997,7 @@ void SAL_CALL VCLXToolkit::mouseMove( const css::awt::MouseEvent & aMouseEvent ) } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_VCLXToolkit_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx index 56a5a0b94123..9357b20e5fe8 100644 --- a/toolkit/source/controls/animatedimages.cxx +++ b/toolkit/source/controls/animatedimages.cxx @@ -492,7 +492,7 @@ namespace toolkit { } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_openoffice_comp_toolkit_AnimatedImagesControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) @@ -500,7 +500,7 @@ org_openoffice_comp_toolkit_AnimatedImagesControl_get_implementation( return cppu::acquire(new AnimatedImagesControl()); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_openoffice_comp_toolkit_AnimatedImagesControlModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 8ca31adf47d3..04b70d6d686b 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -1208,7 +1208,7 @@ uno::Reference< beans::XPropertySetInfo > UnoFrameModel::getPropertySetInfo( ) return xInfo; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlDialogModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -1216,7 +1216,7 @@ stardiv_Toolkit_UnoControlDialogModel_get_implementation( return cppu::acquire(new OGeometryControlModel(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoDialogControl_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -1224,7 +1224,7 @@ stardiv_Toolkit_UnoDialogControl_get_implementation( return cppu::acquire(new UnoDialogControl(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoMultiPageControl_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -1232,7 +1232,7 @@ stardiv_Toolkit_UnoMultiPageControl_get_implementation( return cppu::acquire(new UnoMultiPageControl(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoMultiPageModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -1240,7 +1240,7 @@ stardiv_Toolkit_UnoMultiPageModel_get_implementation( return cppu::acquire(new UnoMultiPageModel(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoPageControl_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -1248,7 +1248,7 @@ stardiv_Toolkit_UnoPageControl_get_implementation( return cppu::acquire(new UnoPageControl(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoPageModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -1256,7 +1256,7 @@ stardiv_Toolkit_UnoPageModel_get_implementation( return cppu::acquire(new UnoPageModel(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoFrameControl_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -1264,7 +1264,7 @@ stardiv_Toolkit_UnoFrameControl_get_implementation( return cppu::acquire(new UnoFrameControl(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoFrameModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx index 194aaf33749f..b25f2c2a582c 100644 --- a/toolkit/source/controls/formattedcontrol.cxx +++ b/toolkit/source/controls/formattedcontrol.cxx @@ -481,7 +481,7 @@ namespace toolkit } // namespace toolkit -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlFormattedFieldModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -489,7 +489,7 @@ stardiv_Toolkit_UnoControlFormattedFieldModel_get_implementation( return cppu::acquire(new toolkit::UnoControlFormattedFieldModel(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoFormattedFieldControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx index ef153feaeec4..7ece076514cb 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx @@ -392,7 +392,7 @@ private: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_DefaultGridColumnModel_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx index 10bebd5c87eb..4a25f01237e0 100644 --- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx +++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx @@ -501,7 +501,7 @@ private: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_DefaultGridDataModel_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx index d0561edbd533..9ad9a8bdbe60 100644 --- a/toolkit/source/controls/grid/gridcolumn.cxx +++ b/toolkit/source/controls/grid/gridcolumn.cxx @@ -310,7 +310,7 @@ namespace toolkit } } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_openoffice_comp_toolkit_GridColumn_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx index cc77817b2f4e..acbbf5ed4ab6 100644 --- a/toolkit/source/controls/grid/gridcontrol.cxx +++ b/toolkit/source/controls/grid/gridcontrol.cxx @@ -448,7 +448,7 @@ void SAL_CALL UnoGridControl::removeSelectionListener(const css::uno::Reference< } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_GridControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) @@ -456,7 +456,7 @@ stardiv_Toolkit_GridControl_get_implementation( return cppu::acquire(new toolkit::UnoGridControl()); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_GridControlModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx index ad1cc2611a51..e9cafb05b6d8 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx @@ -938,7 +938,7 @@ public: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_openoffice_comp_toolkit_SortableGridDataModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx index ad39e9c24748..8d0a3ce774ee 100644 --- a/toolkit/source/controls/roadmapcontrol.cxx +++ b/toolkit/source/controls/roadmapcontrol.cxx @@ -500,7 +500,7 @@ css::uno::Sequence UnoRoadmapControl::getSupportedServiceNames() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlRoadmapModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -508,7 +508,7 @@ stardiv_Toolkit_UnoControlRoadmapModel_get_implementation( return cppu::acquire(new toolkit::UnoControlRoadmapModel(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoRoadmapControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx index fbb44bcbc7ba..3cf094f9f5dd 100644 --- a/toolkit/source/controls/spinningprogress.cxx +++ b/toolkit/source/controls/spinningprogress.cxx @@ -126,7 +126,7 @@ protected: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_openoffice_comp_toolkit_SpinningProgressControlModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx index 967113a46602..bf8a8192a58a 100644 --- a/toolkit/source/controls/stdtabcontroller.cxx +++ b/toolkit/source/controls/stdtabcontroller.cxx @@ -403,7 +403,7 @@ Reference< XControl > StdTabController::FindControl( Sequence< Reference< XCont return Reference< XControl > (); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_StdTabController_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx index b382cf9ae158..2a7dc44a6d8f 100644 --- a/toolkit/source/controls/stdtabcontrollermodel.cxx +++ b/toolkit/source/controls/stdtabcontrollermodel.cxx @@ -431,7 +431,7 @@ css::uno::Sequence StdTabControllerModel::getSupportedServiceNames() "stardiv.vcl.controlmodel.TabController"}; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_StdTabControllerModel_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx index 19ae57413a44..5102f883b5a8 100644 --- a/toolkit/source/controls/tabpagecontainer.cxx +++ b/toolkit/source/controls/tabpagecontainer.cxx @@ -332,7 +332,7 @@ void SAL_CALL UnoControlTabPageContainer::addControl( const OUString& Name, cons xContainerListener->elementInserted( aEvent ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlTabPageContainerModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -340,7 +340,7 @@ stardiv_Toolkit_UnoControlTabPageContainerModel_get_implementation( return cppu::acquire(new UnoControlTabPageContainerModel(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlTabPageContainer_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx index 90f22675da0f..73a10f3c5461 100644 --- a/toolkit/source/controls/tabpagemodel.cxx +++ b/toolkit/source/controls/tabpagemodel.cxx @@ -299,7 +299,7 @@ void SAL_CALL UnoControlTabPage::windowShown( const css::lang::EventObject& ) {} void SAL_CALL UnoControlTabPage::windowHidden( const css::lang::EventObject& ) {} -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlTabPageModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -307,7 +307,7 @@ stardiv_Toolkit_UnoControlTabPageModel_get_implementation( return cppu::acquire(new UnoControlTabPageModel(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlTabPage_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx index 35210ddd776a..a91a5933066a 100644 --- a/toolkit/source/controls/tkscrollbar.cxx +++ b/toolkit/source/controls/tkscrollbar.cxx @@ -302,7 +302,7 @@ namespace toolkit } // namespace toolkit -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlScrollBarModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -310,7 +310,7 @@ stardiv_Toolkit_UnoControlScrollBarModel_get_implementation( return cppu::acquire(new toolkit::UnoControlScrollBarModel(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoScrollBarControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx index d913d40159df..b1fc40aa6826 100644 --- a/toolkit/source/controls/tkspinbutton.cxx +++ b/toolkit/source/controls/tkspinbutton.cxx @@ -415,7 +415,7 @@ public: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoSpinButtonModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -423,7 +423,7 @@ stardiv_Toolkit_UnoSpinButtonModel_get_implementation( return cppu::acquire(new UnoSpinButtonModel(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoSpinButtonControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx index 33a6c739d189..4292b6c42932 100644 --- a/toolkit/source/controls/tree/treecontrol.cxx +++ b/toolkit/source/controls/tree/treecontrol.cxx @@ -506,7 +506,7 @@ void SAL_CALL TreeEditListenerMultiplexer::nodeEdited( const Reference< XTreeNod } } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_TreeControlModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -514,7 +514,7 @@ stardiv_Toolkit_TreeControlModel_get_implementation( return cppu::acquire(new toolkit::UnoTreeModel(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_TreeControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx index 6910e92a1d75..fd43049ca663 100644 --- a/toolkit/source/controls/tree/treedatamodel.cxx +++ b/toolkit/source/controls/tree/treedatamodel.cxx @@ -522,7 +522,7 @@ Sequence< OUString > SAL_CALL MutableTreeNode::getSupportedServiceNames( ) } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_MutableTreeDataModel_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index e4f5b5353fa4..0a992812f7d8 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -831,7 +831,7 @@ void UnoControlContainer::PrepareWindowDescriptor( css::awt::WindowDescriptor& r } } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlContainer_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx index 4db57220cc4d..5c7b11c76043 100644 --- a/toolkit/source/controls/unocontrolcontainermodel.cxx +++ b/toolkit/source/controls/unocontrolcontainermodel.cxx @@ -90,7 +90,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > UnoControlContainerModel::ge return *pHelper; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlContainerModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index a53188af6775..f74f468b7562 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -174,7 +174,7 @@ css::uno::Sequence UnoControlEditModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlEditModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -493,7 +493,7 @@ uno::Sequence< OUString > UnoEditControl::getSupportedServiceNames() return aNames; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoEditControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) @@ -574,7 +574,7 @@ UnoControlFileControlModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlFileControlModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -609,7 +609,7 @@ css::uno::Sequence UnoFileControl::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoFileControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) @@ -759,7 +759,7 @@ css::uno::Sequence UnoControlButtonModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlButtonModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -917,7 +917,7 @@ css::uno::Sequence UnoButtonControl::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoButtonControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) @@ -1024,7 +1024,7 @@ void SAL_CALL UnoControlImageControlModel::setFastPropertyValue_NoBroadcast( sal } } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlImageControlModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -1093,7 +1093,7 @@ css::uno::Sequence UnoImageControlControl::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoImageControlControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) @@ -1162,7 +1162,7 @@ UnoControlRadioButtonModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlRadioButtonModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -1340,7 +1340,7 @@ css::uno::Sequence UnoRadioButtonControl::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoRadioButtonControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) @@ -1408,7 +1408,7 @@ css::uno::Sequence UnoControlCheckBoxModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlCheckBoxModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -1559,7 +1559,7 @@ css::uno::Sequence UnoCheckBoxControl::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoCheckBoxControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) @@ -1617,7 +1617,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFixedHyperlinkModel::getProp return xInfo; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlFixedHyperlinkModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -1750,7 +1750,7 @@ void UnoFixedHyperlinkControl::removeActionListener(const uno::Reference< awt::X maActionListeners.removeInterface( l ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoFixedHyperlinkControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) @@ -1819,7 +1819,7 @@ UnoControlFixedTextModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlFixedTextModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -1918,7 +1918,7 @@ css::uno::Sequence UnoFixedTextControl::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoFixedTextControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) @@ -1990,7 +1990,7 @@ css::uno::Sequence UnoControlGroupBoxModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlGroupBoxModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -2032,7 +2032,7 @@ css::uno::Sequence UnoGroupBoxControl::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoGroupBoxControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) @@ -2592,7 +2592,7 @@ void UnoControlListBoxModel::impl_notifyItemListEvent_nolck( const sal_Int32 i_n m_aItemListListeners.notifyEach( NotificationMethod, aEvent ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlListBoxModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -3020,7 +3020,7 @@ void SAL_CALL UnoListBoxControl::itemListChanged( const lang::EventObject& i_rEv xPeerListener->itemListChanged( i_rEvent ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoListBoxControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) @@ -3114,7 +3114,7 @@ uno::Any UnoControlComboBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons return UnoControlModel::ImplGetDefaultValue( nPropId ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlComboBoxModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -3435,7 +3435,7 @@ sal_Int16 UnoComboBoxControl::getDropDownLineCount() return ImplGetPropertyValue_INT16( BASEPROPERTY_LINECOUNT ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoComboBoxControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) @@ -3592,7 +3592,7 @@ UnoControlDateFieldModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlDateFieldModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -3802,7 +3802,7 @@ css::uno::Sequence UnoDateFieldControl::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoDateFieldControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) @@ -3867,7 +3867,7 @@ UnoControlTimeFieldModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlTimeFieldModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -4036,7 +4036,7 @@ css::uno::Sequence UnoTimeFieldControl::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoTimeFieldControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) @@ -4101,7 +4101,7 @@ UnoControlNumericFieldModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlNumericFieldModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -4261,7 +4261,7 @@ sal_Int16 UnoNumericFieldControl::getDecimalDigits() return ImplGetPropertyValue_INT16( BASEPROPERTY_DECIMALACCURACY ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoNumericFieldControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) @@ -4330,7 +4330,7 @@ UnoControlCurrencyFieldModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlCurrencyFieldModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -4490,7 +4490,7 @@ sal_Int16 UnoCurrencyFieldControl::getDecimalDigits() return ImplGetPropertyValue_INT16( BASEPROPERTY_DECIMALACCURACY ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoCurrencyFieldControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) @@ -4554,7 +4554,7 @@ UnoControlPatternFieldModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlPatternFieldModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -4660,7 +4660,7 @@ css::uno::Sequence UnoPatternFieldControl::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoPatternFieldControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) @@ -4737,7 +4737,7 @@ UnoControlProgressBarModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlProgressBarModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -4829,7 +4829,7 @@ css::uno::Sequence UnoProgressBarControl::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoProgressBarControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) @@ -4902,7 +4902,7 @@ UnoControlFixedLineModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlFixedLineModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -4944,7 +4944,7 @@ css::uno::Sequence UnoFixedLineControl::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoFixedLineControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx index fd253b74b8e1..59044160eac0 100644 --- a/toolkit/source/helper/accessibilityclient.cxx +++ b/toolkit/source/helper/accessibilityclient.cxx @@ -144,7 +144,7 @@ namespace toolkit #if HAVE_FEATURE_DESKTOP #ifndef DISABLE_DYNLOADING - extern "C" { static void SAL_CALL thisModule() {} } + extern "C" { static void thisModule() {} } #else extern "C" void *getStandardAccessibleFactory(); #endif -- cgit ark/killswclient LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/lingucomponent/Library_lnth.mk
AgeCommit message (Expand)Author
2017-10-18strip out trivial indirectionNoel Grandin
2017-04-21gbuild: Remove MSVC 2013 legacy codeDavid Ostrovsky