diff options
38 files changed, 159 insertions, 93 deletions
diff --git a/basic/inc/sbprop.hxx b/basic/inc/sbprop.hxx index 236a34e671f9..f1f7352e9c70 100644 --- a/basic/inc/sbprop.hxx +++ b/basic/inc/sbprop.hxx @@ -22,17 +22,16 @@ #include <basic/sbxprop.hxx> #include <basic/sbdef.hxx> -#include <basic/basicdllapi.h> class SbModule; -class BASIC_DLLPUBLIC SbProperty : public SbxProperty +class SbProperty : public SbxProperty { friend class SbiFactory; friend class SbModule; friend class SbProcedureProperty; SbModule* pMod; - BASIC_DLLPRIVATE SbProperty( const OUString&, SbxDataType, SbModule* ); + SbProperty( const OUString&, SbxDataType, SbModule* ); virtual ~SbProperty() override; public: SBX_DECL_PERSIST_NODATA(SBXID_BASICPROP,1); @@ -41,7 +40,7 @@ public: typedef tools::SvRef<SbProperty> SbPropertyRef; -class BASIC_DLLPUBLIC SbProcedureProperty : public SbxProperty +class SbProcedureProperty : public SbxProperty { bool mbSet; // Flag for set command diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index 9be8091ac314..894944b51a1a 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -46,7 +46,7 @@ class ConfigColorScheme : { public: explicit ConfigColorScheme( const css::uno::Reference< css::uno::XComponentContext > & xContext ); - SAL_DLLPRIVATE virtual ~ConfigColorScheme() override; + virtual ~ConfigColorScheme() override; /// declare XServiceInfo methods virtual OUString SAL_CALL getImplementationName() @@ -60,15 +60,15 @@ public: static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // ____ ConfigItemListener ____ - SAL_DLLPRIVATE void notify( const OUString & rPropertyName ); + void notify( const OUString & rPropertyName ); protected: // ____ XColorScheme ____ - SAL_DLLPRIVATE virtual ::sal_Int32 SAL_CALL getColorByIndex( ::sal_Int32 nIndex ) + virtual ::sal_Int32 SAL_CALL getColorByIndex( ::sal_Int32 nIndex ) throw (css::uno::RuntimeException, std::exception) override; private: - SAL_DLLPRIVATE void retrieveConfigColors(); + void retrieveConfigColors(); // member variables css::uno::Reference< css::uno::XComponentContext > m_xContext; diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx index 040192d61dca..4c9940d110ac 100644 --- a/comphelper/source/container/enumerablemap.cxx +++ b/comphelper/source/container/enumerablemap.cxx @@ -148,8 +148,7 @@ namespace comphelper , XServiceInfo > Map_IFace; - class COMPHELPER_DLLPRIVATE EnumerableMap :public Map_IFace - ,public ComponentBase + class EnumerableMap: public Map_IFace, public ComponentBase { protected: EnumerableMap(); diff --git a/compilerplugins/clang/dllprivate.cxx b/compilerplugins/clang/dllprivate.cxx new file mode 100644 index 000000000000..1acb710c1331 --- /dev/null +++ b/compilerplugins/clang/dllprivate.cxx @@ -0,0 +1,68 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "plugin.hxx" + +namespace { + +class Visitor final: + public RecursiveASTVisitor<Visitor>, public loplugin::Plugin +{ +public: + explicit Visitor(InstantiationData const & data): Plugin(data) {} + + bool VisitNamedDecl(NamedDecl const * decl) { + if (!decl->getLocation().isInvalid()&&ignoreLocation(decl)) { + return true; + } + auto a = decl->getAttr<VisibilityAttr>(); + if (a == nullptr || a->getVisibility() != VisibilityAttr::Hidden) { + return true; + } + if (compiler.getSourceManager().isMacroBodyExpansion( + decl->getLocation()) + && (Lexer::getImmediateMacroName( + decl->getLocation(), compiler.getSourceManager(), + compiler.getLangOpts()) + == "Q_OBJECT")) // from /usr/include/QtCore/qobjectdefs.h + { + return true; + } + auto p = dyn_cast<RecordDecl>(decl->getDeclContext()); + if (p == nullptr) { + report( + DiagnosticsEngine::Warning, + "top-level declaration redundantly marked as DLLPRIVATE", + a->getLocation()) + << decl->getSourceRange(); + } else if (p->getVisibility() == HiddenVisibility) { + report( + DiagnosticsEngine::Warning, + ("declaration nested in DLLPRIVATE declaration redundantly" + " marked as DLLPRIVATE"), + a->getLocation()) + << decl->getSourceRange(); + report( + DiagnosticsEngine::Note, "parent declaration is here", + p->getLocation()) + << p->getSourceRange(); + } + return true; + } + +private: + void run() override + { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } +}; + +static loplugin::Plugin::Registration<Visitor> reg("dllprivate"); + +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index c5f339c0d147..056f337a53b5 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -36,14 +36,14 @@ class SfxMacroTabPage_Impl; class SfxMacroTabPage : public SfxTabPage { SvxMacroTableDtor aTbl; - DECL_DLLPRIVATE_LINK_TYPED( SelectEvent_Impl, SvTreeListBox*, void ); - DECL_DLLPRIVATE_LINK_TYPED( SelectGroup_Impl, SvTreeListBox*, void ); - DECL_DLLPRIVATE_LINK_TYPED( SelectMacro_Impl, SvTreeListBox*, void ); + DECL_LINK_TYPED( SelectEvent_Impl, SvTreeListBox*, void ); + DECL_LINK_TYPED( SelectGroup_Impl, SvTreeListBox*, void ); + DECL_LINK_TYPED( SelectMacro_Impl, SvTreeListBox*, void ); - DECL_DLLPRIVATE_LINK_TYPED( AssignDeleteHdl_Impl, SvTreeListBox*, bool ); - DECL_DLLPRIVATE_LINK_TYPED( AssignDeleteClickHdl_Impl, Button *, void ); + DECL_LINK_TYPED( AssignDeleteHdl_Impl, SvTreeListBox*, bool ); + DECL_LINK_TYPED( AssignDeleteClickHdl_Impl, Button *, void ); bool AssignDeleteHdl(Control *); - DECL_DLLPRIVATE_LINK_TYPED( TimeOut_Impl, Idle*, void ); + DECL_LINK_TYPED( TimeOut_Impl, Idle*, void ); protected: std::unique_ptr<SfxMacroTabPage_Impl> mpImpl; diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index f0e0648282b3..fb9860012a11 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -118,7 +118,7 @@ public: SvxMacroAssignSingleTabDialog(vcl::Window* pParent, const SfxItemSet& rOptionsSet); private: - DECL_DLLPRIVATE_LINK_TYPED( OKHdl_Impl, Button *, void ); + DECL_LINK_TYPED( OKHdl_Impl, Button *, void ); }; diff --git a/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx b/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx index b61511a0670d..a903c29a1b04 100644 --- a/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx +++ b/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx @@ -34,7 +34,7 @@ namespace dbaccess // DatabaseDocumentRecovery struct DatabaseDocumentRecovery_Data; - class DBACCESS_DLLPRIVATE DatabaseDocumentRecovery + class DatabaseDocumentRecovery { public: DatabaseDocumentRecovery( diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx index b081b63547b6..a19fb26b008c 100644 --- a/dbaccess/source/core/recovery/dbdocrecovery.cxx +++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx @@ -201,7 +201,7 @@ namespace dbaccess } // DatabaseDocumentRecovery_Data - struct DBACCESS_DLLPRIVATE DatabaseDocumentRecovery_Data + struct DatabaseDocumentRecovery_Data { const Reference<XComponentContext> aContext; diff --git a/dbaccess/source/core/recovery/storagestream.hxx b/dbaccess/source/core/recovery/storagestream.hxx index ce5ce60b049e..3fe4e28c33f9 100644 --- a/dbaccess/source/core/recovery/storagestream.hxx +++ b/dbaccess/source/core/recovery/storagestream.hxx @@ -31,7 +31,7 @@ namespace dbaccess // StorageOutputStream /** convenience wrapper around a stream living in a storage */ - class DBACCESS_DLLPRIVATE StorageOutputStream + class StorageOutputStream { public: StorageOutputStream( @@ -56,7 +56,7 @@ namespace dbaccess // StorageInputStream /** convenience wrapper around a stream living in a storage */ - class DBACCESS_DLLPRIVATE StorageInputStream + class StorageInputStream { public: StorageInputStream( diff --git a/dbaccess/source/core/recovery/storagetextstream.hxx b/dbaccess/source/core/recovery/storagetextstream.hxx index 53c689d56633..30080e33b393 100644 --- a/dbaccess/source/core/recovery/storagetextstream.hxx +++ b/dbaccess/source/core/recovery/storagetextstream.hxx @@ -29,7 +29,7 @@ namespace dbaccess // StorageTextStream struct StorageTextOutputStream_Data; - class DBACCESS_DLLPRIVATE StorageTextOutputStream : public StorageOutputStream + class StorageTextOutputStream : public StorageOutputStream { public: StorageTextOutputStream( diff --git a/dbaccess/source/core/recovery/storagexmlstream.hxx b/dbaccess/source/core/recovery/storagexmlstream.hxx index 519387f0e772..ba174c8368c3 100644 --- a/dbaccess/source/core/recovery/storagexmlstream.hxx +++ b/dbaccess/source/core/recovery/storagexmlstream.hxx @@ -32,7 +32,7 @@ namespace dbaccess // StorageXMLOutputStream struct StorageXMLOutputStream_Data; - class DBACCESS_DLLPRIVATE StorageXMLOutputStream : public StorageOutputStream + class StorageXMLOutputStream : public StorageOutputStream { public: StorageXMLOutputStream( @@ -63,7 +63,7 @@ namespace dbaccess // StorageXMLInputStream struct StorageXMLInputStream_Data; - class DBACCESS_DLLPRIVATE StorageXMLInputStream : public StorageInputStream + class StorageXMLInputStream : public StorageInputStream { public: StorageXMLInputStream( diff --git a/dbaccess/source/core/recovery/subcomponentloader.cxx b/dbaccess/source/core/recovery/subcomponentloader.cxx index b22b4b374764..fbb9d0b5f0f2 100644 --- a/dbaccess/source/core/recovery/subcomponentloader.cxx +++ b/dbaccess/source/core/recovery/subcomponentloader.cxx @@ -43,7 +43,7 @@ namespace dbaccess using ::com::sun::star::lang::XComponent; // SubComponentLoader - struct DBACCESS_DLLPRIVATE SubComponentLoader_Data + struct SubComponentLoader_Data { const Reference< XCommandProcessor > xDocDefCommands; const Reference< XComponent > xNonDocComponent; diff --git a/dbaccess/source/core/recovery/subcomponentloader.hxx b/dbaccess/source/core/recovery/subcomponentloader.hxx index bce08b477392..0ec0297847b1 100644 --- a/dbaccess/source/core/recovery/subcomponentloader.hxx +++ b/dbaccess/source/core/recovery/subcomponentloader.hxx @@ -39,7 +39,7 @@ namespace dbaccess /** is a helper class which loads/opens a given sub component as soon as the main application window becomes visible. */ - class DBACCESS_DLLPRIVATE SubComponentLoader : public SubComponentLoader_Base + class SubComponentLoader : public SubComponentLoader_Base { public: SubComponentLoader( diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx index a2725117b694..220964ab0d40 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx @@ -165,7 +165,7 @@ namespace dbaccess } // SettingsExportContext - class DBACCESS_DLLPRIVATE SettingsExportContext : public ::xmloff::XMLSettingsExportContext + class SettingsExportContext : public ::xmloff::XMLSettingsExportContext { public: SettingsExportContext( const Reference<XComponentContext>& i_rContext, const StorageXMLOutputStream& i_rDelegator ) @@ -238,7 +238,7 @@ namespace dbaccess // SettingsDocumentHandler typedef ::cppu::WeakImplHelper< XDocumentHandler > SettingsDocumentHandler_Base; - class DBACCESS_DLLPRIVATE SettingsDocumentHandler : public SettingsDocumentHandler_Base + class SettingsDocumentHandler : public SettingsDocumentHandler_Base { public: SettingsDocumentHandler() diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.hxx b/dbaccess/source/core/recovery/subcomponentrecovery.hxx index 263d2cb24219..031df55f7f12 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.hxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.hxx @@ -30,7 +30,7 @@ namespace dbaccess { // SubComponentRecovery - class DBACCESS_DLLPRIVATE SubComponentRecovery + class SubComponentRecovery { public: SubComponentRecovery( diff --git a/dbaccess/source/core/recovery/subcomponents.hxx b/dbaccess/source/core/recovery/subcomponents.hxx index 763b23f396fa..6fa4c6695e3e 100644 --- a/dbaccess/source/core/recovery/subcomponents.hxx +++ b/dbaccess/source/core/recovery/subcomponents.hxx @@ -44,7 +44,7 @@ namespace dbaccess UNKNOWN = 10001 }; - struct DBACCESS_DLLPRIVATE SubComponentDescriptor + struct SubComponentDescriptor { OUString sName; bool bForEditing; diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index b97a70fae2e8..7c14fb3170d9 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -128,11 +128,11 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl MENU_COMMAND ShowPopupMenu( const Point &rPos, const long nPos ); - DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar*, void ); + DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); - DECL_DLLPRIVATE_LINK_TYPED( HandleOptionsBtn, Button*, void ); - DECL_DLLPRIVATE_LINK_TYPED( HandleEnableBtn, Button*, void ); - DECL_DLLPRIVATE_LINK_TYPED( HandleRemoveBtn, Button*, void ); + DECL_LINK_TYPED( HandleOptionsBtn, Button*, void ); + DECL_LINK_TYPED( HandleEnableBtn, Button*, void ); + DECL_LINK_TYPED( HandleRemoveBtn, Button*, void ); public: explicit ExtBoxWithBtns_Impl(vcl::Window* pParent); @@ -1140,7 +1140,7 @@ bool ExtMgrDialog::Notify( NotifyEvent& rNEvt ) return true; } -IMPL_LINK_NOARG_TYPED(ExtMgrDialog, Restart, void*, void) +IMPL_STATIC_LINK_NOARG_TYPED(ExtMgrDialog, Restart, void*, void) { SolarMutexGuard aGuard; ::svtools::executeRestartDialog(comphelper::getProcessComponentContext(), diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 703803025750..801cdd264abe 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -132,15 +132,15 @@ class ExtMgrDialog : public ModelessDialog, bool removeExtensionWarn( const OUString &rExtensionTitle ) const; - DECL_DLLPRIVATE_LINK_TYPED( HandleAddBtn, Button*, void ); - DECL_DLLPRIVATE_LINK_TYPED( HandleUpdateBtn, Button*, void ); - DECL_DLLPRIVATE_LINK_TYPED( HandleCancelBtn, Button*, void ); - DECL_DLLPRIVATE_LINK_TYPED( HandleCloseBtn, Button*, void ); - DECL_DLLPRIVATE_LINK_TYPED( HandleExtTypeCbx, Button*, void ); - DECL_DLLPRIVATE_LINK_TYPED( HandleHyperlink, FixedHyperlink&, void ); - DECL_DLLPRIVATE_LINK_TYPED(TimeOutHdl, Idle *, void); - DECL_DLLPRIVATE_LINK_TYPED( startProgress, void *, void ); - DECL_DLLPRIVATE_LINK_TYPED( Restart, void *, void ); + DECL_LINK_TYPED( HandleAddBtn, Button*, void ); + DECL_LINK_TYPED( HandleUpdateBtn, Button*, void ); + DECL_LINK_TYPED( HandleCancelBtn, Button*, void ); + DECL_LINK_TYPED( HandleCloseBtn, Button*, void ); + DECL_LINK_TYPED( HandleExtTypeCbx, Button*, void ); + DECL_LINK_TYPED( HandleHyperlink, FixedHyperlink&, void ); + DECL_LINK_TYPED(TimeOutHdl, Idle *, void); + DECL_LINK_TYPED( startProgress, void *, void ); + DECL_STATIC_LINK_TYPED( ExtMgrDialog, Restart, void *, void ); public: ExtMgrDialog( vcl::Window * pParent, TheExtensionManager *pManager, Dialog::InitFlag eFlag = Dialog::InitFlag::Default ); @@ -199,12 +199,12 @@ class UpdateRequiredDialog : public ModalDialog, css::uno::Reference< css::task::XAbortChannel > m_xAbortChannel; - DECL_DLLPRIVATE_LINK_TYPED( HandleUpdateBtn, Button*, void ); - DECL_DLLPRIVATE_LINK_TYPED( HandleCloseBtn, Button*, void ); - DECL_DLLPRIVATE_LINK_TYPED( HandleCancelBtn, Button*, void ); - DECL_DLLPRIVATE_LINK_TYPED(TimeOutHdl, Idle *, void); - DECL_DLLPRIVATE_LINK_TYPED( startProgress, void *, void ); - DECL_DLLPRIVATE_LINK_TYPED( HandleHyperlink, FixedHyperlink&, void ); + DECL_LINK_TYPED( HandleUpdateBtn, Button*, void ); + DECL_LINK_TYPED( HandleCloseBtn, Button*, void ); + DECL_LINK_TYPED( HandleCancelBtn, Button*, void ); + DECL_LINK_TYPED(TimeOutHdl, Idle *, void); + DECL_LINK_TYPED( startProgress, void *, void ); + DECL_LINK_TYPED( HandleHyperlink, FixedHyperlink&, void ); static bool isEnabled( const css::uno::Reference< css::deployment::XPackage > &xPackage ); static bool checkDependencies( const css::uno::Reference< css::deployment::XPackage > &xPackage ); diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index 6c70e41d8623..f20153eae304 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -163,7 +163,7 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox void DeleteRemoved(); - DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar*, void ); + DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); void Init(); public: diff --git a/include/sfx2/checkin.hxx b/include/sfx2/checkin.hxx index 1722bb9b8f9d..140c4700fdb7 100644 --- a/include/sfx2/checkin.hxx +++ b/include/sfx2/checkin.hxx @@ -21,7 +21,7 @@ class SfxCheckinDialog : public ModalDialog VclPtr<OKButton> m_pOKBtn; - DECL_DLLPRIVATE_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK_TYPED(OKHdl, Button*, void); public: SfxCheckinDialog( vcl::Window* pParent ); diff --git a/include/svl/lngmisc.hxx b/include/svl/lngmisc.hxx index 5d46d6946262..85b60458ac3f 100644 --- a/include/svl/lngmisc.hxx +++ b/include/svl/lngmisc.hxx @@ -43,7 +43,7 @@ namespace linguistic return cChar < static_cast<sal_Unicode>(' '); } - SVL_DLLPRIVATE sal_Int32 GetNumControlChars( const OUString &rTxt ); + sal_Int32 GetNumControlChars( const OUString &rTxt ); SVL_DLLPUBLIC bool RemoveHyphens(OUString &rTxt); SVL_DLLPUBLIC bool RemoveControlChars(OUString &rTxt); diff --git a/include/svtools/imagemgr.hxx b/include/svtools/imagemgr.hxx index 2b44953b1afb..27e4013f7d2c 100644 --- a/include/svtools/imagemgr.hxx +++ b/include/svtools/imagemgr.hxx @@ -63,7 +63,7 @@ struct VolumeInfo class SvFileInformationManager { private: - SVT_DLLPRIVATE static rtl::OUString GetDescription_Impl( const INetURLObject& rObject, bool bDetectFolder ); + static rtl::OUString GetDescription_Impl( const INetURLObject& rObject, bool bDetectFolder ); public: SVT_DLLPUBLIC static Image GetImage( const INetURLObject& rURL, bool bBig = false ); diff --git a/include/vbahelper/vbaaccesshelper.hxx b/include/vbahelper/vbaaccesshelper.hxx index 50516f4442cf..6bf5d7a5eaad 100644 --- a/include/vbahelper/vbaaccesshelper.hxx +++ b/include/vbahelper/vbaaccesshelper.hxx @@ -43,7 +43,7 @@ namespace ooo namespace vba { - VBAHELPER_DLLPRIVATE inline css::uno::Reference< css::lang::XMultiServiceFactory > getVBAServiceFactory( SfxObjectShell* pShell ) + inline css::uno::Reference< css::lang::XMultiServiceFactory > getVBAServiceFactory( SfxObjectShell* pShell ) { css::uno::Any aUnoVar; if ( !pShell || ! pShell->GetBasicManager()->GetGlobalUNOConstant( "VBAGlobals", aUnoVar ) ) @@ -52,7 +52,7 @@ namespace ooo return xVBAFactory; } - VBAHELPER_DLLPRIVATE inline css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell* pShell, const sal_Char* _pAsciiName, const css::uno::Sequence< css::uno::Any >& aArgs ) throw (css::uno::Exception) + inline css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell* pShell, const sal_Char* _pAsciiName, const css::uno::Sequence< css::uno::Any >& aArgs ) throw (css::uno::Exception) { OSL_PRECOND( pShell, "createVBAUnoAPIService: no shell!" ); OUString sVarName( OUString::createFromAscii( _pAsciiName ) ); @@ -61,7 +61,7 @@ namespace ooo } - VBAHELPER_DLLPRIVATE inline bool isAlienDoc( SfxObjectShell& rDocShell, const char* pMimeType ) + inline bool isAlienDoc( SfxObjectShell& rDocShell, const char* pMimeType ) { bool bRes( false ); const SfxMedium *pMedium = rDocShell.GetMedium(); @@ -70,10 +70,10 @@ namespace ooo bRes = pFilt->GetMimeType().equalsAscii( pMimeType ); return bRes; } - VBAHELPER_DLLPRIVATE inline bool isAlienExcelDoc( SfxObjectShell& rDocShell ) { return isAlienDoc( rDocShell, "application/vnd.ms-excel" ); } + inline bool isAlienExcelDoc( SfxObjectShell& rDocShell ) { return isAlienDoc( rDocShell, "application/vnd.ms-excel" ); } //VBAHELPER_DLLPRIVATE inline bool isAlienWordDoc( SfxObjectShell& rDocShell ) { return isAlienDoc( rDocShell, "application/vnd.ms-word" ); } // word seems to return an erroneous mime type :-/ "application/msword" not consistent with the excel one - VBAHELPER_DLLPRIVATE inline bool isAlienWordDoc( SfxObjectShell& rDocShell ) { return isAlienDoc( rDocShell, "application/msword" ); } + inline bool isAlienWordDoc( SfxObjectShell& rDocShell ) { return isAlienDoc( rDocShell, "application/msword" ); } } // openoffice } // org diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx index 9913d1bf5f9c..25d6383f8879 100644 --- a/include/vcl/longcurr.hxx +++ b/include/vcl/longcurr.hxx @@ -30,7 +30,7 @@ class LocaleDataWrapper; class VCL_DLLPUBLIC LongCurrencyFormatter : public FormatterBase { private: - SAL_DLLPRIVATE friend bool ImplLongCurrencyReformat( const OUString&, BigInt const &, BigInt const &, sal_uInt16, const LocaleDataWrapper&, OUString&, LongCurrencyFormatter& ); + friend bool ImplLongCurrencyReformat( const OUString&, BigInt const &, BigInt const &, sal_uInt16, const LocaleDataWrapper&, OUString&, LongCurrencyFormatter& ); SAL_DLLPRIVATE void ImpInit(); protected: diff --git a/include/xmloff/xformsexport.hxx b/include/xmloff/xformsexport.hxx index bba51b2af13b..5fb10ec782e0 100644 --- a/include/xmloff/xformsexport.hxx +++ b/include/xmloff/xformsexport.hxx @@ -33,13 +33,13 @@ namespace com { namespace sun { namespace star { /** export an XForms model. */ -void SAL_DLLPRIVATE exportXForms( SvXMLExport& ); +void exportXForms( SvXMLExport& ); -OUString SAL_DLLPRIVATE getXFormsBindName( const css::uno::Reference<css::beans::XPropertySet>& xBinding ); +OUString getXFormsBindName( const css::uno::Reference<css::beans::XPropertySet>& xBinding ); -OUString SAL_DLLPRIVATE getXFormsListBindName( const css::uno::Reference<css::beans::XPropertySet>& xBinding ); +OUString getXFormsListBindName( const css::uno::Reference<css::beans::XPropertySet>& xBinding ); -OUString SAL_DLLPRIVATE getXFormsSubmissionName( const css::uno::Reference<css::beans::XPropertySet>& xBinding ); +OUString getXFormsSubmissionName( const css::uno::Reference<css::beans::XPropertySet>& xBinding ); /** returns the settings of the given XForms container, to be exported as document specific settings diff --git a/sd/source/ui/dlg/RemoteDialog.hxx b/sd/source/ui/dlg/RemoteDialog.hxx index 4f1020ce6be1..27f5cb1bd550 100644 --- a/sd/source/ui/dlg/RemoteDialog.hxx +++ b/sd/source/ui/dlg/RemoteDialog.hxx @@ -28,7 +28,7 @@ private: VclPtr<CloseButton> m_pButtonClose; VclPtr<ClientBox> m_pClientBox; - DECL_DLLPRIVATE_LINK_TYPED( HandleConnectButton, Button*, void ); + DECL_LINK_TYPED( HandleConnectButton, Button*, void ); DECL_LINK_TYPED( CloseHdl, SystemWindow&, void ); DECL_LINK_TYPED( CloseClickHdl, Button*, void ); public: diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx index e68e71f38b21..b625ad8e50b2 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx @@ -125,8 +125,8 @@ class ClientBox : public Control bool HandleCursorKey( sal_uInt16 nKeyCode ); void DeleteRemoved(); - DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar*, void ); - DECL_DLLPRIVATE_LINK_TYPED( DeauthoriseHdl, Button*, void ); + DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); + DECL_LINK_TYPED( DeauthoriseHdl, Button*, void ); public: ClientBox( vcl::Window* pParent, WinBits nStyle ); diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx index ae5553915f1d..ec847a95b705 100644 --- a/svl/source/undo/undo.cxx +++ b/svl/source/undo/undo.cxx @@ -220,7 +220,7 @@ void SfxUndoActions::Insert( SfxUndoAction* i_action, size_t i_pos ) typedef ::std::vector< SfxUndoListener* > UndoListeners; -struct SVL_DLLPRIVATE SfxUndoManager_Data +struct SfxUndoManager_Data { ::osl::Mutex aMutex; SfxUndoArray* pUndoArray; @@ -260,7 +260,7 @@ struct SVL_DLLPRIVATE SfxUndoManager_Data namespace svl { namespace undo { namespace impl { - class SVL_DLLPRIVATE LockGuard + class LockGuard { public: explicit LockGuard( SfxUndoManager& i_manager ) @@ -281,7 +281,7 @@ namespace svl { namespace undo { namespace impl typedef void ( SfxUndoListener::*UndoListenerVoidMethod )(); typedef void ( SfxUndoListener::*UndoListenerStringMethod )( const OUString& ); - struct SVL_DLLPRIVATE NotifyUndoListener : public ::std::unary_function< SfxUndoListener*, void > + struct NotifyUndoListener : public ::std::unary_function< SfxUndoListener*, void > { explicit NotifyUndoListener( UndoListenerVoidMethod i_notificationMethod ) :m_notificationMethod( i_notificationMethod ) @@ -321,7 +321,7 @@ namespace svl { namespace undo { namespace impl OUString m_sActionComment; }; - class SVL_DLLPRIVATE UndoManagerGuard + class UndoManagerGuard { public: explicit UndoManagerGuard( SfxUndoManager_Data& i_managerData ) diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index a34281b4f150..f476026a5b23 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -42,7 +42,7 @@ namespace svt { -class SVT_DLLPRIVATE AsyncAccelExec : public cppu::WeakImplHelper<css::lang::XEventListener> +class AsyncAccelExec : public cppu::WeakImplHelper<css::lang::XEventListener> { private: css::uno::Reference<css::lang::XComponent> m_xFrame; @@ -74,11 +74,11 @@ class SVT_DLLPRIVATE AsyncAccelExec : public cppu::WeakImplHelper<css::lang::XEv /** @short allow creation of instances of this class by using our factory only! */ - SVT_DLLPRIVATE AsyncAccelExec(const css::uno::Reference<css::lang::XComponent>& xFrame, + AsyncAccelExec(const css::uno::Reference<css::lang::XComponent>& xFrame, const css::uno::Reference< css::frame::XDispatch >& xDispatch, const css::util::URL& rURL); - DECL_DLLPRIVATE_LINK_TYPED(impl_ts_asyncCallback, LinkParamNone*, void); + DECL_LINK_TYPED(impl_ts_asyncCallback, LinkParamNone*, void); }; diff --git a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx index 424481e67b86..d689ce144e44 100644 --- a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx +++ b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx @@ -42,7 +42,7 @@ namespace sdr { namespace contact { //= ViewContactOfUnoControl - class SVX_DLLPRIVATE ViewContactOfUnoControl : public ViewContactOfSdrObj + class ViewContactOfUnoControl : public ViewContactOfSdrObj { public: // access to SdrObject diff --git a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx index 7872e7655163..df27838fcbb0 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx @@ -46,7 +46,7 @@ namespace sdr { namespace contact { //= ViewObjectContactOfUnoControl class ViewObjectContactOfUnoControl_Impl; - class SVX_DLLPRIVATE ViewObjectContactOfUnoControl : public ViewObjectContactOfSdrObj + class ViewObjectContactOfUnoControl : public ViewObjectContactOfSdrObj { protected: ::rtl::Reference< ViewObjectContactOfUnoControl_Impl > m_pImpl; @@ -104,7 +104,7 @@ namespace sdr { namespace contact { ViewObjectContactOfUnoControl& operator=( const ViewObjectContactOfUnoControl& ) = delete; }; - class SVX_DLLPRIVATE UnoControlPrintOrPreviewContact : public ViewObjectContactOfUnoControl + class UnoControlPrintOrPreviewContact : public ViewObjectContactOfUnoControl { public: UnoControlPrintOrPreviewContact( ObjectContactOfPageView& _rObjectContact, ViewContactOfUnoControl& _rViewContact ); diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx index 17cf77b9c966..f56da8cf6fec 100644 --- a/svx/source/inc/fmpgeimp.hxx +++ b/svx/source/inc/fmpgeimp.hxx @@ -46,7 +46,7 @@ class SdrObject; // eingefuegt worden sind und wann diese entfernt wurden -class SVX_DLLPRIVATE FmFormPageImpl +class FmFormPageImpl { css::uno::Reference< css::form::XForm > xCurrentForm; css::uno::Reference< css::form::XForms > m_xForms; diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx index 7d36f84415a3..677d5635e68a 100644 --- a/svx/source/inc/fmundo.hxx +++ b/svx/source/inc/fmundo.hxx @@ -120,7 +120,7 @@ public: }; -class SVX_DLLPRIVATE FmXUndoEnvironment +class FmXUndoEnvironment : public ::cppu::WeakImplHelper< css::beans::XPropertyChangeListener , css::container::XContainerListener , css::util::XModifyListener diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 44c559d62fca..081284cf7d9e 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -493,7 +493,7 @@ namespace sdr { namespace contact { , XModeChangeListener > ViewObjectContactOfUnoControl_Impl_Base; - class SVX_DLLPRIVATE ViewObjectContactOfUnoControl_Impl: + class ViewObjectContactOfUnoControl_Impl: public ViewObjectContactOfUnoControl_Impl_Base { private: diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 56f71174d447..def93ad20d9b 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -146,7 +146,7 @@ public: protected: /// Calculate the optimal width of the dropdown. Very expensive operation, triggers lots of font measurement. - DECL_DLLPRIVATE_LINK_TYPED(CalcOptimalExtraUserWidth, VclWindowEvent&, void); + DECL_LINK_TYPED(CalcOptimalExtraUserWidth, VclWindowEvent&, void); virtual void Select() override; @@ -201,7 +201,7 @@ private: ".uno:CharEndPreviewFontName", aArgs ); } - DECL_DLLPRIVATE_LINK_TYPED( CheckAndMarkUnknownFont, VclWindowEvent&, void ); + DECL_LINK_TYPED( CheckAndMarkUnknownFont, VclWindowEvent&, void ); void SetOptimalSize(); diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 28dcb0332615..a0228c8e4027 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -57,7 +57,7 @@ class SwDrawModel; // initialize DrawModel (in form of a SwDrawModel) and DocShell (in form of a SwDocShell) // as needed, one or both parameters may be zero -void SAL_DLLPRIVATE InitDrawModelAndDocShell(SwDocShell* pSwDocShell, SwDrawModel* pSwDrawModel); +void InitDrawModelAndDocShell(SwDocShell* pSwDocShell, SwDrawModel* pSwDrawModel); class SW_DLLPUBLIC SwDocShell : public SfxObjectShell diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx index e70cadc543b7..1c69dddd7cbf 100644 --- a/sw/source/ui/inc/mmresultdialogs.hxx +++ b/sw/source/ui/inc/mmresultdialogs.hxx @@ -198,15 +198,15 @@ class SwSendMailDialog : public ModelessDialog //SfxModalDialog sal_Int32 m_nSendCount; sal_Int32 m_nErrorCount; - DECL_DLLPRIVATE_LINK_TYPED( StopHdl_Impl, Button*, void ); - DECL_DLLPRIVATE_LINK_TYPED( CloseHdl_Impl, Button* , void); - DECL_DLLPRIVATE_STATIC_LINK_TYPED( SwSendMailDialog, StartSendMails, void*, void ); - DECL_DLLPRIVATE_STATIC_LINK_TYPED( SwSendMailDialog, StopSendMails, void*, void ); - DECL_DLLPRIVATE_LINK_TYPED( RemoveThis, Idle*, void ); - - SAL_DLLPRIVATE void IterateMails(); - SAL_DLLPRIVATE void SendMails(); - SAL_DLLPRIVATE void UpdateTransferStatus(); + DECL_LINK_TYPED( StopHdl_Impl, Button*, void ); + DECL_LINK_TYPED( CloseHdl_Impl, Button* , void); + DECL_STATIC_LINK_TYPED( SwSendMailDialog, StartSendMails, void*, void ); + DECL_STATIC_LINK_TYPED( SwSendMailDialog, StopSendMails, void*, void ); + DECL_LINK_TYPED( RemoveThis, Idle*, void ); + + void IterateMails(); + void SendMails(); + void UpdateTransferStatus(); virtual void StateChanged( StateChangedType nStateChange ) override; diff --git a/testtools/source/bridgetest/currentcontextchecker.hxx b/testtools/source/bridgetest/currentcontextchecker.hxx index 711a8ef5e716..f431762e90ce 100644 --- a/testtools/source/bridgetest/currentcontextchecker.hxx +++ b/testtools/source/bridgetest/currentcontextchecker.hxx @@ -30,7 +30,7 @@ namespace testtools { namespace bridgetest { -class SAL_DLLPRIVATE CurrentContextChecker : +class CurrentContextChecker : public ::osl::DebugBase< CurrentContextChecker >, public ::cppu::WeakImplHelper< ::test::testtools::bridgetest::XCurrentContextChecker > |