diff options
Diffstat (limited to 'sc')
28 files changed, 81 insertions, 81 deletions
diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx index 8ae79b293bbd..58ec1563319c 100644 --- a/sc/inc/appluno.hxx +++ b/sc/inc/appluno.hxx @@ -33,7 +33,7 @@ #include <rtl/ustring.hxx> #include <sfx2/sfxmodelfactory.hxx> -css::uno::Reference<css::uno::XInterface> SAL_CALL +css::uno::Reference<css::uno::XInterface> ScSpreadsheetSettings_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory>& rSMgr ); css::uno::Reference<css::uno::XInterface> SAL_CALL @@ -44,37 +44,37 @@ css::uno::Reference<css::uno::XInterface> SAL_CALL const css::uno::Reference< css::lang::XMultiServiceFactory>& rSMgr ); // Calc document -css::uno::Sequence< OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw(); -OUString SAL_CALL ScDocument_getImplementationName() throw(); +css::uno::Sequence< OUString > ScDocument_getSupportedServiceNames() throw(); +OUString ScDocument_getImplementationName() throw(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL ScDocument_createInstance( +css::uno::Reference< css::uno::XInterface > ScDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr, SfxModelFlags _nCreationFlags ); // Calc XML import -css::uno::Sequence< OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw(); -OUString SAL_CALL ScXMLImport_getImplementationName() throw(); +css::uno::Sequence< OUString > ScXMLImport_getSupportedServiceNames() throw(); +OUString ScXMLImport_getImplementationName() throw(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_createInstance( +css::uno::Reference< css::uno::XInterface > ScXMLImport_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ); -css::uno::Sequence< OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() throw(); -OUString SAL_CALL ScXMLImport_Meta_getImplementationName() throw(); +css::uno::Sequence< OUString > ScXMLImport_Meta_getSupportedServiceNames() throw(); +OUString ScXMLImport_Meta_getImplementationName() throw(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance( +css::uno::Reference< css::uno::XInterface > ScXMLImport_Meta_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ); -css::uno::Sequence< OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() throw(); -OUString SAL_CALL ScXMLImport_Styles_getImplementationName() throw(); +css::uno::Sequence< OUString > ScXMLImport_Styles_getSupportedServiceNames() throw(); +OUString ScXMLImport_Styles_getImplementationName() throw(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance( +css::uno::Reference< css::uno::XInterface > ScXMLImport_Styles_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ); -css::uno::Sequence< OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames() throw(); -OUString SAL_CALL ScXMLImport_Content_getImplementationName() throw(); +css::uno::Sequence< OUString > ScXMLImport_Content_getSupportedServiceNames() throw(); +OUString ScXMLImport_Content_getImplementationName() throw(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance( +css::uno::Reference< css::uno::XInterface > ScXMLImport_Content_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ); -css::uno::Sequence< OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames() throw(); -OUString SAL_CALL ScXMLImport_Settings_getImplementationName() throw(); +css::uno::Sequence< OUString > ScXMLImport_Settings_getSupportedServiceNames() throw(); +OUString ScXMLImport_Settings_getImplementationName() throw(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_Settings_createInstance( +css::uno::Reference< css::uno::XInterface > ScXMLImport_Settings_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ); class ScSpreadsheetSettings : public cppu::WeakImplHelper< diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx index 56e25f55b6e9..0af471c6440d 100644 --- a/sc/inc/filter.hxx +++ b/sc/inc/filter.hxx @@ -92,7 +92,7 @@ protected: // scfilt plugin symbol extern "C" { - SAL_DLLPUBLIC_EXPORT ScFormatFilterPlugin * SAL_CALL ScFilterCreate(); + SAL_DLLPUBLIC_EXPORT ScFormatFilterPlugin * ScFilterCreate(); } class ScFormatFilter { diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx index d9f4067a3899..2071e8a66ff1 100644 --- a/sc/inc/rangelst.hxx +++ b/sc/inc/rangelst.hxx @@ -152,7 +152,7 @@ private: typedef tools::SvRef<ScRangePairList> ScRangePairListRef; extern "C" -int SAL_CALL ScRangePairList_QsortNameCompare( const void*, const void* ); +int ScRangePairList_QsortNameCompare( const void*, const void* ); #endif diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx index b9fae7492d95..fb0335768eeb 100644 --- a/sc/inc/rangenam.hxx +++ b/sc/inc/rangenam.hxx @@ -189,7 +189,7 @@ inline bool ScRangeData::HasType( Type nType ) const return ( ( eType & nType ) == nType ); } -extern "C" int SAL_CALL ScRangeData_QsortNameCompare( const void*, const void* ); +extern "C" int ScRangeData_QsortNameCompare( const void*, const void* ); class ScRangeName { diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx index 8f976819bd5b..bd2217556644 100644 --- a/sc/source/core/tool/rangelst.cxx +++ b/sc/source/core/tool/rangelst.cxx @@ -1353,7 +1353,7 @@ struct ScRangePairNameSort }; extern "C" -int SAL_CALL ScRangePairList_QsortNameCompare( const void* p1, const void* p2 ) +int ScRangePairList_QsortNameCompare( const void* p1, const void* p2 ) { const ScRangePairNameSort* ps1 = static_cast<const ScRangePairNameSort*>(p1); const ScRangePairNameSort* ps2 = static_cast<const ScRangePairNameSort*>(p2); diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index de12cc15cf6c..fd7de4b83fa5 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -639,7 +639,7 @@ void ScRangeData::InitCode() } extern "C" -int SAL_CALL ScRangeData_QsortNameCompare( const void* p1, const void* p2 ) +int ScRangeData_QsortNameCompare( const void* p1, const void* p2 ) { return (int) ScGlobal::GetCollator()->compareString( (*static_cast<const ScRangeData* const *>(p1))->GetName(), diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx index 536207f2e00a..309179b69b6a 100644 --- a/sc/source/filter/excel/excel.cxx +++ b/sc/source/filter/excel/excel.cxx @@ -222,7 +222,7 @@ ErrCode ScFormatFilterPluginImpl::ScExportExcel5( SfxMedium& rMedium, ScDocument return eRet; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportQPW(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportQPW(SvStream &rStream) { ScDLL::Init(); ScDocument aDocument; @@ -234,7 +234,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportQPW(SvStream &rStream) return ScFormatFilter::Get().ScImportQuattroPro(&rStream, &aDocument) == ERRCODE_NONE; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportCalcRTF(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportCalcRTF(SvStream &rStream) { ScDLL::Init(); ScDocument aDocument; @@ -247,7 +247,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportCalcRTF(SvStream &rStrea return ScFormatFilter::Get().ScImportRTF(rStream, OUString(), &aDocument, aRange) == ERRCODE_NONE; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportXLS(SvStream& rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportXLS(SvStream& rStream) { ScDLL::Init(); SfxMedium aMedium; @@ -281,7 +281,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportXLS(SvStream& rStream) return bRet; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportWKS(SvStream& rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportWKS(SvStream& rStream) { ScDLL::Init(); SfxMedium aMedium; @@ -296,7 +296,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportWKS(SvStream& rStream) return ScFormatFilter::Get().ScImportLotus123(aMedium, &aDocument, RTL_TEXTENCODING_ASCII_US) == ERRCODE_NONE; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportDIF(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportDIF(SvStream &rStream) { ScDLL::Init(); ScDocument aDocument; diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index 28a9a7ce539d..525b2eacebb2 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -358,7 +358,7 @@ ScOrcusFilters* ScFormatFilterPluginImpl::GetOrcusFilters() return &aImpl; } -ScFormatFilterPlugin * SAL_CALL ScFilterCreate() +ScFormatFilterPlugin * ScFilterCreate() { return new ScFormatFilterPluginImpl(); } diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx index 171f5ff67cf7..989befcb6b51 100644 --- a/sc/source/filter/oox/excelfilter.cxx +++ b/sc/source/filter/oox/excelfilter.cxx @@ -183,7 +183,7 @@ OUString ExcelFilter::getImplementationName() } // namespace oox -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_oox_xls_ExcelFilter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx index 16a526dc3b12..639a9bf63900 100644 --- a/sc/source/filter/oox/ooxformulaparser.cxx +++ b/sc/source/filter/oox/ooxformulaparser.cxx @@ -166,7 +166,7 @@ OUString SAL_CALL OOXMLFormulaParser::printFormula( } // namespace oox -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_oox_xls_FormulaParser_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sc/source/filter/orcus/filterdetect.cxx b/sc/source/filter/orcus/filterdetect.cxx index 861c351f0611..137585384e48 100644 --- a/sc/source/filter/orcus/filterdetect.cxx +++ b/sc/source/filter/orcus/filterdetect.cxx @@ -88,7 +88,7 @@ OUString OrcusFormatDetect::detect(css::uno::Sequence<css::beans::PropertyValue> } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_sc_OrcusFormatDetect_get_implementation(css::uno::XComponentContext* , css::uno::Sequence<css::uno::Any> const &) { diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 294956f91daf..0781246233e7 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -242,61 +242,61 @@ OUString lcl_GetFormattedString(ScDocument* pDoc, ScRefCellValue& rCell, const S } // anonymous namespace -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Calc_XMLExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ScXMLExport(context, "com.sun.star.comp.Calc.XMLExporter", SvXMLExportFlags::ALL)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Calc_XMLMetaExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ScXMLExport(context, "com.sun.star.comp.Calc.XMLMetaExporter", SvXMLExportFlags::META)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Calc_XMLStylesExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ScXMLExport(context, "com.sun.star.comp.Calc.XMLStylesExporter", SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::FONTDECLS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Calc_XMLContentExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ScXMLExport(context, "com.sun.star.comp.Calc.XMLContentExporter", SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::FONTDECLS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Calc_XMLSettingsExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ScXMLExport(context, "com.sun.star.comp.Calc.XMLSettingsExporter", SvXMLExportFlags::SETTINGS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Calc_XMLOasisExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ScXMLExport(context, "com.sun.star.comp.Calc.XMLOasisExporter", SvXMLExportFlags::ALL|SvXMLExportFlags::OASIS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Calc_XMLOasisMetaExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ScXMLExport(context, "com.sun.star.comp.Calc.XMLOasisMetaExporter", SvXMLExportFlags::META|SvXMLExportFlags::OASIS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Calc_XMLOasisStylesExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ScXMLExport(context, "com.sun.star.comp.Calc.XMLOasisStylesExporter", SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::OASIS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Calc_XMLOasisContentExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ScXMLExport(context, "com.sun.star.comp.Calc.XMLOasisContentExporter", SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::OASIS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Calc_XMLOasisSettingsExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ScXMLExport(context, "com.sun.star.comp.Calc.XMLOasisSettingsExporter", SvXMLExportFlags::SETTINGS|SvXMLExportFlags::OASIS)); diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index b3f464b1def2..91ebc28bd1cb 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -107,90 +107,90 @@ using namespace com::sun::star; using namespace ::xmloff::token; using namespace ::formula; -OUString SAL_CALL ScXMLImport_getImplementationName() throw() +OUString ScXMLImport_getImplementationName() throw() { return OUString( "com.sun.star.comp.Calc.XMLOasisImporter" ); } -uno::Sequence< OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw() +uno::Sequence< OUString > ScXMLImport_getSupportedServiceNames() throw() { const OUString aServiceName( ScXMLImport_getImplementationName() ); return uno::Sequence< OUString > ( &aServiceName, 1 ); } -uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_createInstance( +uno::Reference< uno::XInterface > ScXMLImport_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) { // return (cppu::OWeakObject*)new ScXMLImport(IMPORT_ALL); return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_getImplementationName(), SvXMLImportFlags::ALL )); } -OUString SAL_CALL ScXMLImport_Meta_getImplementationName() throw() +OUString ScXMLImport_Meta_getImplementationName() throw() { return OUString( "com.sun.star.comp.Calc.XMLOasisMetaImporter" ); } -uno::Sequence< OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() throw() +uno::Sequence< OUString > ScXMLImport_Meta_getSupportedServiceNames() throw() { const OUString aServiceName( ScXMLImport_Meta_getImplementationName() ); return uno::Sequence< OUString > ( &aServiceName, 1 ); } -uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance( +uno::Reference< uno::XInterface > ScXMLImport_Meta_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) { // return (cppu::OWeakObject*)new ScXMLImport(IMPORT_META); return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_Meta_getImplementationName(), SvXMLImportFlags::META )); } -OUString SAL_CALL ScXMLImport_Styles_getImplementationName() throw() +OUString ScXMLImport_Styles_getImplementationName() throw() { return OUString( "com.sun.star.comp.Calc.XMLOasisStylesImporter" ); } -uno::Sequence< OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() throw() +uno::Sequence< OUString > ScXMLImport_Styles_getSupportedServiceNames() throw() { const OUString aServiceName( ScXMLImport_Styles_getImplementationName() ); return uno::Sequence< OUString > ( &aServiceName, 1 ); } -uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance( +uno::Reference< uno::XInterface > ScXMLImport_Styles_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) { // return (cppu::OWeakObject*)new ScXMLImport(SvXMLImportFlagsSTYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::MASTERSTYLES|SvXMLImportFlags::FONTDECLS); return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_Styles_getImplementationName(), SvXMLImportFlags::STYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::MASTERSTYLES|SvXMLImportFlags::FONTDECLS)); } -OUString SAL_CALL ScXMLImport_Content_getImplementationName() throw() +OUString ScXMLImport_Content_getImplementationName() throw() { return OUString( "com.sun.star.comp.Calc.XMLOasisContentImporter" ); } -uno::Sequence< OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames() throw() +uno::Sequence< OUString > ScXMLImport_Content_getSupportedServiceNames() throw() { const OUString aServiceName( ScXMLImport_Content_getImplementationName() ); return uno::Sequence< OUString > ( &aServiceName, 1 ); } -uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance( +uno::Reference< uno::XInterface > ScXMLImport_Content_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) { // return (cppu::OWeakObject*)new ScXMLImport(SvXMLImportFlags::META|SvXMLImportFlags::STYLES|SvXMLImportFlags::MASTERSTYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::CONTENT|SvXMLImportFlags::SCRIPTS|SvXMLImportFlags::SETTINGS|SvXMLImportFlags::FONTDECLS); return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_Content_getImplementationName(), SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::CONTENT|SvXMLImportFlags::SCRIPTS|SvXMLImportFlags::FONTDECLS)); } -OUString SAL_CALL ScXMLImport_Settings_getImplementationName() throw() +OUString ScXMLImport_Settings_getImplementationName() throw() { return OUString( "com.sun.star.comp.Calc.XMLOasisSettingsImporter" ); } -uno::Sequence< OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames() throw() +uno::Sequence< OUString > ScXMLImport_Settings_getSupportedServiceNames() throw() { const OUString aServiceName( ScXMLImport_Settings_getImplementationName() ); return uno::Sequence< OUString > ( &aServiceName, 1 ); } -uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Settings_createInstance( +uno::Reference< uno::XInterface > ScXMLImport_Settings_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) { // return (cppu::OWeakObject*)new ScXMLImport(SvXMLImportFlags::SETTINGS); @@ -2055,7 +2055,7 @@ ScMyImpDetectiveOpArray* ScXMLImport::GetDetectiveOpArray() return pDetectiveOpArray; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportFODS(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportFODS(SvStream &rStream) { ScDLL::Init(); @@ -2104,7 +2104,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportFODS(SvStream &rStream) return ret; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportXLSX(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportXLSX(SvStream &rStream) { ScDLL::Init(); diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxx index f0582fa7d724..1f268b1af5c4 100644 --- a/sc/source/ui/attrdlg/scabstdlg.cxx +++ b/sc/source/ui/attrdlg/scabstdlg.cxx @@ -24,11 +24,11 @@ #include <osl/module.hxx> #include <rtl/ustrbuf.hxx> -typedef ScAbstractDialogFactory* (SAL_CALL *ScFuncPtrCreateDialogFactory)(); +typedef ScAbstractDialogFactory* (*ScFuncPtrCreateDialogFactory)(); #ifndef DISABLE_DYNLOADING -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } #else diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index a5cea0179018..d69c7d6fd0cd 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -3241,7 +3241,7 @@ void ScDocShell::SetIsInUcalc() mbUcalcTest = true; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportSLK(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportSLK(SvStream &rStream) { ScDLL::Init(); ScDocument aDocument; diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 88bab11ffb11..d2e2899454b7 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -2275,7 +2275,7 @@ bool ScImportExport::HTML2Doc( SvStream& rStrm, const OUString& rBaseURL ) #ifndef DISABLE_DYNLOADING -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } #else diff --git a/sc/source/ui/sidebar/ScPanelFactory.cxx b/sc/source/ui/sidebar/ScPanelFactory.cxx index f204e3685fb8..fcbe9a495a42 100644 --- a/sc/source/ui/sidebar/ScPanelFactory.cxx +++ b/sc/source/ui/sidebar/ScPanelFactory.cxx @@ -137,7 +137,7 @@ css::uno::Sequence<OUString> ScPanelFactory::getSupportedServiceNames() } } // end of namespace sc::sidebar -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* ScPanelFactory_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new sc::sidebar::ScPanelFactory()); diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index a6f8df946c86..4adf5aa937ec 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -173,7 +173,7 @@ ScAutoFormatsObj::~ScAutoFormatsObj() { } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* ScAutoFormatsObj_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 064369bf05d8..2f94542b7875 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -95,7 +95,7 @@ SC_SIMPLE_SERVICE_INFO( ScSpreadsheetSettings, "stardiv.StarCalc.ScSpreadsheetSe extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL sc_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * sc_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { if (!pServiceManager) @@ -181,7 +181,7 @@ ScSpreadsheetSettings::~ScSpreadsheetSettings() { } -uno::Reference<uno::XInterface> SAL_CALL ScSpreadsheetSettings_CreateInstance( +uno::Reference<uno::XInterface> ScSpreadsheetSettings_CreateInstance( const uno::Reference<lang::XMultiServiceFactory>& /* rSMgr */ ) { SolarMutexGuard aGuard; @@ -455,7 +455,7 @@ ScRecentFunctionsObj::~ScRecentFunctionsObj() { } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* ScRecentFunctionsObj_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { SolarMutexGuard aGuard; @@ -512,7 +512,7 @@ ScFunctionListObj::~ScFunctionListObj() { } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* ScFunctionListObj_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/exceldetect.cxx b/sc/source/ui/unoobj/exceldetect.cxx index 43e288c4bd7f..b4b6d4d85b06 100644 --- a/sc/source/ui/unoobj/exceldetect.cxx +++ b/sc/source/ui/unoobj/exceldetect.cxx @@ -192,7 +192,7 @@ OUString ScExcelBiffDetect::detect( uno::Sequence<beans::PropertyValue>& lDescri return aType; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_calc_ExcelBiffFormatDetector_get_implementation(css::uno::XComponentContext* /*context*/, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index ee6e6ed3c265..5f1279807ec4 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -128,7 +128,7 @@ ScFilterOptionsObj::~ScFilterOptionsObj() { } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Calc_FilterOptionsDialog_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index c0c4bebaef52..2069bfdd81ac 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -194,7 +194,7 @@ void ScFunctionAccess::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* ScFunctionAcceess_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 35458d103577..3741a8a17265 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -344,7 +344,7 @@ css::uno::Sequence<OUString> ScFilterDetect::getSupportedServiceNames() return seqServiceNames; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_calc_FormatDetector_get_implementation(css::uno::XComponentContext* /*context*/, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sc/source/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxx index 469644dc5b3d..e632de65fa69 100644 --- a/sc/source/ui/unoobj/unodoc.cxx +++ b/sc/source/ui/unoobj/unodoc.cxx @@ -30,18 +30,18 @@ using namespace ::com::sun::star; -OUString SAL_CALL ScDocument_getImplementationName() throw() +OUString ScDocument_getImplementationName() throw() { return OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" ); } -uno::Sequence< OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw() +uno::Sequence< OUString > ScDocument_getSupportedServiceNames() throw() { uno::Sequence<OUString> aSeq { "com.sun.star.sheet.SpreadsheetDocument" }; return aSeq; } -uno::Reference< uno::XInterface > SAL_CALL ScDocument_createInstance( +uno::Reference< uno::XInterface > ScDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > & /* rSMgr */, SfxModelFlags _nCreationFlags ) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/vba/service.cxx b/sc/source/ui/vba/service.cxx index 93d119831b42..562a6b3e0c1d 100644 --- a/sc/source/ui/vba/service.cxx +++ b/sc/source/ui/vba/service.cxx @@ -30,7 +30,7 @@ namespace sdecl = comphelper::service_decl; extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL vbaobj_component_getFactory( + SAL_DLLPUBLIC_EXPORT void * vbaobj_component_getFactory( const sal_Char * pImplName, void *, void *) { void* pRet = sdecl::component_getFactoryHelper( diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index 90297d1a922a..24ae774e4e92 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -903,7 +903,7 @@ uno::Any ScVbaEventsHelper::createWindow( const uno::Sequence< uno::Any >& rArgs return uno::Any( xWindow ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * ScVbaEventsHelper_get_implementation( css::uno::XComponentContext * /*context*/, css::uno::Sequence<css::uno::Any> const &arguments) diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index 2898cbbd9d4d..189fe708f2f0 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -266,7 +266,7 @@ ScVbaGlobals::getServiceNames() return aServiceNames; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * ScVbaGlobals_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &arguments) diff --git a/sc/source/ui/vba/vbatextframe.cxx b/sc/source/ui/vba/vbatextframe.cxx index c6aa6dd328c5..6c420fa9bc41 100644 --- a/sc/source/ui/vba/vbatextframe.cxx +++ b/sc/source/ui/vba/vbatextframe.cxx @@ -60,7 +60,7 @@ ScVbaTextFrame::getServiceNames() return aServiceNames; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * ScVbaTextFrame_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &arguments) |