diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-04-05 19:07:05 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-04-05 19:07:05 +0200 |
| commit | c87019c1a938d7bb4ba1575f79df20f94a619ca9 (patch) | |
| tree | 76f3d71ea01469e16f365f145cdeb464983aebd9 /vcl/source/gdi/gdimtf.cxx | |
| parent | 149bb82c280a7846981793714d9111a83119798d (diff) | |
| parent | ef29f115c0e99c631ec7e037f4b39e961dc3c858 (diff) | |
Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
Conflicts:
svtools/source/control/toolbarmenu.cxx
vcl/inc/vcl/gdimtf.hxx
vcl/inc/vcl/settings.hxx
vcl/unx/inc/saldata.hxx
vcl/unx/kde4/KDESalGraphics.cxx
Diffstat (limited to 'vcl/source/gdi/gdimtf.cxx')
| -rw-r--r-- | vcl/source/gdi/gdimtf.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 79b8f417891b..849750ea20a9 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -439,6 +439,8 @@ void GDIMetaFile::Play( GDIMetaFile& rMtf, sal_uLong nPos ) rMtf.UseCanvas( rMtf.GetUseCanvas() || bUseCanvas ); + rMtf.UseCanvas( rMtf.GetUseCanvas() || bUseCanvas ); + if( nPos > nObjCount ) nPos = nObjCount; |