diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 13:48:05 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 13:48:05 +0000 |
| commit | b7e19783a84667843357b11261f39035f9941f6c (patch) | |
| tree | 22b7f07dde13292d592863945d8d9008e1a9a16c /vcl | |
| parent | 0590c46e7f1a9daeaea337ede34acfb579a59718 (diff) | |
INTEGRATION: CWS cairofixes02 (1.8.40); FILE MERGED
2006/10/09 17:25:33 radekdoulik 1.8.40.2: RESYNC: (1.8-1.9); FILE MERGED
2006/10/09 15:55:03 radekdoulik 1.8.40.1: Issue number: 70245
Submitted by: radekdoulik
Reviewed by: radekdoulik
* patches/cairo/cairocanvas-vcl-add-pixmap-size-to-bitmap-system-data.diff
(vcl/inc/bitmap.hxx): Have the mnWidth and mnHeight fields also on
Win32. Don't know if this will turn out to be absolutely
necessary.
(vcl/win/source/gdi/salbmp.cxx): Set mnWidth and mnHeight in
WinSalBitmap::GetSystemData().
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/win/source/gdi/salbmp.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx index 766a28b6dbfc..fc015913caa8 100644 --- a/vcl/win/source/gdi/salbmp.cxx +++ b/vcl/win/source/gdi/salbmp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: salbmp.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2006-09-17 12:44:37 $ + * last change: $Author: vg $ $Date: 2006-11-01 14:48:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -648,6 +648,9 @@ bool WinSalBitmap::GetSystemData( BitmapSystemData& rData ) bRet = true; rData.pDIB = mhDIB; rData.pDDB = mhDDB; + const Size& rSize = GetSize (); + rData.mnWidth = rSize.Width(); + rData.mnHeight = rSize.Height(); } return bRet; } |