bin/find-can-be-private-symbols.classes.results | 386 ++++++++++++++++++++++ bin/find-can-be-private-symbols.functions.results | 58 +++ bin/find-can-be-private-symbols.py | 1 helpcompiler/inc/HelpLinker.hxx | 4 include/filter/msfilter/mstoolbar.hxx | 4 include/oox/ole/oleobjecthelper.hxx | 2 include/sfx2/classificationhelper.hxx | 2 include/svl/zformat.hxx | 2 include/svx/fmgridif.hxx | 2 include/svx/gridctrl.hxx | 2 include/svx/svdundo.hxx | 6 include/toolkit/awt/vclxwindows.hxx | 2 include/toolkit/helper/listenermultiplexer.hxx | 8 include/tools/urlobj.hxx | 2 include/unotools/localedatawrapper.hxx | 2 include/unotools/useroptions.hxx | 4 include/vcl/BitmapDuoToneFilter.hxx | 2 include/vcl/BitmapGaussianSeparableBlurFilter.hxx | 2 include/vcl/BitmapSeparableUnsharpenFilter.hxx | 2 include/vcl/combobox.hxx | 2 include/vcl/dockingarea.hxx | 2 include/vcl/dockwin.hxx | 2 include/vcl/floatwin.hxx | 2 include/vcl/mapmod.hxx | 2 include/vcl/metaact.hxx | 24 - include/vcl/popupmenuwindow.hxx | 2 include/vcl/status.hxx | 2 include/vcl/transfer.hxx | 6 include/vcl/treelist.hxx | 2 include/xmloff/xmluconv.hxx | 2 sc/inc/chartlis.hxx | 2 sc/inc/compiler.hxx | 2 sc/inc/dbdata.hxx | 2 sc/inc/dpcache.hxx | 4 sc/inc/dptabdat.hxx | 2 sc/inc/externalrefmgr.hxx | 4 sc/inc/orcusxml.hxx | 2 sc/inc/queryentry.hxx | 2 sc/inc/userlist.hxx | 2 sc/source/core/inc/interpre.hxx | 8 sc/source/ui/inc/docsh.hxx | 2 sd/inc/sdabstdlg.hxx | 2 sd/source/ui/inc/drawview.hxx | 2 sd/source/ui/inc/optsitem.hxx | 2 sd/source/ui/inc/sdtreelb.hxx | 14 svx/source/inc/formtoolbars.hxx | 6 sw/inc/dbmgr.hxx | 2 sw/inc/docsh.hxx | 2 sw/inc/ndole.hxx | 2 sw/source/uibase/inc/dbui.hxx | 2 vcl/inc/BitmapColorizeFilter.hxx | 2 vcl/inc/BitmapFastScaleFilter.hxx | 2 vcl/inc/BitmapInterpolateScaleFilter.hxx | 2 vcl/inc/BitmapLightenFilter.hxx | 2 vcl/inc/opengl/framebuffer.hxx | 4 vcl/inc/qt5/Qt5AccessibleWidget.hxx | 14 vcl/inc/qt5/Qt5Bitmap.hxx | 2 vcl/inc/qt5/Qt5Graphics_Controls.hxx | 2 vcl/inc/qt5/Qt5XAccessible.hxx | 2 vcl/source/control/combobox.cxx | 18 - 60 files changed, 551 insertions(+), 106 deletions(-)
New commits: commit e189a3f5b5c4f381dcf109eb9a2ee9b6d32d5551 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Sun Dec 1 18:53:48 2019 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Dec 5 07:01:44 2019 +0100 make some classes module private Mark some stuff SAL_DLLPUBLIC_RTTI in include/vcl/metaact.hxx in order to make ASAN happy. Change-Id: I97febe0968bf58b9cbe60ce647f0ada25e6f4bb0 Reviewed-on: https://gerrit.libreoffice.org/84202 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/bin/find-can-be-private-symbols.classes.results b/bin/find-can-be-private-symbols.classes.results new file mode 100644 index 000000000000..e5a90bdc9f85 --- /dev/null +++ b/bin/find-can-be-private-symbols.classes.results @@ -0,0 +1,386 @@ +ActionListenerMultiplexer +AutoIdle +BitmapAlphaClampFilter +BitmapColorQuantizationFilter +BitmapColorizeFilter +BitmapConvolutionMatrixFilter +BitmapDisabledImageFilter +BitmapDuoToneFilter +BitmapEmbossGreyFilter +BitmapFastScaleFilter +BitmapGaussianSeparableBlurFilter +BitmapInterpolateScaleFilter +BitmapLightenFilter +BitmapMedianFilter +BitmapMonochromeFilter +BitmapMosaicFilter +BitmapPalette +BitmapPopArtFilter +BitmapReadAccess +BitmapSeparableUnsharpenFilter +BitmapSepiaFilter +BitmapSimpleColorQuantizationFilter +BitmapSmoothenFilter +BitmapSobelGreyFilter +BitmapSolarizeFilter +BitmapSymmetryCheck +BitmapWriteAccess +ComboBox::Impl +ConditionEditDropTarget +CurrencyFormatter +DbGridControl::NavigationBar +DbGridControl::NavigationBar::AbsolutePos +DdeGetPutItem +DdeLink +DdeService +DdeTopic +DockingAreaWindow::ImplData +DockingWindow::ImplData +DragSourceHelper::DragGestureListener +DropTargetHelper::DropTargetListener +E3dCompoundObject +EditUndo +ErrorInfo +FillTypeLB +FloatingWindow::ImplData +FmDesignModeChangedHint +FmXGridPeer::GridListenerDelegator +FocusListenerMultiplexer +FontSelectPattern +FontSubsetInfo +FreetypeManager::IFSD_Equal +GrBackendFormat +GrBackendRenderTarget +GrBackendTexture +GrContext +GrContextThreadSafeProxy +GrContext_Base +GrGLExtensions +GrGLInterface +GrGpuResource +GrGpuResource::ProxyAccess +GrImageContext +GrVkExtensions +GrVkSecondaryCBDrawContext +HelpLinker +Hunspell +Hunzip +INetURLObject::SubString +ImplJobSetup +ImplLayoutArgs +IndexerPreProcessor +ItemListenerMultiplexer +KeyListenerMultiplexer +LocaleDataWrapper::Locale_Compare +MapMode::ImplMapMode +MetaAction +MetaFloatTransparentAction +MetaGradientAction +MetaGradientExAction +MetaHatchAction +MetaMaskAction +MetaMaskScaleAction +MetaMaskScalePartAction +MetaPointAction +MetaStretchTextAction +MetaTextAction +MetaTextLineAction +MetaTextRectAction +MetaTransparentAction +MorkParser +MouseListenerMultiplexer +MouseMotionListenerMultiplexer +MyThes +Octree +OpenGLFramebuffer +PackedTextureAtlasManager +PaintListenerMultiplexer +PhysicalFontFamily +PopupMenuFloatingWindow::ImplData +PrintMonitor +ProcessData +PurgeGuard +PushButtonValue +Qt5AccessibleWidget +Qt5Bitmap +Qt5Graphics_Controls +Qt5XAccessible +RenderList +SalData +SalDisplay +SalInfoPrinter +SalPrinter +SalSystem +SameContentListBox +SbClassModuleObject +ScChartListener::ExternalRefListener +ScCompiler::Convention +ScDBCollection::AnonDBs +ScDPCache::Field +ScDPCache::GroupItems +ScDPTableData::CalcInfo +ScDocShell::PrepareSaveGuard +ScExternalRefManager::LinkListener +ScExternalRefManager::SrcFileData +ScFormatEntry +ScInterpreter +ScOrcusXMLTreeParam +ScPaintHint +ScPreviewShell +ScQueryEntry::Item +ScRefreshTimer +ScUserListData::SubStr +SdAbstractDialogFactory +SdOptionsContents +SdOptionsItem +SdOptionsLayout +SdOptionsMisc +SdOptionsPrint +SdOptionsSnap +SdPageObjsTLB::IconProvider +SdPageObjsTLB::SdPageObjsTransferable +SdXImpressDocument +SdrAngleItem +SdrCaptionEscDirItem +SdrCaptionTypeItem +SdrEdgeNode1HorzDistItem +SdrEdgeNode1VertDistItem +SdrEdgeNode2HorzDistItem +SdrEdgeNode2VertDistItem +SdrEmbedObjectLink +SdrGrafBlueItem +SdrGrafContrastItem +SdrGrafCropItem +SdrGrafGamma100Item +SdrGrafGreenItem +SdrGrafLuminanceItem +SdrGrafModeItem +SdrGrafRedItem +SdrGrafTransparenceItem +SdrMeasureTextHPosItem +SdrMeasureTextVPosItem +SdrMeasureUnitItem +SdrOnOffItem +SdrPercentItem +SdrSignedPercentItem +SdrTextAniAmountItem +SdrTextAniDelayItem +SdrTextAniDirectionItem +SdrTextAniKindItem +SdrTextHorzAdjustItem +SdrUndoInsertObj +SdrUndoNewPage +SdrUndoPage +SdrUndoPageChangeMasterPage +SdrUndoPageMasterPage +SdrUndoSetPageNum +SdrYesNoItem +SfxClassificationHelper::Impl +SfxNavigator +SfxStyleSheetModifiedHint +SfxViewFrameItem +SfxVisibilityItem +SpinListenerMultiplexer +StatusBar::ImplData +SvListView::Impl +SvNumberformat::LocaleType +SvXMLUnitConverter::Impl +SvpSalBitmap +SvtUserOptions::ChangeListener +SvtUserOptions::Impl +SvxFillTypeBox +SvxPrintItem +SvxRsidItem +SvxShowText +SvxTPage +SwAnchoredObject +SwAuthenticator +SwColExample +SwConnectionListener +SwContrastGrf +SwDBManager::ConnectionDisposedListener_Impl +SwDocShell::LockAllViewsGuard +SwDrawFrameFormat +SwDrawModeGrf +SwExtraRedline +SwFltRedline +SwFormatEditInReadonly +SwFormatEndAtTextEnd +SwFormatFollowTextFlow +SwFormatFootnoteAtTextEnd +SwFormatLayoutSplit +SwFormatNoBalancedColumns +SwFormatRowSplit +SwGammaGrf +SwHeaderAndFooterEatSpacingItem +SwLayoutFrame +SwLuminanceGrf +SwMirrorGrf +SwNumRuleItem +SwPagePreview +SwRedlineExtraData +SwRedlineExtraData_FormatColl +SwShellCursor +SwTableCellInfo::Impl +SwTableCellRedline +SwTableRowRedline +SwTestItem +SwWebDocShell +SwWebView +SwWrtShellItem +SwXTextRange::Impl +SwXTextTableCursor +SyntaxHighlighter::Tokenizer +SystemWindow::ImplData +TBCBitMap +TBCCDData +TBCExtraInfo +TBCGeneralInfo +TabListenerMultiplexer +TabPageListenerMultiplexer +TransferableHelper::TerminateListener +VCLXFixedHyperlink +VclAlignment +VclBin +VclBuilder::MenuAndId +VclBuilder::ParserState +VclBuilder::sortIntoBestTabTraversalOrder +VclButtonBox +VclGrid +VclWindowEvent +WString +WindowListenerMultiplexer +X11SalObject +X11SkiaSalGraphicsImpl +XMLConstantsPropertyHandler +XMLEnumPropertyHdl +XMLShapeStyleContext +basegfx::BColorModifier +basegfx::MinimalSystemDependentDataManager +basegfx::SystemDependentDataHolder +canvas +chart::PopupRequest +comphelper::RefCountedMutex +comphelper::service_decl::ServiceDecl::Factory +connectivity::component::OComponentPreparedStatement +connectivity::component::OComponentStatement +connectivity::file::OBoolOperator +connectivity::file::OOp_ISNOTNULL +connectivity::file::OOp_ISNULL +connectivity::file::OOp_LIKE +connectivity::odbc::OConnection +connectivity::odbc::ODBCDriver +connectivity::odbc::ODatabaseMetaData +connectivity::odbc::ODatabaseMetaDataResultSet +connectivity::odbc::OPreparedStatement +connectivity::odbc::OResultSet +connectivity::odbc::OResultSetMetaData +connectivity::odbc::OStatement +connectivity::odbc::OStatement_BASE2 +connectivity::odbc::OStatement_Base +connectivity::odbc::OTools +connectivity::sdbcx::IObjectCollection +connectivity::sdbcx::OGroup +connectivity::sdbcx::OKey +cppu::BootstrapException +cppu::ClassData +cppu::ClassDataBase +dbtools::param::ParameterWrapper +desktop::CallbackFlushHandler::CallbackData +dp_misc::AbortChannel +drawinglayer::animation::AnimationEntry +drawinglayer::primitive2d::AnimatedSwitchPrimitive2D +drawinglayer::primitive2d::ObjectAndViewTransformationDependentPrimitive2D +drawinglayer::primitive2d::Primitive2DDecompositionVisitor +drawinglayer::primitive2d::SdrFrameBorderData::SdrConnectStyleData +drawinglayer::primitive2d::ViewTransformationDependentPrimitive2D +drawinglayer::primitive3d +drawinglayer::primitive3d::BasePrimitive3D +drawinglayer::primitive3d::BufferedDecompositionPrimitive3D +drawinglayer::primitive3d::GroupPrimitive3D +drawinglayer::primitive3d::PolyPolygonMaterialPrimitive3D +drawinglayer::primitive3d::PolygonHairlinePrimitive3D +drawinglayer::primitive3d::SdrPrimitive3D +formula::FormulaByteToken +formula::FormulaDoubleToken +formula::FormulaErrorToken +formula::FormulaExternalToken +formula::FormulaFAPToken +formula::FormulaIndexToken +formula::FormulaJumpToken +formula::FormulaMissingToken +formula::FormulaTokenIterator::Item +formula::FormulaTypedDoubleToken +formula::FormulaUnknownToken +jvmaccess::UnoVirtualMachine::CreationException +jvmaccess::VirtualMachine::AttachGuard::CreationException +linguistic::PropertyChgHelper +linguistic::PropertyHelper_Spell +oox::IProgressBar +oox::ole::AxContainerModelBase +oox::ole::AxControlModelBase +oox::ole::AxFontDataModel +oox::ole::AxImageModel +oox::ole::AxMorphDataModelBase +oox::ole::AxMultiPageModel +oox::ole::AxPageModel +oox::ole::AxTabStripModel +oox::ole::AxToggleButtonModel +oox::ole::AxUserFormModel +oox::ole::OleObjectInfo +psp +psp::PrintFontManager::PrintFont +salhelper::ORealDynamicLoader +sd::DrawView +sdr::SelectionController +sdr::ViewSelection +sdr::animation::primitiveAnimator +sdr::contact::ObjectContactPainter +sdr::properties::BaseProperties +sfx2::sidebar::Panel +sfx2::sidebar::TabBar::Item +skjpeg_destination_mgr +svt::MultiLineEditImplementation +svt::MultiLineTextCell +svx::CommonStyleManager +svx::PropertyValueProvider +svx::SvxDialControl::DialControl_Impl +svxform::FormToolboxes +sw::BroadcastingModify +sw::UnoCursorHint +ucbhelper::ActiveDataSink +ucbhelper::InteractionAbort +ucbhelper::InteractionApprove +ucbhelper::InteractionDisapprove +ucbhelper::InteractionRetry +utl::Bootstrap::Impl +utl::OInputStreamHelper +vcl::ExtOutDevData +vcl::GraphicFormatDetector +vcl::IconThemeScanner +vcl::IconThemeSelector +vcl::PngImageReader +vcl::WidgetDefinition +vcl::WidgetDefinitionPart +vcl::WidgetDefinitionReader +vcl::filter::PDFDictionaryElement +vcl::filter::PDFReferenceElement +vcl::filter::PDFStreamElement +vcl::test::OutputDeviceTestAnotherOutDev +vcl::test::OutputDeviceTestBitmap +vcl::test::OutputDeviceTestCommon +vcl::test::OutputDeviceTestGradient +vcl::test::OutputDeviceTestLine +vcl::test::OutputDeviceTestPixel +vcl::test::OutputDeviceTestPolyLine +vcl::test::OutputDeviceTestPolyLineB2D +vcl::test::OutputDeviceTestPolyPolygon +vcl::test::OutputDeviceTestPolyPolygonB2D +vcl::test::OutputDeviceTestPolygon +vcl::test::OutputDeviceTestRect +vcl::unotools::VclCanvasBitmap +void OpenGLTexture +writerperfect::DirectoryStream::Impl +xmloff::OControlBorderHandler +xmloff::OFontWidthHandler +xmloff::ORotationAngleHandler diff --git a/bin/find-can-be-private-symbols.functions.results b/bin/find-can-be-private-symbols.functions.results new file mode 100644 index 000000000000..91468a328d1c --- /dev/null +++ b/bin/find-can-be-private-symbols.functions.results @@ -0,0 +1,58 @@ +CheckNodesRange(SwNodeIndex const&, SwNodeIndex const&, bool) +GrGLAssembleInterface(void*, void (*(*)(void*, char const*))()) +ImpPeekGraphicFormat(SvStream&, rtl::OUString&, bool) +ImplCallPreNotify(NotifyEvent&) +ImplDestroyHelpWindow(bool) +ImplFastBitmapConversion(BitmapBuffer&, BitmapBuffer const&, SalTwoRect const&) +ImplGetSalSystem() +ImplHideSplash() +ImplSVMain() +IsDockingWindowVisible(com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&, rtl::OUString const&) +RefreshToolbars(com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&) +SalGetDesktopEnvironment() +ScFilterCreate +ScResId(char const*, int) +Simplify(SkPath const&, SkPath*) +checkFormula(ScDocument&, ScAddress const&, char const*) +checkFormulaPosition(ScDocument&, ScAddress const&) +checkFormulaPositions(ScDocument&, short, short, int const*, unsigned long) +clearErrorRecorder() +clearFormulaCellChangedFlag(ScDocument&, ScRange const&) +clewErrorString +compileFormula(ScDocument*, rtl::OUString const&, formula::FormulaGrammar::Grammar) +component_getImplementationEnvironment +createLink +ddot +dl_cairo_surface_set_device_scale(_cairo_surface*, double, double) +endlu(SvStream&) +explain +fieldlen(char const*) +getChartRangeRepresentations(SdrOle2Obj const&) +getDataArea +heuristics +invert +libreofficekit_hook +libreofficekit_hook_2 +loadFile(rtl::OUString const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&) +main +makeMinimalTextForScript(UScriptCode) +makeRepresentativeTextForLanguage(o3tl::strong_int<unsigned short, LanguageTypeTag>) +makeRepresentativeTextForScript(UScriptCode) +mod +privateSnippetExecutor +reg_closeKey(void*) +reg_closeRegistry(void*) +reg_dumpRegistry(void*) +reg_openKey(void*, _rtl_uString*, void**) +reg_openRegistry(_rtl_uString*, void**) +reg_openRootKey(void*, void**) +report +sbxToUnoValue(SbxValue const*, com::sun::star::uno::Type const&, com::sun::star::beans::Property const*) +scale +setErrorRecorder() +setLink +set_column +set_title +spaces +toBool(rtl::OUString const&) +vcl_crc64 diff --git a/bin/find-can-be-private-symbols.py b/bin/find-can-be-private-symbols.py index a795abdb9208..f5ff83fd1757 100755 --- a/bin/find-can-be-private-symbols.py +++ b/bin/find-can-be-private-symbols.py @@ -222,4 +222,5 @@ with open("bin/find-can-be-private-symbols.classes.results", "wt") as f: elif sym.startswith("libvisio"): continue elif sym.startswith("libzmf"): continue elif sym.startswith("lucene::"): continue + elif sym.startswith("Sk"): continue f.write(sym + "\n") diff --git a/helpcompiler/inc/HelpLinker.hxx b/helpcompiler/inc/HelpLinker.hxx index 076141e39b92..24bcb9ebd041 100644 --- a/helpcompiler/inc/HelpLinker.hxx +++ b/helpcompiler/inc/HelpLinker.hxx @@ -47,11 +47,11 @@ public: void processDocument( xmlDocPtr doc, const std::string& EncodedDocPath ); }; -class L10N_DLLPUBLIC HelpLinker +class HelpLinker { public: /// @throws HelpProcessingException - void main(std::vector<std::string> &args, + L10N_DLLPUBLIC void main(std::vector<std::string> &args, std::string const * pExtensionPath = nullptr, std::string const * pDestination = nullptr, const OUString* pOfficeHelpPath = nullptr ); diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx index 284d55fd2ea9..f3c3e1ac7a47 100644 --- a/include/filter/msfilter/mstoolbar.hxx +++ b/include/filter/msfilter/mstoolbar.hxx @@ -156,7 +156,7 @@ public: OUString const & CustomText() { return customText.getString(); } }; -class MSFILTER_DLLPUBLIC TBCBitMap final : public TBBase +class TBCBitMap final : public TBBase { friend class TBCBSpecific; // #FIXME hacky access, need to fix sal_Int32 cbDIB; @@ -182,7 +182,7 @@ public: OUString Name(); }; -class MSFILTER_DLLPUBLIC TBCCDData final : public TBBase +class TBCCDData final : public TBBase { sal_Int16 cwstrItems; //Signed integer that specifies the number of items in wstrList. MUST be positive. std::vector< WString > wstrList; // Zero-based index array of WString structures. Number of elements MUST be equal to cwstrItems. diff --git a/include/oox/ole/oleobjecthelper.hxx b/include/oox/ole/oleobjecthelper.hxx index 604785f305b6..19f07cf5f9c0 100644 --- a/include/oox/ole/oleobjecthelper.hxx +++ b/include/oox/ole/oleobjecthelper.hxx @@ -40,7 +40,7 @@ namespace ole { /** Contains generic information about an OLE object. */ -struct OOX_DLLPUBLIC OleObjectInfo +struct OleObjectInfo { StreamDataSequence maEmbeddedData; ///< Data of an embedded OLE object. OUString maTargetLink; ///< Path to external data for linked OLE object. diff --git a/include/sfx2/classificationhelper.hxx b/include/sfx2/classificationhelper.hxx index ed55fe9c04ca..777001fd9de9 100644 --- a/include/sfx2/classificationhelper.hxx +++ b/include/sfx2/classificationhelper.hxx @@ -41,7 +41,7 @@ enum class SfxClassificationPolicyType /// Shared code to handle Business Authorization Identification and Labeling Scheme (BAILS) properties. class SFX2_DLLPUBLIC SfxClassificationHelper { - class Impl; + class SAL_DLLPRIVATE Impl; std::unique_ptr<Impl> m_pImpl; public: diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx index b6d962d1fc98..6c9f5b062f4c 100644 --- a/include/svl/zformat.hxx +++ b/include/svl/zformat.hxx @@ -142,7 +142,7 @@ private: class SVL_DLLPUBLIC SvNumberformat { - struct LocaleType + struct SAL_DLLPRIVATE LocaleType { enum class Substitute : sal_uInt8 { diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index 8b2cdb5e4e29..b438e2aace31 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -366,7 +366,7 @@ private: // (I would like to have a vector here but including the stl in an exported file seems // very risky to me...) - class GridListenerDelegator; + class SAL_DLLPRIVATE GridListenerDelegator; friend class GridListenerDelegator; std::unique_ptr<GridListenerDelegator> m_pGridListener; diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index a3e8c4163307..8dbb1c106b78 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -170,7 +170,7 @@ public: // NavigationBar - class NavigationBar final : public Control + class SAL_DLLPRIVATE NavigationBar final : public Control { class AbsolutePos : public NumericField { diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 99acdb55660b..67316f7792c7 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -514,7 +514,7 @@ public: * ABC for all UndoActions that have something to do with SdrPages. */ -class SVX_DLLPUBLIC SdrUndoPage : public SdrUndoAction +class SdrUndoPage : public SdrUndoAction { protected: SdrPage& mrPage; @@ -618,7 +618,7 @@ public: * Create Action before moving the Page. */ -class SVX_DLLPUBLIC SdrUndoSetPageNum final : public SdrUndoPage +class SdrUndoSetPageNum final : public SdrUndoPage { sal_uInt16 const nOldPageNum; sal_uInt16 const nNewPageNum; @@ -678,7 +678,7 @@ public: * Create Action before changing the MasterPageDescriptors. */ -class SVX_DLLPUBLIC SdrUndoPageChangeMasterPage final : public SdrUndoPageMasterPage +class SdrUndoPageChangeMasterPage final : public SdrUndoPageMasterPage { bool mbNewHadMasterPage; SdrLayerIDSet maNewSet; diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index ab3d0a4ec53a..e3763da5012a 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -467,7 +467,7 @@ public: // class VCLXFixedHyperlink -class TOOLKIT_DLLPUBLIC VCLXFixedHyperlink final : +class VCLXFixedHyperlink final : public css::awt::XFixedHyperlink, public VCLXWindow { diff --git a/include/toolkit/helper/listenermultiplexer.hxx b/include/toolkit/helper/listenermultiplexer.hxx index a76336996244..503b3390719f 100644 --- a/include/toolkit/helper/listenermultiplexer.hxx +++ b/include/toolkit/helper/listenermultiplexer.hxx @@ -159,21 +159,21 @@ DECL_LISTENERMULTIPLEXER_END // class ActionListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START_DLLPUB( ActionListenerMultiplexer, css::awt::XActionListener ) +DECL_LISTENERMULTIPLEXER_START( ActionListenerMultiplexer, css::awt::XActionListener ) void SAL_CALL actionPerformed( const css::awt::ActionEvent& rEvent ) override; DECL_LISTENERMULTIPLEXER_END // class ItemListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START_DLLPUB( ItemListenerMultiplexer, css::awt::XItemListener ) +DECL_LISTENERMULTIPLEXER_START( ItemListenerMultiplexer, css::awt::XItemListener ) void SAL_CALL itemStateChanged( const css::awt::ItemEvent& rEvent ) override; DECL_LISTENERMULTIPLEXER_END // class TabListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START_DLLPUB( TabListenerMultiplexer, css::awt::XTabListener ) +DECL_LISTENERMULTIPLEXER_START( TabListenerMultiplexer, css::awt::XTabListener ) void SAL_CALL inserted( ::sal_Int32 ID ) override; void SAL_CALL removed( ::sal_Int32 ID ) override; void SAL_CALL changed( ::sal_Int32 ID, const css::uno::Sequence< css::beans::NamedValue >& Properties ) override; @@ -253,7 +253,7 @@ DECL_LISTENERMULTIPLEXER_END // class TabPageListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START_DLLPUB( TabPageListenerMultiplexer, css::awt::tab::XTabPageContainerListener ) +DECL_LISTENERMULTIPLEXER_START( TabPageListenerMultiplexer, css::awt::tab::XTabPageContainerListener ) void SAL_CALL tabPageActivated( const css::awt::tab::TabPageActivatedEvent& aEvent ) override; DECL_LISTENERMULTIPLEXER_END diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx index 522dcca35fcd..d8b812bb7a81 100644 --- a/include/tools/urlobj.hxx +++ b/include/tools/urlobj.hxx @@ -923,7 +923,7 @@ public: private: // General Structure: - class SubString + class SAL_DLLPRIVATE SubString { sal_Int32 m_nBegin; sal_Int32 m_nLength; diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx index fd0e457943eb..7c790e0ee8b0 100644 --- a/include/unotools/localedatawrapper.hxx +++ b/include/unotools/localedatawrapper.hxx @@ -90,7 +90,7 @@ class UNOTOOLS_DLLPUBLIC LocaleDataWrapper bool bReservedWordValid; bool bSecondaryCalendarValid; mutable ::utl::ReadWriteMutex aMutex; - struct Locale_Compare + struct SAL_DLLPRIVATE Locale_Compare { bool operator()(const css::lang::Locale& rLocale1, const css::lang::Locale& rLocale2) const; }; diff --git a/include/unotools/useroptions.hxx b/include/unotools/useroptions.hxx index 42dfa37c84df..adc5f5055d5b 100644 --- a/include/unotools/useroptions.hxx +++ b/include/unotools/useroptions.hxx @@ -90,11 +90,11 @@ public: void SetBoolValue (UserOptToken nToken, bool bNewValue); private: - class Impl; + class SAL_DLLPRIVATE Impl; std::shared_ptr<Impl> xImpl; static std::weak_ptr<Impl> xSharedImpl; private: - class ChangeListener; + class SAL_DLLPRIVATE ChangeListener; }; #endif // INCLUDED_UNOTOOLS_USEROPTIONS_HXX diff --git a/include/vcl/BitmapDuoToneFilter.hxx b/include/vcl/BitmapDuoToneFilter.hxx index 8dddfb16bfe2..71aabd6ad02e 100644 --- a/include/vcl/BitmapDuoToneFilter.hxx +++ b/include/vcl/BitmapDuoToneFilter.hxx @@ -15,7 +15,7 @@ class BitmapEx; -class VCL_DLLPUBLIC BitmapDuoToneFilter final : public BitmapFilter +class BitmapDuoToneFilter final : public BitmapFilter { public: BitmapDuoToneFilter(sal_uLong nColorOne, sal_uLong nColorTwo) diff --git a/include/vcl/BitmapGaussianSeparableBlurFilter.hxx b/include/vcl/BitmapGaussianSeparableBlurFilter.hxx index 63188a2c5968..2de99499253d 100644 --- a/include/vcl/BitmapGaussianSeparableBlurFilter.hxx +++ b/include/vcl/BitmapGaussianSeparableBlurFilter.hxx @@ -16,7 +16,7 @@ class BitmapEx; -class VCL_DLLPUBLIC BitmapGaussianSeparableBlurFilter final : public BitmapFilter +class BitmapGaussianSeparableBlurFilter final : public BitmapFilter { public: BitmapGaussianSeparableBlurFilter(double fRadius) diff --git a/include/vcl/BitmapSeparableUnsharpenFilter.hxx b/include/vcl/BitmapSeparableUnsharpenFilter.hxx index d19ea0f0b423..3d867619167a 100644 --- a/include/vcl/BitmapSeparableUnsharpenFilter.hxx +++ b/include/vcl/BitmapSeparableUnsharpenFilter.hxx @@ -18,7 +18,7 @@ class BitmapEx; /** Separable Unsharpen Mask filter is actually a subtracted blurred image from the original image. */ -class VCL_DLLPUBLIC BitmapSeparableUnsharpenFilter final : public BitmapFilter +class BitmapSeparableUnsharpenFilter final : public BitmapFilter { public: BitmapSeparableUnsharpenFilter(double fRadius) diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index 0f7f43695b0d..ff34c96411b4 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -34,7 +34,7 @@ class UserDrawEvent; class VCL_DLLPUBLIC ComboBox : public Edit { private: - struct Impl; + struct SAL_DLLPRIVATE Impl; std::unique_ptr<Impl> m_pImpl; protected: diff --git a/include/vcl/dockingarea.hxx b/include/vcl/dockingarea.hxx index a376d3b5c351..953e21551758 100644 --- a/include/vcl/dockingarea.hxx +++ b/include/vcl/dockingarea.hxx @@ -27,7 +27,7 @@ // - its main purpose is theming support class VCL_DLLPUBLIC DockingAreaWindow final : public vcl::Window { - class ImplData; + class SAL_DLLPRIVATE ImplData; private: std::unique_ptr<ImplData> mpImplData; diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index b2808f043dfc..a3743c2f2c39 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -208,7 +208,7 @@ class VCL_DLLPUBLIC DockingWindow : public vcl::Window , public VclBuilderContainer { - class ImplData; + class SAL_DLLPRIVATE ImplData; private: VclPtr<FloatingWindow> mpFloatWin; VclPtr<vcl::Window> mpOldBorderWin; diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index 52d09597b59c..e924807ca44d 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -73,7 +73,7 @@ enum class FloatWinTitleType class VCL_DLLPUBLIC FloatingWindow : public SystemWindow { - class ImplData; + class SAL_DLLPRIVATE ImplData; private: VclPtr<FloatingWindow> mpNextFloat; VclPtr<vcl::Window> mpFirstPopupModeWin; diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx index 2851c966c890..487f039687ab 100644 --- a/include/vcl/mapmod.hxx +++ b/include/vcl/mapmod.hxx @@ -36,7 +36,7 @@ class VCL_DLLPUBLIC MapMode friend class OutputDevice; public: - struct ImplMapMode; + struct SAL_DLLPRIVATE ImplMapMode; MapMode(); MapMode( const MapMode& rMapMode ); diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index 2666edb5f334..220eedff3406 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -121,7 +121,7 @@ public: const Color& GetColor() const { return maColor; } }; -class VCL_DLLPUBLIC MetaPointAction final : public MetaAction +class SAL_DLLPUBLIC_RTTI MetaPointAction final : public MetaAction { private: Point maPt; @@ -457,7 +457,7 @@ public: const tools::PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } }; -class VCL_DLLPUBLIC MetaTextAction final : public MetaAction +class SAL_DLLPUBLIC_RTTI MetaTextAction final : public MetaAction { private: @@ -529,7 +529,7 @@ public: long* GetDXArray() const { return mpDXAry.get(); } }; -class VCL_DLLPUBLIC MetaStretchTextAction final : public MetaAction +class SAL_DLLPUBLIC_RTTI MetaStretchTextAction final : public MetaAction { private: @@ -567,7 +567,7 @@ public: sal_Int32 GetLen() const { return mnLen; } }; -class VCL_DLLPUBLIC MetaTextRectAction final : public MetaAction +class SAL_DLLPUBLIC_RTTI MetaTextRectAction final : public MetaAction { private: @@ -600,7 +600,7 @@ public: DrawTextFlags GetStyle() const { return mnStyle; } }; -class VCL_DLLPUBLIC MetaTextLineAction final : public MetaAction +class SAL_DLLPUBLIC_RTTI MetaTextLineAction final : public MetaAction { private: @@ -840,7 +840,7 @@ public: const Size& GetSrcSize() const { return maSrcSz; } }; -class VCL_DLLPUBLIC MetaMaskAction final : public MetaAction +class SAL_DLLPUBLIC_RTTI MetaMaskAction final : public MetaAction { private: @@ -874,7 +874,7 @@ public: const Point& GetPoint() const { return maPt; } }; -class VCL_DLLPUBLIC MetaMaskScaleAction final : public MetaAction +class SAL_DLLPUBLIC_RTTI MetaMaskScaleAction final : public MetaAction { private: @@ -910,7 +910,7 @@ public: const Size& GetSize() const { return maSz; } }; -class VCL_DLLPUBLIC MetaMaskScalePartAction final : public MetaAction +class SAL_DLLPUBLIC_RTTI MetaMaskScalePartAction final : public MetaAction { private: @@ -951,7 +951,7 @@ public: const Size& GetSrcSize() const { return maSrcSz; } }; -class VCL_DLLPUBLIC MetaGradientAction final : public MetaAction +class SAL_DLLPUBLIC_RTTI MetaGradientAction final : public MetaAction { private: @@ -1011,7 +1011,7 @@ public: const Gradient& GetGradient() const { return maGradient; } }; -class VCL_DLLPUBLIC MetaHatchAction final : public MetaAction +class SAL_DLLPUBLIC_RTTI MetaHatchAction final : public MetaAction { private: @@ -1494,7 +1494,7 @@ public: RasterOp GetRasterOp() const { return meRasterOp; } }; -class VCL_DLLPUBLIC MetaTransparentAction final : public MetaAction +class SAL_DLLPUBLIC_RTTI MetaTransparentAction final : public MetaAction { private: @@ -1524,7 +1524,7 @@ public: sal_uInt16 GetTransparence() const { return mnTransPercent; } }; -class VCL_DLLPUBLIC MetaFloatTransparentAction final : public MetaAction +class SAL_DLLPUBLIC_RTTI MetaFloatTransparentAction final : public MetaAction { private: diff --git a/include/vcl/popupmenuwindow.hxx b/include/vcl/popupmenuwindow.hxx index 4d035b3b1bdf..42488c2ee206 100644 --- a/include/vcl/popupmenuwindow.hxx +++ b/include/vcl/popupmenuwindow.hxx @@ -26,7 +26,7 @@ class VCL_DLLPUBLIC PopupMenuFloatingWindow : public FloatingWindow { private: - struct ImplData; + struct SAL_DLLPRIVATE ImplData; std::unique_ptr<ImplData> mpImplData; public: PopupMenuFloatingWindow( vcl::Window* pParent ); diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 169dfa5e7b15..2700e2a8e145 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -63,7 +63,7 @@ namespace o3tl class VCL_DLLPUBLIC StatusBar : public vcl::Window { - class ImplData; + class SAL_DLLPRIVATE ImplData; private: std::vector<std::unique_ptr<ImplStatusItem>> mvItemList; std::unique_ptr<ImplData> mpImplData; diff --git a/include/vcl/transfer.hxx b/include/vcl/transfer.hxx index a0b773984d3b..1c1ba0e7db90 100644 --- a/include/vcl/transfer.hxx +++ b/include/vcl/transfer.hxx @@ -133,7 +133,7 @@ class VCL_DLLPUBLIC TransferableHelper : public cppu::WeakImplHelper< css::datat private: // nested class to implement the XTerminateListener interface - class TerminateListener : public cppu::WeakImplHelper< css::frame::XTerminateListener, css::lang::XServiceInfo > + class VCL_DLLPRIVATE TerminateListener : public cppu::WeakImplHelper< css::frame::XTerminateListener, css::lang::XServiceInfo > { private: @@ -374,7 +374,7 @@ class VCL_DLLPUBLIC DragSourceHelper private: // nested class to implement the XDragGestureListener interface - class DragGestureListener : public cppu::WeakImplHelper< css::datatransfer::dnd::XDragGestureListener > + class SAL_DLLPRIVATE DragGestureListener : public cppu::WeakImplHelper< css::datatransfer::dnd::XDragGestureListener > { private: @@ -420,7 +420,7 @@ class VCL_DLLPUBLIC DropTargetHelper private: // nested class to implement the XDropTargetListener interface - class DropTargetListener : public cppu::WeakImplHelper< css::datatransfer::dnd::XDropTargetListener > + class SAL_DLLPRIVATE DropTargetListener : public cppu::WeakImplHelper< css::datatransfer::dnd::XDropTargetListener > { private: diff --git a/include/vcl/treelist.hxx b/include/vcl/treelist.hxx index 20045cb21804..7ab2639e97fc 100644 --- a/include/vcl/treelist.hxx +++ b/include/vcl/treelist.hxx @@ -209,7 +209,7 @@ class VCL_DLLPUBLIC SvListView { friend class SvTreeList; - struct Impl; + struct SAL_DLLPRIVATE Impl; std::unique_ptr<Impl> m_pImpl; protected: diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx index d791f6cb633d..a17c7d0deea6 100644 --- a/include/xmloff/xmluconv.hxx +++ b/include/xmloff/xmluconv.hxx @@ -80,7 +80,7 @@ private: SvXMLUnitConverter(const SvXMLUnitConverter&) = delete; SvXMLUnitConverter& operator=(const SvXMLUnitConverter&) = delete; - struct Impl; + struct SAL_DLLPRIVATE Impl; ::std::unique_ptr<Impl> m_pImpl; public: diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx index 1b49d168f826..ba44467b4a3e 100644 --- a/sc/inc/chartlis.hxx +++ b/sc/inc/chartlis.hxx @@ -41,7 +41,7 @@ class ScChartUnoData; class SC_DLLPUBLIC ScChartListener final : public SvtListener { public: - class ExternalRefListener final : public ScExternalRefManager::LinkListener + class SAL_DLLPRIVATE ExternalRefListener final : public ScExternalRefManager::LinkListener { public: ExternalRefListener(ScChartListener& rParent, ScDocument* pDoc); diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index b45af659ecab..98a3aed7ee78 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -181,7 +181,7 @@ public: EXTENDED_ERROR_DETECTION_NAME_NO_BREAK // name error on unknown symbols, don't break, continue }; - struct Convention + struct SAL_DLLPRIVATE Convention { const formula::FormulaGrammar::AddressConvention meConv; diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx index a7dc35c3b61b..488063cd0a2b 100644 --- a/sc/inc/dbdata.hxx +++ b/sc/inc/dbdata.hxx @@ -273,7 +273,7 @@ public: /** * Stores global anonymous database ranges. */ - class AnonDBs + class SAL_DLLPRIVATE AnonDBs { typedef ::std::vector<std::unique_ptr<ScDBData>> DBsType; DBsType m_DBs; diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx index 1d1559755369..50088234f398 100644 --- a/sc/inc/dpcache.hxx +++ b/sc/inc/dpcache.hxx @@ -53,7 +53,7 @@ public: typedef std::set<ScDPObject*> ScDPObjectSet; typedef std::vector<SCROW> IndexArrayType; - struct GroupItems + struct SAL_DLLPRIVATE GroupItems { ScDPItemDataVec maItems; ScDPNumGroupInfo maInfo; @@ -65,7 +65,7 @@ public: GroupItems(const ScDPNumGroupInfo& rInfo, sal_Int32 nGroupType); }; - struct Field + struct SAL_DLLPRIVATE Field { /** * Optional items for grouped field. diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx index 3df053e36da8..17ba76aca255 100644 --- a/sc/inc/dptabdat.hxx +++ b/sc/inc/dptabdat.hxx @@ -66,7 +66,7 @@ public: /** This structure stores dimension information used when calculating results. These data are read only during result calculation, so it should be passed as a const instance. */ - struct CalcInfo + struct SAL_DLLPRIVATE CalcInfo { ::std::vector<long> aColLevelDims; ::std::vector<ScDPDimension*> aColDims; diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index 71fba923d446..7a6394ad71af 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -371,7 +371,7 @@ public: * link to a certain external file is updated, the notify() method gets * called. */ - class LinkListener + class SAL_DLLPRIVATE LinkListener { public: LinkListener(); @@ -422,7 +422,7 @@ private: public: /** Source document meta-data container. */ - struct SrcFileData + struct SAL_DLLPRIVATE SrcFileData { OUString maFileName; /// original file name as loaded from the file. OUString maRealFileName; /// file name created from the relative name. diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx index 5db292c29d54..f335ae226d7f 100644 --- a/sc/inc/orcusxml.hxx +++ b/sc/inc/orcusxml.hxx @@ -52,7 +52,7 @@ struct ScOrcusXMLTreeParam */ UserDataStoreType m_UserDataStore; - static SC_DLLPUBLIC EntryData* getUserData(const weld::TreeView& rControl, const weld::TreeIter& rEntry); + static EntryData* getUserData(const weld::TreeView& rControl, const weld::TreeIter& rEntry); }; struct ScOrcusImportXMLParam diff --git a/sc/inc/queryentry.hxx b/sc/inc/queryentry.hxx index df858f08f339..46a65b957658 100644 --- a/sc/inc/queryentry.hxx +++ b/sc/inc/queryentry.hxx @@ -34,7 +34,7 @@ struct SC_DLLPUBLIC ScQueryEntry { enum QueryType { ByValue, ByString, ByDate, ByEmpty }; - struct Item + struct SAL_DLLPRIVATE Item { QueryType meType; double mfVal; diff --git a/sc/inc/userlist.hxx b/sc/inc/userlist.hxx index ae4bec457f7c..af9fe70ebdb3 100644 --- a/sc/inc/userlist.hxx +++ b/sc/inc/userlist.hxx @@ -33,7 +33,7 @@ class SC_DLLPUBLIC ScUserListData { public: - struct SubStr + struct SAL_DLLPRIVATE SubStr { OUString maReal; OUString maUpper; diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index 3b902524d901..f3390902385a 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -865,10 +865,10 @@ private: static double gauss(double x); public: - static SC_DLLPUBLIC double phi(double x); - static SC_DLLPUBLIC double integralPhi(double x); - static SC_DLLPUBLIC double gaussinv(double x); - static SC_DLLPUBLIC double GetPercentile( ::std::vector<double> & rArray, double fPercentile ); + static double phi(double x); + static double integralPhi(double x); + static double gaussinv(double x); + static double GetPercentile( ::std::vector<double> & rArray, double fPercentile ); private: diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index a519f4c87d04..1b323aea3b84 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -125,7 +125,7 @@ class SC_DLLPUBLIC ScDocShell final: public SfxObjectShell, public SfxListener /** Do things that need to be done before saving to our own format and necessary clean ups in dtor. */ - class PrepareSaveGuard + class SAL_DLLPRIVATE PrepareSaveGuard { public: explicit PrepareSaveGuard( ScDocShell & rDocShell ); diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index eebe5695748d..3f77b5efd3b5 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -169,7 +169,7 @@ protected: class SdAbstractDialogFactory { public: - SD_DLLPUBLIC static SdAbstractDialogFactory* Create(); + static SdAbstractDialogFactory* Create(); virtual VclPtr<AbstractSvxBulletAndPositionDlg> CreateSvxBulletAndPositionDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView) = 0; virtual VclPtr<VclAbstractDialog> CreateBreakDlg(weld::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount ) = 0; diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index 2d41de1af250..34360c61c772 100644 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -30,7 +30,7 @@ class DrawViewShell; /** * Derivative of ::sd::View; contains also a pointer to the document */ -class SD_DLLPUBLIC DrawView : public ::sd::View +class DrawView : public ::sd::View { public: diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index 3ed947372b1c..c532c39571c2 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -162,7 +162,7 @@ private: SdOptionsLayout maOptionsLayout; }; -class SD_DLLPUBLIC SdOptionsContents : public SdOptionsGeneric +class SdOptionsContents : public SdOptionsGeneric { private: protected: diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index f6e8b9681ec7..dce6c27e11a2 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -64,7 +64,7 @@ class SD_DLLPUBLIC SdPageObjsTLB final : public SvTreeListBox public: // nested class to implement the TransferableHelper - class SdPageObjsTransferable : public SdTransferable + class SAL_DLLPRIVATE SdPageObjsTransferable : public SdTransferable { public: SdPageObjsTransferable( @@ -93,13 +93,13 @@ public: INetBookmark const maBookmark; ::sd::DrawDocShell& mrDocShell; NavigatorDragType const meDragType; - SAL_DLLPRIVATE virtual ~SdPageObjsTransferable() override; + virtual ~SdPageObjsTransferable() override; - SAL_DLLPRIVATE virtual void AddSupportedFormats() override; - SAL_DLLPRIVATE virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; - SAL_DLLPRIVATE virtual void DragFinished( sal_Int8 nDropAction ) override; + virtual void AddSupportedFormats() override; + virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; + virtual void DragFinished( sal_Int8 nDropAction ) override; - SAL_DLLPRIVATE virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override; }; friend class SdPageObjsTLB::SdPageObjsTransferable; @@ -258,7 +258,7 @@ private: /** This inner class is defined in sdtreelb.cxx and is basically a container for the icons used in the list box for the entries. */ - class IconProvider; + class SAL_DLLPRIVATE IconProvider; /** Add one list box entry for the parent of the given shapes and one child entry for each of the given shapes. diff --git a/svx/source/inc/formtoolbars.hxx b/svx/source/inc/formtoolbars.hxx index 4f48646b59cf..c2321e0bef6a 100644 --- a/svx/source/inc/formtoolbars.hxx +++ b/svx/source/inc/formtoolbars.hxx @@ -44,16 +44,16 @@ namespace svxform /** retrieves the URI for the toolbox associated with the given slot, depending on the type of our document */ - SVX_DLLPUBLIC static OUString + static OUString getToolboxResourceName( sal_uInt16 _nSlotId ); /** toggles the toolbox associated with the given slot */ - SVX_DLLPUBLIC void toggleToolbox( sal_uInt16 _nSlotId ) const; + void toggleToolbox( sal_uInt16 _nSlotId ) const; /** determines whether the toolbox associated with the given slot is currently visible */ - SVX_DLLPUBLIC bool isToolboxVisible( sal_uInt16 _nSlotId ) const; + bool isToolboxVisible( sal_uInt16 _nSlotId ) const; }; diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index ec106df3c624..1b90b5dca571 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -235,7 +235,7 @@ class SwDoc; class SW_DLLPUBLIC SwDBManager { struct SwDBManager_Impl; - class ConnectionDisposedListener_Impl; + class SAL_DLLPRIVATE ConnectionDisposedListener_Impl; class MailDispatcherListener_Impl; enum class MergeStatus diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 08eaf82c3e67..865b6e243686 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -320,7 +320,7 @@ public: void CallAutomationDocumentEventSinks(const OUString& Method, css::uno::Sequence< css::uno::Any >& Arguments); void RegisterAutomationDocumentObject(css::uno::Reference< ooo::vba::word::XDocument > const& xDocument); - class LockAllViewsGuard + class SAL_DLLPRIVATE LockAllViewsGuard { std::vector<SwViewShell*> m_aViewWasUnLocked; diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx index b413d5af187d..8382a42e58dc 100644 --- a/sw/inc/ndole.hxx +++ b/sw/inc/ndole.hxx @@ -173,7 +173,7 @@ namespace sw class DocumentSettingManager; } -class SW_DLLPUBLIC PurgeGuard +class PurgeGuard { private: ::sw::DocumentSettingManager &m_rManager; diff --git a/sw/source/uibase/inc/dbui.hxx b/sw/source/uibase/inc/dbui.hxx index d4afc748dd3e..38ace352a2cd 100644 --- a/sw/source/uibase/inc/dbui.hxx +++ b/sw/source/uibase/inc/dbui.hxx @@ -23,7 +23,7 @@ #include <swdllapi.h> -class SW_DLLPUBLIC PrintMonitor: public weld::GenericDialogController +class PrintMonitor: public weld::GenericDialogController { public: std::unique_ptr<weld::Label> m_xDocName; diff --git a/vcl/inc/BitmapColorizeFilter.hxx b/vcl/inc/BitmapColorizeFilter.hxx index 6265d5a3922e..81b565728490 100644 --- a/vcl/inc/BitmapColorizeFilter.hxx +++ b/vcl/inc/BitmapColorizeFilter.hxx @@ -15,7 +15,7 @@ #include <vcl/BitmapFilter.hxx> -class VCL_DLLPUBLIC BitmapColorizeFilter final : public BitmapFilter +class BitmapColorizeFilter final : public BitmapFilter { public: BitmapColorizeFilter(Color aColor) diff --git a/vcl/inc/BitmapFastScaleFilter.hxx b/vcl/inc/BitmapFastScaleFilter.hxx index 6228987b9087..f8d56517a1da 100644 --- a/vcl/inc/BitmapFastScaleFilter.hxx +++ b/vcl/inc/BitmapFastScaleFilter.hxx @@ -14,7 +14,7 @@ #include <vcl/bitmapex.hxx> #include <vcl/BitmapFilter.hxx> -class VCL_DLLPUBLIC BitmapFastScaleFilter final : public BitmapFilter +class BitmapFastScaleFilter final : public BitmapFilter { public: explicit BitmapFastScaleFilter(double fScaleX, double fScaleY) diff --git a/vcl/inc/BitmapInterpolateScaleFilter.hxx b/vcl/inc/BitmapInterpolateScaleFilter.hxx index ef79396301d4..0cb707296b7d 100644 --- a/vcl/inc/BitmapInterpolateScaleFilter.hxx +++ b/vcl/inc/BitmapInterpolateScaleFilter.hxx @@ -14,7 +14,7 @@ #include <vcl/bitmapex.hxx> #include <vcl/BitmapFilter.hxx> -class VCL_DLLPUBLIC BitmapInterpolateScaleFilter final : public BitmapFilter +class BitmapInterpolateScaleFilter final : public BitmapFilter { public: explicit BitmapInterpolateScaleFilter(double fScaleX, double fScaleY) diff --git a/vcl/inc/BitmapLightenFilter.hxx b/vcl/inc/BitmapLightenFilter.hxx index 08480fd43b06..f30e0d5bbff2 100644 --- a/vcl/inc/BitmapLightenFilter.hxx +++ b/vcl/inc/BitmapLightenFilter.hxx @@ -13,7 +13,7 @@ #include <vcl/BitmapFilter.hxx> -class VCL_DLLPUBLIC BitmapLightenFilter final : public BitmapFilter +class BitmapLightenFilter final : public BitmapFilter { public: virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override; diff --git a/vcl/inc/opengl/framebuffer.hxx b/vcl/inc/opengl/framebuffer.hxx index a2dbd1e63282..4445e6198458 100644 --- a/vcl/inc/opengl/framebuffer.hxx +++ b/vcl/inc/opengl/framebuffer.hxx @@ -14,7 +14,7 @@ #include <opengl/texture.hxx> -class VCL_DLLPUBLIC OpenGLFramebuffer final +class OpenGLFramebuffer final { private: GLuint mnId; @@ -33,7 +33,7 @@ public: static void Unbind(GLenum eTarget = GL_FRAMEBUFFER); - bool IsFree() const; + VCL_DLLPUBLIC bool IsFree() const; bool IsAttached( GLuint nTexture ) const; bool IsAttached( const OpenGLTexture& rTexture ) const; void AttachTexture( const OpenGLTexture& rTexture ); diff --git a/vcl/inc/qt5/Qt5AccessibleWidget.hxx b/vcl/inc/qt5/Qt5AccessibleWidget.hxx index 786f442b1956..2cd4840c6dfa 100644 --- a/vcl/inc/qt5/Qt5AccessibleWidget.hxx +++ b/vcl/inc/qt5/Qt5AccessibleWidget.hxx @@ -30,13 +30,13 @@ class Qt5Frame; class Qt5Widget; -class VCLPLUG_QT5_PUBLIC Qt5AccessibleWidget final : public QObject, - public QAccessibleInterface, - public QAccessibleActionInterface, - public QAccessibleTextInterface, - public QAccessibleEditableTextInterface, - public QAccessibleTableInterface, - public QAccessibleValueInterface +class Qt5AccessibleWidget final : public QObject, + public QAccessibleInterface, + public QAccessibleActionInterface, + public QAccessibleTextInterface, + public QAccessibleEditableTextInterface, + public QAccessibleTableInterface, + public QAccessibleValueInterface { Q_OBJECT diff --git a/vcl/inc/qt5/Qt5Bitmap.hxx b/vcl/inc/qt5/Qt5Bitmap.hxx index cedd1aae1479..8ff4297e43f0 100644 --- a/vcl/inc/qt5/Qt5Bitmap.hxx +++ b/vcl/inc/qt5/Qt5Bitmap.hxx @@ -25,7 +25,7 @@ class QImage; -class VCL_DLLPUBLIC Qt5Bitmap final : public SalBitmap +class Qt5Bitmap final : public SalBitmap { std::unique_ptr<QImage> m_pImage; BitmapPalette m_aPalette; diff --git a/vcl/inc/qt5/Qt5Graphics_Controls.hxx b/vcl/inc/qt5/Qt5Graphics_Controls.hxx index 2676fa6413a4..da1af4dc066b 100644 --- a/vcl/inc/qt5/Qt5Graphics_Controls.hxx +++ b/vcl/inc/qt5/Qt5Graphics_Controls.hxx @@ -29,7 +29,7 @@ #include <QtGui/QRegion> #include <QtWidgets/QPushButton> -class VCLPLUG_QT5_PUBLIC Qt5Graphics_Controls final : public vcl::WidgetDrawInterface +class Qt5Graphics_Controls final : public vcl::WidgetDrawInterface { std::unique_ptr<QImage> m_image; QRect m_lastPopupRect; diff --git a/vcl/inc/qt5/Qt5XAccessible.hxx b/vcl/inc/qt5/Qt5XAccessible.hxx index 66b3901f0b85..fe8e424e4628 100644 --- a/vcl/inc/qt5/Qt5XAccessible.hxx +++ b/vcl/inc/qt5/Qt5XAccessible.hxx @@ -22,7 +22,7 @@ class Qt5Widget; // Wrapper class to hold a css::accessibility::XAccessible object // while being able to pass it as a QObject -class VCLPLUG_QT5_PUBLIC Qt5XAccessible : public QObject +class Qt5XAccessible : public QObject { Q_OBJECT diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index af661ee3a34a..14cb33e74dd7 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -80,15 +80,15 @@ struct ComboBox::Impl ComboBoxBounds calcComboBoxDropDownComponentBounds( const Size &rOutSize, const Size &rBorderOutSize) const; - DECL_DLLPRIVATE_LINK( ImplSelectHdl, LinkParamNone*, void ); - DECL_DLLPRIVATE_LINK( ImplCancelHdl, LinkParamNone*, void ); - DECL_DLLPRIVATE_LINK( ImplDoubleClickHdl, ImplListBoxWindow*, void ); - DECL_DLLPRIVATE_LINK( ImplClickBtnHdl, void*, void ); - DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, FloatingWindow*, void ); - DECL_DLLPRIVATE_LINK( ImplSelectionChangedHdl, sal_Int32, void ); - DECL_DLLPRIVATE_LINK( ImplUserDrawHdl, UserDrawEvent*, void ); - DECL_DLLPRIVATE_LINK( ImplAutocompleteHdl, Edit&, void ); - DECL_DLLPRIVATE_LINK( ImplListItemSelectHdl , LinkParamNone*, void ); + DECL_LINK( ImplSelectHdl, LinkParamNone*, void ); + DECL_LINK( ImplCancelHdl, LinkParamNone*, void ); + DECL_LINK( ImplDoubleClickHdl, ImplListBoxWindow*, void ); + DECL_LINK( ImplClickBtnHdl, void*, void ); + DECL_LINK( ImplPopupModeEndHdl, FloatingWindow*, void ); + DECL_LINK( ImplSelectionChangedHdl, sal_Int32, void ); + DECL_LINK( ImplUserDrawHdl, UserDrawEvent*, void ); + DECL_LINK( ImplAutocompleteHdl, Edit&, void ); + DECL_LINK( ImplListItemSelectHdl , LinkParamNone*, void ); }; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits