[Libreoffice-commits] core.git: include/avmedia include/basegfx include/comphelper include/editeng include/sfx2 include/svtools include/tools include/vcl include/xmloff

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Thu Jul 29 16:39:54 UTC 2021


 include/avmedia/mediaplayer.hxx        |    2 -
 include/basegfx/tuple/b3dtuple.hxx     |    2 -
 include/comphelper/container.hxx       |    2 -
 include/editeng/editund2.hxx           |    2 -
 include/editeng/editview.hxx           |    2 -
 include/editeng/overflowingtxt.hxx     |    4 +--
 include/sfx2/sfxstatuslistener.hxx     |    2 -
 include/svtools/editbrowsebox.hxx      |    4 +--
 include/svtools/filechangedchecker.hxx |    2 -
 include/tools/b3dtrans.hxx             |    6 ++---
 include/tools/vcompat.hxx              |    4 +--
 include/vcl/metaact.hxx                |   36 ++++++++++++++++-----------------
 include/xmloff/DashStyle.hxx           |    4 +--
 include/xmloff/GradientStyle.hxx       |    4 +--
 include/xmloff/HatchStyle.hxx          |    4 +--
 include/xmloff/ImageStyle.hxx          |    4 +--
 include/xmloff/MarkerStyle.hxx         |    4 +--
 17 files changed, 44 insertions(+), 44 deletions(-)

