diff options
author | Rüdiger Timm <rt@openoffice.org> | 2006-10-27 11:00:46 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2006-10-27 11:00:46 +0000 |
commit | 26d326ee52ee1bc56003cd7fdfe062186a9214c0 (patch) | |
tree | c3b40ed5ddaed68b871596feea0534e5a118fd81 /vcl/source/gdi/virdev.cxx | |
parent | eabd944232da643a2108ea47dd050b9f606d4ccf (diff) |
INTEGRATION: CWS extleadfix (1.27.24); FILE MERGED
2006/10/09 13:12:54 hdu 1.27.24.5: #i60945# get rid of warning
2006/10/09 12:23:24 hdu 1.27.24.4: #i60945# keep Compat_ZeroExtleadBug flag over RefDevMode reset
2006/10/09 12:11:34 hdu 1.27.24.3: #i60945# keep Compat_ZeroExtleadBug flag over RefDevMode reset
2006/10/09 12:02:44 hdu 1.27.24.2: #i60945# add Compat_ZeroExtleadBug method to enable bugwards compatibility
2006/09/29 14:13:27 hdu 1.27.24.1: #i60945# allow backwards compatible line metrics
Diffstat (limited to 'vcl/source/gdi/virdev.cxx')
-rw-r--r-- | vcl/source/gdi/virdev.cxx | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index 99e6f8ff8442..f07dfa61c8c4 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -4,9 +4,9 @@ * * $RCSfile: virdev.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: obo $ $Date: 2006-09-17 12:11:55 $ + * last change: $Author: rt $ $Date: 2006-10-27 12:00:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -419,8 +419,9 @@ void VirtualDevice::SetReferenceDevice( RefDevMode eRefDevMode ) // avoid adjusting font lists when already in refdev mode BYTE nOldRefDevMode = meRefDevMode; - meRefDevMode = (BYTE)eRefDevMode; - if( nOldRefDevMode != REFDEV_NONE ) + BYTE nOldCompatFlag = (BYTE)meRefDevMode & REFDEV_FORCE_ZERO_EXTLEAD; + meRefDevMode = (BYTE)(eRefDevMode | nOldCompatFlag); + if( (nOldRefDevMode ^ nOldCompatFlag) != REFDEV_NONE ) return; // the reference device should have only scalable fonts @@ -457,3 +458,11 @@ void VirtualDevice::SetReferenceDevice( RefDevMode eRefDevMode ) } // ----------------------------------------------------------------------- + +void VirtualDevice::Compat_ZeroExtleadBug() +{ + meRefDevMode = (BYTE)meRefDevMode | REFDEV_FORCE_ZERO_EXTLEAD; +} + +// ----------------------------------------------------------------------- + |