diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 13:47:51 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 13:47:51 +0000 |
| commit | 0590c46e7f1a9daeaea337ede34acfb579a59718 (patch) | |
| tree | b76db82aed318c22d8734d5b2d246a79e7ccba65 /vcl | |
| parent | bcc566544497e08ba00bed3f8e3dedbc882463e9 (diff) | |
INTEGRATION: CWS cairofixes02 (1.22.22); FILE MERGED
2006/10/09 17:20:59 radekdoulik 1.22.22.2: RESYNC: (1.22-1.24); FILE MERGED
2006/10/09 15:55:03 radekdoulik 1.22.22.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/unx/source/gdi/salbmp.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vcl/unx/source/gdi/salbmp.cxx b/vcl/unx/source/gdi/salbmp.cxx index b7485d8cfc0c..c135bcba82ed 100644 --- a/vcl/unx/source/gdi/salbmp.cxx +++ b/vcl/unx/source/gdi/salbmp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: salbmp.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: kz $ $Date: 2006-10-06 10:06:00 $ + * last change: $Author: vg $ $Date: 2006-11-01 14:47:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -812,6 +812,8 @@ bool X11SalBitmap::GetSystemData( BitmapSystemData& rData ) // prolly not a good idea, since it's accessed from // non-platform aware code in vcl/bitmap.hxx) rData.aPixmap = (void*)mpDDB->ImplGetPixmap(); + rData.mnWidth = mpDDB->ImplGetWidth (); + rData.mnHeight = mpDDB->ImplGetHeight (); return true; } |