New commits:
commit 8ede3362a2a32c7f74e73265599429840544029d
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Jul 29 16:37:49 2021 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Jul 29 18:39:21 2021 +0200

    Fix --enable-mergelibs `make check`
    
    > LNK] CppunitTest/libtest_basegfx.so
    > include/basegfx/tuple/b3dtuple.hxx:92: error: undefined reference to 'basegfx::B3DTuple::getEmptyTuple()'
    
    and
    
    > [LNK] CppunitTest/libtest_svx_removewhichrange.so
    > svx/source/core/extedit.cxx:65: error: undefined reference to 'FileChangedChecker::FileChangedChecker(rtl::OUString const&, std::function<void ()> const&)'
    > svx/source/engine3d/scene3d.cxx:221: error: undefined reference to 'B3dTransformationSet::SetDeviceRectangle(double, double, double, double)'
    > include/tools/b3dtrans.hxx:120: error: undefined reference to 'B3dTransformationSet::SetViewportRectangle(tools::Rectangle const&, tools::Rectangle const&)'
    > svx/source/engine3d/scene3d.cxx:175: error: undefined reference to 'B3dCamera::B3dCamera(basegfx::B3DPoint const&, basegfx::B3DVector const&, double, double)'
    > svx/source/engine3d/scene3d.cxx:243: error: undefined reference to 'B3dCamera::~B3dCamera()'
    > svx/source/engine3d/scene3d.cxx:355: error: undefined reference to 'B3dTransformationSet::SetRatio(double)'
    > svx/source/engine3d/scene3d.cxx:364: error: undefined reference to 'B3dViewport::SetViewportValues(basegfx::B3DPoint const&, basegfx::B3DVector const&, basegfx::B3DVector const&)'
    > svx/source/engine3d/scene3d.cxx:367: error: undefined reference to 'B3dTransformationSet::SetPerspective(bool)'
    > include/tools/b3dtrans.hxx:120: error: undefined reference to 'B3dTransformationSet::SetViewportRectangle(tools::Rectangle const&, tools::Rectangle const&)'
    > include/tools/b3dtrans.hxx:120: error: undefined reference to 'B3dTransformationSet::SetViewportRectangle(tools::Rectangle const&, tools::Rectangle const&)'
    > svx/source/engine3d/scene3d.cxx:186: error: undefined reference to 'B3dCamera::B3dCamera(basegfx::B3DPoint const&, basegfx::B3DVector const&, double, double)'
    > svx/source/engine3d/scene3d.cxx:179: error: undefined reference to 'B3dCamera::~B3dCamera()'
    > svx/source/engine3d/scene3d.cxx:210: error: undefined reference to 'B3dCamera::~B3dCamera()'
    > svx/source/gallery2/galctrl.cxx:213: error: undefined reference to 'avmedia::MediaFloater::setURL(rtl::OUString const&, rtl::OUString const&, bool)'
    > svx/source/gallery2/galtheme.cxx:745: error: undefined reference to 'VersionCompatRead::VersionCompatRead(SvStream&)'
    > svx/source/gallery2/galtheme.cxx:757: error: undefined reference to 'VersionCompatRead::~VersionCompatRead()'
    > svx/source/gallery2/galtheme.cxx:757: error: undefined reference to 'VersionCompatRead::~VersionCompatRead()'
    > svx/source/gallery2/gallerybinaryengine.cxx:774: error: undefined reference to 'VersionCompatWrite::VersionCompatWrite(SvStream&, unsigned short)'
    > /usr/include/c++/12.0.0/bits/unique_ptr.h:85: error: undefined reference to 'VersionCompatWrite::~VersionCompatWrite()'
    > /usr/include/c++/12.0.0/bits/unique_ptr.h:85: error: undefined reference to 'VersionCompatWrite::~VersionCompatWrite()'
    > svx/source/gallery2/gallerybinaryengineentry.cxx:115: error: undefined reference to 'VersionCompatRead::VersionCompatRead(SvStream&)'
    > svx/source/gallery2/gallerybinaryengineentry.cxx:123: error: undefined reference to 'VersionCompatRead::~VersionCompatRead()'
    > svx/source/gallery2/gallerybinaryengineentry.cxx:123: error: undefined reference to 'VersionCompatRead::~VersionCompatRead()'
    > include/editeng/editund2.hxx:29: error: undefined reference to 'vtable for EditUndoManager'
    > /usr/bin/ld.gold: the vtable symbol may be undefined because the class is missing its key function
    > include/editeng/editund2.hxx:29: error: undefined reference to 'vtable for EditUndoManager'
    > /usr/bin/ld.gold: the vtable symbol may be undefined because the class is missing its key function
    > svx/source/svdraw/sdrundomanager.cxx:30: error: undefined reference to 'EditUndoManager::EditUndoManager(unsigned short)'
    > svx/source/svdraw/sdrundomanager.cxx:72: error: undefined reference to 'EditUndoManager::Redo()'
    > svx/source/svdraw/sdrundomanager.cxx:46: error: undefined reference to 'EditUndoManager::Undo()'
    > workdir/CxxObject/svx/source/svdraw/sdrundomanager.o:sdrundomanager.cxx:typeinfo for SdrUndoManager: error: undefined reference to 'typeinfo for EditUndoManager'
    > svx/source/svdraw/svdedxv.cxx:97: error: undefined reference to 'EditViewCallbacks::~EditViewCallbacks()'
    > svx/source/svdraw/svdedxv.cxx:87: error: undefined reference to 'EditViewCallbacks::~EditViewCallbacks()'
    > workdir/CxxObject/svx/source/svdraw/svdedxv.o:svdedxv.cxx:typeinfo for SdrObjEditView: error: undefined reference to 'typeinfo for EditViewCallbacks'
    > svx/source/svdraw/svdfmtf.cxx:1206: error: undefined reference to 'MetaMapModeAction::Execute(OutputDevice*)'
    > svx/source/svdraw/svdfmtf.cxx:1239: error: undefined reference to 'typeinfo for MetaGradientExAction'
    > svx/source/svdraw/svdfmtf.hxx:139: error: undefined reference to 'MetaLayoutModeAction::Execute(OutputDevice*)'
    > svx/source/svdraw/svdfmtf.hxx:136: error: undefined reference to 'MetaTextLineColorAction::Execute(OutputDevice*)'
    > svx/source/svdraw/svdfmtf.hxx:135: error: undefined reference to 'MetaRefPointAction::Execute(OutputDevice*)'
    > svx/source/svdraw/svdfmtf.hxx:115: error: undefined reference to 'MetaRasterOpAction::Execute(OutputDevice*)'
    > svx/source/svdraw/svdfmtf.hxx:117: error: undefined reference to 'MetaPopAction::Execute(OutputDevice*)'
    > svx/source/svdraw/svdfmtf.hxx:116: error: undefined reference to 'MetaPushAction::Execute(OutputDevice*)'
    > svx/source/svdraw/svdfmtf.hxx:112: error: undefined reference to 'MetaFontAction::Execute(OutputDevice*)'
    > svx/source/svdraw/svdfmtf.cxx:1206: error: undefined reference to 'MetaMapModeAction::Execute(OutputDevice*)'
    > svx/source/svdraw/svdfmtf.hxx:113: error: undefined reference to 'MetaTextAlignAction::Execute(OutputDevice*)'
    > svx/source/svdraw/svdfmtf.hxx:111: error: undefined reference to 'MetaTextFillColorAction::Execute(OutputDevice*)'
    > svx/source/svdraw/svdfmtf.hxx:110: error: undefined reference to 'MetaTextColorAction::Execute(OutputDevice*)'
    > svx/source/svdraw/svdfmtf.hxx:118: error: undefined reference to 'MetaMoveClipRegionAction::Execute(OutputDevice*)'
    > svx/source/svdraw/svdfmtf.hxx:120: error: undefined reference to 'MetaISectRegionClipRegionAction::Execute(OutputDevice*)'
    > svx/source/svdraw/svdfmtf.hxx:119: error: undefined reference to 'MetaISectRectClipRegionAction::Execute(OutputDevice*)'
    > svx/source/svdraw/svdfmtf.hxx:114: error: undefined reference to 'MetaClipRegionAction::Execute(OutputDevice*)'
    > svx/source/svdraw/svdfmtf.hxx:140: error: undefined reference to 'MetaTextLanguageAction::Execute(OutputDevice*)'
    > svx/source/svdraw/svdfmtf.hxx:141: error: undefined reference to 'MetaOverlineColorAction::Execute(OutputDevice*)'
    > /usr/include/c++/12.0.0/bits/unique_ptr.h:85: error: undefined reference to 'OFlowChainedText::~OFlowChainedText()'
    > /usr/include/c++/12.0.0/bits/unique_ptr.h:85: error: undefined reference to 'OFlowChainedText::~OFlowChainedText()'
    > svx/source/svdraw/textchainflow.cxx:274: error: undefined reference to 'OFlowChainedText::RemoveOverflowingText(Outliner*)'
    > /usr/include/c++/12.0.0/bits/unique_ptr.h:85: error: undefined reference to 'OFlowChainedText::~OFlowChainedText()'
    > /usr/include/c++/12.0.0/bits/unique_ptr.h:85: error: undefined reference to 'OFlowChainedText::~OFlowChainedText()'
    > svx/source/svdraw/textchainflow.cxx:101: error: undefined reference to 'UFlowChainedText::UFlowChainedText(Outliner const*, bool)'
    > svx/source/svdraw/textchainflow.cxx:96: error: undefined reference to 'OFlowChainedText::OFlowChainedText(Outliner const*, bool)'
    > svx/source/svdraw/textchainflow.cxx:123: error: undefined reference to 'OFlowChainedText::GetOverflowPointSel() const'
    > svx/source/svdraw/textchainflow.cxx:123: error: undefined reference to 'OFlowChainedText::GetOverflowPointSel() const'
    > svx/source/svdraw/textchainflow.cxx:159: error: undefined reference to 'UFlowChainedText::CreateMergedUnderflowParaObject(Outliner*, OutlinerParaObject const*)'
    > svx/source/svdraw/textchainflow.cxx:202: error: undefined reference to 'OFlowChainedText::RemoveOverflowingText(Outliner*)'
    > svx/source/svdraw/textchainflow.cxx:227: error: undefined reference to 'OFlowChainedText::InsertOverflowingText(Outliner*, OutlinerParaObject const*)'
    > svx/source/svdraw/textchainflow.cxx:239: error: undefined reference to 'OFlowChainedText::IsLastParaInterrupted() const'
    > svx/source/svdraw/textchainflow.cxx:235: error: undefined reference to 'OFlowChainedText::IsLastParaInterrupted() const'
    > svx/source/svdraw/textchainflow.cxx:235: error: undefined reference to 'OFlowChainedText::IsLastParaInterrupted() const'
    > svx/source/tbxctrls/tbcontrl.cxx:2747: error: undefined reference to 'SfxStatusListener::ReBind()'
    > include/svx/tbcontrl.hxx:175: error: undefined reference to 'SfxStatusListener::ReBind()'
    > svx/source/tbxctrls/tbcontrl.cxx:2697: error: undefined reference to 'SfxStatusListener::UnBind()'
    > svx/source/tbxctrls/tbcontrl.cxx:2493: error: undefined reference to 'SfxStatusListener::SfxStatusListener(com::sun::star::uno::Reference<com::sun::star::frame::XDispatchProvider> const&, unsigned short, rtl::OUString const&)'
    > svx/source/tbxctrls/tbcontrl.cxx:2493: error: undefined reference to 'SfxStatusListener::SfxStatusListener(com::sun::star::uno::Reference<com::sun::star::frame::XDispatchProvider> const&, unsigned short, rtl::OUString const&)'
    > svx/source/tbxctrls/tbcontrl.cxx:815: error: undefined reference to 'SfxStatusListener::~SfxStatusListener()'
    > svx/source/tbxctrls/tbcontrl.cxx:815: error: undefined reference to 'SfxStatusListener::~SfxStatusListener()'
    > workdir/CxxObject/svx/source/tbxctrls/tbcontrl.o:tbcontrl.cxx:typeinfo for SfxStyleControllerItem_Impl: error: undefined reference to 'typeinfo for SfxStatusListener'
    > workdir/CxxObject/svx/source/tbxctrls/tbcontrl.o:tbcontrl.cxx:vtable for SfxStyleControllerItem_Impl: error: undefined reference to 'SfxStatusListener::dispose()'
    > workdir/CxxObject/svx/source/tbxctrls/tbcontrl.o:tbcontrl.cxx:vtable for SfxStyleControllerItem_Impl: error: undefined reference to 'SfxStatusListener::addEventListener(com::sun::star::uno::Reference<com::sun::star::lang::XEventListener> const&)'
    > workdir/CxxObject/svx/source/tbxctrls/tbcontrl.o:tbcontrl.cxx:vtable for SfxStyleControllerItem_Impl: error: undefined reference to 'SfxStatusListener::removeEventListener(com::sun::star::uno::Reference<com::sun::star::lang::XEventListener> const&)'
    > workdir/CxxObject/svx/source/tbxctrls/tbcontrl.o:tbcontrl.cxx:vtable for SfxStyleControllerItem_Impl: error: undefined reference to 'SfxStatusListener::disposing(com::sun::star::lang::EventObject const&)'
    > workdir/CxxObject/svx/source/tbxctrls/tbcontrl.o:tbcontrl.cxx:vtable for SfxStyleControllerItem_Impl: error: undefined reference to 'SfxStatusListener::statusChanged(com::sun::star::frame::FeatureStateEvent const&)'
    > workdir/CxxObject/svx/source/tbxctrls/tbcontrl.o:tbcontrl.cxx:vtable for SfxStyleControllerItem_Impl: error: undefined reference to 'non-virtual thunk to SfxStatusListener::disposing(com::sun::star::lang::EventObject const&)'
    > workdir/CxxObject/svx/source/tbxctrls/tbcontrl.o:tbcontrl.cxx:vtable for SfxStyleControllerItem_Impl: error: undefined reference to 'non-virtual thunk to SfxStatusListener::statusChanged(com::sun::star::frame::FeatureStateEvent const&)'
    > workdir/CxxObject/svx/source/tbxctrls/tbcontrl.o:tbcontrl.cxx:vtable for SfxStyleControllerItem_Impl: error: undefined reference to 'non-virtual thunk to SfxStatusListener::dispose()'
    > workdir/CxxObject/svx/source/tbxctrls/tbcontrl.o:tbcontrl.cxx:vtable for SfxStyleControllerItem_Impl: error: undefined reference to 'non-virtual thunk to SfxStatusListener::addEventListener(com::sun::star::uno::Reference<com::sun::star::lang::XEventListener> const&)'
    > workdir/CxxObject/svx/source/tbxctrls/tbcontrl.o:tbcontrl.cxx:vtable for SfxStyleControllerItem_Impl: error: undefined reference to 'non-virtual thunk to SfxStatusListener::removeEventListener(com::sun::star::uno::Reference<com::sun::star::lang::XEventListener> const&)'
    > svx/source/tbxctrls/StylesPreviewWindow.cxx:63: error: undefined reference to 'SfxStatusListener::SfxStatusListener(com::sun::star::uno::Reference<com::sun::star::frame::XDispatchProvider> const&, unsigned short, rtl::OUString const&)'
    > svx/source/tbxctrls/StylesPreviewWindow.cxx:65: error: undefined reference to 'SfxStatusListener::ReBind()'
    > svx/source/tbxctrls/StylesPreviewWindow.cxx:409: error: undefined reference to 'SfxStatusListener::UnBind()'
    > svx/source/tbxctrls/StylesPreviewWindow.cxx:413: error: undefined reference to 'SfxStatusListener::dispose()'
    > svx/source/inc/StylesPreviewWindow.hxx:32: error: undefined reference to 'SfxStatusListener::~SfxStatusListener()'
    > svx/source/inc/StylesPreviewWindow.hxx:32: error: undefined reference to 'SfxStatusListener::~SfxStatusListener()'
    > workdir/CxxObject/svx/source/tbxctrls/StylesPreviewWindow.o:StylesPreviewWindow.cxx:typeinfo for StyleStatusListener: error: undefined reference to 'typeinfo for SfxStatusListener'
    > workdir/CxxObject/svx/source/tbxctrls/StylesPreviewWindow.o:StylesPreviewWindow.cxx:vtable for StyleStatusListener: error: undefined reference to 'SfxStatusListener::dispose()'
    > workdir/CxxObject/svx/source/tbxctrls/StylesPreviewWindow.o:StylesPreviewWindow.cxx:vtable for StyleStatusListener: error: undefined reference to 'SfxStatusListener::addEventListener(com::sun::star::uno::Reference<com::sun::star::lang::XEventListener> const&)'
    > workdir/CxxObject/svx/source/tbxctrls/StylesPreviewWindow.o:StylesPreviewWindow.cxx:vtable for StyleStatusListener: error: undefined reference to 'SfxStatusListener::removeEventListener(com::sun::star::uno::Reference<com::sun::star::lang::XEventListener> const&)'
    > workdir/CxxObject/svx/source/tbxctrls/StylesPreviewWindow.o:StylesPreviewWindow.cxx:vtable for StyleStatusListener: error: undefined reference to 'SfxStatusListener::disposing(com::sun::star::lang::EventObject const&)'
    > workdir/CxxObject/svx/source/tbxctrls/StylesPreviewWindow.o:StylesPreviewWindow.cxx:vtable for StyleStatusListener: error: undefined reference to 'SfxStatusListener::statusChanged(com::sun::star::frame::FeatureStateEvent const&)'
    > workdir/CxxObject/svx/source/tbxctrls/StylesPreviewWindow.o:StylesPreviewWindow.cxx:vtable for StyleStatusListener: error: undefined reference to 'non-virtual thunk to SfxStatusListener::disposing(com::sun::star::lang::EventObject const&)'
    > workdir/CxxObject/svx/source/tbxctrls/StylesPreviewWindow.o:StylesPreviewWindow.cxx:vtable for StyleStatusListener: error: undefined reference to 'non-virtual thunk to SfxStatusListener::statusChanged(com::sun::star::frame::FeatureStateEvent const&)'
    > workdir/CxxObject/svx/source/tbxctrls/StylesPreviewWindow.o:StylesPreviewWindow.cxx:vtable for StyleStatusListener: error: undefined reference to 'non-virtual thunk to SfxStatusListener::dispose()'
    > workdir/CxxObject/svx/source/tbxctrls/StylesPreviewWindow.o:StylesPreviewWindow.cxx:vtable for StyleStatusListener: error: undefined reference to 'non-virtual thunk to SfxStatusListener::addEventListener(com::sun::star::uno::Reference<com::sun::star::lang::XEventListener> const&)'
    > workdir/CxxObject/svx/source/tbxctrls/StylesPreviewWindow.o:StylesPreviewWindow.cxx:vtable for StyleStatusListener: error: undefined reference to 'non-virtual thunk to SfxStatusListener::removeEventListener(com::sun::star::uno::Reference<com::sun::star::lang::XEventListener> const&)'
    > svx/source/unodraw/unoshap3.cxx:324: error: undefined reference to 'B3dViewport::SetViewportValues(basegfx::B3DPoint const&, basegfx::B3DVector const&, basegfx::B3DVector const&)'
    > svx/source/xml/xmlxtexp.cxx:92: error: undefined reference to 'XMLMarkerStyleExport::~XMLMarkerStyleExport()'
    > svx/source/xml/xmlxtexp.cxx:102: error: undefined reference to 'XMLDashStyleExport::~XMLDashStyleExport()'
    > svx/source/xml/xmlxtexp.cxx:113: error: undefined reference to 'XMLHatchStyleExport::~XMLHatchStyleExport()'
    > svx/source/xml/xmlxtexp.cxx:123: error: undefined reference to 'XMLGradientStyleExport::~XMLGradientStyleExport()'
    > svx/source/xml/xmlxtexp.cxx:454: error: undefined reference to 'XMLHatchStyleExport::XMLHatchStyleExport(SvXMLExport&)'
    > svx/source/xml/xmlxtexp.cxx:432: error: undefined reference to 'XMLMarkerStyleExport::XMLMarkerStyleExport(SvXMLExport&)'
    > svx/source/xml/xmlxtexp.cxx:443: error: undefined reference to 'XMLDashStyleExport::XMLDashStyleExport(SvXMLExport&)'
    > svx/source/xml/xmlxtexp.cxx:465: error: undefined reference to 'XMLGradientStyleExport::XMLGradientStyleExport(SvXMLExport&)'
    > svx/source/xml/xmlxtexp.cxx:438: error: undefined reference to 'XMLMarkerStyleExport::exportXML(rtl::OUString const&, com::sun::star::uno::Any const&)'
    > svx/source/xml/xmlxtexp.cxx:92: error: undefined reference to 'XMLMarkerStyleExport::~XMLMarkerStyleExport()'
    > svx/source/xml/xmlxtexp.cxx:449: error: undefined reference to 'XMLDashStyleExport::exportXML(rtl::OUString const&, com::sun::star::uno::Any const&)'
    > svx/source/xml/xmlxtexp.cxx:102: error: undefined reference to 'XMLDashStyleExport::~XMLDashStyleExport()'
    > svx/source/xml/xmlxtexp.cxx:460: error: undefined reference to 'XMLHatchStyleExport::exportXML(rtl::OUString const&, com::sun::star::uno::Any const&)'
    > svx/source/xml/xmlxtexp.cxx:113: error: undefined reference to 'XMLHatchStyleExport::~XMLHatchStyleExport()'
    > svx/source/xml/xmlxtexp.cxx:471: error: undefined reference to 'XMLGradientStyleExport::exportXML(rtl::OUString const&, com::sun::star::uno::Any const&)'
    > svx/source/xml/xmlxtexp.cxx:123: error: undefined reference to 'XMLGradientStyleExport::~XMLGradientStyleExport()'
    > svx/source/xml/xmlxtexp.cxx:482: error: undefined reference to 'XMLImageStyle::exportXML(rtl::OUString const&, com::sun::star::uno::Any const&, SvXMLExport&)'
    > svx/source/xml/xmlxtimp.cxx:220: error: undefined reference to 'XMLMarkerStyleImport::XMLMarkerStyleImport(SvXMLImport&)'
    > svx/source/xml/xmlxtimp.cxx:221: error: undefined reference to 'XMLMarkerStyleImport::importXML(com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> const&, com::sun::star::uno::Any&, rtl::OUString&)'
    > svx/source/xml/xmlxtimp.cxx:222: error: undefined reference to 'XMLMarkerStyleImport::~XMLMarkerStyleImport()'
    > svx/source/xml/xmlxtimp.cxx:233: error: undefined reference to 'XMLDashStyleImport::XMLDashStyleImport(SvXMLImport&)'
    > svx/source/xml/xmlxtimp.cxx:234: error: undefined reference to 'XMLDashStyleImport::importXML(com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> const&, com::sun::star::uno::Any&, rtl::OUString&)'
    > svx/source/xml/xmlxtimp.cxx:235: error: undefined reference to 'XMLDashStyleImport::~XMLDashStyleImport()'
    > svx/source/xml/xmlxtimp.cxx:259: error: undefined reference to 'XMLGradientStyleImport::XMLGradientStyleImport(SvXMLImport&)'
    > svx/source/xml/xmlxtimp.cxx:260: error: undefined reference to 'XMLGradientStyleImport::importXML(com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> const&, com::sun::star::uno::Any&, rtl::OUString&)'
    > svx/source/xml/xmlxtimp.cxx:261: error: undefined reference to 'XMLGradientStyleImport::~XMLGradientStyleImport()'
    > svx/source/xml/xmlxtimp.cxx:246: error: undefined reference to 'XMLHatchStyleImport::XMLHatchStyleImport(SvXMLImport&)'
    > svx/source/xml/xmlxtimp.cxx:247: error: undefined reference to 'XMLHatchStyleImport::importXML(com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> const&, com::sun::star::uno::Any&, rtl::OUString&)'
    > svx/source/xml/xmlxtimp.cxx:248: error: undefined reference to 'XMLHatchStyleImport::~XMLHatchStyleImport()'
    > svx/source/xml/xmlxtimp.cxx:273: error: undefined reference to 'XMLImageStyle::importXML(com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> const&, com::sun::star::uno::Any&, rtl::OUString&, SvXMLImport&)'
    > svx/source/xml/xmlxtimp.cxx:222: error: undefined reference to 'XMLMarkerStyleImport::~XMLMarkerStyleImport()'
    > svx/source/xml/xmlxtimp.cxx:235: error: undefined reference to 'XMLDashStyleImport::~XMLDashStyleImport()'
    > svx/source/xml/xmlxtimp.cxx:248: error: undefined reference to 'XMLHatchStyleImport::~XMLHatchStyleImport()'
    > svx/source/xml/xmlxtimp.cxx:261: error: undefined reference to 'XMLGradientStyleImport::~XMLGradientStyleImport()'
    > include/vcl/vclptr.hxx:129: error: undefined reference to 'svt::MultiLineTextCell::MultiLineTextCell(BrowserDataWin*)'
    > include/vcl/vclptr.hxx:129: error: undefined reference to 'svt::MultiLineTextCell::MultiLineTextCell(BrowserDataWin*)'
    > include/svtools/editbrowsebox.hxx:246: error: undefined reference to 'svt::IEditImplementation::~IEditImplementation()'
    > include/svtools/editbrowsebox.hxx:246: error: undefined reference to 'svt::IEditImplementation::~IEditImplementation()'
    > include/svtools/editbrowsebox.hxx:246: error: undefined reference to 'svt::IEditImplementation::~IEditImplementation()'
    > include/svtools/editbrowsebox.hxx:234: error: undefined reference to 'svt::IEditImplementation::~IEditImplementation()'
    > svx/source/form/fmshimp.cxx:3919: error: undefined reference to 'comphelper::IndexAccessIterator::IndexAccessIterator(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&)'
    > svx/source/form/fmshimp.cxx:3919: error: undefined reference to 'comphelper::IndexAccessIterator::IndexAccessIterator(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&)'
    > svx/source/form/fmshimp.cxx:2342: error: undefined reference to 'comphelper::IndexAccessIterator::Next()'
    > svx/source/form/fmshimp.cxx:2437: error: undefined reference to 'comphelper::IndexAccessIterator::Next()'
    > svx/source/inc/fmshimp.hxx:544: error: undefined reference to 'comphelper::IndexAccessIterator::~IndexAccessIterator()'
    > svx/source/inc/fmshimp.hxx:100: error: undefined reference to 'comphelper::IndexAccessIterator::IndexAccessIterator(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&)'
    > svx/source/form/fmshimp.cxx:3092: error: undefined reference to 'comphelper::IndexAccessIterator::Next()'
    > svx/source/inc/fmshimp.hxx:97: error: undefined reference to 'comphelper::IndexAccessIterator::~IndexAccessIterator()'
    > svx/source/inc/fmshimp.hxx:97: error: undefined reference to 'comphelper::IndexAccessIterator::~IndexAccessIterator()'
    > svx/source/inc/fmshimp.hxx:100: error: undefined reference to 'comphelper::IndexAccessIterator::IndexAccessIterator(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&)'
    > svx/source/form/fmshimp.cxx:3212: error: undefined reference to 'comphelper::IndexAccessIterator::Next()'
    > svx/source/inc/fmshimp.hxx:97: error: undefined reference to 'comphelper::IndexAccessIterator::~IndexAccessIterator()'
    > svx/source/form/fmshimp.cxx:1636: error: undefined reference to 'comphelper::IndexAccessIterator::IndexAccessIterator(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&)'
    > svx/source/form/fmshimp.cxx:1636: error: undefined reference to 'comphelper::IndexAccessIterator::~IndexAccessIterator()'
    > svx/source/form/fmshimp.cxx:1636: error: undefined reference to 'comphelper::IndexAccessIterator::~IndexAccessIterator()'
    > workdir/CxxObject/svx/source/form/fmshimp.o:fmshimp.cxx:typeinfo for FmXBoundFormFieldIterator: error: undefined reference to 'typeinfo for comphelper::IndexAccessIterator'
    > workdir/CxxObject/svx/source/form/fmshimp.o:fmshimp.cxx:typeinfo for SearchableControlIterator: error: undefined reference to 'typeinfo for comphelper::IndexAccessIterator'
    
    Change-Id: I9911219083676cd10f5ccfc067655252eb172a3e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119676
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/avmedia/mediaplayer.hxx b/include/avmedia/mediaplayer.hxx
index d00fcc55abd8..b7af886bc40c 100644
--- a/include/avmedia/mediaplayer.hxx
+++ b/include/avmedia/mediaplayer.hxx
@@ -40,7 +40,7 @@ public:
 
 class MediaWindow;
 
