← Back to branch summary

~ubuntu-branches/ubuntu/karmic/openoffice.org-l10n/karmic

« back to all changes in this revision

Viewing changes to ooo-build/patches/cairo/cairocanvas-vcl-add-pixmap-size-to-bitmap-system-data.diff

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2006-10-01 19:53:30 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20061001195330-t7rhiz7ac1dy8fn8
Tags: 2.0.4~rc3-0ubuntu1
* Copy of the openoffice.org source.
  - debian/control.in: Change source name.
  - debian/changelog: Change source name.
  - debian/control: Regenerate control file.
* Include translations from Rosetta 2006-09-28.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ooo-build/patches/cairo/cairocanvas-vcl-add-pixmap-size-to-bitmap-system-data.diff
2
2
--- vcl-orig/inc/bitmap.hxx     2006-07-31 21:21:58.000000000 +0200
3
3
+++ vcl/inc/bitmap.hxx  2006-08-09 17:55:05.000000000 +0200
4
4
@@ -259,6 +259,8 @@ struct BitmapSystemData
5
 
     void* pDDB; // if not NULL then this is actually an HBITMAP
6
5
     #else
7
6
     void* aPixmap;
 
7
     #endif
8
8
+    int mnWidth;
9
9
+    int mnHeight;
10
 
     #endif
11
10
 };
12
11
 
 
12
 class VCL_DLLPUBLIC Bitmap
13
13
diff -rup vcl-orig/unx/source/gdi/salbmp.cxx vcl/unx/source/gdi/salbmp.cxx
14
14
--- vcl-orig/unx/source/gdi/salbmp.cxx  2006-07-31 21:22:00.000000000 +0200
15
15
+++ vcl/unx/source/gdi/salbmp.cxx       2006-08-09 17:55:51.000000000 +0200
22
22
         return true;
23
23
        }
24
24
 
 
25
dummy line to avoid confusing diff-mode
 
26
--- vcl/win/source/gdi/salbmp.cxx
 
27
+++ vcl/win/source/gdi/salbmp.cxx
 
28
@@ -645,6 +645,9 @@
 
29
         bRet = true;
 
30
         rData.pDIB = mhDIB;
 
31
         rData.pDDB = mhDDB;
 
32
+        const Size& rSize = GetSize ();
 
33
+        rData.mnWidth = rSize.Width();
 
34
+        rData.mnHeight = rSize.Height();
 
35
     }
 
36
     return bRet;
 
37
 }
 
38
dummy line to avoid confusing diff-mode