diff options
author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-10-27 15:55:38 +0100 |
---|---|---|
committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-11-07 10:45:10 +0100 |
commit | 70dff8d4bb97a5b9b59f91f3cc168be84b473873 (patch) | |
tree | 569b46f8011d888b2c4f252577574bb42b0cbf47 /svtools | |
parent | ccd93fc33843b1349b67797fc5a26713e6b186e6 (diff) |
Ignore the swapped in graphic, but use its size
Change-Id: I75f17ab5e55119965fcede2b220979cefc1e26ab
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/graphic/grfmgr2.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index c97a0438f0da..7f93bf96f9d7 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -205,12 +205,15 @@ void GraphicManager::ImplCheckSizeOfSwappedInGraphics(const GraphicObject* pGrap for (size_t i = 0, n = maObjList.size(); i < n; ++i) { pObj = maObjList[i]; - if (pObj->meType == GRAPHIC_BITMAP && !pObj->IsSwappedOut() && pObj->GetSizeBytes() && pObj != pGraphicToIgnore) + if (pObj->meType == GRAPHIC_BITMAP && !pObj->IsSwappedOut() && pObj->GetSizeBytes()) { - aCandidates.push_back(pObj); size_t const nSize = pObj->GetSizeBytes(); nUsedSize += nSize; - sizes.insert(std::make_pair(pObj, nSize)); + if( pObj != pGraphicToIgnore ) + { + aCandidates.push_back(pObj); + sizes.insert(std::make_pair(pObj, nSize)); + } } } |