commit 315e585f283e6e4a5f1ac11e7d17a638d04e82b0
author Noel Grandin <noel.grandin@collabora.co.uk> Fri Oct 05 12:31:13 2018 +0200
committer Noel Grandin <noel.grandin@collabora.co.uk> Sat Oct 06 08:18:02 2018 +0200
tree 38cb0e31b05dc210955d701e9c88cf4976d71f6f
parent bb2ff075642664084e735948fcc65e21ad861937

inline GfxLink::SwapIn

only called from one site

Change-Id: I2f8cb927df2f4f389c5d1bee19845aed5535663b
Reviewed-on: https://gerrit.libreoffice.org/61437
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

include/vcl/gfxlink.hxx

diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx
index 5df70b8..38289d4 100644
--- a/include/vcl/gfxlink.hxx
+++ b/include/vcl/gfxlink.hxx
@@ -67,8 +67,8 @@ private:
    GfxLinkType     meType;
    sal_uInt32      mnUserId;

    std::shared_ptr<sal_uInt8> mpSwapInData;
    std::shared_ptr<SwapOutData> mpSwapOutData;
    mutable std::shared_ptr<sal_uInt8> mpSwapInData;
    mutable std::shared_ptr<SwapOutData> mpSwapOutData;

    sal_uInt32      mnSwapInDataSize;
    MapMode         maPrefMapMode;
@@ -108,7 +108,6 @@ public:
    bool                ExportNative( SvStream& rOStream ) const;

    void                SwapOut();
    void                SwapIn();
    bool                IsSwappedOut() const { return( bool(mpSwapOutData) ); }

    bool                IsEMF() const; // WMF & EMF stored under the same type (NativeWmf)

vcl/source/gdi/gfxlink.cxx

diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index 8258239..ed68313 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -79,8 +79,14 @@ bool GfxLink::IsNative() const
const sal_uInt8* GfxLink::GetData() const
{
    if( IsSwappedOut() )
        const_cast<GfxLink*>(this)->SwapIn();

    {
        auto pData = GetSwapInData();
        if (pData)
        {
            mpSwapInData = pData;
            mpSwapOutData.reset();
        }
    }
    return mpSwapInData.get();
}

@@ -167,19 +173,6 @@ void GfxLink::SwapOut()
    }
}

void GfxLink::SwapIn()
{
    if( IsSwappedOut() )
    {
        auto pData = GetSwapInData();
        if (pData)
        {
            mpSwapInData = pData;
            mpSwapOutData.reset();
        }
    }
}

bool GfxLink::ExportNative( SvStream& rOStream ) const
{
    if( GetDataSize() )