-class UNLESS_MERGELIBS(AVMEDIA_DLLPUBLIC) MediaFloater final : public SfxDockingWindow
+class AVMEDIA_DLLPUBLIC MediaFloater final : public SfxDockingWindow
 {
 public:
 
diff --git a/include/basegfx/tuple/b3dtuple.hxx b/include/basegfx/tuple/b3dtuple.hxx
index bb8f4b4067c3..ccc360084dbc 100644
--- a/include/basegfx/tuple/b3dtuple.hxx
+++ b/include/basegfx/tuple/b3dtuple.hxx
@@ -37,7 +37,7 @@ namespace basegfx
         @derive Use this class to implement Points or Vectors
         which are based on three double values
     */
-    class SAL_WARN_UNUSED UNLESS_MERGELIBS(BASEGFX_DLLPUBLIC) B3DTuple : public Tuple3D<double>
+    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC B3DTuple : public Tuple3D<double>
     {
     public:
         /** Create a 3D Tuple
diff --git a/include/comphelper/container.hxx b/include/comphelper/container.hxx
index 5494698342cf..a1ea3de9c32e 100644
--- a/include/comphelper/container.hxx
+++ b/include/comphelper/container.hxx
@@ -34,7 +34,7 @@ namespace comphelper
 
 /** an iterator that iterates through all elements, starting from an XIndexAccess (pre-order)
 */
-class UNLESS_MERGELIBS(COMPHELPER_DLLPUBLIC) IndexAccessIterator
+class COMPHELPER_DLLPUBLIC IndexAccessIterator
 {
 protected:
     css::uno::Reference< css::uno::XInterface>    m_xStartingPoint;
diff --git a/include/editeng/editund2.hxx b/include/editeng/editund2.hxx
index 7ed52849ed05..fb8d66b99443 100644
--- a/include/editeng/editund2.hxx
+++ b/include/editeng/editund2.hxx
@@ -26,7 +26,7 @@
 
 class EditEngine;
 
-class UNLESS_MERGELIBS(EDITENG_DLLPUBLIC) EditUndoManager : public SfxUndoManager
+class EDITENG_DLLPUBLIC EditUndoManager : public SfxUndoManager
 {
     using SfxUndoManager::Undo;
     using SfxUndoManager::Redo;
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index 6ba2e01b285a..c981c544f9e1 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -93,7 +93,7 @@ enum class ScrollRangeCheck
 // react itself as needed.
 // Also Selection visualization is suppressed and EditViewSelectionChange
 // is triggered when Selection changes and needs reaction.
-class UNLESS_MERGELIBS(EDITENG_DLLPUBLIC) EditViewCallbacks
+class EDITENG_DLLPUBLIC EditViewCallbacks
 {
 public:
     EditViewCallbacks() {}
diff --git a/include/editeng/overflowingtxt.hxx b/include/editeng/overflowingtxt.hxx
index ad0a662d1201..5edfdfa00ac6 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -98,7 +98,7 @@ private:
  * (respectively after Overflow and Underflow).
  *
  */
-class UNLESS_MERGELIBS(EDITENG_DLLPUBLIC) OFlowChainedText
+class EDITENG_DLLPUBLIC OFlowChainedText
 {
 public:
     OFlowChainedText(Outliner const *, bool );
@@ -119,7 +119,7 @@ private:
 };
 
 // UFlowChainedText is a simpler class than OFlowChainedText: it almost only joins para-objects
-class UNLESS_MERGELIBS(EDITENG_DLLPUBLIC) UFlowChainedText
+class EDITENG_DLLPUBLIC UFlowChainedText
 {
 public:
     UFlowChainedText(Outliner const *, bool);
diff --git a/include/sfx2/sfxstatuslistener.hxx b/include/sfx2/sfxstatuslistener.hxx
index a9c30d46ca53..52d553e766f6 100644
--- a/include/sfx2/sfxstatuslistener.hxx
+++ b/include/sfx2/sfxstatuslistener.hxx
@@ -33,7 +33,7 @@ namespace com::sun::star::frame { class XDispatch; }
 namespace com::sun::star::frame { class XDispatchProvider; }
 namespace com::sun::star::frame { struct FeatureStateEvent; }
 
-class UNLESS_MERGELIBS(SFX2_DLLPUBLIC) SfxStatusListener : public cppu::WeakImplHelper<
+class SFX2_DLLPUBLIC SfxStatusListener : public cppu::WeakImplHelper<
                           css::frame::XStatusListener,
                           css::lang::XComponent>
 {
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index be1ad5f96594..873b9d1bebb6 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -107,7 +107,7 @@ namespace svt
 
     //= IEditImplementation
 
-    class UNLESS_MERGELIBS(SVT_DLLPUBLIC) IEditImplementation
+    class SVT_DLLPUBLIC IEditImplementation
     {
     public:
         virtual ~IEditImplementation() = 0;
@@ -350,7 +350,7 @@ namespace svt
 
     /** a multi line edit which can be used in a cell of an EditBrowseBox
     */
-    class UNLESS_MERGELIBS(SVT_DLLPUBLIC) MultiLineTextCell final : public ControlBase
+    class SVT_DLLPUBLIC MultiLineTextCell final : public ControlBase
     {
     public:
         MultiLineTextCell(BrowserDataWin* pParent);
diff --git a/include/svtools/filechangedchecker.hxx b/include/svtools/filechangedchecker.hxx
index 22fc5597570a..23ea1c66323d 100644
--- a/include/svtools/filechangedchecker.hxx
+++ b/include/svtools/filechangedchecker.hxx
@@ -25,7 +25,7 @@ class Timer;
     Instances of this class setup a vcl timer to occasionally wake up
     check whether file modification time has changed.
  */
-class UNLESS_MERGELIBS(SVT_DLLPUBLIC) FileChangedChecker
+class SVT_DLLPUBLIC FileChangedChecker
 {
 private:
     Timer                    mTimer;
diff --git a/include/tools/b3dtrans.hxx b/include/tools/b3dtrans.hxx
index c0747cfca174..b12cb7a655cb 100644
--- a/include/tools/b3dtrans.hxx
+++ b/include/tools/b3dtrans.hxx
@@ -31,7 +31,7 @@
 #include <tools/toolsdllapi.h>
 
 /// Transformation sets for 3D output
-class SAL_WARN_UNUSED UNLESS_MERGELIBS(TOOLS_DLLPUBLIC) B3dTransformationSet
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC B3dTransformationSet
 {
 private:
     // Object Matrix Object -> World
@@ -154,7 +154,7 @@ protected:
     Uses a simplified model, in which a point is described using a View
     Reference Point (VRP).
 */
-class SAL_WARN_UNUSED UNLESS_MERGELIBS(TOOLS_DLLPUBLIC) B3dViewport : public B3dTransformationSet
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC B3dViewport : public B3dTransformationSet
 {
 private:
     basegfx::B3DPoint           aVRP;   // View Reference Point
@@ -186,7 +186,7 @@ protected:
 
 // B3D camera
 
-class SAL_WARN_UNUSED UNLESS_MERGELIBS(TOOLS_DLLPUBLIC) B3dCamera final : public B3dViewport
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC B3dCamera final : public B3dViewport
 {
 public:
     B3dCamera(
diff --git a/include/tools/vcompat.hxx b/include/tools/vcompat.hxx
index 18981c659cb3..0b90a8f2b41c 100644
--- a/include/tools/vcompat.hxx
+++ b/include/tools/vcompat.hxx
@@ -30,7 +30,7 @@ inline sal_uInt32 COMPAT_FORMAT(char char1, char char2, char char3, char char4)
 
 class SvStream;
 
-class UNLESS_MERGELIBS(TOOLS_DLLPUBLIC) VersionCompatRead
+class TOOLS_DLLPUBLIC VersionCompatRead
 {
     SvStream& mrRStm;
     sal_uInt32 mnCompatPos;
@@ -47,7 +47,7 @@ public:
     sal_uInt16 GetVersion() const { return mnVersion; }
 };
 
-class UNLESS_MERGELIBS(TOOLS_DLLPUBLIC) VersionCompatWrite
+class TOOLS_DLLPUBLIC VersionCompatWrite
 {
     SvStream& mrWStm;
     sal_uInt32 mnCompatPos;
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index a33cc6c13a8e..93be76c63cab 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -1071,7 +1071,7 @@ public:
     void                SetRect(tools::Rectangle& rRect) { maRect = rRect; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaGradientExAction final : public MetaAction
+class VCL_DLLPUBLIC MetaGradientExAction final : public MetaAction
 {
 private:
 
@@ -1167,7 +1167,7 @@ public:
     void                SetWallpaper(Wallpaper& rWallpaper) { maWallpaper = rWallpaper; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaClipRegionAction final : public MetaAction
+class VCL_DLLPUBLIC MetaClipRegionAction final : public MetaAction
 {
 private:
 
@@ -1199,7 +1199,7 @@ public:
     void                SetClipping(bool bClip) { mbClip = bClip; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaISectRectClipRegionAction final : public MetaAction
+class VCL_DLLPUBLIC MetaISectRectClipRegionAction final : public MetaAction
 {
 private:
 
@@ -1228,7 +1228,7 @@ public:
     void                SetRect(tools::Rectangle& rRect) { maRect = rRect; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaISectRegionClipRegionAction final : public MetaAction
+class VCL_DLLPUBLIC MetaISectRegionClipRegionAction final : public MetaAction
 {
 private:
 
@@ -1257,7 +1257,7 @@ public:
     void                SetRegion(vcl::Region& rRegion) { maRegion = rRegion; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaMoveClipRegionAction final : public MetaAction
+class VCL_DLLPUBLIC MetaMoveClipRegionAction final : public MetaAction
 {
 private:
 
@@ -1347,7 +1347,7 @@ public:
 
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaTextColorAction final : public MetaAction
+class VCL_DLLPUBLIC MetaTextColorAction final : public MetaAction
 {
 private:
 
@@ -1373,7 +1373,7 @@ public:
     void                SetColor(Color& rColor) { maColor = rColor; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaTextFillColorAction final : public MetaAction
+class VCL_DLLPUBLIC MetaTextFillColorAction final : public MetaAction
 {
 private:
 
@@ -1403,7 +1403,7 @@ public:
 
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaTextLineColorAction final : public MetaAction
+class VCL_DLLPUBLIC MetaTextLineColorAction final : public MetaAction
 {
 private:
 
@@ -1432,7 +1432,7 @@ public:
     bool                IsSetting() const { return mbSet; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaOverlineColorAction final : public MetaAction
+class VCL_DLLPUBLIC MetaOverlineColorAction final : public MetaAction
 {
 private:
 
@@ -1461,7 +1461,7 @@ public:
     bool                IsSetting() const { return mbSet; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaTextAlignAction final : public MetaAction
+class VCL_DLLPUBLIC MetaTextAlignAction final : public MetaAction
 {
 private:
 
@@ -1487,7 +1487,7 @@ public:
     void                SetTextAlign(TextAlign eAlign) { maAlign = eAlign; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaMapModeAction final : public MetaAction
+class VCL_DLLPUBLIC MetaMapModeAction final : public MetaAction
 {
 private:
 
@@ -1518,7 +1518,7 @@ public:
 // tdf#127471 decl for friend below
 namespace emfio { class ScaledFontDetectCorrectHelper; }
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaFontAction final : public MetaAction
+class VCL_DLLPUBLIC MetaFontAction final : public MetaAction
 {
 private:
 
@@ -1552,7 +1552,7 @@ public:
 
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaPushAction final : public MetaAction
+class VCL_DLLPUBLIC MetaPushAction final : public MetaAction
 {
 private:
 
@@ -1578,7 +1578,7 @@ public:
     void                SetPushFlags(const PushFlags nFlags) { mnFlags = nFlags; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaPopAction final : public MetaAction
+class VCL_DLLPUBLIC MetaPopAction final : public MetaAction
 {
 public:
 
@@ -1596,7 +1596,7 @@ public:
     virtual void        Read( SvStream& rIStm, ImplMetaReadData* pData ) override;
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaRasterOpAction final : public MetaAction
+class VCL_DLLPUBLIC MetaRasterOpAction final : public MetaAction
 {
 private:
 
@@ -1735,7 +1735,7 @@ public:
     void                SetSize(const Size& rSize) { maSize = rSize; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaRefPointAction final : public MetaAction
+class VCL_DLLPUBLIC MetaRefPointAction final : public MetaAction
 {
 private:
 
@@ -1802,7 +1802,7 @@ public:
     void                SetData(const sal_uInt8* pData, const sal_uInt32 nDataSize) { ImplInitDynamicData(pData, nDataSize); }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaLayoutModeAction final : public MetaAction
+class VCL_DLLPUBLIC MetaLayoutModeAction final : public MetaAction
 {
 private:
 
@@ -1828,7 +1828,7 @@ public:
     void                SetLayoutMode(const ComplexTextLayoutFlags nLayoutMode) { mnLayoutMode = nLayoutMode; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaTextLanguageAction final : public MetaAction
+class VCL_DLLPUBLIC MetaTextLanguageAction final : public MetaAction
 {
 private:
 
diff --git a/include/xmloff/DashStyle.hxx b/include/xmloff/DashStyle.hxx
index 76bce512477a..38cda5c426f0 100644
--- a/include/xmloff/DashStyle.hxx
+++ b/include/xmloff/DashStyle.hxx
@@ -33,7 +33,7 @@ namespace com::sun::star {
 }
 
 
-class UNLESS_MERGELIBS(XMLOFF_DLLPUBLIC) XMLDashStyleImport
+class XMLOFF_DLLPUBLIC XMLDashStyleImport
 {
     SvXMLImport& rImport;
 
@@ -48,7 +48,7 @@ public:
 };
 
 
-class UNLESS_MERGELIBS(XMLOFF_DLLPUBLIC) XMLDashStyleExport
+class XMLOFF_DLLPUBLIC XMLDashStyleExport
 {
     SvXMLExport& rExport;
 
diff --git a/include/xmloff/GradientStyle.hxx b/include/xmloff/GradientStyle.hxx
index 5037505cc46a..9ac9427994cb 100644
--- a/include/xmloff/GradientStyle.hxx
+++ b/include/xmloff/GradientStyle.hxx
@@ -34,7 +34,7 @@ namespace com::sun::star {
 }
 
 
-class UNLESS_MERGELIBS(XMLOFF_DLLPUBLIC) XMLGradientStyleImport
+class XMLOFF_DLLPUBLIC XMLGradientStyleImport
 {
     SvXMLImport& rImport;
 
@@ -49,7 +49,7 @@ public:
 };
 
 
-class UNLESS_MERGELIBS(XMLOFF_DLLPUBLIC) XMLGradientStyleExport
+class XMLOFF_DLLPUBLIC XMLGradientStyleExport
 {
     SvXMLExport& rExport;
 
diff --git a/include/xmloff/HatchStyle.hxx b/include/xmloff/HatchStyle.hxx
index a08eede0c180..85ec02ac488d 100644
--- a/include/xmloff/HatchStyle.hxx
+++ b/include/xmloff/HatchStyle.hxx
@@ -34,7 +34,7 @@ namespace com::sun::star {
 }
 
 
-class UNLESS_MERGELIBS(XMLOFF_DLLPUBLIC) XMLHatchStyleImport
+class XMLOFF_DLLPUBLIC XMLHatchStyleImport
 {
     SvXMLImport& rImport;
 
@@ -48,7 +48,7 @@ public:
         OUString& rStrName );
 };
 
-class UNLESS_MERGELIBS(XMLOFF_DLLPUBLIC) XMLHatchStyleExport
+class XMLOFF_DLLPUBLIC XMLHatchStyleExport
 {
     SvXMLExport& rExport;
 
diff --git a/include/xmloff/ImageStyle.hxx b/include/xmloff/ImageStyle.hxx
index b6e8cb8b0811..add8482d1ce2 100644
--- a/include/xmloff/ImageStyle.hxx
+++ b/include/xmloff/ImageStyle.hxx
@@ -35,8 +35,8 @@ class SvXMLImport;
 namespace XMLImageStyle
 {
 
-UNLESS_MERGELIBS(XMLOFF_DLLPUBLIC) void exportXML(OUString const & rStrName, css::uno::Any const & rValue, SvXMLExport& rExport);
-UNLESS_MERGELIBS(XMLOFF_DLLPUBLIC) bool importXML(css::uno::Reference<css::xml::sax::XFastAttributeList> const & xAttrList,
+XMLOFF_DLLPUBLIC void exportXML(OUString const & rStrName, css::uno::Any const & rValue, SvXMLExport& rExport);
+XMLOFF_DLLPUBLIC bool importXML(css::uno::Reference<css::xml::sax::XFastAttributeList> const & xAttrList,
                                 css::uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport);
 
 }
diff --git a/include/xmloff/MarkerStyle.hxx b/include/xmloff/MarkerStyle.hxx
index b3b73b4ba6f2..70e58cad83b9 100644
--- a/include/xmloff/MarkerStyle.hxx
+++ b/include/xmloff/MarkerStyle.hxx
@@ -34,7 +34,7 @@ namespace com::sun::star {
 }
 
 
-class UNLESS_MERGELIBS(XMLOFF_DLLPUBLIC) XMLMarkerStyleImport
+class XMLOFF_DLLPUBLIC XMLMarkerStyleImport
 {
     SvXMLImport& rImport;
 
@@ -48,7 +48,7 @@ public:
         OUString& rStrName );
 };
 
-class UNLESS_MERGELIBS(XMLOFF_DLLPUBLIC) XMLMarkerStyleExport
+class XMLOFF_DLLPUBLIC XMLMarkerStyleExport
 {
     SvXMLExport& rExport;
 


More information about the Libreoffice-commits mailing list