[Libreoffice-commits] core.git: include/svx

[Stephan Bergmann (via logerrit)]

 include/svx/sdasitm.hxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b77600c02097852675503bb63cce00d4b2756af4
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Feb 3 13:22:29 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Feb 3 15:11:38 2020 +0100

    There should be no need to mark nested PropertyPairHash as SVXCORE_DLLPUBLIC
    
    For one, the surrounding class SdrCustomShapeGeometryItem is already marked
    SVXCORE_DLLPUBLIC (whether or not that impacts the default export status of the
    nested struct on the various platforms, though).  And, for another, the struct
    only has inline members (which should make the previous point moot).
    
    Also, to be on the safe side, mark the PropertyPairHash member function as
    inline already on its first declaration.
    
    (This is a follow-up to ff546a5dd35d6a31f01c70a9b995afc1f7b7389e "tdf#128302:
    Split SVXCORE_DLLPUBLIC from SVX_DLLPUBLIC".)
    
    Change-Id: I6716a589060d816ca822583711d0e559ea114fb7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87865
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx
index 83ad600722a3..e8db1996a9c8 100644
--- a/include/svx/sdasitm.hxx
+++ b/include/svx/sdasitm.hxx
@@ -36,9 +36,9 @@ public:
     typedef std::pair < const OUString, const OUString > PropertyPair;
 
 private:
-    struct SVXCORE_DLLPUBLIC PropertyPairHash
+    struct PropertyPairHash
     {
-        size_t operator()( const SdrCustomShapeGeometryItem::PropertyPair& ) const;
+        inline size_t operator()( const SdrCustomShapeGeometryItem::PropertyPair& ) const;
     };
     typedef std::unordered_map <PropertyPair, sal_Int32, PropertyPairHash> PropertyPairHashMap;
     typedef std::unordered_map<OUString, sal_Int32> PropertyHashMap;
@@ -86,7 +86,7 @@ inline SdrOnOffItem makeSdrTextWordWrapItem( bool bAuto ) {
 
 // some useful inline methods
 
-inline size_t SdrCustomShapeGeometryItem::PropertyPairHash::operator()( const SdrCustomShapeGeometryItem::PropertyPair &r1 ) const
+size_t SdrCustomShapeGeometryItem::PropertyPairHash::operator()( const SdrCustomShapeGeometryItem::PropertyPair &r1 ) const
 {
     size_t hash = 17;
     hash = hash * 37 + r1.first.hashCode();