diff options
| author | Radek Doulik <rodo@novell.com> | 2012-01-25 09:29:00 +0100 |
|---|---|---|
| committer | Radek Doulik <rodo@novell.com> | 2012-01-25 09:29:00 +0100 |
| commit | 9b20b8e9c6a177b98b86f227e2e5d056563ec9d5 (patch) | |
| tree | 3a5792e51b198dc046f0268bbfa3e6076f3a5dea | |
| parent | 7175129b2d8549c5e18e1222c943ddda5f2e9ee5 (diff) | |
Revert "fix rendering of metafiles embedded in emf+"
This reverts commit f7b6cd87f78b786b59984e5b3c8a5a78f0ed7a94.
| -rw-r--r-- | vcl/source/gdi/gdimtf.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 49d3bbb6e49b..f6cb49cfe808 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -406,9 +406,9 @@ void GDIMetaFile::Play( OutputDevice* pOut, size_t nPos ) pOut->SetLayoutMode( 0 ); pOut->SetDigitLanguage( 0 ); - OSL_TRACE("GDIMetaFile::Play on device of size: %d x %d", pOut->GetOutputSizePixel().Width(), pOut->GetOutputSizePixel().Height()); - if( !ImplPlayWithRenderer( pOut, Point(0,0), pOut->GetOutputSizePixel() ) ) { - for( size_t nCurPos = nCurrentActionElement; nCurPos < nPos; nCurPos++ ) + for( size_t nCurPos = nCurrentActionElement; nCurPos < nPos; nCurPos++ ) + { + if( !Hook() ) { MetaCommentAction* pCommentAct = static_cast<MetaCommentAction*>(pAction); if( pAction->GetType() == META_COMMENT_ACTION && @@ -608,7 +608,7 @@ void GDIMetaFile::Play( OutputDevice* pOut, const Point& rPos, { GDIMetaFile* pMtf = pOut->GetConnectMetaFile(); - if( bUseCanvas && ImplPlayWithRenderer( pOut, rPos, aDestSize ) ) + if( bUseCanvas && !pMtf && ImplPlayWithRenderer( pOut, rPos, aDestSize ) ) return; Size aTmpPrefSize( pOut->LogicToPixel( GetPrefSize(), aDrawMap ) ); |