[Libreoffice-commits] core.git: 2 commits - chart2/source include/oox include/sfx2 include/svx include/vcl include/xmloff include/xmlscript oox/inc pyuno/inc reportdesign/inc sc/inc sc/source sd/inc sd/source svtools/inc svx/inc svx/source sw/inc vcl/inc vcl/win
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Fri Nov 22 19:32:31 UTC 2019
chart2/source/inc/OPropertySet.hxx | 2
include/oox/crypto/CryptTools.hxx | 4 -
include/oox/crypto/DocumentDecryption.hxx | 2
include/oox/crypto/DocumentEncryption.hxx | 2
include/oox/helper/binaryoutputstream.hxx | 4 -
include/oox/helper/binarystreambase.hxx | 2
include/oox/ole/vbaproject.hxx | 2
include/oox/vml/vmlformatting.hxx | 2
include/oox/vml/vmlshape.hxx | 2
include/sfx2/DocumentMetadataAccess.hxx | 2
include/sfx2/recentdocsview.hxx | 2
include/sfx2/sidebar/ControlFactory.hxx | 2
include/sfx2/sidebar/ControllerFactory.hxx | 2
include/sfx2/sidebar/Tools.hxx | 2
include/svx/ClassificationEditView.hxx | 2
include/svx/ColorSets.hxx | 2
include/svx/CommonStylePreviewRenderer.hxx | 2
include/svx/ParaSpacingControl.hxx | 4 -
include/svx/dbcharsethelper.hxx | 2
include/svx/dialcontrol.hxx | 2
include/svx/legacyitem.hxx | 18 ++---
include/svx/nbdtmg.hxx | 6 -
include/svx/sdr/contact/viewcontactofpageobj.hxx | 2
include/svx/sdr/contact/viewobjectcontactofpageobj.hxx | 2
include/svx/sdr/overlay/overlayobjectcell.hxx | 2
include/svx/sdr/overlay/overlaytriangle.hxx | 2
include/svx/sidebar/SidebarDialControl.hxx | 2
include/svx/svdotable.hxx | 2
include/svx/tbxcolorupdate.hxx | 2
include/vcl/font/Feature.hxx | 4 -
include/vcl/imagerepository.hxx | 2
include/vcl/mnemonicengine.hxx | 2
include/vcl/ppdparser.hxx | 6 -
include/xmloff/fasttokenhandler.hxx | 2
include/xmlscript/xml_helper.hxx | 2
oox/inc/drawingml/fillproperties.hxx | 2
oox/inc/drawingml/lineproperties.hxx | 2
pyuno/inc/pyuno.hxx | 2
reportdesign/inc/UndoActions.hxx | 16 ++---
sc/inc/NumberFormatControl.hxx | 2
sc/inc/formulagroup.hxx | 2
sc/inc/scopetools.hxx | 6 -
sc/inc/sortparam.hxx | 2
sc/source/ui/inc/datatransformation.hxx | 2
sd/inc/helper/simplereferencecomponent.hxx | 4 -
sd/inc/undo/undomanager.hxx | 2
sd/source/ui/inc/TemplateScanner.hxx | 3
sd/source/ui/inc/WindowUpdater.hxx | 5 -
sd/source/ui/inc/drawview.hxx | 2
svtools/inc/table/tablecontrol.hxx | 18 ++---
svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx | 2
svx/inc/sdr/contact/viewobjectcontactofgroup.hxx | 2
svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx | 22 +++----
svx/inc/sdr/overlay/overlayhandle.hxx | 2
svx/source/inc/formtoolbars.hxx | 2
sw/inc/calbck.hxx | 4 -
sw/inc/frmfmt.hxx | 18 ++---
sw/inc/legacyitem.hxx | 6 -
vcl/inc/BitmapScaleConvolutionFilter.hxx | 2
vcl/inc/font/OpenTypeFeatureDefinitonList.hxx | 2
vcl/inc/fontinstance.hxx | 1
vcl/inc/headless/CustomWidgetDraw.hxx | 2
vcl/inc/unx/printergfx.hxx | 4 -
vcl/inc/unx/wmadaptor.hxx | 2
vcl/inc/widgetdraw/WidgetDefinition.hxx | 2
vcl/inc/win/winlayout.hxx | 1
vcl/win/gdi/winlayout.cxx | 53 +++++++++++++++--
67 files changed, 171 insertions(+), 128 deletions(-)
New commits:
commit 90ea305110e5881256ba272800074a2a9f6b613d
Author: Noel Grandin <noel at peralex.com>
AuthorDate: Fri Nov 22 13:32:17 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Nov 22 20:31:37 2019 +0100
tdf#121740 cache font data to speed up PPT load
takes the load time from 24s to 21s for me.
The cache was determined experimentally for this document.
Change-Id: I34c78d1ff99cb8e72b274a201ded61d23e66941a
Reviewed-on: https://gerrit.libreoffice.org/83470
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/vcl/inc/fontinstance.hxx b/vcl/inc/fontinstance.hxx
index ed4d92e8ef57..b4d7da663090 100644
--- a/vcl/inc/fontinstance.hxx
+++ b/vcl/inc/fontinstance.hxx
@@ -71,6 +71,7 @@ public: // TODO: make data members private
const FontSelectPattern& GetFontSelectPattern() const { return m_aFontSelData; }
const PhysicalFontFace* GetFontFace() const { return m_pFontFace.get(); }
+ PhysicalFontFace* GetFontFace() { return m_pFontFace.get(); }
const ImplFontCache* GetFontCache() const { return mpFontCache; }
bool GetGlyphBoundRect(sal_GlyphId, tools::Rectangle&, bool) const;
diff --git a/vcl/inc/win/winlayout.hxx b/vcl/inc/win/winlayout.hxx
index 991c68f15b66..035998e2bcd9 100644
--- a/vcl/inc/win/winlayout.hxx
+++ b/vcl/inc/win/winlayout.hxx
@@ -164,6 +164,7 @@ public:
void SetHFONT(HFONT hFont) { m_hFont = hFont; }
const WinFontFace * GetFontFace() const { return static_cast<const WinFontFace *>(LogicalFontInstance::GetFontFace()); }
+ WinFontFace * GetFontFace() { return static_cast<WinFontFace *>(LogicalFontInstance::GetFontFace()); }
bool CacheGlyphToAtlas(HDC hDC, HFONT hFont, int nGlyphIndex, SalGraphics& rGraphics, const GenericSalLayout& rLayout);
OpenGLGlyphCache& GetOpenGLGlyphCache() { return maOpenGLGlyphCache; }
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index b67f191c0b47..9f4da1950245 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -1,3 +1,4 @@
+
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
@@ -44,6 +45,7 @@
#include <rtl/character.hxx>
+#include <boost/functional/hash.hpp>
#include <algorithm>
#include <shlwapi.h>
@@ -327,16 +329,53 @@ float WinFontInstance::getHScale() const
return nWidth / nHeight;
}
+struct BlobReference
+{
+ hb_blob_t* mpBlob;
+ BlobReference(hb_blob_t* pBlob) : mpBlob(pBlob)
+ {
+ hb_blob_reference(mpBlob);
+ }
+ BlobReference(BlobReference const & other)
+ : mpBlob(other.mpBlob)
+ {
+ hb_blob_reference(mpBlob);
+ }
+ ~BlobReference() { hb_blob_destroy(mpBlob); }
+};
+using BlobCacheKey = std::pair<rtl::Reference<PhysicalFontFace>, hb_tag_t>;
+struct BlobCacheKeyHash
+{
+ std::size_t operator()(BlobCacheKey const& rKey) const
+ {
+ std::size_t seed = 0;
+ boost::hash_combine(seed, rKey.first.get());
+ boost::hash_combine(seed, rKey.second);
+ return seed;
+ }
+};
+
static hb_blob_t* getFontTable(hb_face_t* /*face*/, hb_tag_t nTableTag, void* pUserData)
{
- sal_uLong nLength = 0;
- unsigned char* pBuffer = nullptr;
+ static o3tl::lru_map<BlobCacheKey, BlobReference, BlobCacheKeyHash> gCache(50);
+
WinFontInstance* pFont = static_cast<WinFontInstance*>(pUserData);
HDC hDC = pFont->GetGraphics()->getHDC();
HFONT hFont = pFont->GetHFONT();
assert(hDC);
assert(hFont);
+ BlobCacheKey cacheKey { rtl::Reference<PhysicalFontFace>(pFont->GetFontFace()), nTableTag };
+ auto it = gCache.find(cacheKey);
+ if (it != gCache.end())
+ {
+ hb_blob_reference(it->second.mpBlob);
+ return it->second.mpBlob;
+ }
+
+ sal_uLong nLength = 0;
+ unsigned char* pBuffer = nullptr;
+
HGDIOBJ hOrigFont = SelectObject(hDC, hFont);
nLength = ::GetFontData(hDC, OSL_NETDWORD(nTableTag), 0, nullptr, 0);
if (nLength > 0 && nLength != GDI_ERROR)
@@ -346,10 +385,14 @@ static hb_blob_t* getFontTable(hb_face_t* /*face*/, hb_tag_t nTableTag, void* pU
}
SelectObject(hDC, hOrigFont);
- hb_blob_t* pBlob = nullptr;
- if (pBuffer != nullptr)
- pBlob = hb_blob_create(reinterpret_cast<const char*>(pBuffer), nLength, HB_MEMORY_MODE_READONLY,
+ if (!pBuffer)
+ return nullptr;
+
+ hb_blob_t* pBlob = hb_blob_create(reinterpret_cast<const char*>(pBuffer), nLength, HB_MEMORY_MODE_READONLY,
pBuffer, [](void* data){ delete[] static_cast<unsigned char*>(data); });
+ if (!pBlob)
+ return pBlob;
+ gCache.insert({cacheKey, BlobReference(pBlob)});
return pBlob;
}
commit 5f520f757774db17ea4e33d34c724cf2af3adcba
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Nov 22 08:40:43 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Nov 22 20:31:27 2019 +0100
make some classes module-private
Change-Id: If7303a082e06f6937fca911c578a40475546cda2
Reviewed-on: https://gerrit.libreoffice.org/83442
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx
index 2ee1caa164c8..1fafa218a9bd 100644
--- a/chart2/source/inc/OPropertySet.hxx
+++ b/chart2/source/inc/OPropertySet.hxx
@@ -37,7 +37,7 @@ namespace property
namespace impl
{ class ImplOPropertySet; }
-class OOO_DLLPUBLIC_CHARTTOOLS OPropertySet :
+class OPropertySet :
public ::cppu::OBroadcastHelper,
// includes beans::XPropertySet, XMultiPropertySet and XFastPropertySet
public ::cppu::OPropertySetHelper,
diff --git a/include/oox/crypto/CryptTools.hxx b/include/oox/crypto/CryptTools.hxx
index 5bd7119c548c..8de3e7db933d 100644
--- a/include/oox/crypto/CryptTools.hxx
+++ b/include/oox/crypto/CryptTools.hxx
@@ -75,7 +75,7 @@ public:
virtual ~Crypto();
};
-class OOX_DLLPUBLIC Decrypt final : public Crypto
+class Decrypt final : public Crypto
{
public:
Decrypt(std::vector<sal_uInt8>& key, std::vector<sal_uInt8>& iv, CryptoType type);
@@ -93,7 +93,7 @@ public:
};
-class OOX_DLLPUBLIC Encrypt final : public Crypto
+class Encrypt final : public Crypto
{
public:
Encrypt(std::vector<sal_uInt8>& key, std::vector<sal_uInt8>& iv, CryptoType type);
diff --git a/include/oox/crypto/DocumentDecryption.hxx b/include/oox/crypto/DocumentDecryption.hxx
index e32667760c9f..10a971182c8b 100644
--- a/include/oox/crypto/DocumentDecryption.hxx
+++ b/include/oox/crypto/DocumentDecryption.hxx
@@ -32,7 +32,7 @@ namespace oox { namespace ole { class OleStorage; } }
namespace oox {
namespace core {
-class OOX_DLLPUBLIC DocumentDecryption
+class DocumentDecryption
{
private:
enum CryptoType
diff --git a/include/oox/crypto/DocumentEncryption.hxx b/include/oox/crypto/DocumentEncryption.hxx
index 944e6b06c910..36455c1b7af5 100644
--- a/include/oox/crypto/DocumentEncryption.hxx
+++ b/include/oox/crypto/DocumentEncryption.hxx
@@ -26,7 +26,7 @@ namespace oox { namespace ole { class OleStorage; } }
namespace oox {
namespace core {
-class OOX_DLLPUBLIC DocumentEncryption
+class DocumentEncryption
{
private:
css::uno::Reference< css::io::XStream > mxDocumentStream;
diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx
index 9ef49331e994..cf3a964de8bd 100644
--- a/include/oox/helper/binaryoutputstream.hxx
+++ b/include/oox/helper/binaryoutputstream.hxx
@@ -42,7 +42,7 @@ namespace oox {
The binary data in the stream is written in little-endian format.
*/
-class OOX_DLLPUBLIC BinaryOutputStream : public virtual BinaryStreamBase
+class BinaryOutputStream : public virtual BinaryStreamBase
{
public:
/** Derived classes implement writing the contents of the passed data
@@ -168,7 +168,7 @@ private:
construction, the stream points to the beginning of the passed data
sequence. The data sequence is expanded automatically while writing to it.
*/
-class OOX_DLLPUBLIC SequenceOutputStream final : public BinaryOutputStream
+class SequenceOutputStream final : public BinaryOutputStream
{
public:
/** Constructs the wrapper object for the passed data sequence.
diff --git a/include/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx
index 9868fc542400..f5302d470738 100644
--- a/include/oox/helper/binarystreambase.hxx
+++ b/include/oox/helper/binarystreambase.hxx
@@ -120,7 +120,7 @@ private:
/** Base class for binary input and output streams wrapping a UNO stream,
seekable via the com.sun.star.io.XSeekable interface.
*/
-class OOX_DLLPUBLIC BinaryXSeekableStream : public virtual BinaryStreamBase
+class BinaryXSeekableStream : public virtual BinaryStreamBase
{
public:
virtual ~BinaryXSeekableStream() override;
diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx
index 58199fc463f6..e72c356f1864 100644
--- a/include/oox/ole/vbaproject.hxx
+++ b/include/oox/ole/vbaproject.hxx
@@ -50,7 +50,7 @@ namespace ole {
class VbaModule;
-class OOX_DLLPUBLIC VbaFilterConfig
+class VbaFilterConfig
{
public:
explicit VbaFilterConfig(
diff --git a/include/oox/vml/vmlformatting.hxx b/include/oox/vml/vmlformatting.hxx
index 875f0ecbfd98..c024bec8bfef 100644
--- a/include/oox/vml/vmlformatting.hxx
+++ b/include/oox/vml/vmlformatting.hxx
@@ -250,7 +250,7 @@ struct OOX_DLLPUBLIC ShadowModel
};
/** The shadow model structure contains all shape textpath properties. */
-struct OOX_DLLPUBLIC TextpathModel
+struct TextpathModel
{
OptValue<OUString> moString; ///< Specifies the string of the textpath.
OptValue<OUString> moStyle; ///< Specifies the style of the textpath.
diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx
index dc4db50c27fe..5ec471299f3f 100644
--- a/include/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
@@ -58,7 +58,7 @@ const sal_Int32 VML_CLIENTDATA_FORMULA = 4;
/** The shape model structure contains all properties shared by all types of shapes. */
-struct OOX_DLLPUBLIC ShapeTypeModel
+struct ShapeTypeModel
{
OUString maShapeId; ///< Unique identifier of the shape.
OUString maLegacyId; ///< Plaintext identifier of the shape.
diff --git a/include/sfx2/DocumentMetadataAccess.hxx b/include/sfx2/DocumentMetadataAccess.hxx
index 5a8820875845..8e77f2831d25 100644
--- a/include/sfx2/DocumentMetadataAccess.hxx
+++ b/include/sfx2/DocumentMetadataAccess.hxx
@@ -72,7 +72,7 @@ createBaseURI(
struct DocumentMetadataAccess_Impl;
-class SFX2_DLLPUBLIC DocumentMetadataAccess final :
+class DocumentMetadataAccess final :
public cppu::WeakImplHelper<css::rdf::XDocumentMetadataAccess>
{
DocumentMetadataAccess(const DocumentMetadataAccess&) = delete;
diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx
index 9469aeec14ef..6eb48dddd47a 100644
--- a/include/sfx2/recentdocsview.hxx
+++ b/include/sfx2/recentdocsview.hxx
@@ -54,7 +54,7 @@ template<> struct typed_flags<sfx2::ApplicationType> : is_typed_flags<sfx2::Appl
namespace sfx2
{
-class SFX2_DLLPUBLIC RecentDocsView final : public ThumbnailView
+class RecentDocsView final : public ThumbnailView
{
public:
RecentDocsView( vcl::Window* pParent );
diff --git a/include/sfx2/sidebar/ControlFactory.hxx b/include/sfx2/sidebar/ControlFactory.hxx
index 42db1081b5c1..26ef4a7134e3 100644
--- a/include/sfx2/sidebar/ControlFactory.hxx
+++ b/include/sfx2/sidebar/ControlFactory.hxx
@@ -33,7 +33,7 @@ namespace sfx2 { namespace sidebar {
directly is that this way the sidebar has a little more control
over look and feel of its controls.
*/
-class SFX2_DLLPUBLIC ControlFactory
+class ControlFactory
{
public:
/** Create the menu button for the task bar.
diff --git a/include/sfx2/sidebar/ControllerFactory.hxx b/include/sfx2/sidebar/ControllerFactory.hxx
index 4dfff756415d..056271701110 100644
--- a/include/sfx2/sidebar/ControllerFactory.hxx
+++ b/include/sfx2/sidebar/ControllerFactory.hxx
@@ -33,7 +33,7 @@ namespace sfx2 { namespace sidebar {
/** Convenience class for the easy creation of toolbox controllers.
*/
-class SFX2_DLLPUBLIC ControllerFactory
+class ControllerFactory
{
public:
static css::uno::Reference<css::frame::XToolbarController> CreateToolBoxController(
diff --git a/include/sfx2/sidebar/Tools.hxx b/include/sfx2/sidebar/Tools.hxx
index 97b26c368dd9..3132553f5991 100644
--- a/include/sfx2/sidebar/Tools.hxx
+++ b/include/sfx2/sidebar/Tools.hxx
@@ -34,7 +34,7 @@ namespace com::sun::star::frame { class XFrame; }
namespace sfx2 { namespace sidebar {
-class SFX2_DLLPUBLIC Tools
+class Tools
{
public:
static Image GetImage (
diff --git a/include/svx/ClassificationEditView.hxx b/include/svx/ClassificationEditView.hxx
index 614b1d2b6a09..fbea139b9792 100644
--- a/include/svx/ClassificationEditView.hxx
+++ b/include/svx/ClassificationEditView.hxx
@@ -27,7 +27,7 @@ public:
virtual OUString CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, boost::optional<Color>& rTxtColor, boost::optional<Color>& rFldColor) override;
};
-class SVX_DLLPUBLIC ClassificationEditView final : public WeldEditView
+class ClassificationEditView final : public WeldEditView
{
public:
ClassificationEditView();
diff --git a/include/svx/ColorSets.hxx b/include/svx/ColorSets.hxx
index 4f2df5e81e23..8b97a35a11c0 100644
--- a/include/svx/ColorSets.hxx
+++ b/include/svx/ColorSets.hxx
@@ -21,7 +21,7 @@
namespace svx
{
-class SVX_DLLPUBLIC ColorSet
+class ColorSet
{
OUString maColorSetName;
std::vector<Color> maColors;
diff --git a/include/svx/CommonStylePreviewRenderer.hxx b/include/svx/CommonStylePreviewRenderer.hxx
index 0ba2108c88ef..5b742861134c 100644
--- a/include/svx/CommonStylePreviewRenderer.hxx
+++ b/include/svx/CommonStylePreviewRenderer.hxx
@@ -26,7 +26,7 @@ class SvxFont;
namespace svx
{
-class SVX_DLLPUBLIC CommonStylePreviewRenderer final : public sfx2::StylePreviewRenderer
+class CommonStylePreviewRenderer final : public sfx2::StylePreviewRenderer
{
std::unique_ptr<SvxFont> m_pFont;
Color maFontColor;
diff --git a/include/svx/ParaSpacingControl.hxx b/include/svx/ParaSpacingControl.hxx
index 4bb79ff6de92..401e8c8ddcbb 100644
--- a/include/svx/ParaSpacingControl.hxx
+++ b/include/svx/ParaSpacingControl.hxx
@@ -29,7 +29,7 @@ namespace vcl { class Window; }
namespace svx {
-class SVX_DLLPUBLIC ParaULSpacingControl : public SfxToolBoxControl
+class ParaULSpacingControl : public SfxToolBoxControl
{
public:
SFX_DECL_TOOLBOX_CONTROL();
@@ -60,7 +60,7 @@ public:
virtual VclPtr<vcl::Window> CreateItemWindow(vcl::Window* pParent) override;
};
-class SVX_DLLPUBLIC ParaLRSpacingControl : public SfxToolBoxControl,
+class ParaLRSpacingControl : public SfxToolBoxControl,
public css::ui::XContextChangeEventListener
{
public:
diff --git a/include/svx/dbcharsethelper.hxx b/include/svx/dbcharsethelper.hxx
index f3461212a2bf..91d7aa5f6e1f 100644
--- a/include/svx/dbcharsethelper.hxx
+++ b/include/svx/dbcharsethelper.hxx
@@ -31,7 +31,7 @@ namespace svxform { namespace charset_helper
/** enumerates all supported charsets
@return the number of charsets supported
*/
- SVX_DLLPUBLIC sal_Int32 getSupportedTextEncodings( ::std::vector< rtl_TextEncoding >& _rEncs );
+ sal_Int32 getSupportedTextEncodings( ::std::vector< rtl_TextEncoding >& _rEncs );
}
}
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index c1124f106388..00b9bb58aa36 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -74,7 +74,7 @@ private:
- Shows the value entered/modified in the numeric field.
- Enables/disables/shows/hides the field according to own state changes.
*/
-class SAL_WARN_UNUSED SVX_DLLPUBLIC DialControl : public Control
+class SAL_WARN_UNUSED DialControl : public Control
{
public:
explicit DialControl( vcl::Window* pParent, WinBits nBits );
diff --git a/include/svx/legacyitem.hxx b/include/svx/legacyitem.hxx
index e75d8186aefa..4a966122010c 100644
--- a/include/svx/legacyitem.hxx
+++ b/include/svx/legacyitem.hxx
@@ -37,21 +37,21 @@ namespace legacy
{
namespace SvxOrientation
{
- sal_uInt16 SVX_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion);
- void SVX_DLLPUBLIC Create(SvxOrientationItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
- SVX_DLLPUBLIC SvStream& Store(const SvxOrientationItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
+ sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion);
+ void Create(SvxOrientationItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
+ SvStream& Store(const SvxOrientationItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
}
namespace SvxMargin
{
- sal_uInt16 SVX_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion);
- void SVX_DLLPUBLIC Create(SvxMarginItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
- SVX_DLLPUBLIC SvStream& Store(const SvxMarginItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
+ sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion);
+ void Create(SvxMarginItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
+ SvStream& Store(const SvxMarginItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
}
namespace SvxRotateMode
{
- sal_uInt16 SVX_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion);
- void SVX_DLLPUBLIC Create(SvxRotateModeItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
- SVX_DLLPUBLIC SvStream& Store(const SvxRotateModeItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
+ sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion);
+ void Create(SvxRotateModeItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
+ SvStream& Store(const SvxRotateModeItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
}
}
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index 5322a39f2f36..963b14c25075 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -146,7 +146,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
};
-class SVX_DLLPUBLIC BulletsTypeMgr final : public NBOTypeMgrBase
+class BulletsTypeMgr final : public NBOTypeMgrBase
{
friend class OutlineTypeMgr;
friend class NumberingTypeMgr;
@@ -168,7 +168,7 @@ class SVX_DLLPUBLIC BulletsTypeMgr final : public NBOTypeMgrBase
};
-class SVX_DLLPUBLIC NumberingTypeMgr: public NBOTypeMgrBase
+class NumberingTypeMgr: public NBOTypeMgrBase
{
private:
NumberingTypeMgr(const NumberingTypeMgr&) = delete;
@@ -187,7 +187,7 @@ class SVX_DLLPUBLIC NumberingTypeMgr: public NBOTypeMgrBase
static NumberingTypeMgr& GetInstance();
};
-class SVX_DLLPUBLIC OutlineTypeMgr: public NBOTypeMgrBase
+class OutlineTypeMgr: public NBOTypeMgrBase
{
private:
OutlineTypeMgr(const OutlineTypeMgr&) = delete;
diff --git a/include/svx/sdr/contact/viewcontactofpageobj.hxx b/include/svx/sdr/contact/viewcontactofpageobj.hxx
index bb87ae187007..a339f1bcecdd 100644
--- a/include/svx/sdr/contact/viewcontactofpageobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofpageobj.hxx
@@ -28,7 +28,7 @@ class SdrPage;
namespace sdr { namespace contact {
-class SVX_DLLPUBLIC ViewContactOfPageObj final : public ViewContactOfSdrObj
+class ViewContactOfPageObj final : public ViewContactOfSdrObj
{
// Create an Object-Specific ViewObjectContact, set ViewContact and
// ObjectContact. Always needs to return something.
diff --git a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx
index 68559a1e2b8e..4af2540c0fd6 100644
--- a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx
@@ -29,7 +29,7 @@ namespace sdr { namespace contact {
class PagePrimitiveExtractor;
-class SVX_DLLPUBLIC ViewObjectContactOfPageObj final : public ViewObjectContactOfSdrObj
+class ViewObjectContactOfPageObj final : public ViewObjectContactOfSdrObj
{
private:
// the page painter helper
diff --git a/include/svx/sdr/overlay/overlayobjectcell.hxx b/include/svx/sdr/overlay/overlayobjectcell.hxx
index 711cc8bcfabc..050893ce907f 100644
--- a/include/svx/sdr/overlay/overlayobjectcell.hxx
+++ b/include/svx/sdr/overlay/overlayobjectcell.hxx
@@ -31,7 +31,7 @@ namespace sdr
{
// OverlayObjectCell - used for cell cursor, selection and AutoFill handle
- class SVX_DLLPUBLIC OverlayObjectCell final : public OverlayObject
+ class OverlayObjectCell final : public OverlayObject
{
public:
typedef ::std::vector< basegfx::B2DRange > RangeVector;
diff --git a/include/svx/sdr/overlay/overlaytriangle.hxx b/include/svx/sdr/overlay/overlaytriangle.hxx
index f13c507e6206..15fad54a705b 100644
--- a/include/svx/sdr/overlay/overlaytriangle.hxx
+++ b/include/svx/sdr/overlay/overlaytriangle.hxx
@@ -26,7 +26,7 @@ namespace sdr
{
namespace overlay
{
- class SVX_DLLPUBLIC OverlayTriangle final : public OverlayObjectWithBasePosition
+ class OverlayTriangle final : public OverlayObjectWithBasePosition
{
// second and third position in pixel
basegfx::B2DPoint const maSecondPosition;
diff --git a/include/svx/sidebar/SidebarDialControl.hxx b/include/svx/sidebar/SidebarDialControl.hxx
index 4362076236ed..e6c080e751c0 100644
--- a/include/svx/sidebar/SidebarDialControl.hxx
+++ b/include/svx/sidebar/SidebarDialControl.hxx
@@ -25,7 +25,7 @@ namespace svx { namespace sidebar {
/** Provide some improvements over the standard DialControl.
*/
-class SVX_DLLPUBLIC SidebarDialControl final : public svx::DialControl
+class SidebarDialControl final : public svx::DialControl
{
public:
SidebarDialControl (vcl::Window* pParent, WinBits nBits);
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index 0dab80d0c0d7..7965d84afd1d 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -72,7 +72,7 @@ struct CellPos
/// TableStyleSettings
-struct SVX_DLLPUBLIC TableStyleSettings
+struct TableStyleSettings
{
bool mbUseFirstRow;
bool mbUseLastRow;
diff --git a/include/svx/tbxcolorupdate.hxx b/include/svx/tbxcolorupdate.hxx
index ec7639bac3c7..e37f7f1f0e4d 100644
--- a/include/svx/tbxcolorupdate.hxx
+++ b/include/svx/tbxcolorupdate.hxx
@@ -42,7 +42,7 @@ namespace svx
formerly known as SvxTbxButtonColorUpdater_Impl, residing in svx/source/tbxctrls/colorwindow.hxx.
*/
- class SVX_DLLPUBLIC ToolboxButtonColorUpdater
+ class ToolboxButtonColorUpdater
{
public:
ToolboxButtonColorUpdater( sal_uInt16 nSlotId, sal_uInt16 nTbxBtnId, ToolBox* ptrTbx, bool bWideButton,
diff --git a/include/vcl/font/Feature.hxx b/include/vcl/font/Feature.hxx
index b56ce19ba194..a6d4587dcbce 100644
--- a/include/vcl/font/Feature.hxx
+++ b/include/vcl/font/Feature.hxx
@@ -93,7 +93,7 @@ struct VCL_DLLPUBLIC FeatureID
uint32_t m_aLanguageCode;
};
-struct VCL_DLLPUBLIC Feature
+struct Feature
{
Feature();
Feature(FeatureID const& rID, FeatureType eType);
@@ -105,7 +105,7 @@ struct VCL_DLLPUBLIC Feature
// This is basically duplicates hb_feature_t to avoid including HarfBuzz
// headers here, so the member types should remain compatible.
-struct VCL_DLLPUBLIC FeatureSetting
+struct FeatureSetting
{
FeatureSetting(OString feature);
diff --git a/include/vcl/imagerepository.hxx b/include/vcl/imagerepository.hxx
index 083a01667b9a..a1a28d3fa241 100644
--- a/include/vcl/imagerepository.hxx
+++ b/include/vcl/imagerepository.hxx
@@ -33,7 +33,7 @@ namespace vcl
//= ImageRepository
// provides access to the application's image repository (image.zip)
- class VCL_DLLPUBLIC ImageRepository
+ class ImageRepository
{
public:
/** loads an image from the application's image repository
diff --git a/include/vcl/mnemonicengine.hxx b/include/vcl/mnemonicengine.hxx
index 1574704158ed..45d05b5d0d3f 100644
--- a/include/vcl/mnemonicengine.hxx
+++ b/include/vcl/mnemonicengine.hxx
@@ -118,7 +118,7 @@ namespace vcl
//= MnemonicEngine
struct MnemonicEngine_Data;
- class VCL_DLLPUBLIC MnemonicEngine
+ class MnemonicEngine
{
::std::unique_ptr< MnemonicEngine_Data > m_pData;
diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx
index 71a17dcc70f5..2d0701c4a859 100644
--- a/include/vcl/ppdparser.hxx
+++ b/include/vcl/ppdparser.hxx
@@ -54,7 +54,7 @@ struct VCL_DLLPUBLIC PPDValue
* PPDKey - a container for the available options (=values) of a PPD keyword
*/
-class VCL_DLLPUBLIC PPDKey
+class PPDKey
{
friend class PPDParser;
friend class CPDManager;
@@ -110,7 +110,7 @@ struct PPDKeyhash
* PPDParser - parses a PPD file and contains all available keys from it
*/
-class VCL_DLLPUBLIC PPDParser
+class PPDParser
{
friend class PPDContext;
friend class CUPSManager;
@@ -224,7 +224,7 @@ public:
* contents of a PPDParser.
*/
-class VCL_DLLPUBLIC PPDContext
+class PPDContext
{
typedef std::unordered_map< const PPDKey*, const PPDValue*, PPDKeyhash > hash_type;
hash_type m_aCurrentValues;
diff --git a/include/xmloff/fasttokenhandler.hxx b/include/xmloff/fasttokenhandler.hxx
index cad4a5638933..613df97ae03d 100644
--- a/include/xmloff/fasttokenhandler.hxx
+++ b/include/xmloff/fasttokenhandler.hxx
@@ -69,7 +69,7 @@ private:
struct StaticTokenMap : public rtl::Static< TokenMap, StaticTokenMap > {};
-class XMLOFF_DLLPUBLIC FastTokenHandler final : public cppu::WeakImplHelper<
+class FastTokenHandler final : public cppu::WeakImplHelper<
css::xml::sax::XFastTokenHandler >,
public sax_fastparser::FastTokenHandlerBase
{
diff --git a/include/xmlscript/xml_helper.hxx b/include/xmlscript/xml_helper.hxx
index b5fde5dfb13a..75772d24c52f 100644
--- a/include/xmlscript/xml_helper.hxx
+++ b/include/xmlscript/xml_helper.hxx
@@ -39,7 +39,7 @@ namespace xmlscript
##################################################################################################*/
-class XMLSCRIPT_DLLPUBLIC XMLElement
+class XMLElement
: public cppu::WeakImplHelper< css::xml::sax::XAttributeList >
{
public:
diff --git a/oox/inc/drawingml/fillproperties.hxx b/oox/inc/drawingml/fillproperties.hxx
index 45f5c4b40272..f189a91344e8 100644
--- a/oox/inc/drawingml/fillproperties.hxx
+++ b/oox/inc/drawingml/fillproperties.hxx
@@ -126,7 +126,7 @@ struct BlipFillProperties
void assignUsed( const BlipFillProperties& rSourceProps );
};
-struct OOX_DLLPUBLIC FillProperties
+struct FillProperties
{
OptValue< sal_Int32 > moFillType; /// Fill type (OOXML token).
Color maFillColor; /// Solid fill color and transparence.
diff --git a/oox/inc/drawingml/lineproperties.hxx b/oox/inc/drawingml/lineproperties.hxx
index b0d27a278373..46be7b9bd0a2 100644
--- a/oox/inc/drawingml/lineproperties.hxx
+++ b/oox/inc/drawingml/lineproperties.hxx
@@ -49,7 +49,7 @@ struct LineArrowProperties
void assignUsed( const LineArrowProperties& rSourceProps );
};
-struct OOX_DLLPUBLIC LineProperties
+struct LineProperties
{
typedef ::std::pair< sal_Int32, sal_Int32 > DashStop;
typedef ::std::vector< DashStop > DashStopVector;
diff --git a/pyuno/inc/pyuno.hxx b/pyuno/inc/pyuno.hxx
index 39f5a0ed128f..9c621e71cffe 100644
--- a/pyuno/inc/pyuno.hxx
+++ b/pyuno/inc/pyuno.hxx
@@ -301,7 +301,7 @@ public:
@see PyThreadAttach
*/
-class LO_DLLPUBLIC_PYUNO PyThreadDetach
+class PyThreadDetach
{
PyThreadState *tstate;
PyThreadDetach ( const PyThreadDetach & ) = delete;
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index 4b52aeef31fb..cac660fc520c 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -52,7 +52,7 @@ namespace rptui
/** Helper class to allow std::mem_fun for SAL_CALL
*/
- class REPORTDESIGN_DLLPUBLIC OGroupHelper
+ class OGroupHelper
{
css::uno::Reference< css::report::XGroup > m_xGroup;
OGroupHelper(const OGroupHelper&) = delete;
@@ -75,7 +75,7 @@ namespace rptui
/** Helper class to allow std::mem_fun for SAL_CALL
*/
- class REPORTDESIGN_DLLPUBLIC OReportHelper
+ class OReportHelper
{
css::uno::Reference< css::report::XReportDefinition > m_xReport;
public:
@@ -159,7 +159,7 @@ namespace rptui
// OUndoContainerAction
- class REPORTDESIGN_DLLPUBLIC OUndoContainerAction: public OCommentUndoAction
+ class OUndoContainerAction: public OCommentUndoAction
{
OUndoContainerAction(OUndoContainerAction const &) = delete;
void operator =(OUndoContainerAction const &) = delete;
@@ -191,7 +191,7 @@ namespace rptui
// OUndoReportSectionAction
- class REPORTDESIGN_DLLPUBLIC OUndoReportSectionAction : public OUndoContainerAction
+ class OUndoReportSectionAction : public OUndoContainerAction
{
OReportHelper m_aReportHelper;
::std::function<css::uno::Reference< css::report::XSection >(OReportHelper *)> m_pMemberFunction;
@@ -210,7 +210,7 @@ namespace rptui
// OUndoGroupSectionAction
- class REPORTDESIGN_DLLPUBLIC OUndoGroupSectionAction : public OUndoContainerAction
+ class OUndoGroupSectionAction : public OUndoContainerAction
{
OGroupHelper m_aGroupHelper;
::std::function<css::uno::Reference< css::report::XSection >(OGroupHelper *)> m_pMemberFunction;
@@ -228,7 +228,7 @@ namespace rptui
};
// ORptUndoPropertyAction
- class REPORTDESIGN_DLLPUBLIC ORptUndoPropertyAction: public OCommentUndoAction
+ class ORptUndoPropertyAction: public OCommentUndoAction
{
css::uno::Reference< css::beans::XPropertySet> m_xObj;
OUString const m_aPropertyName;
@@ -255,7 +255,7 @@ namespace rptui
// OUndoPropertyReportSectionAction
- class REPORTDESIGN_DLLPUBLIC OUndoPropertyReportSectionAction : public ORptUndoPropertyAction
+ class OUndoPropertyReportSectionAction : public ORptUndoPropertyAction
{
OReportHelper m_aReportHelper;
::std::function<css::uno::Reference< css::report::XSection >(OReportHelper *)> m_pMemberFunction;
@@ -272,7 +272,7 @@ namespace rptui
// OUndoPropertyGroupSectionAction
- class REPORTDESIGN_DLLPUBLIC OUndoPropertyGroupSectionAction : public ORptUndoPropertyAction
+ class OUndoPropertyGroupSectionAction : public ORptUndoPropertyAction
{
OGroupHelper m_aGroupHelper;
::std::function<css::uno::Reference< css::report::XSection >(OGroupHelper *)> m_pMemberFunction;
diff --git a/sc/inc/NumberFormatControl.hxx b/sc/inc/NumberFormatControl.hxx
index 84db53607090..e2c8712b7032 100644
--- a/sc/inc/NumberFormatControl.hxx
+++ b/sc/inc/NumberFormatControl.hxx
@@ -25,7 +25,7 @@
namespace sc {
-class SC_DLLPUBLIC ScNumberFormatControl final : public SfxToolBoxControl
+class ScNumberFormatControl final : public SfxToolBoxControl
{
public:
SFX_DECL_TOOLBOX_CONTROL();
diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx
index 8cdc97818d0c..7f16ab3f64b7 100644
--- a/sc/inc/formulagroup.hxx
+++ b/sc/inc/formulagroup.hxx
@@ -108,7 +108,7 @@ struct FormulaGroupContext
/**
* Abstract base class for a "compiled" formula
*/
-class SC_DLLPUBLIC CompiledFormula
+class CompiledFormula
{
public:
CompiledFormula();
diff --git a/sc/inc/scopetools.hxx b/sc/inc/scopetools.hxx
index aa48cf7ebf95..571b1fce52f5 100644
--- a/sc/inc/scopetools.hxx
+++ b/sc/inc/scopetools.hxx
@@ -29,7 +29,7 @@ public:
~AutoCalcSwitch();
};
-class SC_DLLPUBLIC ExpandRefsSwitch
+class ExpandRefsSwitch
{
ScDocument& mrDoc;
bool const mbOldValue;
@@ -47,7 +47,7 @@ public:
~UndoSwitch();
};
-class SC_DLLPUBLIC IdleSwitch
+class IdleSwitch
{
ScDocument& mrDoc;
bool const mbOldValue;
@@ -57,7 +57,7 @@ public:
};
/// Wrapper for ScDocument::DelayFormulaGrouping()
-class SC_DLLPUBLIC DelayFormulaGroupingSwitch
+class DelayFormulaGroupingSwitch
{
ScDocument& mrDoc;
bool const mbOldValue;
diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx
index 58f6b38e7db1..eb927e87b870 100644
--- a/sc/inc/sortparam.hxx
+++ b/sc/inc/sortparam.hxx
@@ -81,7 +81,7 @@ struct SC_DLLPUBLIC ScSortParam
namespace sc {
-struct SC_DLLPUBLIC ReorderParam
+struct ReorderParam
{
/**
* This sort range already takes into account the presence or absence of
diff --git a/sc/source/ui/inc/datatransformation.hxx b/sc/source/ui/inc/datatransformation.hxx
index 9fa167d50289..b99d2c10c7cb 100644
--- a/sc/source/ui/inc/datatransformation.hxx
+++ b/sc/source/ui/inc/datatransformation.hxx
@@ -101,7 +101,7 @@ public:
const std::set<SCCOL> & getColumns() const;
};
-class SC_DLLPUBLIC SortTransformation : public DataTransformation
+class SortTransformation : public DataTransformation
{
ScSortParam const maSortParam;
public:
diff --git a/sd/inc/helper/simplereferencecomponent.hxx b/sd/inc/helper/simplereferencecomponent.hxx
index 759e1c70b2f1..53ad24a9ef6a 100644
--- a/sd/inc/helper/simplereferencecomponent.hxx
+++ b/sd/inc/helper/simplereferencecomponent.hxx
@@ -41,8 +41,8 @@ public:
the total number of calls to release() by a platform dependent amount
(which, hopefully, is quite large).
*/
- SD_DLLPUBLIC void acquire();
- SD_DLLPUBLIC void release();
+ void acquire();
+ void release();
void Dispose();
diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx
index bed4f0f798f0..57df73cd193a 100644
--- a/sd/inc/undo/undomanager.hxx
+++ b/sd/inc/undo/undomanager.hxx
@@ -26,7 +26,7 @@
namespace sd
{
-class SD_DLLPUBLIC UndoManager final : public SdrUndoManager
+class UndoManager final : public SdrUndoManager
{
public:
UndoManager();
diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx
index 552159e0b89a..4a73c6d09842 100644
--- a/sd/source/ui/inc/TemplateScanner.hxx
+++ b/sd/source/ui/inc/TemplateScanner.hxx
@@ -62,8 +62,7 @@ public:
supported format) last. When a step does not add a new template then
the value of the previous step is returned.
*/
-class SD_DLLPUBLIC TemplateScanner
- : public ::sd::tools::AsynchronousTask
+class TemplateScanner : public ::sd::tools::AsynchronousTask
{
public:
/** Create a new template scanner and prepare but do not execute the scanning.
diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx
index c244624cd60c..a9d5947a9939 100644
--- a/sd/source/ui/inc/WindowUpdater.hxx
+++ b/sd/source/ui/inc/WindowUpdater.hxx
@@ -47,8 +47,7 @@ namespace sd {
<member>RegisterWindow()</member> method. When a document is given then
this document is reformatted when the monitored option changes.</p>
*/
-class SD_DLLPUBLIC WindowUpdater
- : public utl::ConfigurationListener
+class WindowUpdater : public utl::ConfigurationListener
{
public:
explicit WindowUpdater();
@@ -115,7 +114,7 @@ private:
The output device to update. When it is <null/> then the call
is ignored.
*/
- SAL_DLLPRIVATE void UpdateWindow (OutputDevice* pDevice) const;
+ void UpdateWindow (OutputDevice* pDevice) const;
};
} // end of namespace sd
diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx
index 2d41de1af250..34360c61c772 100644
--- a/sd/source/ui/inc/drawview.hxx
+++ b/sd/source/ui/inc/drawview.hxx
@@ -30,7 +30,7 @@ class DrawViewShell;
/**
* Derivative of ::sd::View; contains also a pointer to the document
*/
-class SD_DLLPUBLIC DrawView : public ::sd::View
+class DrawView : public ::sd::View
{
public:
diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx
index 41b1491af34c..ec33b1ce1dd1 100644
--- a/svtools/inc/table/tablecontrol.hxx
+++ b/svtools/inc/table/tablecontrol.hxx
@@ -52,7 +52,7 @@ namespace svt { namespace table
cell).
The control supports accessibility, this is encapsulated in IAccessibleTable
*/
- class SVT_DLLPUBLIC TableControl : public Control, public vcl::table::IAccessibleTable
+ class TableControl : public Control, public vcl::table::IAccessibleTable
{
private:
std::shared_ptr<TableControl_Impl> m_pImpl;
@@ -97,7 +97,7 @@ namespace svt { namespace table
*/
void GoTo( ColPos _nColumnPos, RowPos _nRow);
- SVT_DLLPRIVATE virtual void Resize() override;
+ virtual void Resize() override;
void Select();
/**after removing a row, updates the vector which contains the selected rows
@@ -113,12 +113,12 @@ namespace svt { namespace table
virtual void StateChanged( StateChangedType i_nStateChange ) override;
/** Creates and returns the accessible object of the whole GridControl. */
- SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
- SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex ) override;
- SVT_DLLPRIVATE virtual OUString GetAccessibleObjectName(vcl::table::AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const override;
- SVT_DLLPRIVATE virtual void GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow ) override;
- SVT_DLLPRIVATE virtual OUString GetAccessibleObjectDescription(vcl::table::AccessibleTableControlObjType eObjType) const override;
- SVT_DLLPRIVATE virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet, vcl::table::AccessibleTableControlObjType eObjType ) const override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex ) override;
+ virtual OUString GetAccessibleObjectName(vcl::table::AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const override;
+ virtual void GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow ) override;
+ virtual OUString GetAccessibleObjectDescription(vcl::table::AccessibleTableControlObjType eObjType) const override;
+ virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet, vcl::table::AccessibleTableControlObjType eObjType ) const override;
// temporary methods
// Those do not really belong into the public API - they're intended for firing A11Y-related events. However,
@@ -160,7 +160,7 @@ namespace svt { namespace table
private:
- DECL_DLLPRIVATE_LINK( ImplSelectHdl, LinkParamNone*, void );
+ DECL_LINK( ImplSelectHdl, LinkParamNone*, void );
private:
TableControl( const TableControl& ) = delete;
diff --git a/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx b/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx
index f30603be9959..fb4198fc5509 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx
@@ -28,7 +28,7 @@ namespace sdr
{
namespace contact
{
- class SVX_DLLPUBLIC ViewObjectContactOfE3dScene : public ViewObjectContactOfSdrObj
+ class ViewObjectContactOfE3dScene : public ViewObjectContactOfSdrObj
{
protected:
// 2d primitive creator
diff --git a/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx b/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx
index af2dd6644998..04d8d49209c9 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx
@@ -26,7 +26,7 @@ namespace sdr
{
namespace contact
{
- class SVX_DLLPUBLIC ViewObjectContactOfGroup : public ViewObjectContactOfSdrObj
+ class ViewObjectContactOfGroup : public ViewObjectContactOfSdrObj
{
public:
// basic constructor.
diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx
index e267b6179467..db8e0b33aed9 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx
@@ -28,7 +28,7 @@ namespace sdr
{
namespace contact
{
- class SVX_DLLPUBLIC ViewObjectContactOfPageSubObject : public ViewObjectContact
+ class ViewObjectContactOfPageSubObject : public ViewObjectContact
{
protected:
const SdrPage& getPage() const;
@@ -47,7 +47,7 @@ namespace sdr
{
namespace contact
{
- class SVX_DLLPUBLIC ViewObjectContactOfPageBackground : public ViewObjectContactOfPageSubObject
+ class ViewObjectContactOfPageBackground : public ViewObjectContactOfPageSubObject
{
protected:
virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override;
@@ -65,7 +65,7 @@ namespace sdr
{
namespace contact
{
- class SVX_DLLPUBLIC ViewObjectContactOfMasterPage : public ViewObjectContactOfPageSubObject
+ class ViewObjectContactOfMasterPage : public ViewObjectContactOfPageSubObject
{
protected:
public:
@@ -81,7 +81,7 @@ namespace sdr
{
namespace contact
{
- class SVX_DLLPUBLIC ViewObjectContactOfPageFill : public ViewObjectContactOfPageSubObject
+ class ViewObjectContactOfPageFill : public ViewObjectContactOfPageSubObject
{
protected:
virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override;
@@ -99,7 +99,7 @@ namespace sdr
{
namespace contact
{
- class SVX_DLLPUBLIC ViewObjectContactOfPageShadow : public ViewObjectContactOfPageSubObject
+ class ViewObjectContactOfPageShadow : public ViewObjectContactOfPageSubObject
{
public:
ViewObjectContactOfPageShadow(ObjectContact& rObjectContact, ViewContact& rViewContact);
@@ -114,7 +114,7 @@ namespace sdr
{
namespace contact
{
- class SVX_DLLPUBLIC ViewObjectContactOfOuterPageBorder : public ViewObjectContactOfPageSubObject
+ class ViewObjectContactOfOuterPageBorder : public ViewObjectContactOfPageSubObject
{
public:
ViewObjectContactOfOuterPageBorder(ObjectContact& rObjectContact, ViewContact& rViewContact);
@@ -129,7 +129,7 @@ namespace sdr
{
namespace contact
{
- class SVX_DLLPUBLIC ViewObjectContactOfInnerPageBorder : public ViewObjectContactOfPageSubObject
+ class ViewObjectContactOfInnerPageBorder : public ViewObjectContactOfPageSubObject
{
public:
ViewObjectContactOfInnerPageBorder(ObjectContact& rObjectContact, ViewContact& rViewContact);
@@ -144,7 +144,7 @@ namespace sdr
{
namespace contact
{
- class SVX_DLLPUBLIC ViewObjectContactOfPageHierarchy : public ViewObjectContactOfPageSubObject
+ class ViewObjectContactOfPageHierarchy : public ViewObjectContactOfPageSubObject
{
public:
ViewObjectContactOfPageHierarchy(ObjectContact& rObjectContact, ViewContact& rViewContact);
@@ -159,7 +159,7 @@ namespace sdr
{
namespace contact
{
- class SVX_DLLPUBLIC ViewObjectContactOfPageGrid : public ViewObjectContactOfPageSubObject
+ class ViewObjectContactOfPageGrid : public ViewObjectContactOfPageSubObject
{
protected:
virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override;
@@ -177,7 +177,7 @@ namespace sdr
{
namespace contact
{
- class SVX_DLLPUBLIC ViewObjectContactOfPageHelplines : public ViewObjectContactOfPageSubObject
+ class ViewObjectContactOfPageHelplines : public ViewObjectContactOfPageSubObject
{
protected:
virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override;
@@ -195,7 +195,7 @@ namespace sdr
{
namespace contact
{
- class SVX_DLLPUBLIC ViewObjectContactOfSdrPage : public ViewObjectContact
+ class ViewObjectContactOfSdrPage : public ViewObjectContact
{
public:
ViewObjectContactOfSdrPage(ObjectContact& rObjectContact, ViewContact& rViewContact);
diff --git a/svx/inc/sdr/overlay/overlayhandle.hxx b/svx/inc/sdr/overlay/overlayhandle.hxx
index d6f50d8ae22f..4d86f2bfc000 100644
--- a/svx/inc/sdr/overlay/overlayhandle.hxx
+++ b/svx/inc/sdr/overlay/overlayhandle.hxx
@@ -17,7 +17,7 @@
namespace sdr { namespace overlay {
-class SVX_DLLPUBLIC OverlayHandle final : public OverlayObjectWithBasePosition
+class OverlayHandle final : public OverlayObjectWithBasePosition
{
basegfx::B2DSize const maSize;
Color const maStrokeColor;
diff --git a/svx/source/inc/formtoolbars.hxx b/svx/source/inc/formtoolbars.hxx
index 9887404aa999..4f48646b59cf 100644
--- a/svx/source/inc/formtoolbars.hxx
+++ b/svx/source/inc/formtoolbars.hxx
@@ -36,7 +36,7 @@ namespace svxform
@param _rxFrame
the frame to analyze
*/
- SVX_DLLPUBLIC FormToolboxes(
+ FormToolboxes(
const css::uno::Reference< css::frame::XFrame >& _rxFrame
);
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 57eeac3ca535..f8596caddc27 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -60,14 +60,14 @@ class SfxPoolItem;
namespace sw
{
class ClientIteratorBase;
- struct SW_DLLPUBLIC LegacyModifyHint final: SfxHint
+ struct LegacyModifyHint final: SfxHint
{
LegacyModifyHint(const SfxPoolItem* pOld, const SfxPoolItem* pNew) : m_pOld(pOld), m_pNew(pNew) {};
virtual ~LegacyModifyHint() override;
const SfxPoolItem* m_pOld;
const SfxPoolItem* m_pNew;
};
- struct SW_DLLPUBLIC ModifyChangedHint final: SfxHint
+ struct ModifyChangedHint final: SfxHint
{
ModifyChangedHint(const SwModify* pNew) : m_pNew(pNew) {};
virtual ~ModifyChangedHint() override;
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 4bfd5268d251..193bb64e03bd 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -266,25 +266,25 @@ namespace sw
DELETE_FRAMES,
POST_RESTORE_FLY_ANCHOR,
};
- struct SW_DLLPUBLIC DrawFrameFormatHint final: SfxHint
+ struct DrawFrameFormatHint final: SfxHint
{
DrawFrameFormatHintId const m_eId;
DrawFrameFormatHint(DrawFrameFormatHintId eId) : m_eId(eId) {};
virtual ~DrawFrameFormatHint() override;
};
- struct SW_DLLPUBLIC CheckDrawFrameFormatLayerHint final: SfxHint
+ struct CheckDrawFrameFormatLayerHint final: SfxHint
{
bool* m_bCheckControlLayer;
CheckDrawFrameFormatLayerHint(bool* bCheckControlLayer) : m_bCheckControlLayer(bCheckControlLayer) {};
virtual ~CheckDrawFrameFormatLayerHint() override;
};
- struct SW_DLLPUBLIC ContactChangedHint final: SfxHint
+ struct ContactChangedHint final: SfxHint
{
SdrObject** m_ppObject;
ContactChangedHint(SdrObject** ppObject) : m_ppObject(ppObject) {};
virtual ~ContactChangedHint() override;
};
- struct SW_DLLPUBLIC DrawFormatLayoutCopyHint final : SfxHint
+ struct DrawFormatLayoutCopyHint final : SfxHint
{
SwDrawFrameFormat& m_rDestFormat;
SwDoc& m_rDestDoc;
@@ -314,31 +314,31 @@ namespace sw
WW8AnchorConvHint(WW8AnchorConvResult& rResult) : m_rResult(rResult) {};
virtual ~WW8AnchorConvHint() override;
};
- struct SW_DLLPUBLIC RestoreFlyAnchorHint final : SfxHint
+ struct RestoreFlyAnchorHint final : SfxHint
{
const Point m_aPos;
RestoreFlyAnchorHint(Point aPos) : m_aPos(aPos) {};
virtual ~RestoreFlyAnchorHint() override;
};
- struct SW_DLLPUBLIC CreatePortionHint final : SfxHint
+ struct CreatePortionHint final : SfxHint
{
SwDrawContact** m_ppContact;
CreatePortionHint(SwDrawContact** ppContact) : m_ppContact(ppContact) {};
virtual ~CreatePortionHint() override;
};
- struct SW_DLLPUBLIC CollectTextObjectsHint final : SfxHint
+ struct CollectTextObjectsHint final : SfxHint
{
std::list<SdrTextObj*>& m_rTextObjects;
CollectTextObjectsHint(std::list<SdrTextObj*>& rTextObjects) : m_rTextObjects(rTextObjects) {};
virtual ~CollectTextObjectsHint() override;
};
- struct SW_DLLPUBLIC GetZOrderHint final : SfxHint
+ struct GetZOrderHint final : SfxHint
{
sal_uInt32& m_rnZOrder;
GetZOrderHint(sal_uInt32& rnZOrder) : m_rnZOrder(rnZOrder) {};
virtual ~GetZOrderHint() override;
};
- struct SW_DLLPUBLIC GetObjectConnectedHint final : SfxHint
+ struct GetObjectConnectedHint final : SfxHint
{
bool& m_risConnected;
const SwRootFrame* m_pRoot;
diff --git a/sw/inc/legacyitem.hxx b/sw/inc/legacyitem.hxx
index 6df864b9de58..de7764b6c38f 100644
--- a/sw/inc/legacyitem.hxx
+++ b/sw/inc/legacyitem.hxx
@@ -33,9 +33,9 @@ namespace legacy
{
namespace SwFormatVert
{
- sal_uInt16 SW_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion);
- void SW_DLLPUBLIC Create(SwFormatVertOrient& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
- SW_DLLPUBLIC SvStream& Store(const SwFormatVertOrient& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
+ sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion);
+ void Create(SwFormatVertOrient& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
+ SvStream& Store(const SwFormatVertOrient& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
}
}
diff --git a/vcl/inc/BitmapScaleConvolutionFilter.hxx b/vcl/inc/BitmapScaleConvolutionFilter.hxx
index 74dc4b7844ad..3c5bdcb8a8fb 100644
--- a/vcl/inc/BitmapScaleConvolutionFilter.hxx
+++ b/vcl/inc/BitmapScaleConvolutionFilter.hxx
@@ -26,7 +26,7 @@
namespace vcl
{
-class VCL_DLLPUBLIC BitmapScaleConvolutionFilter : public BitmapFilter
+class BitmapScaleConvolutionFilter : public BitmapFilter
{
protected:
BitmapScaleConvolutionFilter(const double& rScaleX, const double& rScaleY, std::unique_ptr<Kernel> pKernel)
diff --git a/vcl/inc/font/OpenTypeFeatureDefinitonList.hxx b/vcl/inc/font/OpenTypeFeatureDefinitonList.hxx
index 693c3e59641b..f587887427ed 100644
--- a/vcl/inc/font/OpenTypeFeatureDefinitonList.hxx
+++ b/vcl/inc/font/OpenTypeFeatureDefinitonList.hxx
@@ -20,7 +20,7 @@ namespace vcl
{
namespace font
{
-class VCL_DLLPUBLIC OpenTypeFeatureDefinitonListPrivate
+class OpenTypeFeatureDefinitonListPrivate
{
private:
std::vector<FeatureDefinition> m_aFeatureDefinition;
diff --git a/vcl/inc/headless/CustomWidgetDraw.hxx b/vcl/inc/headless/CustomWidgetDraw.hxx
index 7abd8445ddbe..0f1171aae960 100644
--- a/vcl/inc/headless/CustomWidgetDraw.hxx
+++ b/vcl/inc/headless/CustomWidgetDraw.hxx
@@ -19,7 +19,7 @@
namespace vcl
{
-class VCL_DLLPUBLIC CustomWidgetDraw : public vcl::WidgetDrawInterface
+class CustomWidgetDraw : public vcl::WidgetDrawInterface
{
private:
static WidgetThemeLibrary* s_pWidgetImplementation;
diff --git a/vcl/inc/unx/printergfx.hxx b/vcl/inc/unx/printergfx.hxx
index 10d83546c49e..d093e94a9d58 100644
--- a/vcl/inc/unx/printergfx.hxx
+++ b/vcl/inc/unx/printergfx.hxx
@@ -117,7 +117,7 @@ struct CharacterMetric;
* vcl/unx/source/gdi/salgdi2.cxx
*/
-class VCL_DLLPUBLIC PrinterBmp
+class PrinterBmp
{
public:
@@ -155,7 +155,7 @@ struct GraphicsStatus
GraphicsStatus();
};
-class VCL_DLLPUBLIC PrinterGfx
+class PrinterGfx
{
private:
diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx
index 7df7ca25cd19..797d312faced 100644
--- a/vcl/inc/unx/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
@@ -34,7 +34,7 @@ class X11SalFrame;
namespace vcl_sal {
-class VCLPLUG_GEN_PUBLIC WMAdaptor
+class WMAdaptor
{
public:
enum WMAtom {
diff --git a/vcl/inc/widgetdraw/WidgetDefinition.hxx b/vcl/inc/widgetdraw/WidgetDefinition.hxx
index 50a853a6c1a6..d1fdcb2492cf 100644
--- a/vcl/inc/widgetdraw/WidgetDefinition.hxx
+++ b/vcl/inc/widgetdraw/WidgetDefinition.hxx
@@ -155,7 +155,7 @@ template <> struct VCL_DLLPUBLIC hash<vcl::ControlTypeAndPart>
namespace vcl
{
-class VCL_DLLPUBLIC WidgetDefinitionState
+class WidgetDefinitionState
{
public:
OString msEnabled;
More information about the Libreoffice-commits
mailing list