[Libreoffice-commits] core.git: include/svx sd/source svx/inc svx/Library_svxcore.mk svx/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Sun Feb 2 17:40:34 UTC 2020
include/svx/ColorSets.hxx | 2
include/svx/CommonStyleManager.hxx | 2
include/svx/EnhancedCustomShape2d.hxx | 2
include/svx/EnhancedCustomShapeFunctionParser.hxx | 4 -
include/svx/EnhancedCustomShapeGeometry.hxx | 8 +-
include/svx/EnhancedCustomShapeTypeNames.hxx | 6 -
include/svx/ImageMapInfo.hxx | 2
include/svx/PaletteManager.hxx | 2
include/svx/ParseContext.hxx | 4 -
include/svx/SvxColorValueSet.hxx | 4 -
include/svx/SvxNumOptionsTabPageHelper.hxx | 2
include/svx/SvxPresetListBox.hxx | 2
include/svx/XPropertyEntry.hxx | 2
include/svx/camera3d.hxx | 2
include/svx/charthelper.hxx | 2
include/svx/chrtitem.hxx | 10 +-
include/svx/clipfmtitem.hxx | 2
include/svx/colorbox.hxx | 4 -
include/svx/colorwindow.hxx | 8 +-
include/svx/cube3d.hxx | 2
include/svx/dataaccessdescriptor.hxx | 2
include/svx/dbaexchange.hxx | 6 -
include/svx/deflt3d.hxx | 2
include/svx/dialmgr.hxx | 4 -
include/svx/dlgutil.hxx | 6 -
include/svx/drawitem.hxx | 14 ++--
include/svx/e3ditem.hxx | 2
include/svx/e3dsceneupdater.hxx | 2
include/svx/e3dundo.hxx | 2
include/svx/extedit.hxx | 4 -
include/svx/extrud3d.hxx | 2
include/svx/extrusionbar.hxx | 4 -
include/svx/fmdmod.hxx | 2
include/svx/fmdpage.hxx | 2
include/svx/fmgridcl.hxx | 4 -
include/svx/fmgridif.hxx | 4 -
include/svx/fmmodel.hxx | 2
include/svx/fmpage.hxx | 2
include/svx/fmsearch.hxx | 2
include/svx/fmshell.hxx | 4 -
include/svx/fmtools.hxx | 6 -
include/svx/fmview.hxx | 2
include/svx/fontworkbar.hxx | 4 -
include/svx/fontworkgallery.hxx | 2
include/svx/framelink.hxx | 2
include/svx/framelinkarray.hxx | 2
include/svx/galctrl.hxx | 2
include/svx/gallery.hxx | 2
include/svx/gallery1.hxx | 2
include/svx/galleryitem.hxx | 2
include/svx/galmisc.hxx | 4 -
include/svx/galtheme.hxx | 2
include/svx/graphichelper.hxx | 2
include/svx/grfcrop.hxx | 2
include/svx/gridctrl.hxx | 2
include/svx/helperhittest3d.hxx | 2
include/svx/hexcolorcontrol.hxx | 2
include/svx/itextprovider.hxx | 2
include/svx/langbox.hxx | 4 -
include/svx/lathe3d.hxx | 2
include/svx/linectrl.hxx | 2
include/svx/obj3d.hxx | 4 -
include/svx/objfac3d.hxx | 2
include/svx/pagenumberlistbox.hxx | 2
include/svx/papersizelistbox.hxx | 2
include/svx/polygn3d.hxx | 2
include/svx/polypolygoneditor.hxx | 2
include/svx/samecontentlistbox.hxx | 2
include/svx/scene3d.hxx | 2
include/svx/sdangitm.hxx | 2
include/svx/sdasitm.hxx | 4 -
include/svx/sdgcoitm.hxx | 6 -
include/svx/sdgcpitm.hxx | 2
include/svx/sdggaitm.hxx | 2
include/svx/sdgluitm.hxx | 4 -
include/svx/sdgmoitm.hxx | 2
include/svx/sdgtritm.hxx | 2
include/svx/sdmetitm.hxx | 2
include/svx/sdooitm.hxx | 2
include/svx/sdprcitm.hxx | 4 -
include/svx/sdr/animation/objectanimator.hxx | 2
include/svx/sdr/animation/scheduler.hxx | 4 -
include/svx/sdr/attribute/sdrallfillattributeshelper.hxx | 2
include/svx/sdr/contact/displayinfo.hxx | 2
include/svx/sdr/contact/objectcontact.hxx | 2
include/svx/sdr/contact/objectcontactofobjlistpainter.hxx | 4 -
include/svx/sdr/contact/objectcontactofpageview.hxx | 2
include/svx/sdr/contact/viewcontact.hxx | 2
include/svx/sdr/contact/viewcontactofe3dscene.hxx | 2
include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx | 2
include/svx/sdr/contact/viewcontactofsdrobj.hxx | 2
include/svx/sdr/contact/viewcontactofvirtobj.hxx | 2
include/svx/sdr/contact/viewobjectcontact.hxx | 2
include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx | 2
include/svx/sdr/contact/viewobjectcontactredirector.hxx | 2
include/svx/sdr/overlay/overlayanimatedbitmapex.hxx | 2
include/svx/sdr/overlay/overlaybitmapex.hxx | 2
include/svx/sdr/overlay/overlaymanager.hxx | 2
include/svx/sdr/overlay/overlayobject.hxx | 4 -
include/svx/sdr/overlay/overlayobjectlist.hxx | 2
include/svx/sdr/overlay/overlaypolypolygon.hxx | 2
include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx | 2
include/svx/sdr/overlay/overlayselection.hxx | 2
include/svx/sdr/primitive2d/sdrattributecreator.hxx | 8 +-
include/svx/sdr/primitive2d/sdrdecompositiontools.hxx | 10 +-
include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx | 4 -
include/svx/sdr/properties/defaultproperties.hxx | 2
include/svx/sdr/properties/properties.hxx | 4 -
include/svx/sdr/table/tablecontroller.hxx | 2
include/svx/sdrhittesthelper.hxx | 4 -
include/svx/sdrobjectfilter.hxx | 2
include/svx/sdrpagewindow.hxx | 2
include/svx/sdrpaintwindow.hxx | 4 -
include/svx/sdrundomanager.hxx | 2
include/svx/sdtaaitm.hxx | 2
include/svx/sdtaditm.hxx | 2
include/svx/sdtaiitm.hxx | 4 -
include/svx/sdtaitm.hxx | 4 -
include/svx/sdtakitm.hxx | 2
include/svx/sdtayitm.hxx | 2
include/svx/sdtfchim.hxx | 2
include/svx/sdtfsitm.hxx | 2
include/svx/sdynitm.hxx | 2
include/svx/selectioncontroller.hxx | 2
include/svx/shapepropertynotifier.hxx | 6 -
include/svx/sidebar/PanelLayout.hxx | 2
include/svx/spacinglistbox.hxx | 2
include/svx/sphere3d.hxx | 2
include/svx/svdcrtv.hxx | 2
include/svx/svddrag.hxx | 2
include/svx/svddrgmt.hxx | 10 +-
include/svx/svddrgv.hxx | 2
include/svx/svdedtv.hxx | 2
include/svx/svdedxv.hxx | 2
include/svx/svdetc.hxx | 20 ++---
include/svx/svdglev.hxx | 2
include/svx/svdglue.hxx | 4 -
include/svx/svdhdl.hxx | 8 +-
include/svx/svdhlpln.hxx | 2
include/svx/svditer.hxx | 2
include/svx/svdlayer.hxx | 4 -
include/svx/svdmark.hxx | 6 -
include/svx/svdmodel.hxx | 4 -
include/svx/svdmrkv.hxx | 2
include/svx/svdoashp.hxx | 2
include/svx/svdoattr.hxx | 2
include/svx/svdobj.hxx | 16 ++--
include/svx/svdocapt.hxx | 2
include/svx/svdocirc.hxx | 4 -
include/svx/svdoedge.hxx | 2
include/svx/svdograf.hxx | 2
include/svx/svdogrp.hxx | 2
include/svx/svdomeas.hxx | 2
include/svx/svdomedia.hxx | 2
include/svx/svdoole2.hxx | 4 -
include/svx/svdopage.hxx | 2
include/svx/svdopath.hxx | 2
include/svx/svdorect.hxx | 2
include/svx/svdotable.hxx | 9 +-
include/svx/svdotext.hxx | 2
include/svx/svdouno.hxx | 2
include/svx/svdoutl.hxx | 2
include/svx/svdovirt.hxx | 2
include/svx/svdpage.hxx | 8 +-
include/svx/svdpagv.hxx | 2
include/svx/svdpntv.hxx | 2
include/svx/svdpoev.hxx | 2
include/svx/svdpool.hxx | 2
include/svx/svdsnpv.hxx | 2
include/svx/svdsob.hxx | 2
include/svx/svdtext.hxx | 2
include/svx/svdtrans.hxx | 16 ++--
include/svx/svdundo.hxx | 38 +++++------
include/svx/svdview.hxx | 6 -
include/svx/svdviter.hxx | 2
include/svx/svdxcgv.hxx | 2
include/svx/svx3ditems.hxx | 18 ++---
include/svx/svxdlg.hxx | 2
include/svx/svxdllapi.h | 6 +
include/svx/sxcecitm.hxx | 6 -
include/svx/sxcllitm.hxx | 4 -
include/svx/sxctitm.hxx | 2
include/svx/sxekitm.hxx | 2
include/svx/sxenditm.hxx | 8 +-
include/svx/sxmbritm.hxx | 2
include/svx/sxmtfitm.hxx | 2
include/svx/sxmtpitm.hxx | 4 -
include/svx/sxmtritm.hxx | 2
include/svx/sxmuitm.hxx | 2
include/svx/tbcontrl.hxx | 8 +-
include/svx/uiobject.hxx | 2
include/svx/unoapi.hxx | 20 ++---
include/svx/unobrushitemhelper.hxx | 4 -
include/svx/unofill.hxx | 12 +--
include/svx/unomod.hxx | 4 -
include/svx/unomodel.hxx | 10 +-
include/svx/unopage.hxx | 2
include/svx/unoprov.hxx | 4 -
include/svx/unoshape.hxx | 14 ++--
include/svx/unoshtxt.hxx | 2
include/svx/view3d.hxx | 2
include/svx/viewpt3d.hxx | 2
include/svx/xbitmap.hxx | 2
include/svx/xbtmpit.hxx | 2
include/svx/xcolit.hxx | 2
include/svx/xdash.hxx | 2
include/svx/xfillit0.hxx | 2
include/svx/xflasit.hxx | 2
include/svx/xflbckit.hxx | 2
include/svx/xflbmpit.hxx | 2
include/svx/xflbmsli.hxx | 2
include/svx/xflbmsxy.hxx | 4 -
include/svx/xflbmtit.hxx | 2
include/svx/xflboxy.hxx | 4 -
include/svx/xflbstit.hxx | 2
include/svx/xflbtoxy.hxx | 4 -
include/svx/xflclit.hxx | 2
include/svx/xflftrit.hxx | 2
include/svx/xflgrit.hxx | 2
include/svx/xflhtit.hxx | 2
include/svx/xfltrit.hxx | 2
include/svx/xftadit.hxx | 2
include/svx/xftdiit.hxx | 2
include/svx/xftmrit.hxx | 2
include/svx/xftouit.hxx | 2
include/svx/xftshcit.hxx | 2
include/svx/xftshit.hxx | 2
include/svx/xftshxy.hxx | 4 -
include/svx/xftstit.hxx | 2
include/svx/xgrad.hxx | 2
include/svx/xgrscit.hxx | 2
include/svx/xhatch.hxx | 2
include/svx/xit.hxx | 2
include/svx/xlineit0.hxx | 2
include/svx/xlinjoit.hxx | 2
include/svx/xlnasit.hxx | 2
include/svx/xlncapit.hxx | 2
include/svx/xlnclit.hxx | 2
include/svx/xlndsit.hxx | 2
include/svx/xlnedcit.hxx | 2
include/svx/xlnedit.hxx | 2
include/svx/xlnedwit.hxx | 2
include/svx/xlnstcit.hxx | 2
include/svx/xlnstit.hxx | 2
include/svx/xlnstwit.hxx | 2
include/svx/xlntrit.hxx | 2
include/svx/xlnwtit.hxx | 2
include/svx/xmleohlp.hxx | 2
include/svx/xmlexchg.hxx | 4 -
include/svx/xmlgrhlp.hxx | 2
include/svx/xoutbmp.hxx | 2
include/svx/xpoly.hxx | 2
include/svx/xsflclit.hxx | 2
include/svx/xtable.hxx | 28 ++++----
include/svx/xtextit0.hxx | 4 -
sd/source/ui/app/sdxfer.cxx | 2
sd/source/ui/table/tablefunction.cxx | 2
svx/Library_svxcore.mk | 2
svx/inc/GalleryControl.hxx | 2
svx/inc/galobj.hxx | 2
svx/source/inc/cell.hxx | 2
svx/source/inc/datanavi.hxx | 2
svx/source/inc/fmexch.hxx | 4 -
svx/source/inc/fmexpl.hxx | 2
svx/source/inc/fmobj.hxx | 2
svx/source/inc/fmpgeimp.hxx | 2
svx/source/inc/fmservs.hxx | 2
svx/source/inc/fmshimp.hxx | 2
svx/source/inc/sqlparserclient.hxx | 2
svx/source/table/tablertfexporter.cxx | 2
svx/source/table/tablertfimporter.cxx | 2
271 files changed, 465 insertions(+), 460 deletions(-)
New commits:
commit ff546a5dd35d6a31f01c70a9b995afc1f7b7389e
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sat Feb 1 08:06:41 2020 +0100
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sun Feb 2 18:39:50 2020 +0100
tdf#128302: Split SVXCORE_DLLPUBLIC from SVX_DLLPUBLIC
Using SVX_DLLPUBLIC for both Library_svxcore and Library_svx had started to
cause failures with clang-cl on Windows now, presumably due to devirtualization:
> linectrl.o : error LNK2001: unresolved external symbol "protected: virtual void __cdecl SvxMetricField::DataChanged(class DataChangedEvent const &)" (?DataChanged at SvxMetricField@@MEAAXAEBVDataChangedEvent@@@Z)
> linectrl.o : error LNK2001: unresolved external symbol "protected: virtual bool __cdecl SvxMetricField::PreNotify(class NotifyEvent &)" (?PreNotify at SvxMetricField@@MEAA_NAEAVNotifyEvent@@@Z)
> linectrl.o : error LNK2001: unresolved external symbol "protected: virtual bool __cdecl SvxMetricField::EventNotify(class NotifyEvent &)" (?EventNotify at SvxMetricField@@MEAA_NAEAVNotifyEvent@@@Z)
> linectrl.o : error LNK2001: unresolved external symbol "protected: virtual void __cdecl SvxMetricField::Modify(void)" (?Modify at SvxMetricField@@MEAAXXZ)
> linectrl.o : error LNK2001: unresolved external symbol "private: virtual bool __cdecl SvxFillAttrBox::PreNotify(class NotifyEvent &)" (?PreNotify at SvxFillAttrBox@@EEAA_NAEAVNotifyEvent@@@Z)
> linectrl.o : error LNK2001: unresolved external symbol "private: virtual bool __cdecl SvxFillAttrBox::EventNotify(class NotifyEvent &)" (?EventNotify at SvxFillAttrBox@@EEAA_NAEAVNotifyEvent@@@Z)
> C:\lo-clang\core\instdir\program\svxcorelo.dll : fatal error LNK1120: 6 unresolved externals
Replacing certain uses of SVX_DLLPUBLIC with the newly introduced
SVXCORE_DLLPUBLIC (include/svx/svxdllapi.h) has been done on Linux as follows:
> git grep -w --line-number -e SVX_DLLPUBLIC --and --not -e '#define SVX_DLLPUBLIC' >LINES
to produce a file LINES containing all 640 uses. (Conveniently, all uses
happen to be on different lines.) Manually create a file TOKENS
with 640 corresponding lines, each containing the (class or function) name that
is made SVX_DLLPUBLIC by in the corresponding line in LINES. Then
> nm -D --def instdir/program/libsvxcorelo.so | grep -ivw '[vw]' | c++filt >SVXCORESYMS
> nm -D --def instdir/program/libsvxlo.so | grep -ivw '[vw]' | c++filt >SVXSYMS
> n=$(cat TOKENS | wc -l)
> for ((i=1;i<="$n";++i)); do
> tok=$(head -n "$i" TOKENS | tail -1)
> printf @
> grep -Fw "$tok" SVXCORESYMS >/dev/null && printf svxcore
> printf @
> grep -Fw "$tok" SVXSYMS >/dev/null && printf svx
> printf '@ '
> head -n "$i" LINES | tail -1
> done
to generate 640 output lines detailing for each SVX_DLLPUBLIC name occurrene
whether it is mentioned in exports from neither (@@@), only from svx (@@svx@),
only from svxcore (@svxcore@@), or from both libraries (@svxcore at svx@). The
numbers that gives is
10 @@@
180 @@svx@
424 @svxcore@@
26 @svxcore at svx@
The 10 @@@ ask for follow-up clean up, but most of them are just left as
SVX_DLLPUBLIC for now. The exceptions are sxv::ITextProvider
(include/svx/itextprovider.hxx) and SdrCustomShapeGeometryItem::PropertyPairHash
(include/svx/sdasitm.hxx, where PropertyPairHash is a member struct of
SVXCORE_DLLPUBLIC SdrCustomShapeGeometryItem). Keeping them as SVX_DLLPUBLIC
would cause "unresolved externals" errors when linking Library_svxcore on
Windows.
The 180 @@svx@ are fine to keep as-is, and the 424 @svxcore@@ need rewriting.
The 26 @svxcore at svx@ needed manual inspection to decide (in some cases, the
chosen name in TOKENS was a too generic function name like Fill, in other cases
it was the name of a class exported from one library but also mentioned in the
arguments of a function exported from the other).
And for sdr::table::SdrTableObj the class itself is defined in svxcore while the
static member functions ExportAsRTF and ImportAsRTF are defined in svx. But
MSVC does not allow to mark the class as SVXCORE_DLLPUBLIC and the two static
member functions as SVX_DLLPLUBIC, so move the two functions out of the class.
(There appears to be no real necessity that they were static member functions in
the first place; they don't even need to be friends of the class. Nevertheless,
this mixture of functionality from svxcore and svx in include/svx/svdotable.hxx
may ask for follow-up clean up, one way or another.)
All the output lines that need rewriting (all the @svxcore@@ ones, and the
manually picked subset of @@@ and @svxcore at svx@ ones) are copied into a new file
CHANGE (containing 451 lines). Then
> sed -E -e 's|^@.*@.*@ ([^:]+):([0-9]+):.*$|sed -i -e "\2 s/SVX_DLLPUBLIC/SVXCORE_DLLPUBLIC/" \1|' <CHANGE >COMMANDS
> . COMMANDS
to do the changes.
Change-Id: If9b6dd1c9e9ba2eb883dbdac4385d28c6fc8a203
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87794
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/include/svx/ColorSets.hxx b/include/svx/ColorSets.hxx
index 8b97a35a11c0..88e401aa332c 100644
--- a/include/svx/ColorSets.hxx
+++ b/include/svx/ColorSets.hxx
@@ -43,7 +43,7 @@ public:
}
};
-class SVX_DLLPUBLIC ColorSets
+class SVXCORE_DLLPUBLIC ColorSets
{
std::vector<ColorSet> maColorSets;
public:
diff --git a/include/svx/CommonStyleManager.hxx b/include/svx/CommonStyleManager.hxx
index 78d2b787ebb0..b7820beb5e07 100644
--- a/include/svx/CommonStyleManager.hxx
+++ b/include/svx/CommonStyleManager.hxx
@@ -22,7 +22,7 @@ class SfxStyleSheetBase;
namespace svx
{
-class SVX_DLLPUBLIC CommonStyleManager final : public sfx2::StyleManager
+class SVXCORE_DLLPUBLIC CommonStyleManager final : public sfx2::StyleManager
{
public:
CommonStyleManager(SfxObjectShell& rShell)
diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx
index 87b9af0a7f11..a8e95ba52877 100644
--- a/include/svx/EnhancedCustomShape2d.hxx
+++ b/include/svx/EnhancedCustomShape2d.hxx
@@ -74,7 +74,7 @@ namespace o3tl
// escher, but we are using it internally in to differentiate
// between X_RANGE and Y_RANGE
-class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet
+class SVXCORE_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet
{
SdrObjCustomShape& mrSdrObjCustomShape;
MSO_SPT eSpType;
diff --git a/include/svx/EnhancedCustomShapeFunctionParser.hxx b/include/svx/EnhancedCustomShapeFunctionParser.hxx
index 6027fb755ad7..122f0406a6d5 100644
--- a/include/svx/EnhancedCustomShapeFunctionParser.hxx
+++ b/include/svx/EnhancedCustomShapeFunctionParser.hxx
@@ -131,7 +131,7 @@ inline std::basic_ostream<charT, traits> & operator <<(
#define EXPRESSION_FLAG_SUMANGLE_MODE 1
-SVX_DLLPUBLIC void FillEquationParameter( const css::drawing::EnhancedCustomShapeParameter&, const sal_Int32, EnhancedCustomShapeEquation& );
+SVXCORE_DLLPUBLIC void FillEquationParameter( const css::drawing::EnhancedCustomShapeParameter&, const sal_Int32, EnhancedCustomShapeEquation& );
class SAL_DLLPUBLIC_RTTI ExpressionNode
{
@@ -232,7 +232,7 @@ public:
@return the generated function object.
*/
- SVX_DLLPUBLIC static std::shared_ptr<ExpressionNode> const & parseFunction( const OUString& rFunction, const EnhancedCustomShape2d& rCustoShape );
+ SVXCORE_DLLPUBLIC static std::shared_ptr<ExpressionNode> const & parseFunction( const OUString& rFunction, const EnhancedCustomShape2d& rCustoShape );
// this is a singleton
FunctionParser() = delete;
diff --git a/include/svx/EnhancedCustomShapeGeometry.hxx b/include/svx/EnhancedCustomShapeGeometry.hxx
index 4d52476ad189..c4caae2aa0ca 100644
--- a/include/svx/EnhancedCustomShapeGeometry.hxx
+++ b/include/svx/EnhancedCustomShapeGeometry.hxx
@@ -92,13 +92,13 @@ struct mso_CustomShape
#define MSO_I | sal_Int32(0x80000000)
bool SortFilledObjectsToBackByDefault( MSO_SPT eSpType );
-SVX_DLLPUBLIC bool IsCustomShapeFilledByDefault( MSO_SPT eSpType );
-SVX_DLLPUBLIC sal_Int16 GetCustomShapeConnectionTypeDefault( MSO_SPT eSpType );
+SVXCORE_DLLPUBLIC bool IsCustomShapeFilledByDefault( MSO_SPT eSpType );
+SVXCORE_DLLPUBLIC sal_Int16 GetCustomShapeConnectionTypeDefault( MSO_SPT eSpType );
// #i28269#
-SVX_DLLPUBLIC bool IsCustomShapeStrokedByDefault( MSO_SPT eSpType );
+SVXCORE_DLLPUBLIC bool IsCustomShapeStrokedByDefault( MSO_SPT eSpType );
-SVX_DLLPUBLIC const mso_CustomShape* GetCustomShapeContent( MSO_SPT eSpType );
+SVXCORE_DLLPUBLIC const mso_CustomShape* GetCustomShapeContent( MSO_SPT eSpType );
#endif
diff --git a/include/svx/EnhancedCustomShapeTypeNames.hxx b/include/svx/EnhancedCustomShapeTypeNames.hxx
index bf9049589341..2e5f49da0c89 100644
--- a/include/svx/EnhancedCustomShapeTypeNames.hxx
+++ b/include/svx/EnhancedCustomShapeTypeNames.hxx
@@ -25,9 +25,9 @@
namespace EnhancedCustomShapeTypeNames
{
- SVX_DLLPUBLIC MSO_SPT Get( const OUString& );
- SVX_DLLPUBLIC OUString Get( const MSO_SPT );
- SVX_DLLPUBLIC OUString GetAccName( const OUString& );
+ SVXCORE_DLLPUBLIC MSO_SPT Get( const OUString& );
+ SVXCORE_DLLPUBLIC OUString Get( const MSO_SPT );
+ SVXCORE_DLLPUBLIC OUString GetAccName( const OUString& );
}
#endif
diff --git a/include/svx/ImageMapInfo.hxx b/include/svx/ImageMapInfo.hxx
index 2bc4ea8cf21f..7cd8f4f1780a 100644
--- a/include/svx/ImageMapInfo.hxx
+++ b/include/svx/ImageMapInfo.hxx
@@ -25,7 +25,7 @@
#define SVX_IMAPINFO_ID 2
-class SVX_DLLPUBLIC SvxIMapInfo final : public SdrObjUserData, public SfxListener
+class SVXCORE_DLLPUBLIC SvxIMapInfo final : public SdrObjUserData, public SfxListener
{
ImageMap aImageMap;
diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx
index d468f0199588..40a4af22f7f8 100644
--- a/include/svx/PaletteManager.hxx
+++ b/include/svx/PaletteManager.hxx
@@ -32,7 +32,7 @@ namespace com::sun::star::uno { class XComponentContext; }
namespace svx { class ToolboxButtonColorUpdaterBase; }
namespace weld { class Window; }
-class SVX_DLLPUBLIC PaletteManager
+class SVXCORE_DLLPUBLIC PaletteManager
{
const sal_uInt16 mnMaxRecentColors;
diff --git a/include/svx/ParseContext.hxx b/include/svx/ParseContext.hxx
index 130ed8ccaaf3..18c23ad209ed 100644
--- a/include/svx/ParseContext.hxx
+++ b/include/svx/ParseContext.hxx
@@ -31,7 +31,7 @@ namespace svxform
//= OSystemParseContext
- class SVX_DLLPUBLIC OSystemParseContext final : public ::connectivity::IParseContext
+ class SVXCORE_DLLPUBLIC OSystemParseContext final : public ::connectivity::IParseContext
{
private:
@@ -63,7 +63,7 @@ namespace svxform
/** helper class which needs access to a (shared and ref-counted) OSystemParseContext
instance.
*/
- class SVX_DLLPUBLIC OParseContextClient
+ class SVXCORE_DLLPUBLIC OParseContextClient
{
protected:
OParseContextClient();
diff --git a/include/svx/SvxColorValueSet.hxx b/include/svx/SvxColorValueSet.hxx
index 42315203980a..8c1b50138c8b 100644
--- a/include/svx/SvxColorValueSet.hxx
+++ b/include/svx/SvxColorValueSet.hxx
@@ -25,7 +25,7 @@
class XColorList;
-class SVX_DLLPUBLIC SvxColorValueSet : public ValueSet
+class SVXCORE_DLLPUBLIC SvxColorValueSet : public ValueSet
{
public:
SvxColorValueSet(vcl::Window* pParent, WinBits nWinStyle);
@@ -42,7 +42,7 @@ public:
Size layoutToGivenHeight(sal_uInt32 nHeight, sal_uInt32 nEntryCount);
};
-class SVX_DLLPUBLIC ColorValueSet : public SvtValueSet
+class SVXCORE_DLLPUBLIC ColorValueSet : public SvtValueSet
{
public:
ColorValueSet(std::unique_ptr<weld::ScrolledWindow> pWindow);
diff --git a/include/svx/SvxNumOptionsTabPageHelper.hxx b/include/svx/SvxNumOptionsTabPageHelper.hxx
index c1ee2274258a..98766254dce2 100644
--- a/include/svx/SvxNumOptionsTabPageHelper.hxx
+++ b/include/svx/SvxNumOptionsTabPageHelper.hxx
@@ -27,7 +27,7 @@
using namespace css::uno;
using namespace css::text;
-class SVX_DLLPUBLIC SvxNumOptionsTabPageHelper
+class SVXCORE_DLLPUBLIC SvxNumOptionsTabPageHelper
{
public:
static Reference<XDefaultNumberingProvider> GetNumberingProvider();
diff --git a/include/svx/SvxPresetListBox.hxx b/include/svx/SvxPresetListBox.hxx
index e2aadca2d75f..25ac0815384a 100644
--- a/include/svx/SvxPresetListBox.hxx
+++ b/include/svx/SvxPresetListBox.hxx
@@ -24,7 +24,7 @@
#include <svx/xtable.hxx>
#include <tools/gen.hxx>
-class SVX_DLLPUBLIC SvxPresetListBox final : public SvtValueSet
+class SVXCORE_DLLPUBLIC SvxPresetListBox final : public SvtValueSet
{
private:
static constexpr sal_uInt32 nColCount = 3;
diff --git a/include/svx/XPropertyEntry.hxx b/include/svx/XPropertyEntry.hxx
index a7880202deae..22514d2b86fd 100644
--- a/include/svx/XPropertyEntry.hxx
+++ b/include/svx/XPropertyEntry.hxx
@@ -25,7 +25,7 @@
-class SVX_DLLPUBLIC XPropertyEntry
+class SVXCORE_DLLPUBLIC XPropertyEntry
{
private:
OUString maPropEntryName;
diff --git a/include/svx/camera3d.hxx b/include/svx/camera3d.hxx
index cf61dfc326a7..4cd21601b5dd 100644
--- a/include/svx/camera3d.hxx
+++ b/include/svx/camera3d.hxx
@@ -31,7 +31,7 @@
|*
\************************************************************************/
-class SAL_WARN_UNUSED SVX_DLLPUBLIC Camera3D final : public Viewport3D
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC Camera3D final : public Viewport3D
{
basegfx::B3DPoint aPosition;
basegfx::B3DPoint aLookAt;
diff --git a/include/svx/charthelper.hxx b/include/svx/charthelper.hxx
index e5435562cdca..c1fa1c1f9fd6 100644
--- a/include/svx/charthelper.hxx
+++ b/include/svx/charthelper.hxx
@@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star {
namespace basegfx { class B2DRange; }
-class SAL_WARN_UNUSED SVX_DLLPUBLIC ChartHelper
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC ChartHelper
{
public:
/// Use chart's XUpdatable::update() to update values.
diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx
index 07b0b5eea7c5..cb18efa0ad33 100644
--- a/include/svx/chrtitem.hxx
+++ b/include/svx/chrtitem.hxx
@@ -77,7 +77,7 @@ enum class SvxChartRegress
#define CHREGRESS_COUNT (sal_uInt16(SvxChartRegress::Unknown) + 1)
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartRegressItem final : public SfxEnumItem<SvxChartRegress>
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxChartRegressItem final : public SfxEnumItem<SvxChartRegress>
{
public:
SvxChartRegressItem(SvxChartRegress eRegress /*= SvxChartRegress::Linear*/,
@@ -88,7 +88,7 @@ public:
sal_uInt16 GetValueCount() const override { return CHREGRESS_COUNT; }
};
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartTextOrderItem final : public SfxEnumItem<SvxChartTextOrder>
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxChartTextOrderItem final : public SfxEnumItem<SvxChartTextOrder>
{
public:
SvxChartTextOrderItem(SvxChartTextOrder eOrder /*= SvxChartTextOrder::SideBySide*/,
@@ -102,7 +102,7 @@ public:
sal_uInt16 GetValueCount() const override { return CHTXTORDER_COUNT; }
};
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartKindErrorItem final : public SfxEnumItem<SvxChartKindError>
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxChartKindErrorItem final : public SfxEnumItem<SvxChartKindError>
{
public:
SvxChartKindErrorItem(SvxChartKindError /*eOrient = SvxChartKindError::NONE*/,
@@ -113,7 +113,7 @@ public:
sal_uInt16 GetValueCount() const override { return CHERROR_COUNT; }
};
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartIndicateItem final : public SfxEnumItem<SvxChartIndicate>
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxChartIndicateItem final : public SfxEnumItem<SvxChartIndicate>
{
public:
SvxChartIndicateItem(SvxChartIndicate eOrient /*= SvxChartIndicate::NONE*/,
@@ -124,7 +124,7 @@ public:
sal_uInt16 GetValueCount() const override { return CHINDICATE_COUNT; }
};
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxDoubleItem final : public SfxPoolItem
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxDoubleItem final : public SfxPoolItem
{
double fVal;
diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx
index 74054a1d88bf..180c4eeccd7a 100644
--- a/include/svx/clipfmtitem.hxx
+++ b/include/svx/clipfmtitem.hxx
@@ -31,7 +31,7 @@
class SfxItemPool;
struct SvxClipboardFormatItem_Impl;
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxClipboardFormatItem final : public SfxPoolItem
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxClipboardFormatItem final : public SfxPoolItem
{
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SvxClipboardFormatItem* Clone( SfxItemPool *pPool = nullptr ) const override;
diff --git a/include/svx/colorbox.hxx b/include/svx/colorbox.hxx
index f8a65715dd9e..23374d377fcd 100644
--- a/include/svx/colorbox.hxx
+++ b/include/svx/colorbox.hxx
@@ -28,7 +28,7 @@ private:
VclPtr<SvxColorListBox> mxControl;
};
-class SVX_DLLPUBLIC SvxColorListBox : public MenuButton
+class SVXCORE_DLLPUBLIC SvxColorListBox : public MenuButton
{
private:
friend class SvxListBoxColorWrapper;
@@ -79,7 +79,7 @@ private:
ColorListBox* mpControl;
};
-class SVX_DLLPUBLIC ColorListBox
+class SVXCORE_DLLPUBLIC ColorListBox
{
private:
friend class ListBoxColorWrapper;
diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx
index 8a2f42751dfd..e19245e2ac73 100644
--- a/include/svx/colorwindow.hxx
+++ b/include/svx/colorwindow.hxx
@@ -34,7 +34,7 @@ namespace com::sun::star::frame { class XFrame; }
class PaletteManager;
-class SVX_DLLPUBLIC ColorStatus
+class SVXCORE_DLLPUBLIC ColorStatus
{
Color maColor;
Color maTLBRColor;
@@ -51,7 +51,7 @@ typedef std::function<void(const OUString&, const NamedColor&)> ColorSelectFunct
#define COL_NONE_COLOR ::Color(0x80, 0xFF, 0xFF, 0xFF)
-class SVX_DLLPUBLIC SvxColorWindow final : public svtools::ToolbarPopup
+class SVXCORE_DLLPUBLIC SvxColorWindow final : public svtools::ToolbarPopup
{
private:
const sal_uInt16 theSlotId;
@@ -109,7 +109,7 @@ public:
class SvxColorToolBoxControl;
-class SVX_DLLPUBLIC MenuOrToolMenuButton
+class SVXCORE_DLLPUBLIC MenuOrToolMenuButton
{
private:
// either
@@ -137,7 +137,7 @@ public:
weld::Widget* get_widget() const;
};
-class SVX_DLLPUBLIC ColorWindow final : public WeldToolbarPopup
+class SVXCORE_DLLPUBLIC ColorWindow final : public WeldToolbarPopup
{
private:
const sal_uInt16 theSlotId;
diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx
index 1556c0f85087..6fdcce7256ef 100644
--- a/include/svx/cube3d.hxx
+++ b/include/svx/cube3d.hxx
@@ -44,7 +44,7 @@ class E3dDefaultAttributes;
|*
\************************************************************************/
-class SAL_WARN_UNUSED SVX_DLLPUBLIC E3dCubeObj final : public E3dCompoundObject
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC E3dCubeObj final : public E3dCompoundObject
{
// Parameter
basegfx::B3DPoint aCubePos;
diff --git a/include/svx/dataaccessdescriptor.hxx b/include/svx/dataaccessdescriptor.hxx
index c06e6474f3fe..bc3423999a4d 100644
--- a/include/svx/dataaccessdescriptor.hxx
+++ b/include/svx/dataaccessdescriptor.hxx
@@ -61,7 +61,7 @@ namespace svx
/** class encapsulating the css::sdb::DataAccessDescriptor service.
*/
- class SAL_WARN_UNUSED SVX_DLLPUBLIC ODataAccessDescriptor final
+ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC ODataAccessDescriptor final
{
std::unique_ptr<ODADescriptorImpl> m_pImpl;
diff --git a/include/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx
index 0881d3760dbd..7401acbc9990 100644
--- a/include/svx/dbaexchange.hxx
+++ b/include/svx/dbaexchange.hxx
@@ -51,7 +51,7 @@ namespace svx
//= OColumnTransferable
- class SAL_WARN_UNUSED SVX_DLLPUBLIC OColumnTransferable final : public TransferDataContainer
+ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC OColumnTransferable final : public TransferDataContainer
{
public:
OColumnTransferable(ColumnTransferFormatFlags nFormats);
@@ -152,7 +152,7 @@ namespace svx
/** class for transferring data access objects (tables, queries, statements ...)
*/
- class SAL_WARN_UNUSED SVX_DLLPUBLIC ODataAccessObjectTransferable : public TransferableHelper
+ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC ODataAccessObjectTransferable : public TransferableHelper
{
ODataAccessDescriptor m_aDescriptor;
OUString m_sCompatibleObjectDescription;
@@ -238,7 +238,7 @@ namespace svx
/** class for transferring multiple columns
*/
- class SAL_WARN_UNUSED SVX_DLLPUBLIC OMultiColumnTransferable final : public TransferDataContainer
+ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC OMultiColumnTransferable final : public TransferDataContainer
{
public:
OMultiColumnTransferable();
diff --git a/include/svx/deflt3d.hxx b/include/svx/deflt3d.hxx
index 8a482e37ab2c..85a41872b783 100644
--- a/include/svx/deflt3d.hxx
+++ b/include/svx/deflt3d.hxx
@@ -30,7 +30,7 @@
|*
\************************************************************************/
-class SAL_WARN_UNUSED SVX_DLLPUBLIC E3dDefaultAttributes
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC E3dDefaultAttributes
{
private:
// Cube object
diff --git a/include/svx/dialmgr.hxx b/include/svx/dialmgr.hxx
index 20a5c25b81eb..6dc6dcaa436d 100644
--- a/include/svx/dialmgr.hxx
+++ b/include/svx/dialmgr.hxx
@@ -22,8 +22,8 @@
#include <rtl/ustring.hxx>
#include <svx/svxdllapi.h>
-SVX_DLLPUBLIC std::locale SvxResLocale();
-SVX_DLLPUBLIC OUString SvxResId(const char* pId);
+SVXCORE_DLLPUBLIC std::locale SvxResLocale();
+SVXCORE_DLLPUBLIC OUString SvxResId(const char* pId);
#endif
diff --git a/include/svx/dlgutil.hxx b/include/svx/dlgutil.hxx
index cc31297f5bb5..0359321e4030 100644
--- a/include/svx/dlgutil.hxx
+++ b/include/svx/dlgutil.hxx
@@ -26,9 +26,9 @@
class SfxItemSet;
-SVX_DLLPUBLIC FieldUnit GetModuleFieldUnit( const SfxItemSet& );
-SVX_DLLPUBLIC FieldUnit GetModuleFieldUnit();
-SVX_DLLPUBLIC bool GetApplyCharUnit( const SfxItemSet& );
+SVXCORE_DLLPUBLIC FieldUnit GetModuleFieldUnit( const SfxItemSet& );
+SVXCORE_DLLPUBLIC FieldUnit GetModuleFieldUnit();
+SVXCORE_DLLPUBLIC bool GetApplyCharUnit( const SfxItemSet& );
constexpr DrawModeFlags OUTPUT_DRAWMODE_COLOR = DrawModeFlags::Default;
constexpr DrawModeFlags OUTPUT_DRAWMODE_CONTRAST = DrawModeFlags::SettingsLine | DrawModeFlags::SettingsFill | DrawModeFlags::SettingsText | DrawModeFlags::SettingsGradient;
diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx
index a7b0933559a4..21a7d334fc66 100644
--- a/include/svx/drawitem.hxx
+++ b/include/svx/drawitem.hxx
@@ -23,7 +23,7 @@
#include <svx/xtable.hxx>
#include <svx/svxdllapi.h>
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxColorListItem final : public SfxPoolItem
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxColorListItem final : public SfxPoolItem
{
XColorListRef pColorList;
@@ -48,7 +48,7 @@ public:
const XColorListRef& GetColorList() const { return pColorList; }
};
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxGradientListItem final : public SfxPoolItem
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxGradientListItem final : public SfxPoolItem
{
XGradientListRef pGradientList;
@@ -73,7 +73,7 @@ public:
const XGradientListRef& GetGradientList() const { return pGradientList; }
};
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxHatchListItem final : public SfxPoolItem
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxHatchListItem final : public SfxPoolItem
{
XHatchListRef pHatchList;
@@ -97,7 +97,7 @@ public:
const XHatchListRef& GetHatchList() const { return pHatchList; }
};
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxBitmapListItem final : public SfxPoolItem
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxBitmapListItem final : public SfxPoolItem
{
XBitmapListRef pBitmapList;
@@ -122,7 +122,7 @@ public:
const XBitmapListRef& GetBitmapList() const { return pBitmapList; }
};
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxPatternListItem final : public SfxPoolItem
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxPatternListItem final : public SfxPoolItem
{
XPatternListRef pPatternList;
@@ -146,7 +146,7 @@ public:
const XPatternListRef& GetPatternList() const { return pPatternList; }
};
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxDashListItem final : public SfxPoolItem
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxDashListItem final : public SfxPoolItem
{
XDashListRef pDashList;
@@ -171,7 +171,7 @@ public:
const XDashListRef& GetDashList() const { return pDashList; }
};
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxLineEndListItem final : public SfxPoolItem
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxLineEndListItem final : public SfxPoolItem
{
XLineEndListRef pLineEndList;
diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx
index 8216c61ab3a1..29e7636e64da 100644
--- a/include/svx/e3ditem.hxx
+++ b/include/svx/e3ditem.hxx
@@ -24,7 +24,7 @@
#include <basegfx/vector/b3dvector.hxx>
#include <svx/svxdllapi.h>
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxB3DVectorItem final : public SfxPoolItem
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxB3DVectorItem final : public SfxPoolItem
{
basegfx::B3DVector aVal;
diff --git a/include/svx/e3dsceneupdater.hxx b/include/svx/e3dsceneupdater.hxx
index a6049843985c..6ba0afa888dc 100644
--- a/include/svx/e3dsceneupdater.hxx
+++ b/include/svx/e3dsceneupdater.hxx
@@ -44,7 +44,7 @@ namespace drawinglayer { namespace geometry {
use it. This is only desirable if changes to the scene's content
are intended to change the scene's 2D geometry attributes
*/
-class SVX_DLLPUBLIC E3DModifySceneSnapRectUpdater
+class SVXCORE_DLLPUBLIC E3DModifySceneSnapRectUpdater
{
// the scene which may be changed. This gets set to the outmost scene
// of the to-be-changed 3D object when the scene has a 3d transformation
diff --git a/include/svx/e3dundo.hxx b/include/svx/e3dundo.hxx
index c5eadb10dcf9..156b38e0c827 100644
--- a/include/svx/e3dundo.hxx
+++ b/include/svx/e3dundo.hxx
@@ -80,7 +80,7 @@ public:
|* Undo for 3D attributes (implemented using Set3DAttributes())
|*
\************************************************************************/
-class SAL_WARN_UNUSED SVX_DLLPUBLIC E3dAttributesUndoAction final : public SdrUndoAction
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC E3dAttributesUndoAction final : public SdrUndoAction
{
private:
using SdrUndoAction::Repeat;
diff --git a/include/svx/extedit.hxx b/include/svx/extedit.hxx
index f5994a96de80..0168068f66c8 100644
--- a/include/svx/extedit.hxx
+++ b/include/svx/extedit.hxx
@@ -19,7 +19,7 @@ class Graphic;
class GraphicObject;
class FileChangedChecker;
-class SAL_WARN_UNUSED SVX_DLLPUBLIC ExternalToolEdit
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC ExternalToolEdit
{
protected:
OUString m_aFileName;
@@ -42,7 +42,7 @@ public:
class FmFormView;
class SdrObject;
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SdrExternalToolEdit final
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SdrExternalToolEdit final
: public ExternalToolEdit
,public SfxListener
{
diff --git a/include/svx/extrud3d.hxx b/include/svx/extrud3d.hxx
index deb5687f6fe7..b66779957dc7 100644
--- a/include/svx/extrud3d.hxx
+++ b/include/svx/extrud3d.hxx
@@ -35,7 +35,7 @@ class E3dDefaultAttributes;
|*
\************************************************************************/
-class SAL_WARN_UNUSED SVX_DLLPUBLIC E3dExtrudeObj final : public E3dCompoundObject
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC E3dExtrudeObj final : public E3dCompoundObject
{
private:
// to allow sdr::properties::E3dExtrudeProperties access to SetGeometryValid()
diff --git a/include/svx/extrusionbar.hxx b/include/svx/extrusionbar.hxx
index bd83a9938951..eec86cebfa5e 100644
--- a/include/svx/extrusionbar.hxx
+++ b/include/svx/extrusionbar.hxx
@@ -32,9 +32,9 @@ class SdrView;
namespace svx
{
-SVX_DLLPUBLIC bool checkForSelectedCustomShapes( SdrView const * pSdrView, bool bOnlyExtruded );
+SVXCORE_DLLPUBLIC bool checkForSelectedCustomShapes( SdrView const * pSdrView, bool bOnlyExtruded );
-class SAL_WARN_UNUSED SVX_DLLPUBLIC ExtrusionBar final : public SfxShell
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC ExtrusionBar final : public SfxShell
{
public:
SFX_DECL_INTERFACE(SVX_INTERFACE_EXTRUSION_BAR)
diff --git a/include/svx/fmdmod.hxx b/include/svx/fmdmod.hxx
index 667a259d02e4..d5447879e317 100644
--- a/include/svx/fmdmod.hxx
+++ b/include/svx/fmdmod.hxx
@@ -22,7 +22,7 @@
#include <svx/unomod.hxx>
#include <svx/svxdllapi.h>
-class SVX_DLLPUBLIC SvxFmMSFactory : public SvxUnoDrawMSFactory
+class SVXCORE_DLLPUBLIC SvxFmMSFactory : public SvxUnoDrawMSFactory
{
public:
diff --git a/include/svx/fmdpage.hxx b/include/svx/fmdpage.hxx
index 152f862086af..e1bfb4089f8e 100644
--- a/include/svx/fmdpage.hxx
+++ b/include/svx/fmdpage.hxx
@@ -27,7 +27,7 @@
// SvxFmDrawPage
-class SVX_DLLPUBLIC SvxFmDrawPage :public SvxDrawPage
+class SVXCORE_DLLPUBLIC SvxFmDrawPage :public SvxDrawPage
,public css::form::XFormsSupplier2
{
protected:
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index 82c98efe28c0..2483a4a5f652 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -31,7 +31,7 @@ namespace com::sun::star::container { class XNameAccess; }
// FmGridHeader
struct FmGridHeaderData;
-class SAL_WARN_UNUSED SVX_DLLPUBLIC FmGridHeader
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC FmGridHeader
:public ::svt::EditBrowserHeader
,public DropTargetHelper
{
@@ -86,7 +86,7 @@ private:
// FmGridControl
class FmXGridPeer;
-class SAL_WARN_UNUSED SVX_DLLPUBLIC FmGridControl : public DbGridControl
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC FmGridControl : public DbGridControl
{
friend class FmGridHeader;
diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx
index b438e2aace31..1e7857dfbb94 100644
--- a/include/svx/fmgridif.hxx
+++ b/include/svx/fmgridif.hxx
@@ -205,7 +205,7 @@ typedef ::cppu::ImplHelper10< css::form::XBoundComponent,
> FmXGridControl_BASE;
class FmXGridPeer;
-class SAL_WARN_UNUSED SVX_DLLPUBLIC FmXGridControl :public UnoControl
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC FmXGridControl :public UnoControl
,public FmXGridControl_BASE
{
FmXModifyMultiplexer m_aModifyListeners;
@@ -316,7 +316,7 @@ protected:
// FmXGridPeer -> Peer for the Gridcontrol
class FmGridControl;
-class SAL_WARN_UNUSED SVX_DLLPUBLIC FmXGridPeer:
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC FmXGridPeer:
public cppu::ImplInheritanceHelper<
VCLXWindow,
css::form::XGridPeer,
diff --git a/include/svx/fmmodel.hxx b/include/svx/fmmodel.hxx
index 98261b7d80d6..31ef08679cf6 100644
--- a/include/svx/fmmodel.hxx
+++ b/include/svx/fmmodel.hxx
@@ -29,7 +29,7 @@ class SfxItemPool;
class FmXUndoEnvironment;
struct FmFormModelImplData;
-class SVX_DLLPUBLIC FmFormModel :
+class SVXCORE_DLLPUBLIC FmFormModel :
public SdrModel
{
private:
diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx
index b2d659363757..b3005014b757 100644
--- a/include/svx/fmpage.hxx
+++ b/include/svx/fmpage.hxx
@@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star {
class SdrView;
class HelpEvent;
-class SVX_DLLPUBLIC FmFormPage : public SdrPage
+class SVXCORE_DLLPUBLIC FmFormPage : public SdrPage
{
FmFormPage& operator=(const FmFormPage&) = delete;
FmFormPage(const FmFormPage&) = delete;
diff --git a/include/svx/fmsearch.hxx b/include/svx/fmsearch.hxx
index c702f0106212..bb0d303d1fd5 100644
--- a/include/svx/fmsearch.hxx
+++ b/include/svx/fmsearch.hxx
@@ -31,7 +31,7 @@ namespace com::sun::star::sdbc { class XResultSet; }
// Helper methods
-SVX_DLLPUBLIC bool IsSearchableControl( const css::uno::Reference< css::uno::XInterface>& _xControl,
+SVXCORE_DLLPUBLIC bool IsSearchableControl( const css::uno::Reference< css::uno::XInterface>& _xControl,
OUString* pCurrentText = nullptr);
// check if the control has one of the interfaces we can use for searching
// *pCurrentText will be filled with the current text of the control (as used when searching this control)
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx
index cb57d5fad893..394acb685d52 100644
--- a/include/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
@@ -59,7 +59,7 @@ namespace svx
}
-class SAL_WARN_UNUSED SVX_DLLPUBLIC FmDesignModeChangedHint final : public SfxHint
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC FmDesignModeChangedHint final : public SfxHint
{
bool const m_bDesignMode;
@@ -70,7 +70,7 @@ public:
bool GetDesignMode() const { return m_bDesignMode; }
};
-class SVX_DLLPUBLIC FmFormShell final : public SfxShell
+class SVXCORE_DLLPUBLIC FmFormShell final : public SfxShell
{
friend class FmFormView;
friend class FmXFormShell;
diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx
index 4ed9b7efcf7b..21a93d41f048 100644
--- a/include/svx/fmtools.hxx
+++ b/include/svx/fmtools.hxx
@@ -49,13 +49,13 @@ namespace vcl { class Window; }
// displaying a database exception for the user
// display info about a simple css::sdbc::SQLException
void displayException(const css::sdbc::SQLException&, vcl::Window* _pParent);
-SVX_DLLPUBLIC void displayException(const css::sdb::SQLContext&, vcl::Window* _pParent);
+SVXCORE_DLLPUBLIC void displayException(const css::sdb::SQLContext&, vcl::Window* _pParent);
void displayException(const css::sdb::SQLErrorEvent&, vcl::Window* _pParent = nullptr);
void displayException(const css::uno::Any&, vcl::Window* _pParent = nullptr);
sal_Int32 getElementPos(const css::uno::Reference< css::container::XIndexAccess>& xCont, const css::uno::Reference< css::uno::XInterface>& xElement);
-SVX_DLLPUBLIC OUString getLabelName(const css::uno::Reference< css::beans::XPropertySet>& xControlModel);
+SVXCORE_DLLPUBLIC OUString getLabelName(const css::uno::Reference< css::beans::XPropertySet>& xControlModel);
// = class CursorWrapper - a helper class which works in common with a css::uno::Reference<XDatabaseUpdateCursor>,
@@ -74,7 +74,7 @@ private:
public:
// Construction/Destruction
CursorWrapper(const css::uno::Reference< css::sdbc::XRowSet>& _rxCursor, bool bUseCloned = false);
- SVX_DLLPUBLIC CursorWrapper(const css::uno::Reference< css::sdbc::XResultSet>& _rxCursor, bool bUseCloned = false);
+ SVXCORE_DLLPUBLIC CursorWrapper(const css::uno::Reference< css::sdbc::XResultSet>& _rxCursor, bool bUseCloned = false);
// if bUseCloned == sal_True, the cursor is first doubled over the XCloneable interface (which it must implement)
// and then used
diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx
index 508b3380eb91..b83420b43e0c 100644
--- a/include/svx/fmview.hxx
+++ b/include/svx/fmview.hxx
@@ -51,7 +51,7 @@ namespace com { namespace sun { namespace star { namespace form {
}
} } } }
-class SVX_DLLPUBLIC FmFormView : public E3dView
+class SVXCORE_DLLPUBLIC FmFormView : public E3dView
{
rtl::Reference<FmXFormView> pImpl;
FmFormShell* pFormShell;
diff --git a/include/svx/fontworkbar.hxx b/include/svx/fontworkbar.hxx
index 224aae1dbb1e..a11e015e9750 100644
--- a/include/svx/fontworkbar.hxx
+++ b/include/svx/fontworkbar.hxx
@@ -32,9 +32,9 @@ class SdrView;
namespace svx
{
-bool SVX_DLLPUBLIC checkForSelectedFontWork( SdrView const * pSdrView, sal_uInt32& nCheckStatus );
+bool SVXCORE_DLLPUBLIC checkForSelectedFontWork( SdrView const * pSdrView, sal_uInt32& nCheckStatus );
-class SAL_WARN_UNUSED SVX_DLLPUBLIC FontworkBar final : public SfxShell
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC FontworkBar final : public SfxShell
{
public:
SFX_DECL_INTERFACE(SVX_INTERFACE_FONTWORK_BAR)
diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx
index af27c1eb0a5b..c492a1f143c5 100644
--- a/include/svx/fontworkgallery.hxx
+++ b/include/svx/fontworkgallery.hxx
@@ -44,7 +44,7 @@ public:
sal_Int32 getScale() const;
};
-class SAL_WARN_UNUSED SVX_DLLPUBLIC FontWorkGalleryDialog final : public weld::GenericDialogController
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC FontWorkGalleryDialog final : public weld::GenericDialogController
{
sal_uInt16 mnThemeId;
SdrView& mrSdrView;
diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx
index 4c662700bec6..5296ab88d56e 100644
--- a/include/svx/framelink.hxx
+++ b/include/svx/framelink.hxx
@@ -98,7 +98,7 @@ enum class RefMode
|
|<- middle of the frame border
*/
-class SAL_WARN_UNUSED SVX_DLLPUBLIC Style
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC Style
{
private:
class implStyle
diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx
index 55938bde7ec6..d15e6d2bedc7 100644
--- a/include/svx/framelinkarray.hxx
+++ b/include/svx/framelinkarray.hxx
@@ -60,7 +60,7 @@ class Style;
whether to mirror the double frame styles, and whether to swap diagonal
frame borders.
*/
-class SAL_WARN_UNUSED SVX_DLLPUBLIC Array
+class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC Array
{
public:
/** Constructs an empty array. */
diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index d88a156850e0..9e46720c9a52 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -67,7 +67,7 @@ public:
static void PreviewMedia( const INetURLObject& rURL );
};
-class SVX_DLLPUBLIC DialogGalleryPreview final : public weld::CustomWidgetController
+class SVXCORE_DLLPUBLIC DialogGalleryPreview final : public weld::CustomWidgetController
{
private:
GraphicObject aGraphicObj;
diff --git a/include/svx/gallery.hxx b/include/svx/gallery.hxx
index 717fbcf129bf..28d99de9fa59 100644
--- a/include/svx/gallery.hxx
+++ b/include/svx/gallery.hxx
@@ -96,7 +96,7 @@ class SdrModel;
class Graphic;
class BitmapEx;
-class SVX_DLLPUBLIC GalleryExplorer
+class SVXCORE_DLLPUBLIC GalleryExplorer
{
public:
diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx
index e0f4c4511bf6..7bf2c3456c57 100644
--- a/include/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
@@ -82,7 +82,7 @@ class GalleryTheme;
class GalleryThemeCacheEntry;
-class SVX_DLLPUBLIC Gallery final : public SfxBroadcaster
+class SVXCORE_DLLPUBLIC Gallery final : public SfxBroadcaster
{
typedef std::vector<GalleryThemeCacheEntry*> GalleryCacheThemeList;
diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx
index aa513ed270c0..9ac8339d80b6 100644
--- a/include/svx/galleryitem.hxx
+++ b/include/svx/galleryitem.hxx
@@ -37,7 +37,7 @@ namespace com::sun::star::lang { class XComponent; }
#define SVXGALLERYITEM_PARAMS 5
#define SVXGALLERYITEM_ARGNAME "GalleryItem"
-class SVX_DLLPUBLIC SvxGalleryItem final : public SfxPoolItem
+class SVXCORE_DLLPUBLIC SvxGalleryItem final : public SfxPoolItem
{
sal_Int8 m_nType;
OUString m_aURL;
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index 9fdd02ba3e5a..6cd95b4bf548 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -83,7 +83,7 @@ class FmFormModel;
GalleryGraphicImportRet GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, OUString& rFilterName );
bool GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel );
bool CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap );
-SVX_DLLPUBLIC OUString
+SVXCORE_DLLPUBLIC OUString
GetReducedString( const INetURLObject& rURL, sal_Int32 nMaxLen );
OUString GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL );
@@ -115,7 +115,7 @@ public:
class GraphicFilter;
-class SVX_DLLPUBLIC GalleryProgress
+class SVXCORE_DLLPUBLIC GalleryProgress
{
css::uno::Reference< css::awt::XProgressBar > mxProgressBar;
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index ff7200ded31b..d676ab6f3191 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -64,7 +64,7 @@ namespace unogallery
}
-class SVX_DLLPUBLIC GalleryTheme : public SfxBroadcaster
+class SVXCORE_DLLPUBLIC GalleryTheme : public SfxBroadcaster
{
friend class Gallery;
friend class GalleryThemeCacheEntry;
diff --git a/include/svx/graphichelper.hxx b/include/svx/graphichelper.hxx
index 8adfac1d4116..b582de4a2669 100644
--- a/include/svx/graphichelper.hxx
+++ b/include/svx/graphichelper.hxx
@@ -27,7 +27,7 @@ namespace com::sun::star::drawing { class XShape; }
namespace weld { class Widget; }
namespace weld { class Window; }
-class SVX_DLLPUBLIC GraphicHelper
+class SVXCORE_DLLPUBLIC GraphicHelper
{
public:
diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx
index 3877f471da17..b24aa9c0a19b 100644
--- a/include/svx/grfcrop.hxx
+++ b/include/svx/grfcrop.hxx
@@ -26,7 +26,7 @@
#define GRFCROP_VERSION_SWDEFAULT 0
#define GRFCROP_VERSION_MOVETOSVX 1
-class SVX_DLLPUBLIC SvxGrfCrop : public SfxPoolItem
+class SVXCORE_DLLPUBLIC SvxGrfCrop : public SfxPoolItem
{
sal_Int32 nLeft, nRight, nTop, nBottom;
public:
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 8dbb1c106b78..33174e56aaef 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -160,7 +160,7 @@ enum class DbGridControlNavigationBarState
class FmXGridSourcePropListener;
class DisposeListenerGridBridge;
-class SVX_DLLPUBLIC DbGridControl : public svt::EditBrowseBox
+class SVXCORE_DLLPUBLIC DbGridControl : public svt::EditBrowseBox
{
friend class FmXGridSourcePropListener;
friend class GridFieldValueListener;
diff --git a/include/svx/helperhittest3d.hxx b/include/svx/helperhittest3d.hxx
index e8a4a9e77aae..0e07e309b9c4 100644
--- a/include/svx/helperhittest3d.hxx
+++ b/include/svx/helperhittest3d.hxx
@@ -73,7 +73,7 @@ E3dScene* fillViewInformation3DForCompoundObject(
not empty, the first object is the object closest to the viewer
*/
-SVX_DLLPUBLIC void getAllHit3DObjectsSortedFrontToBack(
+SVXCORE_DLLPUBLIC void getAllHit3DObjectsSortedFrontToBack(
const basegfx::B2DPoint& rPoint,
const E3dScene& rScene,
::std::vector< const E3dCompoundObject* >& o_rResult);
diff --git a/include/svx/hexcolorcontrol.hxx b/include/svx/hexcolorcontrol.hxx
index 63b44992d370..3eaaae9ac8af 100644
--- a/include/svx/hexcolorcontrol.hxx
+++ b/include/svx/hexcolorcontrol.hxx
@@ -30,7 +30,7 @@ struct ImplSVEvent;
namespace weld {
-class SVX_DLLPUBLIC HexColorControl
+class SVXCORE_DLLPUBLIC HexColorControl
{
private:
std::unique_ptr<weld::Entry> m_xEntry;
diff --git a/include/svx/itextprovider.hxx b/include/svx/itextprovider.hxx
index 7a8ca44e859d..361b2293e36f 100644
--- a/include/svx/itextprovider.hxx
+++ b/include/svx/itextprovider.hxx
@@ -22,7 +22,7 @@ namespace svx
/** This interface provides access to text object(s) in an SdrObject.
*/
- class SVX_DLLPUBLIC ITextProvider
+ class SVXCORE_DLLPUBLIC ITextProvider
{
public:
/** Return the number of texts available for this object. */
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index 82c50321da6d..583de15aa5c4 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -43,9 +43,9 @@ namespace o3tl
}
// load language strings from resource
-SVX_DLLPUBLIC OUString GetDicInfoStr( const OUString& rName, const LanguageType nLang, bool bNeg );
+SVXCORE_DLLPUBLIC OUString GetDicInfoStr( const OUString& rName, const LanguageType nLang, bool bNeg );
-class SVX_DLLPUBLIC SvxLanguageBox
+class SVXCORE_DLLPUBLIC SvxLanguageBox
{
public:
enum class EditedAndValid
diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx
index 2e92883b1977..a14ae9a0ea6c 100644
--- a/include/svx/lathe3d.hxx
+++ b/include/svx/lathe3d.hxx
@@ -39,7 +39,7 @@ class E3dDefaultAttributes;
|*
\************************************************************************/
-class SVX_DLLPUBLIC E3dLatheObj final : public E3dCompoundObject
+class SVXCORE_DLLPUBLIC E3dLatheObj final : public E3dCompoundObject
{
basegfx::B2DPolyPolygon maPolyPoly2D;
diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx
index bf7365b5859b..cd75dbe99eed 100644
--- a/include/svx/linectrl.hxx
+++ b/include/svx/linectrl.hxx
@@ -34,7 +34,7 @@ class XLineDashItem;
typedef std::function<bool(const OUString&, const css::uno::Any&)> LineStyleSelectFunction;
// SvxLineStyleController:
-class SVX_DLLPUBLIC SvxLineStyleToolBoxControl final : public svt::PopupWindowController
+class SVXCORE_DLLPUBLIC SvxLineStyleToolBoxControl final : public svt::PopupWindowController
{
private:
std::unique_ptr<svx::ToolboxButtonLineStyleUpdater> m_xBtnUpdater;
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index 8916d145e45e..b4c7abf6d3b7 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -59,7 +59,7 @@ public:
|*
\************************************************************************/
-class SVX_DLLPUBLIC E3dObject : public SdrAttrObj
+class SVXCORE_DLLPUBLIC E3dObject : public SdrAttrObj
{
private:
// Allow everything for E3dObjList and E3dDragMethod
@@ -150,7 +150,7 @@ public:
|*
\************************************************************************/
-class SVX_DLLPUBLIC E3dCompoundObject : public E3dObject
+class SVXCORE_DLLPUBLIC E3dCompoundObject : public E3dObject
{
private:
// to allow sdr::properties::E3dCompoundProperties access to SetGeometryValid()
diff --git a/include/svx/objfac3d.hxx b/include/svx/objfac3d.hxx
index 19f7074e4088..e5defce5d9c8 100644
--- a/include/svx/objfac3d.hxx
+++ b/include/svx/objfac3d.hxx
@@ -33,7 +33,7 @@
class SdrObject;
struct SdrObjCreatorParams;
-class SVX_DLLPUBLIC E3dObjFactory
+class SVXCORE_DLLPUBLIC E3dObjFactory
{
public:
E3dObjFactory();
diff --git a/include/svx/pagenumberlistbox.hxx b/include/svx/pagenumberlistbox.hxx
index 08bb19220ccd..aa2137e66d42 100644
--- a/include/svx/pagenumberlistbox.hxx
+++ b/include/svx/pagenumberlistbox.hxx
@@ -24,7 +24,7 @@
#include <svx/svxdllapi.h>
#include <vcl/weld.hxx>
-class SVX_DLLPUBLIC SvxPageNumberListBox
+class SVXCORE_DLLPUBLIC SvxPageNumberListBox
{
private:
std::unique_ptr<weld::ComboBox> m_xControl;
diff --git a/include/svx/papersizelistbox.hxx b/include/svx/papersizelistbox.hxx
index 5ede4fc81bc6..a80425ba8423 100644
--- a/include/svx/papersizelistbox.hxx
+++ b/include/svx/papersizelistbox.hxx
@@ -30,7 +30,7 @@ enum class PaperSizeApp
Draw
};
-class SVX_DLLPUBLIC SvxPaperSizeListBox
+class SVXCORE_DLLPUBLIC SvxPaperSizeListBox
{
private:
std::unique_ptr<weld::ComboBox> m_xControl;
diff --git a/include/svx/polygn3d.hxx b/include/svx/polygn3d.hxx
index 8dc2a124afb4..0c6a7799d27a 100644
--- a/include/svx/polygn3d.hxx
+++ b/include/svx/polygn3d.hxx
@@ -23,7 +23,7 @@
#include <svx/obj3d.hxx>
#include <svx/svxdllapi.h>
-class SVX_DLLPUBLIC E3dPolygonObj final : public E3dCompoundObject
+class SVXCORE_DLLPUBLIC E3dPolygonObj final : public E3dCompoundObject
{
// parameters
basegfx::B3DPolyPolygon aPolyPoly3D;
diff --git a/include/svx/polypolygoneditor.hxx b/include/svx/polypolygoneditor.hxx
index c5b079d707c8..e8b6138dffa4 100644
--- a/include/svx/polypolygoneditor.hxx
+++ b/include/svx/polypolygoneditor.hxx
@@ -31,7 +31,7 @@ namespace sdr
{
/** this class implements some helper functions to edit a B2DPolyPolygon */
-class SVX_DLLPUBLIC PolyPolygonEditor
+class SVXCORE_DLLPUBLIC PolyPolygonEditor
{
public:
PolyPolygonEditor( const basegfx::B2DPolyPolygon& rPolyPolygon);
diff --git a/include/svx/samecontentlistbox.hxx b/include/svx/samecontentlistbox.hxx
index f767fbd30e84..1f5a503e98cf 100644
--- a/include/svx/samecontentlistbox.hxx
+++ b/include/svx/samecontentlistbox.hxx
@@ -25,7 +25,7 @@
namespace SameContentListBox
{
- void SVX_DLLPUBLIC Fill(weld::ComboBox& rComboBox);
+ void SVXCORE_DLLPUBLIC Fill(weld::ComboBox& rComboBox);
};
#endif
diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx
index ac41ca082191..bd53b273a16c 100644
--- a/include/svx/scene3d.hxx
+++ b/include/svx/scene3d.hxx
@@ -54,7 +54,7 @@ class Imp3DDepthRemapper;
|*
\************************************************************************/
-class SVX_DLLPUBLIC E3dScene : public E3dObject, public SdrObjList
+class SVXCORE_DLLPUBLIC E3dScene : public E3dObject, public SdrObjList
{
protected:
virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
diff --git a/include/svx/sdangitm.hxx b/include/svx/sdangitm.hxx
index 3ee62cef7df0..81897d43c810 100644
--- a/include/svx/sdangitm.hxx
+++ b/include/svx/sdangitm.hxx
@@ -24,7 +24,7 @@
-class SVX_DLLPUBLIC SdrAngleItem: public SfxInt32Item {
+class SVXCORE_DLLPUBLIC SdrAngleItem: public SfxInt32Item {
public:
SdrAngleItem(sal_uInt16 nId, sal_Int32 nAngle): SfxInt32Item(nId,nAngle) {}
virtual SdrAngleItem* Clone(SfxItemPool* pPool=nullptr) const override;
diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx
index a66fdefdd1e0..83ad600722a3 100644
--- a/include/svx/sdasitm.hxx
+++ b/include/svx/sdasitm.hxx
@@ -30,13 +30,13 @@
namespace com::sun::star::uno { class Any; }
-class SVX_DLLPUBLIC SdrCustomShapeGeometryItem : public SfxPoolItem
+class SVXCORE_DLLPUBLIC SdrCustomShapeGeometryItem : public SfxPoolItem
{
public:
typedef std::pair < const OUString, const OUString > PropertyPair;
private:
- struct SVX_DLLPUBLIC PropertyPairHash
+ struct SVXCORE_DLLPUBLIC PropertyPairHash
{
size_t operator()( const SdrCustomShapeGeometryItem::PropertyPair& ) const;
};
diff --git a/include/svx/sdgcoitm.hxx b/include/svx/sdgcoitm.hxx
index 5031bb336dbf..936d60bed35c 100644
--- a/include/svx/sdgcoitm.hxx
+++ b/include/svx/sdgcoitm.hxx
@@ -28,7 +28,7 @@
// SdrGrafRedItem -
-class SVX_DLLPUBLIC SdrGrafRedItem : public SdrSignedPercentItem
+class SVXCORE_DLLPUBLIC SdrGrafRedItem : public SdrSignedPercentItem
{
public:
@@ -42,7 +42,7 @@ public:
// SdrGrafGreenItem -
-class SVX_DLLPUBLIC SdrGrafGreenItem : public SdrSignedPercentItem
+class SVXCORE_DLLPUBLIC SdrGrafGreenItem : public SdrSignedPercentItem
{
public:
@@ -56,7 +56,7 @@ public:
// SdrGrafBlueItem -
-class SVX_DLLPUBLIC SdrGrafBlueItem : public SdrSignedPercentItem
+class SVXCORE_DLLPUBLIC SdrGrafBlueItem : public SdrSignedPercentItem
{
public:
diff --git a/include/svx/sdgcpitm.hxx b/include/svx/sdgcpitm.hxx
index ba5bd28688b8..7f5dfb4e6b48 100644
--- a/include/svx/sdgcpitm.hxx
+++ b/include/svx/sdgcpitm.hxx
@@ -27,7 +27,7 @@
// SdrGrafCropItem -
-class SVX_DLLPUBLIC SdrGrafCropItem : public SvxGrfCrop
+class SVXCORE_DLLPUBLIC SdrGrafCropItem : public SvxGrfCrop
{
public:
diff --git a/include/svx/sdggaitm.hxx b/include/svx/sdggaitm.hxx
index 3d84c44e13a8..5a81962e8792 100644
--- a/include/svx/sdggaitm.hxx
+++ b/include/svx/sdggaitm.hxx
@@ -28,7 +28,7 @@
// SdrGrafGamma100Item -
-class SVX_DLLPUBLIC SdrGrafGamma100Item : public SfxUInt32Item
+class SVXCORE_DLLPUBLIC SdrGrafGamma100Item : public SfxUInt32Item
{
public:
diff --git a/include/svx/sdgluitm.hxx b/include/svx/sdgluitm.hxx
index 9e2b328cd56e..886b3cf22344 100644
--- a/include/svx/sdgluitm.hxx
+++ b/include/svx/sdgluitm.hxx
@@ -28,7 +28,7 @@
// SdrGrafLuminanceItem -
-class SVX_DLLPUBLIC SdrGrafLuminanceItem : public SdrSignedPercentItem
+class SVXCORE_DLLPUBLIC SdrGrafLuminanceItem : public SdrSignedPercentItem
{
public:
@@ -43,7 +43,7 @@ public:
// SdrGrafContrastItem -
-class SVX_DLLPUBLIC SdrGrafContrastItem : public SdrSignedPercentItem
+class SVXCORE_DLLPUBLIC SdrGrafContrastItem : public SdrSignedPercentItem
{
public:
diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx
index 94c1a3076496..e04872ff975a 100644
--- a/include/svx/sdgmoitm.hxx
+++ b/include/svx/sdgmoitm.hxx
@@ -32,7 +32,7 @@ protected:
SfxEnumItem(SDRATTR_GRAFMODE, eMode) {}
};
-class SVX_DLLPUBLIC SdrGrafModeItem : public SdrGrafModeItem_Base
+class SVXCORE_DLLPUBLIC SdrGrafModeItem : public SdrGrafModeItem_Base
{
public:
SdrGrafModeItem( GraphicDrawMode eMode = GraphicDrawMode::Standard ) : SdrGrafModeItem_Base( eMode ) {}
diff --git a/include/svx/sdgtritm.hxx b/include/svx/sdgtritm.hxx
index ed65a379303a..05f2f8eb5554 100644
--- a/include/svx/sdgtritm.hxx
+++ b/include/svx/sdgtritm.hxx
@@ -28,7 +28,7 @@
// SdrGrafTransparenceItem -
-class SVX_DLLPUBLIC SdrGrafTransparenceItem : public SdrPercentItem
+class SVXCORE_DLLPUBLIC SdrGrafTransparenceItem : public SdrPercentItem
{
public:
diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx
index f7342778b12c..8abecbad394c 100644
--- a/include/svx/sdmetitm.hxx
+++ b/include/svx/sdmetitm.hxx
@@ -27,7 +27,7 @@
// For all metrics. GetPresentation returns for example for
// Value=2500 a "25mm".
-class SVX_DLLPUBLIC SdrMetricItem: public SfxInt32Item {
+class SVXCORE_DLLPUBLIC SdrMetricItem: public SfxInt32Item {
public:
SdrMetricItem(sal_uInt16 nId, sal_Int32 nVal): SfxInt32Item(nId,nVal) {}
virtual SdrMetricItem* Clone(SfxItemPool* pPool=nullptr) const override;
diff --git a/include/svx/sdooitm.hxx b/include/svx/sdooitm.hxx
index 4010c8700549..a0e7cfe570e5 100644
--- a/include/svx/sdooitm.hxx
+++ b/include/svx/sdooitm.hxx
@@ -27,7 +27,7 @@
// here GetValueTextByVal() returns "on" or "off" instead
// of "TRUE" or "FALSE"
-class SVX_DLLPUBLIC SdrOnOffItem: public SfxBoolItem {
+class SVXCORE_DLLPUBLIC SdrOnOffItem: public SfxBoolItem {
public:
SdrOnOffItem(sal_uInt16 nId, bool bOn): SfxBoolItem(nId,bOn) {}
virtual SdrOnOffItem* Clone(SfxItemPool* pPool=nullptr) const override;
diff --git a/include/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx
index a3ad78402342..6aff6b11929a 100644
--- a/include/svx/sdprcitm.hxx
+++ b/include/svx/sdprcitm.hxx
@@ -27,7 +27,7 @@
// Integer percents of 0
-class SVX_DLLPUBLIC SdrPercentItem : public SfxUInt16Item
+class SVXCORE_DLLPUBLIC SdrPercentItem : public SfxUInt16Item
{
public:
SdrPercentItem(sal_uInt16 nId, sal_uInt16 nVal): SfxUInt16Item(nId,nVal) {}
@@ -41,7 +41,7 @@ public:
// Integer percents of +/-
-class SVX_DLLPUBLIC SdrSignedPercentItem : public SfxInt16Item
+class SVXCORE_DLLPUBLIC SdrSignedPercentItem : public SfxInt16Item
{
public:
SdrSignedPercentItem( sal_uInt16 nId, sal_Int16 nVal ) : SfxInt16Item( nId,nVal ) {}
diff --git a/include/svx/sdr/animation/objectanimator.hxx b/include/svx/sdr/animation/objectanimator.hxx
index aaa0e99c72d5..86d8ed8ac4a1 100644
--- a/include/svx/sdr/animation/objectanimator.hxx
+++ b/include/svx/sdr/animation/objectanimator.hxx
@@ -32,7 +32,7 @@ namespace sdr
public:
// basic constructor and destructor
primitiveAnimator();
- SVX_DLLPUBLIC virtual ~primitiveAnimator() override;
+ SVXCORE_DLLPUBLIC virtual ~primitiveAnimator() override;
};
} // end of namespace animation
} // end of namespace sdr
diff --git a/include/svx/sdr/animation/scheduler.hxx b/include/svx/sdr/animation/scheduler.hxx
index 59aba43460ca..43666f3982f7 100644
--- a/include/svx/sdr/animation/scheduler.hxx
+++ b/include/svx/sdr/animation/scheduler.hxx
@@ -31,7 +31,7 @@ namespace sdr
namespace animation
{
- class SVX_DLLPUBLIC Event
+ class SVXCORE_DLLPUBLIC Event
{
// time of event in ms
sal_uInt32 mnTime;
@@ -49,7 +49,7 @@ namespace sdr
virtual void Trigger(sal_uInt32 nTime) = 0;
};
- class SVX_DLLPUBLIC Scheduler : public Timer
+ class SVXCORE_DLLPUBLIC Scheduler : public Timer
{
// time in ms
sal_uInt32 mnTime;
diff --git a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
index 79b2689784da..020401f0541f 100644
--- a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
+++ b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
@@ -34,7 +34,7 @@ namespace drawinglayer
{
namespace attribute
{
- class SVX_DLLPUBLIC SdrAllFillAttributesHelper
+ class SVXCORE_DLLPUBLIC SdrAllFillAttributesHelper
{
private:
basegfx::B2DRange maLastPaintRange;
diff --git a/include/svx/sdr/contact/displayinfo.hxx b/include/svx/sdr/contact/displayinfo.hxx
index 6a054eb5d824..4c5842b454cb 100644
--- a/include/svx/sdr/contact/displayinfo.hxx
+++ b/include/svx/sdr/contact/displayinfo.hxx
@@ -29,7 +29,7 @@ namespace sdr
{
namespace contact
{
- class SVX_DLLPUBLIC DisplayInfo final
+ class SVXCORE_DLLPUBLIC DisplayInfo final
{
// The Layers which shall be processed (visible)
SdrLayerIDSet maProcessLayers;
diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx
index e65630d1ec7e..27c219b2cba4 100644
--- a/include/svx/sdr/contact/objectcontact.hxx
+++ b/include/svx/sdr/contact/objectcontact.hxx
@@ -41,7 +41,7 @@ class DisplayInfo;
class ViewContact;
class ViewObjectContactRedirector;
-class SVX_DLLPUBLIC ObjectContact
+class SVXCORE_DLLPUBLIC ObjectContact
{
private:
// make ViewObjectContact a friend to exclusively allow it to use
diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
index 9a822d8fbd33..a7124bade869 100644
--- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
+++ b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
@@ -30,7 +30,7 @@ class SdrObject;
namespace sdr { namespace contact {
-class SVX_DLLPUBLIC ObjectContactPainter : public ObjectContact
+class SVXCORE_DLLPUBLIC ObjectContactPainter : public ObjectContact
{
protected:
// Hierarchy access methods
@@ -46,7 +46,7 @@ public:
// typedef for transferring SdrObject
typedef ::std::vector< SdrObject* > SdrObjectVector;
-class SVX_DLLPUBLIC ObjectContactOfObjListPainter final : public ObjectContactPainter
+class SVXCORE_DLLPUBLIC ObjectContactOfObjListPainter final : public ObjectContactPainter
{
// Target OutputDevice
OutputDevice& mrTargetOutputDevice;
diff --git a/include/svx/sdr/contact/objectcontactofpageview.hxx b/include/svx/sdr/contact/objectcontactofpageview.hxx
index 3d4623de2812..c3f4ef9d3d19 100644
--- a/include/svx/sdr/contact/objectcontactofpageview.hxx
+++ b/include/svx/sdr/contact/objectcontactofpageview.hxx
@@ -30,7 +30,7 @@ namespace sdr
{
namespace contact
{
- class SVX_DLLPUBLIC ObjectContactOfPageView : public ObjectContact, public Idle
+ class SVXCORE_DLLPUBLIC ObjectContactOfPageView : public ObjectContact, public Idle
{
// the owner of this ObjectContactOfPageView. Set from constructor and not
// to be changed in any way.
diff --git a/include/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx
index d3455ac77cd0..288a0007266a 100644
--- a/include/svx/sdr/contact/viewcontact.hxx
+++ b/include/svx/sdr/contact/viewcontact.hxx
@@ -33,7 +33,7 @@ namespace sdr { namespace contact {
class ObjectContact;
class ViewObjectContact;
-class SVX_DLLPUBLIC ViewContact
+class SVXCORE_DLLPUBLIC ViewContact
{
private:
// make ViewObjectContact a friend to exclusively allow it to use
diff --git a/include/svx/sdr/contact/viewcontactofe3dscene.hxx b/include/svx/sdr/contact/viewcontactofe3dscene.hxx
index b27e7d1596da..890a964b0af7 100644
--- a/include/svx/sdr/contact/viewcontactofe3dscene.hxx
+++ b/include/svx/sdr/contact/viewcontactofe3dscene.hxx
@@ -34,7 +34,7 @@ namespace basegfx {
namespace sdr { namespace contact {
-class SVX_DLLPUBLIC ViewContactOfE3dScene final : public ViewContactOfSdrObj
+class SVXCORE_DLLPUBLIC ViewContactOfE3dScene final : public ViewContactOfSdrObj
{
public:
// basic constructor, used from SdrObject.
diff --git a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
index 2039fc4a12a2..0d7813a71029 100644
--- a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
@@ -29,7 +29,7 @@ namespace avmedia { class MediaItem; }
namespace sdr { namespace contact {
-class SVX_DLLPUBLIC ViewContactOfSdrMediaObj : public ViewContactOfSdrObj
+class SVXCORE_DLLPUBLIC ViewContactOfSdrMediaObj : public ViewContactOfSdrObj
{
friend class ViewObjectContactOfSdrMediaObj;
diff --git a/include/svx/sdr/contact/viewcontactofsdrobj.hxx b/include/svx/sdr/contact/viewcontactofsdrobj.hxx
index 2508316a7c9f..d8d17d96c3f1 100644
--- a/include/svx/sdr/contact/viewcontactofsdrobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrobj.hxx
@@ -31,7 +31,7 @@ class Bitmap;
namespace sdr { namespace contact {
-class SVX_DLLPUBLIC ViewContactOfSdrObj : public ViewContact
+class SVXCORE_DLLPUBLIC ViewContactOfSdrObj : public ViewContact
{
protected:
// the owner of this ViewContact. Set from constructor and not
diff --git a/include/svx/sdr/contact/viewcontactofvirtobj.hxx b/include/svx/sdr/contact/viewcontactofvirtobj.hxx
index e82e6ce30fb5..3e514f116ee1 100644
--- a/include/svx/sdr/contact/viewcontactofvirtobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofvirtobj.hxx
@@ -26,7 +26,7 @@ class SdrVirtObj;
namespace sdr { namespace contact {
-class SVX_DLLPUBLIC ViewContactOfVirtObj : public ViewContactOfSdrObj
+class SVXCORE_DLLPUBLIC ViewContactOfVirtObj : public ViewContactOfSdrObj
{
protected:
// internal access to SdrObject. Implementation in *.cxx to avoid
diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx
index 460dd83b51f1..f7542908a8e6 100644
--- a/include/svx/sdr/contact/viewobjectcontact.hxx
+++ b/include/svx/sdr/contact/viewobjectcontact.hxx
@@ -37,7 +37,7 @@ class ObjectContact;
class ViewContact;
class ViewObjectContactRedirector;
-class SVX_DLLPUBLIC ViewObjectContact
+class SVXCORE_DLLPUBLIC ViewObjectContact
{
private:
// must-exist and constant contacts
diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
index 44296b96cf1c..7f2565576322 100644
--- a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
@@ -28,7 +28,7 @@ class OutputDevice;
namespace sdr { namespace contact {
-class SVX_DLLPUBLIC ViewObjectContactOfSdrObj : public ViewObjectContact
+class SVXCORE_DLLPUBLIC ViewObjectContactOfSdrObj : public ViewObjectContact
{
/** Test whether the primitive is visible on any layer from @c aLayers
diff --git a/include/svx/sdr/contact/viewobjectcontactredirector.hxx b/include/svx/sdr/contact/viewobjectcontactredirector.hxx
index 7679564028ff..c30be2b9ddca 100644
--- a/include/svx/sdr/contact/viewobjectcontactredirector.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactredirector.hxx
@@ -32,7 +32,7 @@ class ViewObjectContact;
// single ViewObjectContacts. An own derivation may be set at single ViewContacts
// or at the ObjectContact for redirecting all. If both is used, the one at single
// objects will have priority.
-class SVX_DLLPUBLIC ViewObjectContactRedirector
+class SVXCORE_DLLPUBLIC ViewObjectContactRedirector
{
public:
// basic constructor.
diff --git a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
index b6d9c46e3a47..35079a47e4c7 100644
--- a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
+++ b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
@@ -28,7 +28,7 @@ namespace sdr
{
namespace overlay
{
- class SVX_DLLPUBLIC OverlayAnimatedBitmapEx final : public OverlayObjectWithBasePosition
+ class SVXCORE_DLLPUBLIC OverlayAnimatedBitmapEx final : public OverlayObjectWithBasePosition
{
// the Bitmaps
BitmapEx const maBitmapEx1;
diff --git a/include/svx/sdr/overlay/overlaybitmapex.hxx b/include/svx/sdr/overlay/overlaybitmapex.hxx
index 41c65b208126..a0022e1c7bda 100644
--- a/include/svx/sdr/overlay/overlaybitmapex.hxx
+++ b/include/svx/sdr/overlay/overlaybitmapex.hxx
@@ -28,7 +28,7 @@ namespace sdr
{
namespace overlay
{
- class SVX_DLLPUBLIC OverlayBitmapEx final : public OverlayObjectWithBasePosition
+ class SVXCORE_DLLPUBLIC OverlayBitmapEx final : public OverlayObjectWithBasePosition
{
// the Bitmap itself
BitmapEx const maBitmapEx;
diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx
index c84a3cbf2bc1..c3b9b340ab35 100644
--- a/include/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
@@ -47,7 +47,7 @@ namespace sdr
{
namespace overlay
{
- class SVX_DLLPUBLIC OverlayManager
+ class SVXCORE_DLLPUBLIC OverlayManager
: protected sdr::animation::Scheduler
, public salhelper::SimpleReferenceObject
{
diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx
index 61dd91f91cbb..569d93a25de9 100644
--- a/include/svx/sdr/overlay/overlayobject.hxx
+++ b/include/svx/sdr/overlay/overlayobject.hxx
@@ -50,7 +50,7 @@ namespace sdr
{
namespace overlay
{
- class SVX_DLLPUBLIC OverlayObject : public sdr::animation::Event
+ class SVXCORE_DLLPUBLIC OverlayObject : public sdr::animation::Event
{
private:
OverlayObject(const OverlayObject&) = delete;
@@ -184,7 +184,7 @@ namespace sdr
{
namespace overlay
{
- class SVX_DLLPUBLIC OverlayObjectWithBasePosition : public OverlayObject
+ class SVXCORE_DLLPUBLIC OverlayObjectWithBasePosition : public OverlayObject
{
protected:
// base position in logical coordinates
diff --git a/include/svx/sdr/overlay/overlayobjectlist.hxx b/include/svx/sdr/overlay/overlayobjectlist.hxx
index 8044ae70147d..4859db33e6e6 100644
--- a/include/svx/sdr/overlay/overlayobjectlist.hxx
+++ b/include/svx/sdr/overlay/overlayobjectlist.hxx
@@ -33,7 +33,7 @@ namespace sdr
{
namespace overlay
{
- class SVX_DLLPUBLIC OverlayObjectList final
+ class SVXCORE_DLLPUBLIC OverlayObjectList final
{
// the vector of OverlayObjects
::std::vector< std::unique_ptr<OverlayObject> > maVector;
diff --git a/include/svx/sdr/overlay/overlaypolypolygon.hxx b/include/svx/sdr/overlay/overlaypolypolygon.hxx
index 6d9bcf812232..80442723395d 100644
--- a/include/svx/sdr/overlay/overlaypolypolygon.hxx
+++ b/include/svx/sdr/overlay/overlaypolypolygon.hxx
@@ -28,7 +28,7 @@ namespace sdr
{
namespace overlay
{
- class SVX_DLLPUBLIC OverlayPolyPolygonStripedAndFilled final : public OverlayObject
+ class SVXCORE_DLLPUBLIC OverlayPolyPolygonStripedAndFilled final : public OverlayObject
{
// geometry
basegfx::B2DPolyPolygon const maLinePolyPolygon;
diff --git a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
index ccf3fcc7622a..84cf195f4b5c 100644
--- a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
+++ b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
@@ -28,7 +28,7 @@ namespace sdr
{
namespace overlay
{
- class SVX_DLLPUBLIC OverlayPrimitive2DSequenceObject final : public OverlayObjectWithBasePosition
+ class SVXCORE_DLLPUBLIC OverlayPrimitive2DSequenceObject final : public OverlayObjectWithBasePosition
{
// the sequence of primitives to show
const drawinglayer::primitive2d::Primitive2DContainer maSequence;
diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx
index 8dac9e108580..ec328f81da71 100644
--- a/include/svx/sdr/overlay/overlayselection.hxx
+++ b/include/svx/sdr/overlay/overlayselection.hxx
@@ -35,7 +35,7 @@ namespace sdr
Transparent
};
- class SVX_DLLPUBLIC OverlaySelection final : public OverlayObject
+ class SVXCORE_DLLPUBLIC OverlaySelection final : public OverlayObject
{
// type of overlay
OverlayType const meOverlayType;
diff --git a/include/svx/sdr/primitive2d/sdrattributecreator.hxx b/include/svx/sdr/primitive2d/sdrattributecreator.hxx
index 15e489b8e5ab..b26d516b239d 100644
--- a/include/svx/sdr/primitive2d/sdrattributecreator.hxx
+++ b/include/svx/sdr/primitive2d/sdrattributecreator.hxx
@@ -55,17 +55,17 @@ namespace drawinglayer
namespace primitive2d
{
// SdrAttribute creators
- attribute::SdrLineAttribute SVX_DLLPUBLIC createNewSdrLineAttribute(
+ attribute::SdrLineAttribute SVXCORE_DLLPUBLIC createNewSdrLineAttribute(
const SfxItemSet& rSet);
- attribute::SdrLineStartEndAttribute SVX_DLLPUBLIC createNewSdrLineStartEndAttribute(
+ attribute::SdrLineStartEndAttribute SVXCORE_DLLPUBLIC createNewSdrLineStartEndAttribute(
const SfxItemSet& rSet,
double fWidth);
attribute::SdrShadowAttribute createNewSdrShadowAttribute(
const SfxItemSet& rSet);
- attribute::SdrFillAttribute SVX_DLLPUBLIC createNewSdrFillAttribute(
+ attribute::SdrFillAttribute SVXCORE_DLLPUBLIC createNewSdrFillAttribute(
const SfxItemSet& rSet);
// #i101508# Support handing over given text-to-border distances
@@ -77,7 +77,7 @@ namespace drawinglayer
const sal_Int32* pRight = nullptr,
const sal_Int32* pLower = nullptr);
- attribute::FillGradientAttribute SVX_DLLPUBLIC createNewTransparenceGradientAttribute(
+ attribute::FillGradientAttribute SVXCORE_DLLPUBLIC createNewTransparenceGradientAttribute(
const SfxItemSet& rSet);
attribute::SdrFillGraphicAttribute createNewSdrFillGraphicAttribute(
diff --git a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
index da3c54650746..e8e538d8e4ed 100644
--- a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
+++ b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
@@ -45,23 +45,23 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DReference SVX_DLLPUBLIC createPolyPolygonFillPrimitive(
+ Primitive2DReference SVXCORE_DLLPUBLIC createPolyPolygonFillPrimitive(
const basegfx::B2DPolyPolygon& rPolyPolygon,
const attribute::SdrFillAttribute& rFill,
const attribute::FillGradientAttribute& rFillGradient);
- Primitive2DReference SVX_DLLPUBLIC createPolyPolygonFillPrimitive(
+ Primitive2DReference SVXCORE_DLLPUBLIC createPolyPolygonFillPrimitive(
const basegfx::B2DPolyPolygon& rPolyPolygon,
const basegfx::B2DRange& rDefinitionRange,
const attribute::SdrFillAttribute& rFill,
const attribute::FillGradientAttribute& rFillGradient);
- Primitive2DReference SVX_DLLPUBLIC createPolygonLinePrimitive(
+ Primitive2DReference SVXCORE_DLLPUBLIC createPolygonLinePrimitive(
const basegfx::B2DPolygon& rPolygon,
const attribute::SdrLineAttribute& rLine,
const attribute::SdrLineStartEndAttribute& rStroke);
- Primitive2DReference SVX_DLLPUBLIC createTextPrimitive(
+ Primitive2DReference SVXCORE_DLLPUBLIC createTextPrimitive(
const basegfx::B2DPolyPolygon& rUnitPolyPolygon,
const basegfx::B2DHomMatrix& rObjectTransform,
const attribute::SdrTextAttribute& rText,
@@ -69,7 +69,7 @@ namespace drawinglayer
bool bCellText,
bool bWordWrap);
- Primitive2DContainer SVX_DLLPUBLIC createEmbeddedShadowPrimitive(
+ Primitive2DContainer SVXCORE_DLLPUBLIC createEmbeddedShadowPrimitive(
const Primitive2DContainer& rContent,
const attribute::SdrShadowAttribute& rShadow);
diff --git a/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx
index c7355a296b72..ed41e9b79ddf 100644
--- a/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx
@@ -29,7 +29,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SVX_DLLPUBLIC SdrFrameBorderData
+ class SVXCORE_DLLPUBLIC SdrFrameBorderData
{
private:
basegfx::B2DPoint maOrigin; /// start point of borderline
@@ -88,7 +88,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SVX_DLLPUBLIC SdrFrameBorderPrimitive2D final : public BufferedDecompositionPrimitive2D
+ class SVXCORE_DLLPUBLIC SdrFrameBorderPrimitive2D final : public BufferedDecompositionPrimitive2D
{
private:
std::shared_ptr<SdrFrameBorderDataVector> maFrameBorders;
diff --git a/include/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx
index 96d4fe5f1d84..852b5e88164c 100644
--- a/include/svx/sdr/properties/defaultproperties.hxx
+++ b/include/svx/sdr/properties/defaultproperties.hxx
@@ -34,7 +34,7 @@ namespace sdr
{
namespace properties
{
- class SVX_DLLPUBLIC DefaultProperties : public BaseProperties
+ class SVXCORE_DLLPUBLIC DefaultProperties : public BaseProperties
{
protected:
// the to be used ItemSet
diff --git a/include/svx/sdr/properties/properties.hxx b/include/svx/sdr/properties/properties.hxx
index 56182af840e2..22d9bf2f78b0 100644
--- a/include/svx/sdr/properties/properties.hxx
+++ b/include/svx/sdr/properties/properties.hxx
@@ -76,7 +76,7 @@ namespace sdr
{
namespace properties
{
- class SVX_DLLPUBLIC BaseProperties
+ class SVXCORE_DLLPUBLIC BaseProperties
{
private:
// the owner of this Properties. Set from constructor and not
@@ -203,7 +203,7 @@ namespace sdr
};
// checks the FillStyle item and removes unneeded Gradient, FillBitmap and Hatch items
- void SVX_DLLPUBLIC CleanupFillProperties( SfxItemSet& rItemSet );
+ void SVXCORE_DLLPUBLIC CleanupFillProperties( SfxItemSet& rItemSet );
} // end of namespace properties
} // end of namespace sdr
diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx
index 3570cff6f56d..f186b32147f6 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -39,7 +39,7 @@ namespace sdr { namespace table {
class TableModel;
-class SVX_DLLPUBLIC SvxTableController final : public sdr::SelectionController
+class SVXCORE_DLLPUBLIC SvxTableController final : public sdr::SelectionController
{
public:
SVX_DLLPRIVATE SvxTableController(
diff --git a/include/svx/sdrhittesthelper.hxx b/include/svx/sdrhittesthelper.hxx
index 0a10c7b3e32f..3dc9c81d69f5 100644
--- a/include/svx/sdrhittesthelper.hxx
+++ b/include/svx/sdrhittesthelper.hxx
@@ -38,7 +38,7 @@ namespace drawinglayer { namespace primitive2d { class Primitive2DContainer; }}
// Wrappers for classic Sdr* Mode/View classes
-SVX_DLLPUBLIC SdrObject* SdrObjectPrimitiveHit(
+SVXCORE_DLLPUBLIC SdrObject* SdrObjectPrimitiveHit(
const SdrObject& rObject,
const Point& rPnt,
sal_uInt16 nTol,
@@ -48,7 +48,7 @@ SVX_DLLPUBLIC SdrObject* SdrObjectPrimitiveHit(
/// allow getting back an evtl. resulting primitive stack which lead to a hit
drawinglayer::primitive2d::Primitive2DContainer* pHitContainer = nullptr);
-SVX_DLLPUBLIC SdrObject* SdrObjListPrimitiveHit(
+SVXCORE_DLLPUBLIC SdrObject* SdrObjListPrimitiveHit(
const SdrObjList& rList,
const Point& rPnt,
sal_uInt16 nTol,
diff --git a/include/svx/sdrobjectfilter.hxx b/include/svx/sdrobjectfilter.hxx
index bb200991a298..497bf51a2d7b 100644
--- a/include/svx/sdrobjectfilter.hxx
+++ b/include/svx/sdrobjectfilter.hxx
@@ -33,7 +33,7 @@ namespace svx
/** specifies a boolean predicate on the set of all SdrObjects - vulgo a filter.
*/
- class SVX_DLLPUBLIC SAL_NO_VTABLE ISdrObjectFilter
+ class SVXCORE_DLLPUBLIC SAL_NO_VTABLE ISdrObjectFilter
{
public:
virtual bool includeObject( const SdrObject& i_rObject ) const = 0;
diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx
index 7cd6d3fdf6fb..e7d534ca1a9c 100644
--- a/include/svx/sdrpagewindow.hxx
+++ b/include/svx/sdrpagewindow.hxx
@@ -45,7 +45,7 @@ namespace basegfx { class B2DRange; }
class SdrPaintWindow;
class SdrPageView;
-class SVX_DLLPUBLIC SdrPageWindow
+class SVXCORE_DLLPUBLIC SdrPageWindow
{
struct Impl;
diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx
index 287ec01b6195..55ecb22fd159 100644
--- a/include/svx/sdrpaintwindow.hxx
+++ b/include/svx/sdrpaintwindow.hxx
@@ -41,7 +41,7 @@ namespace sdr
/// paint the transparent children of rWin that overlap rPixelRect
/// (for example, transparent form controls like check boxes)
-void SVX_DLLPUBLIC
+void SVXCORE_DLLPUBLIC
PaintTransparentChildren(vcl::Window const & rWindow, tools::Rectangle const& rPixelRect);
class SdrPreRenderDevice
@@ -62,7 +62,7 @@ public:
OutputDevice& GetPreRenderDevice() { return *mpPreRenderDevice; }
};
-class SVX_DLLPUBLIC SdrPaintWindow
+class SVXCORE_DLLPUBLIC SdrPaintWindow
{
private:
// the OutputDevice this window represents
diff --git a/include/svx/sdrundomanager.hxx b/include/svx/sdrundomanager.hxx
index 827758e177a9..ab92c931cf8f 100644
--- a/include/svx/sdrundomanager.hxx
+++ b/include/svx/sdrundomanager.hxx
@@ -25,7 +25,7 @@
class SfxObjectShell;
-class SVX_DLLPUBLIC SdrUndoManager : public EditUndoManager
+class SVXCORE_DLLPUBLIC SdrUndoManager : public EditUndoManager
{
private:
using EditUndoManager::Undo;
diff --git a/include/svx/sdtaaitm.hxx b/include/svx/sdtaaitm.hxx
index 03aba5f9b9fd..71764b2962a3 100644
--- a/include/svx/sdtaaitm.hxx
+++ b/include/svx/sdtaaitm.hxx
@@ -23,7 +23,7 @@
#include <svx/svddef.hxx>
#include <svx/svxdllapi.h>
-class SVX_DLLPUBLIC SdrTextAniAmountItem final : public SfxInt16Item {
+class SVXCORE_DLLPUBLIC SdrTextAniAmountItem final : public SfxInt16Item {
public:
SdrTextAniAmountItem(sal_Int16 nVal=0): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,nVal) {}
virtual SdrTextAniAmountItem* Clone(SfxItemPool* pPool=nullptr) const override;
diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx
index 87788994ad6e..1208dd7724c4 100644
--- a/include/svx/sdtaditm.hxx
+++ b/include/svx/sdtaditm.hxx
@@ -31,7 +31,7 @@ enum class SdrTextAniDirection
Left, Right, Up, Down
};
-class SVX_DLLPUBLIC SdrTextAniDirectionItem: public SfxEnumItem<SdrTextAniDirection> {
+class SVXCORE_DLLPUBLIC SdrTextAniDirectionItem: public SfxEnumItem<SdrTextAniDirection> {
public:
SdrTextAniDirectionItem(SdrTextAniDirection eDir=SdrTextAniDirection::Left): SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION, eDir) {}
virtual SdrTextAniDirectionItem* Clone(SfxItemPool* pPool=nullptr) const override;
diff --git a/include/svx/sdtaiitm.hxx b/include/svx/sdtaiitm.hxx
index 37291ce62bd8..d847208a6857 100644
--- a/include/svx/sdtaiitm.hxx
+++ b/include/svx/sdtaiitm.hxx
@@ -22,7 +22,7 @@
#include <svx/sdynitm.hxx>
#include <svx/svddef.hxx>
-class SVX_DLLPUBLIC SdrTextAniStartInsideItem final : public SdrYesNoItem {
+class SVXCORE_DLLPUBLIC SdrTextAniStartInsideItem final : public SdrYesNoItem {
public:
SdrTextAniStartInsideItem(bool bOn=false): SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,bOn) {}
virtual ~SdrTextAniStartInsideItem() override;
@@ -34,7 +34,7 @@ public:
SdrTextAniStartInsideItem & operator =(SdrTextAniStartInsideItem &&) = delete; // due to SdrYesNoItem
};
-class SVX_DLLPUBLIC SdrTextAniStopInsideItem final : public SdrYesNoItem {
+class SVXCORE_DLLPUBLIC SdrTextAniStopInsideItem final : public SdrYesNoItem {
public:
SdrTextAniStopInsideItem(bool bOn=false): SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,bOn) {}
virtual ~SdrTextAniStopInsideItem() override;
diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx
index 5a7ecdfc73bf..d977f83bec4e 100644
--- a/include/svx/sdtaitm.hxx
+++ b/include/svx/sdtaitm.hxx
@@ -32,7 +32,7 @@ enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP, // aligned to top (normally
SDRTEXTVERTADJUST_BLOCK // support vertical full with supported now
/*,SDRTEXTVERTADJUST_STRETCH*/}; // also stretch letters in their height (ni)
-class SVX_DLLPUBLIC SdrTextVertAdjustItem: public SfxEnumItem<SdrTextVertAdjust> {
+class SVXCORE_DLLPUBLIC SdrTextVertAdjustItem: public SfxEnumItem<SdrTextVertAdjust> {
public:
SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST, eAdj) {}
SdrTextVertAdjustItem(SdrTextVertAdjust eAdj, sal_uInt16 nWhich): SfxEnumItem(nWhich, eAdj) {}
@@ -56,7 +56,7 @@ enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT, // left adjusted
SDRTEXTHORZADJUST_BLOCK // use the whole text frame width
/*,SDRTEXTHORZADJUST_STRETCH*/}; // FitToSize in X direction (ni).
-class SVX_DLLPUBLIC SdrTextHorzAdjustItem: public SfxEnumItem<SdrTextHorzAdjust> {
+class SVXCORE_DLLPUBLIC SdrTextHorzAdjustItem: public SfxEnumItem<SdrTextHorzAdjust> {
public:
SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): SfxEnumItem(SDRATTR_TEXT_HORZADJUST, eAdj) {}
virtual SdrTextHorzAdjustItem* Clone(SfxItemPool* pPool=nullptr) const override;
diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx
index d4d481cf40f7..f2dca7833118 100644
--- a/include/svx/sdtakitm.hxx
+++ b/include/svx/sdtakitm.hxx
@@ -76,7 +76,7 @@ enum class SdrTextAniKind {
// of the text depends on the anchor of the drawing object. This
// corresponds to the position of the text in normal Paint (without scrolling).
-class SVX_DLLPUBLIC SdrTextAniKindItem: public SfxEnumItem<SdrTextAniKind> {
+class SVXCORE_DLLPUBLIC SdrTextAniKindItem: public SfxEnumItem<SdrTextAniKind> {
public:
SdrTextAniKindItem(SdrTextAniKind eKind=SdrTextAniKind::NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND, eKind) {}
virtual SdrTextAniKindItem* Clone(SfxItemPool* pPool=nullptr) const override;
diff --git a/include/svx/sdtayitm.hxx b/include/svx/sdtayitm.hxx
index b20172854838..7308991d00d5 100644
--- a/include/svx/sdtayitm.hxx
+++ b/include/svx/sdtayitm.hxx
@@ -23,7 +23,7 @@
#include <svx/svddef.hxx>
#include <svx/svxdllapi.h>
-class SVX_DLLPUBLIC SdrTextAniDelayItem final : public SfxUInt16Item {
+class SVXCORE_DLLPUBLIC SdrTextAniDelayItem final : public SfxUInt16Item {
public:
SdrTextAniDelayItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,nVal) {}
virtual SdrTextAniDelayItem* Clone(SfxItemPool* pPool=nullptr) const override;
diff --git a/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx
index 03faae2747b5..976bb72f1f8d 100644
--- a/include/svx/sdtfchim.hxx
+++ b/include/svx/sdtfchim.hxx
@@ -22,7 +22,7 @@
#include <svl/eitem.hxx>
#include <svx/svxdllapi.h>
-class SVX_DLLPUBLIC SdrTextFixedCellHeightItem final : public SfxBoolItem
+class SVXCORE_DLLPUBLIC SdrTextFixedCellHeightItem final : public SfxBoolItem
{
public:
diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx
index c95b5dd6754c..597da1ad591c 100644
--- a/include/svx/sdtfsitm.hxx
+++ b/include/svx/sdtfsitm.hxx
@@ -30,7 +30,7 @@
// TextMaxFrameWidth is reached).
-class SVX_DLLPUBLIC SdrTextFitToSizeTypeItem
+class SVXCORE_DLLPUBLIC SdrTextFitToSizeTypeItem
: public SfxEnumItem<css::drawing::TextFitToSizeType>
{
public:
diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx
index d17fbdfa1f69..a67f3f41fd7e 100644
--- a/include/svx/sdynitm.hxx
+++ b/include/svx/sdynitm.hxx
@@ -27,7 +27,7 @@
// GetValueTextByVal() returns "yes" or "no"
// instead of "TRUE" and "FALSE"
//-------------------------------------------------- ----------
-class SVX_DLLPUBLIC SdrYesNoItem: public SfxBoolItem {
+class SVXCORE_DLLPUBLIC SdrYesNoItem: public SfxBoolItem {
public:
SdrYesNoItem(sal_uInt16 nId, bool bOn): SfxBoolItem(nId,bOn) {}
virtual SdrYesNoItem* Clone(SfxItemPool* pPool=nullptr) const override;
diff --git a/include/svx/selectioncontroller.hxx b/include/svx/selectioncontroller.hxx
index 79c19f60dc61..ded8adf06ca5 100644
--- a/include/svx/selectioncontroller.hxx
+++ b/include/svx/selectioncontroller.hxx
@@ -40,7 +40,7 @@ namespace sdr
namespace table { struct CellPos; }
-class SVX_DLLPUBLIC SelectionController: public cppu::OWeakObject
+class SVXCORE_DLLPUBLIC SelectionController: public cppu::OWeakObject
{
public:
virtual bool onKeyInput(const KeyEvent& rKEvt, vcl::Window* pWin);
diff --git a/include/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx
index 90fa7700a54a..bdef4e11e7b8 100644
--- a/include/svx/shapepropertynotifier.hxx
+++ b/include/svx/shapepropertynotifier.hxx
@@ -45,7 +45,7 @@ namespace svx
/** a provider for a property value
*/
- class SVX_DLLPUBLIC IPropertyValueProvider
+ class SVXCORE_DLLPUBLIC IPropertyValueProvider
{
public:
/** returns the name of the property which this provider is responsible for
@@ -66,7 +66,7 @@ namespace svx
This default implementation queries the object which it is constructed with for the XPropertySet interface,
and calls the getPropertyValue method.
*/
- class SVX_DLLPUBLIC PropertyValueProvider :public IPropertyValueProvider
+ class SVXCORE_DLLPUBLIC PropertyValueProvider :public IPropertyValueProvider
{
public:
PropertyValueProvider( ::cppu::OWeakObject& _rContext, const char* _pAsciiPropertyName )
@@ -97,7 +97,7 @@ namespace svx
The class is intended to be held as member of the class which does the property change broadcasting.
*/
- class SVX_DLLPUBLIC PropertyChangeNotifier
+ class SVXCORE_DLLPUBLIC PropertyChangeNotifier
{
public:
/** constructs a notifier instance
diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx
index ed9ea771ed41..0571f1d5406d 100644
--- a/include/svx/sidebar/PanelLayout.hxx
+++ b/include/svx/sidebar/PanelLayout.hxx
@@ -21,7 +21,7 @@
#include <com/sun/star/frame/XFrame.hpp>
/// This class is the base for the Widget Layout-based sidebar panels.
-class SVX_DLLPUBLIC PanelLayout : public Control, public VclBuilderContainer
+class SVXCORE_DLLPUBLIC PanelLayout : public Control, public VclBuilderContainer
{
protected:
std::unique_ptr<weld::Builder> m_xBuilder;
diff --git a/include/svx/spacinglistbox.hxx b/include/svx/spacinglistbox.hxx
index d40e45b549b4..455a5729c843 100644
--- a/include/svx/spacinglistbox.hxx
+++ b/include/svx/spacinglistbox.hxx
@@ -28,7 +28,7 @@ enum class SpacingType { SPACING_INCH, MARGINS_INCH, SPACING_CM, MARGINS_CM };
/// Custom Widget ListBox to hold entries for Spacing & Margin settings of Header/Footer
namespace SpacingListBox
{
- void SVX_DLLPUBLIC Fill(SpacingType eType, weld::ComboBox&);
+ void SVXCORE_DLLPUBLIC Fill(SpacingType eType, weld::ComboBox&);
}
#endif
diff --git a/include/svx/sphere3d.hxx b/include/svx/sphere3d.hxx
index 03a78ae36d68..3bc2ab2f192c 100644
--- a/include/svx/sphere3d.hxx
+++ b/include/svx/sphere3d.hxx
@@ -32,7 +32,7 @@ class E3dDefaultAttributes;
* SphereObject with diameter r3DSize.
* The count of planes depends on the horizontal and vertical segment count.
*/
-class SVX_DLLPUBLIC E3dSphereObj final : public E3dCompoundObject
+class SVXCORE_DLLPUBLIC E3dSphereObj final : public E3dCompoundObject
{
private:
basegfx::B3DPoint aCenter;
diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx
index 95c7cad02e33..1bf7276a02cc 100644
--- a/include/svx/svdcrtv.hxx
+++ b/include/svx/svdcrtv.hxx
@@ -32,7 +32,7 @@ class SdrObjConnection;
class ImplConnectMarkerOverlay;
class ImpSdrCreateViewExtraData;
-class SVX_DLLPUBLIC SdrCreateView : public SdrDragView
+class SVXCORE_DLLPUBLIC SdrCreateView : public SdrDragView
{
friend class SdrPageView;
diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx
index d1fde32edda0..0deef29e4f10 100644
--- a/include/svx/svddrag.hxx
+++ b/include/svx/svddrag.hxx
@@ -43,7 +43,7 @@ struct SdrDragStatUserData
virtual ~SdrDragStatUserData() = 0;
};
-class SVX_DLLPUBLIC SdrDragStat final
+class SVXCORE_DLLPUBLIC SdrDragStat final
{
SdrHdl* pHdl; // The Handle for the User
SdrView* pView;
diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx
index 2698817b7790..43a8c7ef1ece 100644
--- a/include/svx/svddrgmt.hxx
+++ b/include/svx/svddrgmt.hxx
@@ -48,7 +48,7 @@ public:
};
-class SVX_DLLPUBLIC SdrDragEntryPolyPolygon final : public SdrDragEntry
+class SVXCORE_DLLPUBLIC SdrDragEntryPolyPolygon final : public SdrDragEntry
{
private:
basegfx::B2DPolyPolygon const maOriginalPolyPolygon;
@@ -112,7 +112,7 @@ public:
};
-class SVX_DLLPUBLIC SdrDragMethod
+class SVXCORE_DLLPUBLIC SdrDragMethod
{
private:
std::vector< std::unique_ptr<SdrDragEntry> > maSdrDragEntries;
@@ -226,7 +226,7 @@ inline const tools::Rectangle& SdrDragMethod::GetMarkedRect() const
// SdrDragMove
-class SVX_DLLPUBLIC SdrDragMove : public SdrDragMethod
+class SVXCORE_DLLPUBLIC SdrDragMove : public SdrDragMethod
{
private:
long nBestXSnap;
@@ -255,7 +255,7 @@ public:
// SdrDragResize
-class SVX_DLLPUBLIC SdrDragResize : public SdrDragMethod
+class SVXCORE_DLLPUBLIC SdrDragResize : public SdrDragMethod
{
protected:
Fraction aXFact;
@@ -277,7 +277,7 @@ public:
// SdrDragObjOwn
-class SVX_DLLPUBLIC SdrDragObjOwn : public SdrDragMethod
+class SVXCORE_DLLPUBLIC SdrDragObjOwn : public SdrDragMethod
{
private:
// SdrDragObjOwn always works on a clone since it has no transformation
diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx
index 2de2d23d0e26..654f010c7b3f 100644
--- a/include/svx/svddrgv.hxx
+++ b/include/svx/svddrgv.hxx
@@ -26,7 +26,7 @@
class SdrUndoGeoObj;
-class SVX_DLLPUBLIC SdrDragView : public SdrExchangeView
+class SVXCORE_DLLPUBLIC SdrDragView : public SdrExchangeView
{
friend class SdrPageView;
friend class SdrDragMethod;
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index 973a28cd1b9e..35236d6e2570 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -68,7 +68,7 @@ namespace o3tl
template<> struct typed_flags<SdrInsertFlags> : is_typed_flags<SdrInsertFlags, 0x0f> {};
}
-class SVX_DLLPUBLIC SdrEditView : public SdrMarkView
+class SVXCORE_DLLPUBLIC SdrEditView : public SdrMarkView
{
friend class SdrPageView;
friend class SdrDragDistort;
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index aab4e216feb9..f20863aecf69 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -58,7 +58,7 @@ enum class SdrEndTextEditKind
// - macromode
-class SVX_DLLPUBLIC SdrObjEditView : public SdrGlueEditView, public EditViewCallbacks
+class SVXCORE_DLLPUBLIC SdrObjEditView : public SdrGlueEditView, public EditViewCallbacks
{
friend class SdrPageView;
friend class ImpSdrEditPara;
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index 895fc9d95789..1cde7792fa1b 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -53,7 +53,7 @@ namespace com { namespace sun { namespace star { namespace lang {
* The resulting default font height, however, stays the same (the logical
* font height is converted).
*/
-SVX_DLLPUBLIC std::unique_ptr<SdrOutliner> SdrMakeOutliner(OutlinerMode nOutlinerMode, SdrModel& rMod);
+SVXCORE_DLLPUBLIC std::unique_ptr<SdrOutliner> SdrMakeOutliner(OutlinerMode nOutlinerMode, SdrModel& rMod);
/**
* Global default settings for the DrawingEngine.
@@ -88,7 +88,7 @@ class SfxItemSet;
*
* @returns false for XFILL_NONE and rCol remains unchanged
*/
-SVX_DLLPUBLIC bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol);
+SVXCORE_DLLPUBLIC bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol);
/**
@@ -108,7 +108,7 @@ std::unique_ptr<sal_uInt16[]> RemoveWhichRange(const sal_uInt16* pOldWhichTable,
* In order to break open Metafiles (sd/source/ui/dlg/brkdlg.cxx),
* SdrEditView::DoImportMarkedMtf() and ImpSdrGDIMetaFileImport::DoImport()
*/
-class SVX_DLLPUBLIC SvdProgressInfo
+class SVXCORE_DLLPUBLIC SvdProgressInfo
{
private:
size_t m_nSumCurAction; // Sum of all handled Actions
@@ -168,18 +168,18 @@ class OLEObjCache
public:
OLEObjCache();
- SVX_DLLPUBLIC ~OLEObjCache();
+ SVXCORE_DLLPUBLIC ~OLEObjCache();
void InsertObj(SdrOle2Obj* pObj);
void RemoveObj(SdrOle2Obj* pObj);
- SVX_DLLPUBLIC size_t size() const;
- SVX_DLLPUBLIC SdrOle2Obj* operator[](size_t nPos);
- SVX_DLLPUBLIC const SdrOle2Obj* operator[](size_t nPos) const;
+ SVXCORE_DLLPUBLIC size_t size() const;
+ SVXCORE_DLLPUBLIC SdrOle2Obj* operator[](size_t nPos);
+ SVXCORE_DLLPUBLIC const SdrOle2Obj* operator[](size_t nPos) const;
};
-class SVX_DLLPUBLIC SdrGlobalData
+class SVXCORE_DLLPUBLIC SdrGlobalData
{
const SvtSysLocale* pSysLocale; // follows always locale settings
const LocaleDataWrapper* pLocaleData; // follows always SysLocale
@@ -197,13 +197,13 @@ public:
OLEObjCache& GetOLEObjCache() { return aOLEObjCache; }
};
-SVX_DLLPUBLIC SdrGlobalData & GetSdrGlobalData();
+SVXCORE_DLLPUBLIC SdrGlobalData & GetSdrGlobalData();
// #i101872# isolated GetTextEditBackgroundColor for tooling
class SdrObjEditView;
-SVX_DLLPUBLIC Color GetTextEditBackgroundColor(const SdrObjEditView& rView);
+SVXCORE_DLLPUBLIC Color GetTextEditBackgroundColor(const SdrObjEditView& rView);
#endif // INCLUDED_SVX_SVDETC_HXX
diff --git a/include/svx/svdglev.hxx b/include/svx/svdglev.hxx
index e0261b7c0708..53dbef281786 100644
--- a/include/svx/svdglev.hxx
+++ b/include/svx/svdglev.hxx
@@ -29,7 +29,7 @@ class SdrGluePoint;
// Edit GluePoints at the objects (GluePoints for connector)
-class SVX_DLLPUBLIC SdrGlueEditView : public SdrPolyEditView
+class SVXCORE_DLLPUBLIC SdrGlueEditView : public SdrPolyEditView
{
// copy marked GluePoints and mark instead of the old ones
void ImpCopyMarkedGluePoints();
diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx
index 9efb73172db9..ab6d6760c085 100644
--- a/include/svx/svdglue.hxx
+++ b/include/svx/svdglue.hxx
@@ -65,7 +65,7 @@ namespace o3tl
template<> struct typed_flags<SdrAlign> : is_typed_flags<SdrAlign, 0x1313> {};
}
-class SVX_DLLPUBLIC SdrGluePoint {
+class SVXCORE_DLLPUBLIC SdrGluePoint {
// Reference Point is SdrObject::GetSnapRect().Center()
// bNoPercent=false: position is -5000..5000 (1/100)% or 0..10000 (depending on align)
// bNoPercent=true : position is in log unit, relative to the reference point
@@ -115,7 +115,7 @@ public:
#define SDRGLUEPOINT_NOTFOUND 0xFFFF
-class SVX_DLLPUBLIC SdrGluePointList {
+class SVXCORE_DLLPUBLIC SdrGluePointList {
std::vector<std::unique_ptr<SdrGluePoint>> aList;
public:
SdrGluePointList() {};
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index 2aaa3b7f7bc7..61a9aed78c62 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -127,7 +127,7 @@ enum class BitmapMarkerKind
};
-class SVX_DLLPUBLIC SdrHdl
+class SVXCORE_DLLPUBLIC SdrHdl
{
friend class SdrMarkView; // for the access to nObjHdlNum
friend class SdrHdlList;
@@ -252,7 +252,7 @@ public:
#define SDR_HANDLE_COLOR_SIZE_NORMAL Size(13, 13)
#define SDR_HANDLE_COLOR_SIZE_SELECTED Size(17, 17)
-class SVX_DLLPUBLIC SdrHdlColor final : public SdrHdl
+class SVXCORE_DLLPUBLIC SdrHdlColor final : public SdrHdl
{
// size of colr markers
Size aMarkerSize;
@@ -425,7 +425,7 @@ public:
};
-class SVX_DLLPUBLIC SdrHdlList
+class SVXCORE_DLLPUBLIC SdrHdlList
{
protected:
size_t mnFocusIndex;
@@ -485,7 +485,7 @@ public:
};
-class SVX_DLLPUBLIC SdrCropHdl final : public SdrHdl
+class SVXCORE_DLLPUBLIC SdrCropHdl final : public SdrHdl
{
public:
SdrCropHdl(
diff --git a/include/svx/svdhlpln.hxx b/include/svx/svdhlpln.hxx
index acbc98dc9384..aa850773c4e2 100644
--- a/include/svx/svdhlpln.hxx
+++ b/include/svx/svdhlpln.hxx
@@ -58,7 +58,7 @@ public:
#define SDRHELPLINE_NOTFOUND 0xFFFF
-class SVX_DLLPUBLIC SdrHelpLineList {
+class SVXCORE_DLLPUBLIC SdrHelpLineList {
std::vector<std::unique_ptr<SdrHelpLine>> aList;
public:
diff --git a/include/svx/svditer.hxx b/include/svx/svditer.hxx
index 6f64ccb31677..17dae03fd2fc 100644
--- a/include/svx/svditer.hxx
+++ b/include/svx/svditer.hxx
@@ -35,7 +35,7 @@ class SdrMarkList;
// SdrIterMode::DeepNoGroups : With recursive descent parser, Next() returns no group objects
enum class SdrIterMode { Flat, DeepWithGroups, DeepNoGroups };
-class SVX_DLLPUBLIC SdrObjListIter
+class SVXCORE_DLLPUBLIC SdrObjListIter
{
std::vector< const SdrObject* > maObjList;
size_t mnIndex;
diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx
index 2289efb32975..3a7fa8d45fa8 100644
--- a/include/svx/svdlayer.hxx
+++ b/include/svx/svdlayer.hxx
@@ -55,7 +55,7 @@
class SdrModel;
-class SVX_DLLPUBLIC SdrLayer
+class SVXCORE_DLLPUBLIC SdrLayer
{
friend class SdrLayerAdmin;
@@ -99,7 +99,7 @@ public:
#define SDRLAYERPOS_NOTFOUND 0xffff
// When Changing the layer data you currently have to set the Modify flag manually
-class SVX_DLLPUBLIC SdrLayerAdmin {
+class SVXCORE_DLLPUBLIC SdrLayerAdmin {
friend class SdrView;
friend class SdrModel;
friend class SdrPage;
diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx
index 1c0dd2af670a..e80c3573ab2c 100644
--- a/include/svx/svdmark.hxx
+++ b/include/svx/svdmark.hxx
@@ -40,7 +40,7 @@ typedef std::set<sal_uInt16> SdrUShortCont;
/**
* Everything a View needs to know about a selected object
*/
-class SVX_DLLPUBLIC SdrMark final : public sdr::ObjectUser
+class SVXCORE_DLLPUBLIC SdrMark final : public sdr::ObjectUser
{
sal_Int64 mnTimeStamp;
SdrObject* mpSelectedSdrObject; // the selected object
@@ -132,7 +132,7 @@ public:
}
};
-class SVX_DLLPUBLIC SdrMarkList final
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list