diff options
author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-11-02 11:47:04 +0100 |
---|---|---|
committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-11-07 10:45:17 +0100 |
commit | 9dc3b49c891fb9fe45c24de4b7e1e88fe400afe0 (patch) | |
tree | dd53fdb401d19ec5f6804840b5abcd5b4242a49e /sw | |
parent | 61a5abd5fab308c9e6580e752fa846f5bf0d7e51 (diff) |
Remove some useless swapping call inside SwGrfNode
Change-Id: I4cd2677197c7a6cff71e2966c2b2dd2285032c07
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/graphic/ndgrf.cxx | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 9973837390d6..47c27405a48d 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -341,7 +341,6 @@ void SwGrfNode::onGraphicChanged() if(pFlyFmt) { - const bool bWasSwappedOut = GetGrfObj().IsSwappedOut(); OUString aName; OUString aTitle; OUString aDesc; @@ -382,11 +381,6 @@ void SwGrfNode::onGraphicChanged() { SetDescription(aDesc); } - - if (bWasSwappedOut) - { - SwapOut(); - } } } @@ -675,10 +669,6 @@ bool SwGrfNode::SavePersistentData() return true; } - // swap in first if already in storage - if( HasEmbeddedStreamName() && !SwapIn() ) - return false; - // #i44367# // Do not delete graphic file in storage, because the graphic file could // be referenced by other graphic nodes. @@ -997,9 +987,7 @@ SwCntntNode* SwGrfNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const } else { - if( maGrfObj.IsSwappedOut() ) - const_cast<SwGrfNode*>(this)->SwapIn(); - aTmpGrf = maGrfObj.GetGraphic(); + aTmpGrf = GetGrf(); } const sfx2::LinkManager& rMgr = getIDocumentLinksAdministration()->GetLinkManager(); |