diff options
31 files changed, 55 insertions, 78 deletions
diff --git a/bin/find-can-be-private-symbols.classes.results b/bin/find-can-be-private-symbols.classes.results index 05defda91c09..520f90bdb04b 100644 --- a/bin/find-can-be-private-symbols.classes.results +++ b/bin/find-can-be-private-symbols.classes.results @@ -4,7 +4,6 @@ BitmapConvolutionMatrixFilter BitmapEmbossGreyFilter BitmapMedianFilter BitmapMonochromeFilter -BitmapMonochromeMatrixFilter BitmapMosaicFilter BitmapPalette BitmapPopArtFilter @@ -25,17 +24,12 @@ FmDesignModeChangedHint FocusListenerMultiplexer FontSelectPattern FontSubsetInfo -FreetypeManager::IFSD_Equal GrBackendFormat GrBackendRenderTarget GrBackendTexture GrContext GrContextThreadSafeProxy GrContext_Base -GrGLExtensions -GrGLInterface -GrGpuResource -GrGpuResource::ProxyAccess GrImageContext GrVkExtensions GrVkSecondaryCBDrawContext @@ -51,6 +45,7 @@ MorkParser MouseListenerMultiplexer MouseMotionListenerMultiplexer MyThes +NotifyEvent OpenGLFramebuffer OpenGLZone PackedTextureAtlasManager @@ -64,7 +59,6 @@ SalInfoPrinter SalPrinter SalSystem SbClassModuleObject -ScChart2DataProvider ScFormatEntry ScPaintHint ScPreviewShell @@ -112,8 +106,6 @@ SfxStyleSheetModifiedHint SfxViewFrameItem SfxVisibilityItem SpinListenerMultiplexer -SvxGraphicObject -SvxMetricField SvxPrintItem SvxRsidItem SvxShowText @@ -157,9 +149,6 @@ SyntaxHighlighter::Tokenizer SystemWindow::ImplData TBCExtraInfo TBCGeneralInfo -TreeEditListenerMultiplexer -TreeExpansionListenerMultiplexer -TreeSelectionListenerMultiplexer VclAlignment VclBin VclBuilder::MenuAndId @@ -246,23 +235,19 @@ oox::ole::AxPageModel oox::ole::AxTabStripModel oox::ole::AxToggleButtonModel oox::ole::AxUserFormModel -psp::PrintFontManager::PrintFont salhelper::ORealDynamicLoader -sc::FormulaGroupInterpreter sd::DrawView sdr::SelectionController sdr::ViewSelection sdr::animation::primitiveAnimator sdr::contact::ObjectContactPainter -sdr::properties::BaseProperties sfx2::sidebar::Panel sfx2::sidebar::SidebarToolBox -sfx2::sidebar::TabBar::Item -skjpeg_destination_mgr -svt::MultiLineEditImplementation +svt::ControlBase +svt::EditControlBase svt::MultiLineTextCell +svtools::ToolbarPopup svx::CommonStyleManager -svx::DialControl::DialControl_Impl svx::PropertyValueProvider sw::BroadcastingModify sw::UnoCursorHint @@ -272,7 +257,6 @@ ucbhelper::InteractionApprove ucbhelper::InteractionDisapprove ucbhelper::InteractionRetry ucbhelper::InteractionSupplyAuthentication -utl::Bootstrap::Impl utl::OInputStreamHelper vcl::ExtOutDevData vcl::test::OutputDeviceTestGradient @@ -281,3 +265,4 @@ writerperfect::DirectoryStream::Impl xmloff::OControlBorderHandler xmloff::OFontWidthHandler xmloff::ORotationAngleHandler +xmlsecurity::pdfio diff --git a/bin/find-can-be-private-symbols.functions.results b/bin/find-can-be-private-symbols.functions.results index 59453f8ea623..6b2b4c0e5787 100644 --- a/bin/find-can-be-private-symbols.functions.results +++ b/bin/find-can-be-private-symbols.functions.results @@ -1,4 +1,3 @@ -GrGLAssembleInterface(void*, void (*(*)(void*, char const*))()) ImplCallPreNotify(NotifyEvent&) ImplDestroyHelpWindow(bool) ImplFastBitmapConversion(BitmapBuffer&, BitmapBuffer const&, SalTwoRect const&) diff --git a/bin/find-can-be-private-symbols.py b/bin/find-can-be-private-symbols.py index f5ff83fd1757..d679dd2a24bf 100755 --- a/bin/find-can-be-private-symbols.py +++ b/bin/find-can-be-private-symbols.py @@ -30,14 +30,14 @@ classes_with_imported_symbols = set() all_source_names = set() -# look for imported symbols in executables -subprocess_find_all_source_names = subprocess.Popen("git grep -oh -P '\\b\\w\\w\\w+\\b' -- '*.h*'", stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True) +subprocess_find_all_source_names = subprocess.Popen("git grep -oh -P '\\b\\w\\w\\w+\\b' -- '*.h*' | sort -u", stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True) with subprocess_find_all_source_names.stdout as txt: for line in txt: line = line.strip() all_source_names.add(line) subprocess_find_all_source_names.terminate() +# find all our shared libs subprocess_find = subprocess.Popen("find ./instdir -name *.so && find ./workdir/LinkTarget/CppunitTest -name *.so", stdout=subprocess.PIPE, shell=True) with subprocess_find.stdout as txt: for line in txt: @@ -51,7 +51,8 @@ with subprocess_find.stdout as txt: for line2 in txt2: line2 = line2.strip() if line_regex.match(line2): - exported_symbols.add(line2.split(" ")[2]) + sym = line2.split(" ")[2] + exported_symbols.add(sym) # look for imported symbols subprocess_objdump = subprocess.Popen("objdump -T " + sharedlib, stdout=subprocess.PIPE, shell=True) with subprocess_objdump.stdout as txt2: diff --git a/framework/inc/addonmenu.hxx b/framework/inc/addonmenu.hxx index 9e3aeb9dc812..dbffa8c1e495 100644 --- a/framework/inc/addonmenu.hxx +++ b/framework/inc/addonmenu.hxx @@ -38,7 +38,7 @@ class PopupMenu; namespace framework { -class UNLESS_MERGELIBS(FWK_DLLPUBLIC) AddonMenuManager +class AddonMenuManager { public: static bool HasAddonMenuElements(); diff --git a/framework/inc/classes/converter.hxx b/framework/inc/classes/converter.hxx index 6c20f4841b18..7841a237d905 100644 --- a/framework/inc/classes/converter.hxx +++ b/framework/inc/classes/converter.hxx @@ -31,7 +31,7 @@ namespace framework{ -class UNLESS_MERGELIBS(FWK_DLLPUBLIC) Converter +class Converter { public: // Seq<beans.NamedValue> <=> Seq<beans.PropertyValue> diff --git a/framework/inc/classes/fwkresid.hxx b/framework/inc/classes/fwkresid.hxx index e63ddce86adf..bd5119046297 100644 --- a/framework/inc/classes/fwkresid.hxx +++ b/framework/inc/classes/fwkresid.hxx @@ -20,10 +20,9 @@ #ifndef INCLUDED_FRAMEWORK_INC_CLASSES_FWKRESID_HXX #define INCLUDED_FRAMEWORK_INC_CLASSES_FWKRESID_HXX -#include <framework/fwkdllapi.h> #include <rtl/ustring.hxx> -FWK_DLLPUBLIC OUString FwkResId(const char* pId); +OUString FwkResId(const char* pId); #endif // __FRAMEWORK_CLASSES_FWKRESID diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx index 85cc13abf874..849a7f548144 100644 --- a/framework/inc/classes/protocolhandlercache.hxx +++ b/framework/inc/classes/protocolhandlercache.hxx @@ -27,7 +27,6 @@ #include <unotools/configitem.hxx> #include <rtl/ustring.hxx> -#include <framework/fwkdllapi.h> namespace framework{ @@ -44,7 +43,7 @@ namespace framework{ This struct holds the information about one such registered protocol handler. A list of handler objects is defined as ProtocolHandlerHash. see below */ -struct FWK_DLLPUBLIC ProtocolHandler +struct ProtocolHandler { /* member */ public: @@ -87,7 +86,7 @@ typedef std::unordered_map<OUString, ProtocolHandler> HandlerHash; */ class HandlerCFGAccess; -class UNLESS_MERGELIBS(FWK_DLLPUBLIC) HandlerCache final +class HandlerCache final { /* member */ private: diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx index fb7033c5b059..4dcb94003449 100644 --- a/framework/inc/helper/mischelper.hxx +++ b/framework/inc/helper/mischelper.hxx @@ -34,7 +34,6 @@ #include <i18nlangtag/lang.h> #include <svl/languageoptions.hxx> #include <rtl/ustring.hxx> -#include <framework/fwkdllapi.h> #include <functional> #include <set> @@ -115,7 +114,7 @@ public: css::uno::Reference< css::linguistic2::XLanguageGuessing > const & GetGuesser() const; }; -FWK_DLLPUBLIC void FillLangItems( std::set< OUString > &rLangItems, +void FillLangItems( std::set< OUString > &rLangItems, const css::uno::Reference< css::frame::XFrame > &rxFrame, const LanguageGuessingHelper & rLangGuessHelper, SvtScriptType nScriptType, @@ -245,12 +244,12 @@ class WeakDocumentEventListener final : public ::cppu::WeakImplHelper<css::docum } }; -FWK_DLLPUBLIC css::uno::Reference<css::ui::XContextChangeEventListener> +css::uno::Reference<css::ui::XContextChangeEventListener> GetFirstListenerWith_Impl( css::uno::Reference<css::uno::XInterface> const& xEventFocus, std::function<bool (css::uno::Reference<css::ui::XContextChangeEventListener> const&)> const& rPredicate); -FWK_DLLPUBLIC extern auto (*g_pGetMultiplexerListener)( +extern auto (*g_pGetMultiplexerListener)( css::uno::Reference<css::uno::XInterface> const&, std::function<bool (css::uno::Reference<css::ui::XContextChangeEventListener> const&)> const&) -> css::uno::Reference<css::ui::XContextChangeEventListener>; diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx index 392d017e753c..fc0dce8d6068 100644 --- a/framework/inc/jobs/configaccess.hxx +++ b/framework/inc/jobs/configaccess.hxx @@ -34,7 +34,7 @@ namespace framework{ instead of using specialized config items of the svtools project. This class can wrap such configuration access. */ -class UNLESS_MERGELIBS(FWK_DLLPUBLIC) ConfigAccess final +class ConfigAccess final { public: diff --git a/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx index 1eb839e45dbc..0c2705011a5b 100644 --- a/framework/inc/jobs/jobconst.hxx +++ b/framework/inc/jobs/jobconst.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_JOBS_JOBCONST_HXX #include <rtl/ustring.hxx> -#include <framework/fwkdllapi.h> namespace framework{ @@ -33,7 +32,7 @@ namespace framework{ it's code. Typos can occur or code will be changed by new developers ... Shared set of constant values can help to improve the maintenance of this code. */ -class FWK_DLLPUBLIC JobConst +class JobConst { public: static const OUString ANSWER_DEACTIVATE_JOB; diff --git a/framework/inc/menuconfiguration.hxx b/framework/inc/menuconfiguration.hxx index f602a4495580..0c8ae43545bd 100644 --- a/framework/inc/menuconfiguration.hxx +++ b/framework/inc/menuconfiguration.hxx @@ -20,7 +20,6 @@ #pragma once #include <config_options.h> -#include <framework/fwkdllapi.h> #include <cppuhelper/weakref.hxx> @@ -37,7 +36,7 @@ const sal_uInt16 ITEMID_ADDONLIST = 6678; // used to be a SID in sfx2, namespace framework { -struct FWK_DLLPUBLIC MenuAttributes +struct MenuAttributes { private: oslInterlockedCount refCount; @@ -78,7 +77,7 @@ public: } }; -class UNLESS_MERGELIBS(FWK_DLLPUBLIC) MenuConfiguration final +class MenuConfiguration final { public: MenuConfiguration( diff --git a/framework/inc/statusbarconfiguration.hxx b/framework/inc/statusbarconfiguration.hxx index 1a8c6ed95225..262e08613839 100644 --- a/framework/inc/statusbarconfiguration.hxx +++ b/framework/inc/statusbarconfiguration.hxx @@ -31,7 +31,7 @@ namespace com::sun::star::uno { template <typename > class Reference; } namespace framework { -class UNLESS_MERGELIBS(FWK_DLLPUBLIC) StatusBarConfiguration +class StatusBarConfiguration { public: static bool LoadStatusBar( diff --git a/framework/inc/toolboxconfiguration.hxx b/framework/inc/toolboxconfiguration.hxx index 16d531a4e2aa..0981a8780f82 100644 --- a/framework/inc/toolboxconfiguration.hxx +++ b/framework/inc/toolboxconfiguration.hxx @@ -31,7 +31,7 @@ namespace com::sun::star::uno { template <typename > class Reference; } namespace framework { -class UNLESS_MERGELIBS(FWK_DLLPUBLIC) ToolBoxConfiguration +class ToolBoxConfiguration { public: static bool LoadToolBox( diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx index 74d6c58ea80f..c70bcae8ca21 100644 --- a/framework/inc/uielement/constitemcontainer.hxx +++ b/framework/inc/uielement/constitemcontainer.hxx @@ -39,7 +39,7 @@ namespace framework class RootItemContainer; class ItemContainer; -class UNLESS_MERGELIBS(FWK_DLLPUBLIC) ConstItemContainer final : public ::cppu::WeakImplHelper< +class ConstItemContainer final : public ::cppu::WeakImplHelper< css::container::XIndexAccess, css::lang::XUnoTunnel , css::beans::XFastPropertySet, diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx index 67133ba17f68..cc12b5fa18f5 100644 --- a/framework/inc/uielement/rootitemcontainer.hxx +++ b/framework/inc/uielement/rootitemcontainer.hxx @@ -34,7 +34,6 @@ #include <cppuhelper/propshlp.hxx> #include <vector> -#include <framework/fwkdllapi.h> namespace framework { @@ -53,9 +52,9 @@ class RootItemContainer final : private cppu::BaseMutex, friend class ConstItemContainer; public: - FWK_DLLPUBLIC RootItemContainer(); - FWK_DLLPUBLIC RootItemContainer( const css::uno::Reference< css::container::XIndexAccess >& rItemAccessContainer ); - virtual FWK_DLLPUBLIC ~RootItemContainer() override; + RootItemContainer(); + RootItemContainer( const css::uno::Reference< css::container::XIndexAccess >& rItemAccessContainer ); + virtual ~RootItemContainer() override; // XInterface virtual void SAL_CALL acquire() throw () override @@ -68,7 +67,7 @@ class RootItemContainer final : private cppu::BaseMutex, virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XUnoTunnel - static FWK_DLLPUBLIC const css::uno::Sequence< sal_Int8 >& getUnoTunnelId() throw(); + static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId() throw(); sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) override; // XIndexContainer diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx index 539232c97664..5e28a94f8ca8 100644 --- a/framework/inc/xml/menudocumenthandler.hxx +++ b/framework/inc/xml/menudocumenthandler.hxx @@ -29,7 +29,6 @@ #include <rtl/ustring.hxx> #include <cppuhelper/implbase.hxx> -#include <framework/fwkdllapi.h> namespace framework{ diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx index 1af96555d4e0..1ed4c34dd44f 100644 --- a/framework/inc/xml/saxnamespacefilter.hxx +++ b/framework/inc/xml/saxnamespacefilter.hxx @@ -35,7 +35,7 @@ namespace framework // workaround for incremental linking bugs in MSVC2015 class SAL_DLLPUBLIC_TEMPLATE SaxNamespaceFilter_Base : public cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > {}; -class UNLESS_MERGELIBS(FWK_DLLPUBLIC) SaxNamespaceFilter final : public SaxNamespaceFilter_Base +class SaxNamespaceFilter final : public SaxNamespaceFilter_Base { public: SaxNamespaceFilter( css::uno::Reference< css::xml::sax::XDocumentHandler > const & rSax1DocumentHandler ); diff --git a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx index 01caf9885cca..ac56461e35b0 100644 --- a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx @@ -180,7 +180,7 @@ public: This primitive defines a waveline based on a PolygonStrokePrimitive2D where the wave is defined by wave width and wave length. */ -class DRAWINGLAYER_DLLPUBLIC PolygonWavePrimitive2D final : public PolygonStrokePrimitive2D +class PolygonWavePrimitive2D final : public PolygonStrokePrimitive2D { private: /// wave definition diff --git a/include/framework/transactionmanager.hxx b/include/framework/transactionmanager.hxx index 28b2623666d4..351ce89d2487 100644 --- a/include/framework/transactionmanager.hxx +++ b/include/framework/transactionmanager.hxx @@ -91,7 +91,7 @@ enum EExceptionMode @devstatus draft *//*-*************************************************************************************************************/ -class UNLESS_MERGELIBS(FWK_DLLPUBLIC) TransactionManager +class TransactionManager { // public methods diff --git a/include/oox/crypto/StrongEncryptionDataSpace.hxx b/include/oox/crypto/StrongEncryptionDataSpace.hxx index d287970e6519..40fd6f79e1e0 100644 --- a/include/oox/crypto/StrongEncryptionDataSpace.hxx +++ b/include/oox/crypto/StrongEncryptionDataSpace.hxx @@ -27,7 +27,7 @@ namespace oox { namespace crypto { -class OOX_DLLPUBLIC StrongEncryptionDataSpace final +class StrongEncryptionDataSpace final : public cppu::WeakImplHelper<css::lang::XServiceInfo, css::packages::XPackageEncryption> { css::uno::Reference<css::uno::XComponentContext> mxContext; diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx index 0d10efa82e6a..70ff1ec29ebb 100644 --- a/include/sfx2/sidebar/TabBar.hxx +++ b/include/sfx2/sidebar/TabBar.hxx @@ -42,8 +42,7 @@ class SidebarController; /** The tab bar is the container for the individual tabs. */ -class UNLESS_MERGELIBS(SFX2_DLLPUBLIC) TabBar final - : public vcl::Window +class TabBar final : public vcl::Window { public: /** DeckMenuData has entries for display name, and a flag: diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 128c16021ca0..1b13daa0a565 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -380,7 +380,7 @@ namespace svt //= concrete edit implementations typedef GenericEditImplementation< Edit > EditImplementation_Base; - class UNLESS_MERGELIBS(SVT_DLLPUBLIC) EditImplementation final : public EditImplementation_Base + class EditImplementation final : public EditImplementation_Base { DECL_LINK(ModifyHdl, Edit&, void); public: diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index 387c67f4bdb3..3614ae4fe309 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -153,7 +153,7 @@ namespace svx class ToolboxButtonColorUpdaterBase; } -class SVXCORE_DLLPUBLIC SvxStyleToolBoxControl final : public cppu::ImplInheritanceHelper<svt::ToolboxController, +class SvxStyleToolBoxControl final : public cppu::ImplInheritanceHelper<svt::ToolboxController, css::lang::XServiceInfo> { struct Impl; @@ -192,14 +192,14 @@ private: std::unique_ptr<SfxTemplateItem> pFamilyState[MAX_FAMILIES]; sal_uInt16 nActFamily; // Id in the ToolBox = Position - 1 - SVX_DLLPRIVATE void Update(); - SVX_DLLPRIVATE void FillStyleBox(); - SVX_DLLPRIVATE void SelectStyle(const OUString& rStyleName); + void Update(); + void FillStyleBox(); + void SelectStyle(const OUString& rStyleName); friend class SfxStyleControllerItem_Impl; - SVX_DLLPRIVATE void SetFamilyState(sal_uInt16 nIdx, const SfxTemplateItem* pItem); - SVX_DLLPRIVATE SfxStyleFamily GetActFamily() const; + void SetFamilyState(sal_uInt16 nIdx, const SfxTemplateItem* pItem); + SfxStyleFamily GetActFamily() const; }; typedef std::function<void(const OUString&, const NamedColor&)> ColorSelectFunction; diff --git a/include/vcl/gdimetafiletools.hxx b/include/vcl/gdimetafiletools.hxx index 923d49c21e8f..d956658676a0 100644 --- a/include/vcl/gdimetafiletools.hxx +++ b/include/vcl/gdimetafiletools.hxx @@ -35,12 +35,12 @@ class GDIMetaFile; // reimplement these im/exports to use primitives and not metafiles as base // information. -void VCL_DLLPUBLIC clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource); +void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource); // Allow to check if a Metafile contains clipping or not -bool VCL_DLLPUBLIC usesClipActions(const GDIMetaFile& rSource); +bool usesClipActions(const GDIMetaFile& rSource); // hook to access metafile members in classes of modules above vcl. Currently // used in MetafilePrimitive2D to be able to access the local Metafile member diff --git a/include/vcl/uitest/formattedfielduiobject.hxx b/include/vcl/uitest/formattedfielduiobject.hxx index 2408fe753e1b..0077f0fde798 100644 --- a/include/vcl/uitest/formattedfielduiobject.hxx +++ b/include/vcl/uitest/formattedfielduiobject.hxx @@ -14,7 +14,7 @@ class FormattedField; -class UITEST_DLLPUBLIC FormattedFieldUIObject : public SpinFieldUIObject +class FormattedFieldUIObject : public SpinFieldUIObject { VclPtr<FormattedField> mxFormattedField; diff --git a/include/vcl/uitest/metricfielduiobject.hxx b/include/vcl/uitest/metricfielduiobject.hxx index 21ff7ac88d11..a4b4efdd26aa 100644 --- a/include/vcl/uitest/metricfielduiobject.hxx +++ b/include/vcl/uitest/metricfielduiobject.hxx @@ -14,7 +14,7 @@ class MetricField; -class UITEST_DLLPUBLIC MetricFieldUIObject : public SpinFieldUIObject +class MetricFieldUIObject : public SpinFieldUIObject { VclPtr<MetricField> mxMetricField; diff --git a/include/vcl/viewdataentry.hxx b/include/vcl/viewdataentry.hxx index 2bce7556a109..6b7413f04a1f 100644 --- a/include/vcl/viewdataentry.hxx +++ b/include/vcl/viewdataentry.hxx @@ -43,7 +43,7 @@ struct SvViewDataItem * highlighted. When an entry is only highlighted, it looks visually * highlighted, but not logically selected. */ -class VCL_DLLPUBLIC SvViewDataEntry +class SvViewDataEntry { friend class SvTreeList; diff --git a/svx/source/inc/StylesPreviewToolBoxControl.hxx b/svx/source/inc/StylesPreviewToolBoxControl.hxx index 45e2126abec2..7e2bd85da67e 100644 --- a/svx/source/inc/StylesPreviewToolBoxControl.hxx +++ b/svx/source/inc/StylesPreviewToolBoxControl.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> -class SVXCORE_DLLPUBLIC StylesPreviewToolBoxControl final +class StylesPreviewToolBoxControl final : public cppu::ImplInheritanceHelper<svt::ToolboxController, css::lang::XServiceInfo> { VclPtr<StylesPreviewWindow_Impl> m_xVclBox; @@ -68,4 +68,4 @@ private: #endif -/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/svx/source/inc/svdpdf.hxx b/svx/source/inc/svdpdf.hxx index 6482b60ef867..60a90619e6a8 100644 --- a/svx/source/inc/svdpdf.hxx +++ b/svx/source/inc/svdpdf.hxx @@ -54,7 +54,7 @@ class SdrObject; class SvdProgressInfo; // Helper Class to import PDF -class SVXCORE_DLLPUBLIC ImpSdrPdfImport final +class ImpSdrPdfImport final { std::vector<SdrObject*> maTmpList; ScopedVclPtr<VirtualDevice> mpVD; diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx b/vcl/inc/jsdialog/jsdialogbuilder.hxx index f36b7ae3fa54..950898ead48c 100644 --- a/vcl/inc/jsdialog/jsdialogbuilder.hxx +++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx @@ -34,7 +34,7 @@ public: void Invoke() override; }; -class VCL_DLLPUBLIC JSDialogSender +class JSDialogSender { std::unique_ptr<JSDialogNotifyIdle> mpIdleNotify; @@ -189,7 +189,7 @@ public: virtual void insert_page(const OString& rIdent, const OUString& rLabel, int nPos) override; }; -class VCL_DLLPUBLIC JSSpinButton : public JSWidget<SalInstanceSpinButton, ::FormattedField> +class JSSpinButton : public JSWidget<SalInstanceSpinButton, ::FormattedField> { public: JSSpinButton(VclPtr<vcl::Window> aOwnedToplevel, ::FormattedField* pSpin, @@ -198,7 +198,7 @@ public: virtual void set_value(int value) override; }; -class VCL_DLLPUBLIC JSMessageDialog : public SalInstanceMessageDialog, public JSDialogSender +class JSMessageDialog : public SalInstanceMessageDialog, public JSDialogSender { public: JSMessageDialog(::MessageDialog* pDialog, SalInstanceBuilder* pBuilder, bool bTakeOwnership); @@ -208,7 +208,7 @@ public: virtual void set_secondary_text(const OUString& rText) override; }; -class VCL_DLLPUBLIC JSCheckButton : public JSWidget<SalInstanceCheckButton, ::CheckBox> +class JSCheckButton : public JSWidget<SalInstanceCheckButton, ::CheckBox> { public: JSCheckButton(VclPtr<vcl::Window> aOwnedToplevel, ::CheckBox* pCheckBox, @@ -217,7 +217,7 @@ public: virtual void set_active(bool active) override; }; -class VCL_DLLPUBLIC JSDrawingArea : public SalInstanceDrawingArea, public JSDialogSender +class JSDrawingArea : public SalInstanceDrawingArea, public JSDialogSender { public: JSDrawingArea(VclPtr<vcl::Window> aOwnedToplevel, VclDrawingArea* pDrawingArea, @@ -229,7 +229,7 @@ public: virtual void queue_draw_area(int x, int y, int width, int height) override; }; -class VCL_DLLPUBLIC JSToolbar : public JSWidget<SalInstanceToolbar, ::ToolBox> +class JSToolbar : public JSWidget<SalInstanceToolbar, ::ToolBox> { public: JSToolbar(VclPtr<vcl::Window> aOwnedToplevel, ::ToolBox* pToolbox, SalInstanceBuilder* pBuilder, diff --git a/vcl/inc/pdf/objectcopier.hxx b/vcl/inc/pdf/objectcopier.hxx index 364fffbf1548..6e98ed0834f9 100644 --- a/vcl/inc/pdf/objectcopier.hxx +++ b/vcl/inc/pdf/objectcopier.hxx @@ -28,7 +28,7 @@ class PDFObjectElement; } /// Copies objects from one PDF file into another one. -class VCL_DLLPUBLIC PDFObjectCopier +class PDFObjectCopier { PDFObjectContainer& m_rContainer; |