summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2018-11-22 15:59:35 +0100
committerMichael Stahl <Michael.Stahl@cib.de>2018-12-01 08:44:45 +0100
commit7058c016c5f1e4ac867db0852ca75d7e9fda2dc5 (patch)
tree74211841173e162931d5b58c9f5e1f14ff08fbcc
parent1af5ca57dc89fffd460a3168a937036b589c3cd7 (diff)
sw: remove nutso check from SwNoTextFrame::PaintPicture()
This is a remnant of code that was removed with commits 2cbc57c8283d26924d95b77398f85e96ca4ea155 CWS swqbf91 and becf02e58637276ab80227ffb19aa01c86e4962d CWS swqbf89. The level counter was apparently abused to store the load status of SwGrfNode's image. Since the counter is always 0, the condition is always true and TriggerAsyncRetrieveInputStream() is always called here; let's hope not calling it isn't going to break anything. Change-Id: I4cef0ddab081ed2df1fc6e88230a8c19a5632d7e
-rw-r--r--sw/source/core/doc/notxtfrm.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 40a895586f2e..31a189c47470 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -1074,7 +1074,7 @@ void SwNoTextFrame::PaintPicture( vcl::RenderContext* pOut, const SwRect &rGrfAr
if( !pGrfObj ||
!pGrfObj->IsDataComplete() ||
!(aTmpSz = pGrfNd->GetTwipSize()).Width() ||
- !aTmpSz.Height() || !pGrfNd->GetAutoFormatLvl() )
+ !aTmpSz.Height())
{
pGrfNd->TriggerAsyncRetrieveInputStream(); // #i73788#
}