[Libreoffice-commits] core.git: sw/inc sw/source

[Libreoffice Gerrit user]

 sw/inc/ndgrf.hxx                 |    2 --
 sw/source/core/graphic/ndgrf.cxx |    7 +------
 2 files changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 9456d6cd5fd473a01cbebeb19b6cd284cf37e166
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Aug 13 11:20:11 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Aug 14 10:45:54 2018 +0200

    loplugin:returnconstant in SwGrfNode
    
    Change-Id: If6e7c7750db8cdc45a2c487f1aebcf504a0e1edb
    Reviewed-on: https://gerrit.libreoffice.org/58958
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index a5e4e0cc2969..e82061421aa6 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -120,8 +120,6 @@ public:
 private:
     /// Loading of graphic immediately before displaying.
     bool SwapIn( bool bWaitForData = false );
-    /// Remove graphic in order to free memory.
-    bool SwapOut();
 
 public:
     bool HasEmbeddedStreamName() const { return maGrfObj.HasUserData(); }
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 63a0c43d946c..ead2aadfdac1 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -493,11 +493,6 @@ bool SwGrfNode::SwapIn(bool bWaitForData)
     return bRet;
 }
 
-bool SwGrfNode::SwapOut()
-{
-    return true;
-}
-
 bool SwGrfNode::GetFileFilterNms( OUString* pFileNm, OUString* pFilterNm ) const
 {
     bool bRet = false;
@@ -555,7 +550,7 @@ bool SwGrfNode::SavePersistentData()
     // Important note: see also fix for #i40014#
 
     // swap out into temp file
-    return SwapOut();
+    return true;
 }
 
 bool SwGrfNode::RestorePersistentData()