You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/02/03 14:24:38 UTC
svn commit: r1441909 [40/45] - in /openoffice/branches/l10n: ./
ext_libraries/apr-util/ ext_libraries/apr/ ext_libraries/hunspell/
ext_sources/ extras/l10n/source/ast/ extras/l10n/source/da/
extras/l10n/source/eu/ extras/l10n/source/gd/ extras/l10n/sou...
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/paintbrush_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/paintbrush_curs.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/paintbrush_curs.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/paintbrush_curs.h Sun Feb 3 13:23:59 2013
@@ -23,7 +23,7 @@
#define paintbrush_curs_height 16
#define paintbrush_curs_x_hot 0
#define paintbrush_curs_y_hot 10
-static char paintbrush_curs_bits[] = {
+static const unsigned char paintbrush_curs_bits[] = {
0x00, 0x80, 0x00, 0x40, 0x00, 0x20, 0x00, 0x90, 0x80, 0xcb, 0x60, 0x64,
0x90, 0x34, 0x08, 0x19, 0x06, 0x22, 0x11, 0x24, 0x09, 0x18, 0x46, 0x14,
0x24, 0x0a, 0x18, 0x05, 0x90, 0x02, 0xe0, 0x01 };
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/paintbrush_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/paintbrush_mask.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/paintbrush_mask.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/paintbrush_mask.h Sun Feb 3 13:23:59 2013
@@ -21,7 +21,7 @@
#define paintbrush_mask_width 16
#define paintbrush_mask_height 16
-static char paintbrush_mask_bits[] = {
+static const unsigned char paintbrush_mask_bits[] = {
0x00, 0x80, 0x00, 0xc0, 0x00, 0xe0, 0x00, 0xf0, 0x80, 0xfb, 0xe0, 0x7f,
0xf0, 0x3f, 0xf8, 0x1f, 0xfe, 0x3f, 0xff, 0x3f, 0xff, 0x1f, 0xfe, 0x1f,
0xfc, 0x0f, 0xf8, 0x07, 0xf0, 0x03, 0xe0, 0x01 };
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotcol_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotcol_curs.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotcol_curs.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotcol_curs.h Sun Feb 3 13:23:59 2013
@@ -24,7 +24,7 @@
#define pivotcol_curs_height 32
#define pivotcol_curs_x_hot 7
#define pivotcol_curs_y_hot 5
-static char pivotcol_curs_bits[] = {
+static const unsigned char pivotcol_curs_bits[] = {
0xff, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x55, 0x01, 0x00, 0x00,
0x29, 0x01, 0x00, 0x00, 0x15, 0x01, 0x00, 0x00, 0xa9, 0x00, 0x00, 0x00,
0x95, 0x01, 0x00, 0x00, 0xa9, 0x02, 0x00, 0x00, 0x95, 0x04, 0x00, 0x00,
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotcol_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotcol_mask.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotcol_mask.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotcol_mask.h Sun Feb 3 13:23:59 2013
@@ -24,7 +24,7 @@
#define pivotcol_mask_height 32
#define pivotcol_mask_x_hot 7
#define pivotcol_mask_y_hot 5
-static char pivotcol_mask_bits[] = {
+static const unsigned char pivotcol_mask_bits[] = {
0xff, 0x01, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00,
0xff, 0x01, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00,
0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotdel_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotdel_curs.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotdel_curs.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotdel_curs.h Sun Feb 3 13:23:59 2013
@@ -24,7 +24,7 @@
#define pivotdel_curs_height 32
#define pivotdel_curs_x_hot 9
#define pivotdel_curs_y_hot 8
-static char pivotdel_curs_bits[] = {
+static const unsigned char pivotdel_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x80, 0x01, 0x00,
0x3c, 0xc0, 0x00, 0x00, 0x73, 0x6f, 0x07, 0x00, 0xe1, 0x30, 0x04, 0x00,
0xc1, 0x1d, 0x04, 0x00, 0x81, 0x0f, 0x04, 0x00, 0x01, 0x07, 0x04, 0x00,
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotdel_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotdel_mask.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotdel_mask.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotdel_mask.h Sun Feb 3 13:23:59 2013
@@ -24,7 +24,7 @@
#define pivotdel_mask_height 32
#define pivotdel_mask_x_hot 9
#define pivotdel_mask_y_hot 8
-static char pivotdel_mask_bits[] = {
+static const unsigned char pivotdel_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x80, 0x01, 0x00,
0x3c, 0xc0, 0x00, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00,
0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00,
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotfld_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotfld_curs.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotfld_curs.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotfld_curs.h Sun Feb 3 13:23:59 2013
@@ -24,7 +24,7 @@
#define pivotfld_curs_height 32
#define pivotfld_curs_x_hot 8
#define pivotfld_curs_y_hot 7
-static char pivotfld_curs_bits[] = {
+static const unsigned char pivotfld_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0x00,
0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x04, 0x00,
0x01, 0x00, 0x04, 0x00, 0x01, 0x01, 0x04, 0x00, 0x01, 0x03, 0x04, 0x00,
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotfld_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotfld_mask.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotfld_mask.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotfld_mask.h Sun Feb 3 13:23:59 2013
@@ -24,7 +24,7 @@
#define pivotfld_mask_height 32
#define pivotfld_mask_x_hot 8
#define pivotfld_mask_y_hot 7
-static char pivotfld_mask_bits[] = {
+static const unsigned char pivotfld_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0x00,
0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00,
0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00,
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotrow_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotrow_curs.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotrow_curs.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotrow_curs.h Sun Feb 3 13:23:59 2013
@@ -24,7 +24,7 @@
#define pivotrow_curs_height 32
#define pivotrow_curs_x_hot 8
#define pivotrow_curs_y_hot 7
-static char pivotrow_curs_bits[] = {
+static const unsigned char pivotrow_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0x00,
0x01, 0x00, 0x04, 0x00, 0x55, 0x55, 0x07, 0x00, 0xa9, 0xaa, 0x06, 0x00,
0x55, 0x54, 0x07, 0x00, 0x29, 0xa9, 0x06, 0x00, 0x55, 0x53, 0x07, 0x00,
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotrow_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotrow_mask.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotrow_mask.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/pivotrow_mask.h Sun Feb 3 13:23:59 2013
@@ -24,7 +24,7 @@
#define pivotrow_mask_height 32
#define pivotrow_curs_x_hot 8
#define pivotrow_curs_y_hot 7
-static char pivotrow_mask_bits[] = {
+static const unsigned char pivotrow_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0x00,
0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00,
0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00,
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/rotate_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/rotate_curs.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/rotate_curs.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/rotate_curs.h Sun Feb 3 13:23:59 2013
@@ -24,7 +24,7 @@
#define rotate_curs_height 32
#define rotate_curs_x_hot 15
#define rotate_curs_y_hot 15
-static char rotate_curs_bits[] = {
+static const unsigned char rotate_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00,
0x00, 0xc0, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00, 0xd8, 0x00, 0x00,
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/rotate_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/rotate_mask.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/rotate_mask.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/rotate_mask.h Sun Feb 3 13:23:59 2013
@@ -22,7 +22,7 @@
#define rotate_mask_width 32
#define rotate_mask_height 32
-static char rotate_mask_bits[] = {
+static const unsigned char rotate_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00,
0x00, 0xe0, 0x01, 0x00, 0x00, 0xf8, 0x03, 0x00, 0x00, 0xfc, 0x01, 0x00,
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblsele_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblsele_curs.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblsele_curs.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblsele_curs.h Sun Feb 3 13:23:59 2013
@@ -23,7 +23,7 @@
#define tblsele_curs_height 16
#define tblsele_curs_x_hot 14
#define tblsele_curs_y_hot 8
-static char tblsele_curs_bits[] = {
+static const unsigned char tblsele_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x0c,
0x00, 0x1c, 0xfc, 0x3f, 0xfc, 0x7f, 0xfc, 0x3f, 0x00, 0x1c, 0x00, 0x0c,
0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblsele_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblsele_mask.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblsele_mask.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblsele_mask.h Sun Feb 3 13:23:59 2013
@@ -21,7 +21,7 @@
#define tblsele_mask_width 16
#define tblsele_mask_height 16
-static char tblsele_mask_bits[] = {
+static const unsigned char tblsele_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x0e, 0x00, 0x1e,
0xfe, 0x3f, 0xfe, 0x7f, 0xfe, 0xff, 0xfe, 0x7f, 0xfe, 0x3f, 0x00, 0x1e,
0x00, 0x0e, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00 };
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblsels_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblsels_curs.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblsels_curs.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblsels_curs.h Sun Feb 3 13:23:59 2013
@@ -23,7 +23,7 @@
#define tblsels_curs_height 16
#define tblsels_curs_x_hot 7
#define tblsels_curs_y_hot 14
-static char tblsels_curs_bits[] = {
+static const unsigned char tblsels_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01,
0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xf8, 0x0f, 0xf0, 0x07,
0xe0, 0x03, 0xc0, 0x01, 0x80, 0x00, 0x00, 0x00 };
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblsels_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblsels_mask.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblsels_mask.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblsels_mask.h Sun Feb 3 13:23:59 2013
@@ -21,7 +21,7 @@
#define tblsels_mask_width 16
#define tblsels_mask_height 16
-static char tblsels_mask_bits[] = {
+static const unsigned char tblsels_mask_bits[] = {
0x00, 0x00, 0xe0, 0x03, 0xe0, 0x03, 0xe0, 0x03, 0xe0, 0x03, 0xe0, 0x03,
0xe0, 0x03, 0xe0, 0x03, 0xe0, 0x03, 0xfc, 0x1f, 0xfc, 0x1f, 0xf8, 0x0f,
0xf0, 0x07, 0xe0, 0x03, 0xc0, 0x01, 0x80, 0x00 };
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblselse_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblselse_curs.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblselse_curs.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblselse_curs.h Sun Feb 3 13:23:59 2013
@@ -23,7 +23,7 @@
#define tblselse_curs_height 16
#define tblselse_curs_x_hot 14
#define tblselse_curs_y_hot 14
-static char tblselse_curs_bits[] = {
+static const unsigned char tblselse_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0xf0, 0x00,
0xf0, 0x01, 0xe0, 0x03, 0xc0, 0x47, 0x80, 0x6f, 0x00, 0x7f, 0x00, 0x7e,
0x00, 0x7c, 0x00, 0x7e, 0x00, 0x7f, 0x00, 0x00 };
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblselse_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblselse_mask.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblselse_mask.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblselse_mask.h Sun Feb 3 13:23:59 2013
@@ -21,7 +21,7 @@
#define tblselse_mask_width 16
#define tblselse_mask_height 16
-static char tblselse_mask_bits[] = {
+static const unsigned char tblselse_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0xf0, 0x00, 0xf8, 0x01,
0xf8, 0x03, 0xf0, 0xc7, 0xe0, 0xef, 0xc0, 0xff, 0x80, 0xff, 0x00, 0xff,
0x00, 0xfe, 0x00, 0xff, 0x80, 0xff, 0x80, 0xff };
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblselsw_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblselsw_curs.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblselsw_curs.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblselsw_curs.h Sun Feb 3 13:23:59 2013
@@ -23,7 +23,7 @@
#define tblselsw_curs_height 16
#define tblselsw_curs_x_hot 1
#define tblselsw_curs_y_hot 14
-static char tblselsw_curs_bits[] = {
+static const unsigned char tblselsw_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x0f,
0x80, 0x0f, 0xc0, 0x07, 0xe2, 0x03, 0xf6, 0x01, 0xfe, 0x00, 0x7e, 0x00,
0x3e, 0x00, 0x7e, 0x00, 0xfe, 0x00, 0x00, 0x00 };
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h Sun Feb 3 13:23:59 2013
@@ -21,7 +21,7 @@
#define tblselsw_mask_width 16
#define tblselsw_mask_height 16
-static char tblselsw_mask_bits[] = {
+static const unsigned char tblselsw_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x0f, 0x80, 0x1f,
0xc0, 0x1f, 0xe3, 0x0f, 0xf7, 0x07, 0xff, 0x03, 0xff, 0x01, 0xff, 0x00,
0x7f, 0x00, 0xff, 0x00, 0xff, 0x01, 0xff, 0x01 };
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblselw_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblselw_curs.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblselw_curs.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblselw_curs.h Sun Feb 3 13:23:59 2013
@@ -23,7 +23,7 @@
#define tblselw_curs_height 16
#define tblselw_curs_x_hot 1
#define tblselw_curs_y_hot 8
-static char tblselw_curs_bits[] = {
+static const unsigned char tblselw_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x30, 0x00,
0x38, 0x00, 0xfc, 0x3f, 0xfe, 0x3f, 0xfc, 0x3f, 0x38, 0x00, 0x30, 0x00,
0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblselw_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblselw_mask.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblselw_mask.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/tblselw_mask.h Sun Feb 3 13:23:59 2013
@@ -21,7 +21,7 @@
#define tblselw_mask_width 16
#define tblselw_mask_height 16
-static char tblselw_mask_bits[] = {
+static const unsigned char tblselw_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x70, 0x00, 0x78, 0x00,
0xfc, 0x7f, 0xfe, 0x7f, 0xff, 0x7f, 0xfe, 0x7f, 0xfc, 0x7f, 0x78, 0x00,
0x70, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00 };
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/timemove_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/timemove_curs.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/timemove_curs.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/timemove_curs.h Sun Feb 3 13:23:59 2013
@@ -24,7 +24,7 @@
#define timemove_curs_height 32
#define timemove_curs_x_hot 16
#define timemove_curs_y_hot 16
-static char timemove_curs_bits[] = {
+static const unsigned char timemove_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0xc0,0x07,0x00,0x00,
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/timemove_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/timemove_mask.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/timemove_mask.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/timemove_mask.h Sun Feb 3 13:23:59 2013
@@ -24,7 +24,7 @@
#define timemove_mask_height 32
#define timemove_mask_x_hot 16
#define timemove_mask_y_hot 16
-static char timemove_mask_bits[] = {
+static const unsigned char timemove_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x01,0x00,0x00,0x80,0x03,0x00,0x00,0xc0,0x07,0x00,0x00,0xe0,0x0f,0x00,0x00,
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/timesize_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/timesize_curs.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/timesize_curs.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/timesize_curs.h Sun Feb 3 13:23:59 2013
@@ -24,7 +24,7 @@
#define timesize_curs_height 32
#define timesize_curs_x_hot 16
#define timesize_curs_y_hot 16
-static char timesize_curs_bits[] = {
+static const unsigned char timesize_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0xff,0xff,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/timesize_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/timesize_mask.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/timesize_mask.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/timesize_mask.h Sun Feb 3 13:23:59 2013
@@ -24,7 +24,7 @@
#define timesize_mask_height 32
#define timesize_mask_x_hot 16
#define timesize_mask_y_hot 16
-static char timesize_mask_bits[] = {
+static const unsigned char timesize_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,
0xff,0x03,0x80,0xff,0xff,0x03,0x80,0xff,0xff,0x03,0x80,0xff,0xff,0x03,0x80,
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/vertcurs_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/vertcurs_curs.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/vertcurs_curs.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/vertcurs_curs.h Sun Feb 3 13:23:59 2013
@@ -23,7 +23,7 @@
#define vertcurs_curs_height 16
#define vertcurs_curs_x_hot 8
#define vertcurs_curs_y_hot 8
-static char vertcurs_curs_bits[] = {
+static const unsigned char vertcurs_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x40, 0x02, 0x40,
0x06, 0x60, 0xfc, 0x3f, 0x06, 0x60, 0x02, 0x40, 0x02, 0x40, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/vertcurs_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/vertcurs_mask.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/vertcurs_mask.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/vertcurs_mask.h Sun Feb 3 13:23:59 2013
@@ -23,7 +23,7 @@
#define vertcurs_mask_height 16
#define vertcurs_mask_x_hot 8
#define vertcurs_mask_y_hot 8
-static char vertcurs_mask_bits[] = {
+static const unsigned char vertcurs_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xe0, 0x07, 0xe0, 0x0f, 0xf0,
0xff, 0xff, 0xfe, 0x7f, 0xff, 0xff, 0x0f, 0xf0, 0x07, 0xe0, 0x07, 0xe0,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/vshear_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/vshear_curs.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/vshear_curs.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/vshear_curs.h Sun Feb 3 13:23:59 2013
@@ -24,7 +24,7 @@
#define vshear_curs_height 32
#define vshear_curs_x_hot 15
#define vshear_curs_y_hot 15
-static char vshear_curs_bits[] = {
+static const unsigned char vshear_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x04, 0x00,
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/vshear_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/vshear_mask.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/vshear_mask.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/vshear_mask.h Sun Feb 3 13:23:59 2013
@@ -22,7 +22,7 @@
#define vshear_mask_width 32
#define vshear_mask_height 32
-static char vshear_mask_bits[] = {
+static const unsigned char vshear_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x0e, 0x00, 0x00, 0x70, 0x0e, 0x00,
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/alpha.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/alpha.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/alpha.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/alpha.hxx Sun Feb 3 13:23:59 2013
@@ -36,11 +36,10 @@ class BitmapEx;
class VCL_DLLPUBLIC AlphaMask : private Bitmap
{
+private:
friend class BitmapEx;
friend class OutputDevice;
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream&, const ImageList& );
-
-private:
+ friend bool VCL_DLLPUBLIC ReadDIBBitmapEx(BitmapEx& rTarget, SvStream& rIStm);
SAL_DLLPRIVATE const Bitmap& ImplGetBitmap() const;
SAL_DLLPRIVATE void ImplSetBitmap( const Bitmap& rBitmap );
@@ -51,7 +50,7 @@ public:
AlphaMask( const Bitmap& rBitmap );
AlphaMask( const AlphaMask& rAlphaMask );
AlphaMask( const Size& rSizePixel, sal_uInt8* pEraseTransparency = NULL );
- ~AlphaMask();
+ virtual ~AlphaMask();
AlphaMask& operator=( const Bitmap& rBitmap );
AlphaMask& operator=( const AlphaMask& rAlphaMask ) { return (AlphaMask&) Bitmap::operator=( rAlphaMask ); }
@@ -66,7 +65,10 @@ public:
void SetPrefSize( const Size& rSize ) { Bitmap::SetPrefSize( rSize ); }
Size GetSizePixel() const { return Bitmap::GetSizePixel(); }
- void SetSizePixel( const Size& rNewSize ) { Bitmap::SetSizePixel( rNewSize ); }
+ void SetSizePixel( const Size& rNewSize, sal_uInt32 nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE )
+ {
+ Bitmap::SetSizePixel( rNewSize, nScaleFlag );
+ }
sal_uLong GetSizeBytes() const { return Bitmap::GetSizeBytes(); }
sal_uLong GetChecksum() const { return Bitmap::GetChecksum(); }
@@ -81,8 +83,8 @@ public:
sal_Bool Erase( sal_uInt8 cTransparency );
sal_Bool Invert();
sal_Bool Mirror( sal_uLong nMirrorFlags );
- sal_Bool Scale( const Size& rNewSize, sal_uLong nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE );
- sal_Bool Scale( const double& rScaleX, const double& rScaleY, sal_uLong nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE );
+ sal_Bool Scale( const Size& rNewSize, sal_uInt32 nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE );
+ sal_Bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE );
sal_Bool Rotate( long nAngle10, sal_uInt8 cFillTransparency );
sal_Bool Replace( const Bitmap& rMask, sal_uInt8 rReplaceTransparency );
sal_Bool Replace( sal_uInt8 cSearchTransparency, sal_uInt8 cReplaceTransparency, sal_uLong nTol = 0UL );
@@ -94,14 +96,7 @@ public:
BitmapReadAccess* AcquireReadAccess() { return Bitmap::AcquireReadAccess(); }
BitmapWriteAccess* AcquireWriteAccess() { return Bitmap::AcquireWriteAccess(); }
void ReleaseAccess( BitmapReadAccess* pAccess );
-
-public:
-
- sal_Bool Read( SvStream& rIStm, sal_Bool bFileHeader = sal_True ) { return Bitmap::Read( rIStm, bFileHeader ); }
- sal_Bool Write( SvStream& rOStm, sal_Bool bCompressed = sal_True, sal_Bool bFileHeader = sal_True ) const { return Bitmap::Write( rOStm, bCompressed, bFileHeader ); }
-
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const BitmapEx& rBitmapEx );
- friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, BitmapEx& rBitmapEx );
};
#endif // _SV_ALPHA_HXX
+// eof
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/bitmap.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/bitmap.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/bitmap.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/bitmap.hxx Sun Feb 3 13:23:59 2013
@@ -343,8 +343,6 @@ class BitmapWriteAccess;
class BitmapPalette;
class ImpBitmap;
class Color;
-class SvStream;
-struct DIBInfoHeader;
class ResId;
class GDIMetaFile;
class AlphaMask;
@@ -383,20 +381,6 @@ public:
SAL_DLLPRIVATE void ImplSetImpBitmap( ImpBitmap* pImpBmp );
SAL_DLLPRIVATE void ImplAssignWithSize( const Bitmap& rBitmap );
- SAL_DLLPRIVATE static sal_Bool ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, sal_uLong nOffset );
- SAL_DLLPRIVATE static sal_Bool ImplReadDIBFileHeader( SvStream& rIStm, sal_uLong& rOffset );
- SAL_DLLPRIVATE static sal_Bool ImplReadDIBInfoHeader( SvStream& rIStm, DIBInfoHeader& rHeader, sal_Bool& bTopDown );
- SAL_DLLPRIVATE static sal_Bool ImplReadDIBPalette( SvStream& rIStm, BitmapWriteAccess& rAcc, sal_Bool bQuad );
- SAL_DLLPRIVATE static sal_Bool ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, BitmapWriteAccess& rAcc, sal_Bool bTopDown );
- SAL_DLLPRIVATE sal_Bool ImplWriteDIB( SvStream& rOStm, BitmapReadAccess& rAcc, sal_Bool bCompressed ) const;
- SAL_DLLPRIVATE static sal_Bool ImplWriteDIBFileHeader( SvStream& rOStm, BitmapReadAccess& rAcc );
- SAL_DLLPRIVATE static sal_Bool ImplWriteDIBPalette( SvStream& rOStm, BitmapReadAccess& rAcc );
- SAL_DLLPRIVATE static sal_Bool ImplWriteDIBBits( SvStream& rOStm, BitmapReadAccess& rAcc,
- sal_uLong nCompression, sal_uInt32& rImageSize );
- SAL_DLLPRIVATE static void ImplDecodeRLE( sal_uInt8* pBuffer, DIBInfoHeader& rHeader,
- BitmapWriteAccess& rAcc, sal_Bool bRLE4 );
- SAL_DLLPRIVATE static sal_Bool ImplWriteRLE( SvStream& rOStm, BitmapReadAccess& rAcc, sal_Bool bRLE4 );
-
SAL_DLLPRIVATE void ImplAdaptBitCount(Bitmap& rNew) const;
SAL_DLLPRIVATE sal_Bool ImplScaleFast( const double& rScaleX, const double& rScaleY );
SAL_DLLPRIVATE sal_Bool ImplScaleInterpolate( const double& rScaleX, const double& rScaleY );
@@ -436,7 +420,7 @@ public:
Bitmap( const Size& rSizePixel, sal_uInt16 nBitCount, const BitmapPalette* pPal = NULL );
Bitmap( const ResId& rResId );
Bitmap( SalBitmap* pSalBitmap );
- ~Bitmap();
+ virtual ~Bitmap();
Bitmap& operator=( const Bitmap& rBitmap );
inline sal_Bool operator!() const;
@@ -456,7 +440,7 @@ public:
inline void SetPrefSize( const Size& rSize );
Size GetSizePixel() const;
- void SetSizePixel( const Size& rNewSize );
+ void SetSizePixel( const Size& rNewSize, sal_uInt32 nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE );
/**
* The pixel size of a bitmap's source (e.g. an image file)
@@ -654,7 +638,7 @@ public:
@return sal_True, if the operation was completed successfully.
*/
- sal_Bool Scale( const Size& rNewSize, sal_uLong nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE );
+ sal_Bool Scale( const Size& rNewSize, sal_uInt32 nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE );
/** Scale the bitmap
@@ -666,7 +650,7 @@ public:
@return sal_True, if the operation was completed successfully.
*/
- sal_Bool Scale( const double& rScaleX, const double& rScaleY, sal_uLong nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE );
+ sal_Bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE );
// Adapt the BitCount of rNew to BitCount of lolal, including grey or color paltette
// Can be used to create alpha/mask bitmaps after their processing in 24bit
@@ -878,18 +862,9 @@ public:
const BmpFilterParam* pFilterParam = NULL,
const Link* pProgress = NULL );
-public:
BitmapReadAccess* AcquireReadAccess();
BitmapWriteAccess* AcquireWriteAccess();
void ReleaseAccess( BitmapReadAccess* pAccess );
-
-public:
-
- sal_Bool Read( SvStream& rIStm, sal_Bool bFileHeader = sal_True );
- sal_Bool Write( SvStream& rOStm, sal_Bool bCompressed = sal_True, sal_Bool bFileHeader = sal_True ) const;
-
- friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Bitmap& rBitmap );
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const Bitmap& rBitmap );
};
// -----------
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/bitmapex.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/bitmapex.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/bitmapex.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/bitmapex.hxx Sun Feb 3 13:23:59 2013
@@ -28,6 +28,7 @@
#include <vcl/bitmap.hxx>
#include <vcl/alpha.hxx>
#include <tools/color.hxx>
+#include <basegfx/color/bcolormodifier.hxx>
// -------------------
// - TransparentType -
@@ -46,9 +47,9 @@ enum TransparentType
class VCL_DLLPUBLIC BitmapEx
{
- friend class ImpGraphic;
-
private:
+ friend class ImpGraphic;
+ friend bool VCL_DLLPUBLIC WriteDIBBitmapEx(const BitmapEx& rSource, SvStream& rOStm);
Bitmap aBitmap;
Bitmap aMask;
@@ -59,15 +60,9 @@ private:
public:
-//#if 0 // _SOLAR__PRIVATE
-
SAL_DLLPRIVATE ImpBitmap* ImplGetBitmapImpBitmap() const { return aBitmap.ImplGetImpBitmap(); }
SAL_DLLPRIVATE ImpBitmap* ImplGetMaskImpBitmap() const { return aMask.ImplGetImpBitmap(); }
-//#endif // PRIVATE
-
-public:
-
BitmapEx();
BitmapEx( const ResId& rResId );
BitmapEx( const BitmapEx& rBitmapEx );
@@ -109,7 +104,7 @@ public:
AlphaMask GetAlpha() const;
const Size& GetSizePixel() const { return aBitmapSize; }
- void SetSizePixel( const Size& rNewSize );
+ void SetSizePixel( const Size& rNewSize, sal_uInt32 nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE );
const Size& GetPrefSize() const { return aBitmap.GetPrefSize(); }
void SetPrefSize( const Size& rPrefSize ) { aBitmap.SetPrefSize( rPrefSize ); }
@@ -255,7 +250,7 @@ public:
@return sal_True, if the operation was completed successfully.
*/
- sal_Bool Scale( const Size& rNewSize, sal_uLong nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE );
+ sal_Bool Scale( const Size& rNewSize, sal_uInt32 nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE );
/** Scale the bitmap
@@ -267,7 +262,7 @@ public:
@return sal_True, if the operation was completed successfully.
*/
- sal_Bool Scale( const double& rScaleX, const double& rScaleY, sal_uLong nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE );
+ sal_Bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE );
/** Rotate bitmap by the specified angle
@@ -387,10 +382,43 @@ public:
*/
sal_uInt8 GetTransparency(sal_Int32 nX, sal_Int32 nY) const;
-public:
+ /** Create transformed Bitmap
+
+ @param fWidth
+ The target width in pixels
+
+ @param fHeight
+ The target height in pixels
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const BitmapEx& rBitmapEx );
- friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, BitmapEx& rBitmapEx );
+ @param rTransformation
+ The back transformation for each pixel in (0 .. fWidth),(0 .. fHeight) to
+ local pixel coordiantes
+ */
+ BitmapEx TransformBitmapEx(
+ double fWidth,
+ double fHeight,
+ const basegfx::B2DHomMatrix& rTransformation) const;
+
+ /** Create transformed Bitmap
+
+ @param rTransformation
+ The transformation from unit coordinates to target
+
+ @param fMaximumArea
+ A limitation for the maximum size of pixels to use for the result
+
+ @return The transformed bitmap
+ */
+ BitmapEx getTransformed(
+ const basegfx::B2DHomMatrix& rTransformation,
+ double fMaximumArea = 500000.0) const;
+
+ /** Create ColorStack-modified version of this BitmapEx
+
+ @param rBColorModifierStack
+ A ColrModifierStack which defines how each pixel has to be modified
+ */
+ BitmapEx ModifyBitmapEx(const basegfx::BColorModifierStack& rBColorModifierStack) const;
};
#endif // _SV_BITMAPEX_HXX
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/button.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/button.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/button.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/button.hxx Sun Feb 3 13:23:59 2013
@@ -66,12 +66,12 @@ public:
SAL_DLLPRIVATE void ImplSetSymbolRect(const Rectangle&);
protected:
- Button( WindowType nType );
+ explicit Button( WindowType nType );
public:
- Button( Window* pParent, WinBits nStyle = 0 );
- Button( Window* pParent, const ResId& rResId );
- ~Button();
+ explicit Button( Window* pParent, WinBits nStyle = 0 );
+ explicit Button( Window* pParent, const ResId& );
+ virtual ~Button();
virtual void Click();
@@ -149,7 +149,7 @@ public:
SAL_DLLPRIVATE sal_Bool ImplIsDefButton() const;
protected:
- PushButton( WindowType nType );
+ explicit PushButton( WindowType nType );
virtual void FillLayoutData() const;
virtual const Font&
@@ -157,9 +157,9 @@ protected:
virtual const Color&
GetCanonicalTextColor( const StyleSettings& _rStyle ) const;
public:
- PushButton( Window* pParent, WinBits nStyle = 0 );
- PushButton( Window* pParent, const ResId& rResId );
- ~PushButton();
+ explicit PushButton( Window* pParent, WinBits nStyle = 0 );
+ explicit PushButton( Window* pParent, const ResId& );
+ virtual ~PushButton();
virtual void MouseButtonDown( const MouseEvent& rMEvt );
virtual void Tracking( const TrackingEvent& rTEvt );
@@ -232,8 +232,8 @@ private:
SAL_DLLPRIVATE OKButton & operator= (const OKButton &);
public:
- OKButton( Window* pParent, WinBits nStyle = WB_DEFBUTTON );
- OKButton( Window* pParent, const ResId& rResId );
+ explicit OKButton( Window* pParent, WinBits nStyle = WB_DEFBUTTON );
+ explicit OKButton( Window* pParent, const ResId& );
virtual void Click();
};
@@ -254,8 +254,8 @@ private:
SAL_DLLPRIVATE CancelButton & operator= (const CancelButton &);
public:
- CancelButton( Window* pParent, WinBits nStyle = 0 );
- CancelButton( Window* pParent, const ResId& rResId );
+ explicit CancelButton( Window* pParent, WinBits nStyle = 0 );
+ explicit CancelButton( Window* pParent, const ResId& );
virtual void Click();
};
@@ -276,8 +276,8 @@ private:
SAL_DLLPRIVATE HelpButton & operator= ( const HelpButton & );
public:
- HelpButton( Window* pParent, WinBits nStyle = 0 );
- HelpButton( Window* pParent, const ResId& rResId );
+ explicit HelpButton( Window* pParent, WinBits nStyle = 0 );
+ explicit HelpButton( Window* pParent, const ResId& );
virtual void Click();
};
@@ -344,9 +344,9 @@ protected:
void DrawRadioButtonState( );
public:
- RadioButton( Window* pParent, WinBits nWinStyle = 0 );
- RadioButton( Window* pParent, const ResId& rResId );
- ~RadioButton();
+ explicit RadioButton( Window* pParent, WinBits nWinStyle = 0 );
+ explicit RadioButton( Window* pParent, const ResId& );
+ virtual ~RadioButton();
virtual void MouseButtonDown( const MouseEvent& rMEvt );
virtual void Tracking( const TrackingEvent& rTEvt );
@@ -450,8 +450,8 @@ public:
SAL_DLLPRIVATE void ImplCheck();
SAL_DLLPRIVATE void ImplSetMinimumNWFSize();
public:
- CheckBox( Window* pParent, WinBits nStyle = 0 );
- CheckBox( Window* pParent, const ResId& rResId );
+ explicit CheckBox( Window* pParent, WinBits nStyle = 0 );
+ explicit CheckBox( Window* pParent, const ResId& );
virtual void MouseButtonDown( const MouseEvent& rMEvt );
virtual void Tracking( const TrackingEvent& rTEvt );
@@ -515,12 +515,12 @@ private:
SAL_DLLPRIVATE ImageButton & operator= ( const ImageButton & );
protected:
- ImageButton( WindowType nType );
+ explicit ImageButton( WindowType nType );
public:
- ImageButton( Window* pParent, WinBits nStyle = 0 );
- ImageButton( Window* pParent, const ResId& rResId );
- ~ImageButton();
+ explicit ImageButton( Window* pParent, WinBits nStyle = 0 );
+ explicit ImageButton( Window* pParent, const ResId& );
+ virtual ~ImageButton();
};
class VCL_DLLPUBLIC ImageRadioButton : public RadioButton
@@ -530,9 +530,9 @@ class VCL_DLLPUBLIC ImageRadioButton : p
SAL_DLLPRIVATE ImageRadioButton & operator= ( const ImageRadioButton & );
public:
- ImageRadioButton( Window* pParent, WinBits nStyle = 0 );
- ImageRadioButton( Window* pParent, const ResId& rResId );
- ~ImageRadioButton();
+ explicit ImageRadioButton( Window* pParent, WinBits nStyle = 0 );
+ explicit ImageRadioButton( Window* pParent, const ResId& );
+ virtual ~ImageRadioButton();
};
class VCL_DLLPUBLIC TriStateBox : public CheckBox
@@ -542,9 +542,9 @@ class VCL_DLLPUBLIC TriStateBox : public
SAL_DLLPRIVATE TriStateBox & operator= ( const TriStateBox & );
public:
- TriStateBox( Window* pParent, WinBits nStyle = 0 );
- TriStateBox( Window* pParent, const ResId& rResId );
- ~TriStateBox();
+ explicit TriStateBox( Window* pParent, WinBits nStyle = 0 );
+ explicit TriStateBox( Window* pParent, const ResId& );
+ virtual ~TriStateBox();
};
class VCL_DLLPUBLIC DisclosureButton : public CheckBox
@@ -552,10 +552,11 @@ class VCL_DLLPUBLIC DisclosureButton : p
protected:
SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState();
public:
- DisclosureButton( Window* pParent, WinBits nStyle = 0 );
- DisclosureButton( Window* pParent, const ResId& rResId );
+ explicit DisclosureButton( Window* pParent, WinBits nStyle = 0 );
+ explicit DisclosureButton( Window* pParent, const ResId& );
virtual void KeyInput( const KeyEvent& rKEvt );
};
#endif // _SV_BUTTON_HXX
+
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/combobox.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/combobox.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/combobox.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/combobox.hxx Sun Feb 3 13:23:59 2013
@@ -77,14 +77,14 @@ protected:
//#endif
protected:
- ComboBox( WindowType nType );
+ explicit ComboBox( WindowType nType );
sal_Bool IsDropDownBox() const { return mpFloatWin ? sal_True : sal_False; }
virtual void FillLayoutData() const;
public:
- ComboBox( Window* pParent, WinBits nStyle = 0 );
- ComboBox( Window* pParent, const ResId& rResId );
- ~ComboBox();
+ explicit ComboBox( Window* pParent, WinBits nStyle = 0 );
+ explicit ComboBox( Window* pParent, const ResId& );
+ virtual ~ComboBox();
virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
virtual void Resize();
@@ -224,3 +224,4 @@ public:
};
#endif // _COMBOBOX_HXX
+
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/ctrl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/ctrl.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/ctrl.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/ctrl.hxx Sun Feb 3 13:23:59 2013
@@ -130,9 +130,9 @@ public:
//#endif
public:
- Control( Window* pParent, WinBits nWinStyle = 0 );
- Control( Window* pParent, const ResId& rResId );
- ~Control();
+ explicit Control( Window* pParent, WinBits nWinStyle = 0 );
+ explicit Control( Window* pParent, const ResId& );
+ virtual ~Control();
virtual void GetFocus();
virtual void LoseFocus();
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/dialog.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/dialog.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/dialog.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/dialog.hxx Sun Feb 3 13:23:59 2013
@@ -74,8 +74,8 @@ protected:
virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
public:
- Dialog( Window* pParent, WinBits nStyle = WB_STDDIALOG );
- Dialog( Window* pParent, const ResId& rResId );
+ explicit Dialog( Window* pParent, WinBits nStyle = WB_STDDIALOG );
+ explicit Dialog( Window* pParent, const ResId& );
virtual ~Dialog();
virtual long Notify( NotifyEvent& rNEvt );
@@ -128,8 +128,8 @@ class VCL_DLLPUBLIC ModelessDialog : pub
//#endif
public:
- ModelessDialog( Window* pParent, WinBits nStyle = WB_STDMODELESS );
- ModelessDialog( Window* pParent, const ResId& rResId );
+ explicit ModelessDialog( Window* pParent, WinBits nStyle = WB_STDMODELESS );
+ explicit ModelessDialog( Window* pParent, const ResId& );
};
// ---------------
@@ -139,8 +139,8 @@ public:
class VCL_DLLPUBLIC ModalDialog : public Dialog
{
public:
- ModalDialog( Window* pParent, WinBits nStyle = WB_STDMODAL );
- ModalDialog( Window* pParent, const ResId& rResId );
+ explicit ModalDialog( Window* pParent, WinBits nStyle = WB_STDMODAL );
+ explicit ModalDialog( Window* pParent, const ResId& );
private:
using Window::Show;
@@ -156,3 +156,4 @@ private:
};
#endif // _SV_DIALOG_HXX
+
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/dockingarea.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/dockingarea.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/dockingarea.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/dockingarea.hxx Sun Feb 3 13:23:59 2013
@@ -44,8 +44,8 @@ private:
SAL_DLLPRIVATE DockingAreaWindow & operator= (const DockingAreaWindow &);
public:
- DockingAreaWindow( Window *pParent );
- ~DockingAreaWindow();
+ explicit DockingAreaWindow( Window* pParent );
+ virtual ~DockingAreaWindow();
void SetAlign( WindowAlign eNewAlign );
WindowAlign GetAlign() const;
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/event.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/event.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/event.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/event.hxx Sun Feb 3 13:23:59 2013
@@ -128,8 +128,8 @@ private:
sal_uInt16 mnCode;
public:
- MouseEvent();
- MouseEvent( const Point& rPos, sal_uInt16 nClicks = 1,
+ explicit MouseEvent();
+ explicit MouseEvent( const Point& rPos, sal_uInt16 nClicks = 1,
sal_uInt16 nMode = 0, sal_uInt16 nButtons = 0,
sal_uInt16 nModifier = 0 );
@@ -207,9 +207,9 @@ private:
sal_Bool mbKeyboardActivated;
public:
- HelpEvent();
- HelpEvent( sal_uInt16 nHelpMode );
- HelpEvent( const Point& rMousePos, sal_uInt16 nHelpMode );
+ explicit HelpEvent();
+ explicit HelpEvent( sal_uInt16 nHelpMode );
+ explicit HelpEvent( const Point& rMousePos, sal_uInt16 nHelpMode );
const Point& GetMousePosPixel() const;
sal_uInt16 GetMode() const { return mnMode; }
@@ -300,8 +300,8 @@ private:
sal_uInt16 mnFlags;
public:
- TrackingEvent();
- TrackingEvent( const MouseEvent& rMEvt,
+ explicit TrackingEvent();
+ explicit TrackingEvent( const MouseEvent&,
sal_uInt16 nTrackFlags = 0 );
const MouseEvent& GetMouseEvent() const { return maMEvt; }
@@ -435,8 +435,8 @@ private:
sal_uInt16 mnType;
public:
- DataChangedEvent();
- DataChangedEvent( sal_uInt16 nType,
+ explicit DataChangedEvent();
+ explicit DataChangedEvent( sal_uInt16 nType,
const void* pData = NULL,
sal_uLong nFlags = 0 );
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/field.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/field.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/field.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/field.hxx Sun Feb 3 13:23:59 2013
@@ -64,7 +64,7 @@ protected:
sal_Bool IsDefaultLocale() const { return mbDefaultLocale; }
public:
- FormatterBase( Edit* pField = NULL );
+ explicit FormatterBase( Edit* pField = NULL );
virtual ~FormatterBase();
const LocaleDataWrapper& GetLocaleDataWrapper() const;
@@ -502,9 +502,9 @@ public:
class VCL_DLLPUBLIC PatternField : public SpinField, public PatternFormatter
{
public:
- PatternField( Window* pParent, WinBits nWinStyle );
- PatternField( Window* pParent, const ResId& rResId );
- ~PatternField();
+ explicit PatternField( Window* pParent, WinBits nWinStyle );
+ explicit PatternField( Window* pParent, const ResId& );
+ virtual ~PatternField();
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
@@ -522,9 +522,9 @@ protected:
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
public:
- NumericField( Window* pParent, WinBits nWinStyle );
- NumericField( Window* pParent, const ResId& rResId );
- ~NumericField();
+ explicit NumericField( Window* pParent, WinBits nWinStyle );
+ explicit NumericField( Window* pParent, const ResId& );
+ virtual ~NumericField();
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
@@ -549,9 +549,9 @@ protected:
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
public:
- MetricField( Window* pParent, WinBits nWinStyle );
- MetricField( Window* pParent, const ResId& rResId );
- ~MetricField();
+ explicit MetricField( Window* pParent, WinBits nWinStyle );
+ explicit MetricField( Window* pParent, const ResId& );
+ virtual ~MetricField();
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
@@ -616,9 +616,9 @@ protected:
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
public:
- CurrencyField( Window* pParent, WinBits nWinStyle );
- CurrencyField( Window* pParent, const ResId& rResId );
- ~CurrencyField();
+ explicit CurrencyField( Window* pParent, WinBits nWinStyle );
+ explicit CurrencyField( Window* pParent, const ResId& );
+ virtual ~CurrencyField();
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
@@ -648,9 +648,9 @@ protected:
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
public:
- DateField( Window* pParent, WinBits nWinStyle );
- DateField( Window* pParent, const ResId& rResId );
- ~DateField();
+ explicit DateField( Window* pParent, WinBits nWinStyle );
+ explicit DateField( Window* pParent, const ResId& );
+ virtual ~DateField();
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
@@ -684,9 +684,9 @@ protected:
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
public:
- TimeField( Window* pParent, WinBits nWinStyle );
- TimeField( Window* pParent, const ResId& rResId );
- ~TimeField();
+ explicit TimeField( Window* pParent, WinBits nWinStyle );
+ explicit TimeField( Window* pParent, const ResId& );
+ virtual ~TimeField();
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
@@ -715,9 +715,9 @@ public:
class VCL_DLLPUBLIC PatternBox : public ComboBox, public PatternFormatter
{
public:
- PatternBox( Window* pParent, WinBits nWinStyle );
- PatternBox( Window* pParent, const ResId& rResId );
- ~PatternBox();
+ explicit PatternBox( Window* pParent, WinBits nWinStyle );
+ explicit PatternBox( Window* pParent, const ResId& );
+ virtual ~PatternBox();
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
@@ -742,9 +742,9 @@ public:
class VCL_DLLPUBLIC NumericBox : public ComboBox, public NumericFormatter
{
public:
- NumericBox( Window* pParent, WinBits nWinStyle );
- NumericBox( Window* pParent, const ResId& rResId );
- ~NumericBox();
+ explicit NumericBox( Window* pParent, WinBits nWinStyle );
+ explicit NumericBox( Window* pParent, const ResId& );
+ virtual ~NumericBox();
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
@@ -769,9 +769,9 @@ public:
class VCL_DLLPUBLIC MetricBox : public ComboBox, public MetricFormatter
{
public:
- MetricBox( Window* pParent, WinBits nWinStyle );
- MetricBox( Window* pParent, const ResId& rResId );
- ~MetricBox();
+ explicit MetricBox( Window* pParent, WinBits nWinStyle );
+ explicit MetricBox( Window* pParent, const ResId& );
+ virtual ~MetricBox();
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
@@ -802,9 +802,9 @@ public:
class VCL_DLLPUBLIC CurrencyBox : public ComboBox, public CurrencyFormatter
{
public:
- CurrencyBox( Window* pParent, WinBits nWinStyle );
- CurrencyBox( Window* pParent, const ResId& rResId );
- ~CurrencyBox();
+ explicit CurrencyBox( Window* pParent, WinBits nWinStyle );
+ explicit CurrencyBox( Window* pParent, const ResId& );
+ virtual ~CurrencyBox();
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
@@ -831,9 +831,9 @@ public:
class VCL_DLLPUBLIC DateBox : public ComboBox, public DateFormatter
{
public:
- DateBox( Window* pParent, WinBits nWinStyle );
- DateBox( Window* pParent, const ResId& rResId );
- ~DateBox();
+ explicit DateBox( Window* pParent, WinBits nWinStyle );
+ explicit DateBox( Window* pParent, const ResId& );
+ virtual ~DateBox();
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
@@ -858,9 +858,9 @@ public:
class VCL_DLLPUBLIC TimeBox : public ComboBox, public TimeFormatter
{
public:
- TimeBox( Window* pParent, WinBits nWinStyle );
- TimeBox( Window* pParent, const ResId& rResId );
- ~TimeBox();
+ explicit TimeBox( Window* pParent, WinBits nWinStyle );
+ explicit TimeBox( Window* pParent, const ResId& );
+ virtual ~TimeBox();
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/fixed.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/fixed.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/fixed.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/fixed.hxx Sun Feb 3 13:23:59 2013
@@ -58,9 +58,9 @@ protected:
GetCanonicalTextColor( const StyleSettings& _rStyle ) const;
public:
- FixedText( Window* pParent, WinBits nStyle = 0 );
- FixedText( Window* pParent, const ResId& rResId );
- FixedText( Window* pParent, const ResId& rResId, bool bDisableAccessibleLabelForRelation );
+ explicit FixedText( Window* pParent, WinBits nStyle = 0 );
+ explicit FixedText( Window* pParent, const ResId& );
+ explicit FixedText( Window* pParent, const ResId&, bool bDisableAccessibleLabelForRelation );
virtual void Paint( const Rectangle& rRect );
virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
@@ -95,8 +95,8 @@ protected:
GetCanonicalTextColor( const StyleSettings& _rStyle ) const;
public:
- FixedLine( Window* pParent, WinBits nStyle = WB_HORZ );
- FixedLine( Window* pParent, const ResId& rResId );
+ explicit FixedLine( Window* pParent, WinBits nStyle = WB_HORZ );
+ explicit FixedLine( Window* pParent, const ResId& );
virtual void Paint( const Rectangle& rRect );
virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
@@ -129,9 +129,9 @@ protected:
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
public:
- FixedBitmap( Window* pParent, WinBits nStyle = 0 );
- FixedBitmap( Window* pParent, const ResId& rResId );
- ~FixedBitmap();
+ explicit FixedBitmap( Window* pParent, WinBits nStyle = 0 );
+ explicit FixedBitmap( Window* pParent, const ResId& );
+ virtual ~FixedBitmap();
virtual void Paint( const Rectangle& rRect );
virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
@@ -170,9 +170,9 @@ protected:
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
public:
- FixedImage( Window* pParent, WinBits nStyle = 0 );
- FixedImage( Window* pParent, const ResId& rResId );
- ~FixedImage();
+ explicit FixedImage( Window* pParent, WinBits nStyle = 0 );
+ explicit FixedImage( Window* pParent, const ResId& );
+ virtual ~FixedImage();
virtual void Paint( const Rectangle& rRect );
virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
@@ -193,3 +193,4 @@ public:
};
#endif // _SV_FIXED_HXX
+
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/floatwin.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/floatwin.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/floatwin.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/floatwin.hxx Sun Feb 3 13:23:59 2013
@@ -121,9 +121,9 @@ public:
//#endif
public:
- FloatingWindow( Window* pParent, WinBits nStyle = WB_STDFLOATWIN );
- FloatingWindow( Window* pParent, const ResId& rResId );
- ~FloatingWindow();
+ explicit FloatingWindow( Window* pParent, WinBits nStyle = WB_STDFLOATWIN );
+ explicit FloatingWindow( Window* pParent, const ResId& );
+ virtual ~FloatingWindow();
virtual long Notify( NotifyEvent& rNEvt );
virtual void StateChanged( StateChangedType nType );
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/fontmanager.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/fontmanager.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/fontmanager.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/fontmanager.hxx Sun Feb 3 13:23:59 2013
@@ -290,7 +290,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
std::map< sal_Unicode, sal_Int32 > m_aEncodingVector;
std::map< sal_Unicode, rtl::OString > m_aNonEncoded;
- PrintFont( fonttype::type eType );
+ explicit PrintFont( fonttype::type eType );
virtual ~PrintFont();
virtual bool queryMetricPage( int nPage, utl::MultiAtomProvider* pProvider ) = 0;
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/group.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/group.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/group.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/group.hxx Sun Feb 3 13:23:59 2013
@@ -50,8 +50,8 @@ private:
GetCanonicalTextColor( const StyleSettings& _rStyle ) const;
public:
- GroupBox( Window* pParent, WinBits nStyle = 0 );
- GroupBox( Window* pParent, const ResId& rResId );
+ explicit GroupBox( Window* pParent, WinBits nStyle = 0 );
+ explicit GroupBox( Window* pParent, const ResId& );
virtual void Paint( const Rectangle& rRect );
virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
@@ -61,3 +61,4 @@ public:
};
#endif // _SV_GROUP_HXX
+
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/lstbox.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/lstbox.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/lstbox.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/lstbox.hxx Sun Feb 3 13:23:59 2013
@@ -79,9 +79,9 @@ protected:
virtual void FillLayoutData() const;
public:
- ListBox( Window* pParent, WinBits nStyle = WB_BORDER );
- ListBox( Window* pParent, const ResId& rResId );
- ~ListBox();
+ explicit ListBox( Window* pParent, WinBits nStyle = WB_BORDER );
+ explicit ListBox( Window* pParent, const ResId& );
+ virtual ~ListBox();
virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
virtual void Resize();
@@ -255,8 +255,9 @@ private:
sal_uInt16 GetSavedValue();
public:
- MultiListBox( Window* pParent, WinBits nStyle = 0 );
- MultiListBox( Window* pParent, const ResId& rResId );
+ explicit MultiListBox( Window* pParent, WinBits nStyle = 0 );
+ explicit MultiListBox( Window* pParent, const ResId& );
};
#endif // _SV_LSTBOX_HXX
+
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/menu.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/menu.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/menu.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/menu.hxx Sun Feb 3 13:23:59 2013
@@ -104,7 +104,7 @@ struct ImplMenuDelData
ImplMenuDelData* mpNext;
const Menu* mpMenu;
- ImplMenuDelData( const Menu* pMenu );
+ explicit ImplMenuDelData( const Menu* );
~ImplMenuDelData();
bool isDeleted() const { return mpMenu == 0; }
@@ -201,7 +201,7 @@ public:
SAL_DLLPRIVATE Menu* ImplGetStartedFrom() const;
Menu();
- Menu( sal_Bool bMenuBar );
+ explicit Menu( sal_Bool bMenuBar );
SAL_DLLPRIVATE Window* ImplGetWindow() const { return pWindow; }
@@ -410,9 +410,9 @@ class VCL_DLLPUBLIC MenuBar : public Men
public:
MenuBar();
- MenuBar( const ResId& rResId );
+ explicit MenuBar( const ResId& );
MenuBar( const MenuBar& rMenu );
- ~MenuBar();
+ virtual ~MenuBar();
MenuBar& operator =( const MenuBar& rMenu );
@@ -500,8 +500,8 @@ protected:
public:
PopupMenu();
PopupMenu( const PopupMenu& rMenu );
- PopupMenu( const ResId& rResId );
- ~PopupMenu();
+ explicit PopupMenu( const ResId& );
+ virtual ~PopupMenu();
void SetText( const XubString& rTitle ) { aTitleText = rTitle; }
const XubString& GetText() const { return aTitleText; }
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/menubtn.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/menubtn.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/menubtn.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/menubtn.hxx Sun Feb 3 13:23:59 2013
@@ -67,9 +67,9 @@ protected:
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
public:
- MenuButton( Window* pParent, WinBits nStyle = 0 );
- MenuButton( Window* pParent, const ResId& rResId );
- ~MenuButton();
+ explicit MenuButton( Window* pParent, WinBits nStyle = 0 );
+ explicit MenuButton( Window* pParent, const ResId& );
+ virtual ~MenuButton();
virtual void MouseButtonDown( const MouseEvent& rMEvt );
virtual void KeyInput( const KeyEvent& rKEvt );
@@ -92,3 +92,4 @@ public:
};
#endif // _SV_MENUBTN_HXX
+
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/metaact.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/metaact.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/metaact.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/metaact.hxx Sun Feb 3 13:23:59 2013
@@ -159,7 +159,7 @@ protected:
public:
MetaAction();
- MetaAction( sal_uInt16 nType );
+ explicit MetaAction( sal_uInt16 nType );
virtual void Execute( OutputDevice* pOut );
@@ -221,7 +221,7 @@ private:
public:
DECL_META_ACTION( Point, META_POINT_ACTION )
- MetaPointAction( const Point& rPt );
+ explicit MetaPointAction( const Point& );
virtual void Move( long nHorzMove, long nVertMove );
virtual void Scale( double fScaleX, double fScaleY );
@@ -272,7 +272,7 @@ private:
public:
DECL_META_ACTION( Rect, META_RECT_ACTION )
- MetaRectAction( const Rectangle& rRect );
+ explicit MetaRectAction( const Rectangle& );
virtual void Move( long nHorzMove, long nVertMove );
virtual void Scale( double fScaleX, double fScaleY );
@@ -323,7 +323,7 @@ private:
public:
DECL_META_ACTION( Ellipse, META_ELLIPSE_ACTION )
- MetaEllipseAction( const Rectangle& rRect );
+ explicit MetaEllipseAction( const Rectangle& );
virtual void Move( long nHorzMove, long nVertMove );
virtual void Scale( double fScaleX, double fScaleY );
@@ -431,8 +431,8 @@ private:
public:
DECL_META_ACTION( PolyLine, META_POLYLINE_ACTION )
- MetaPolyLineAction( const Polygon& rPoly );
- MetaPolyLineAction( const Polygon& rPoly, const LineInfo& rLineInfo );
+ explicit MetaPolyLineAction( const Polygon& );
+ explicit MetaPolyLineAction( const Polygon&, const LineInfo& );
virtual void Move( long nHorzMove, long nVertMove );
virtual void Scale( double fScaleX, double fScaleY );
@@ -456,7 +456,7 @@ private:
public:
DECL_META_ACTION( Polygon, META_POLYGON_ACTION )
- MetaPolygonAction( const Polygon& rPoly );
+ explicit MetaPolygonAction( const Polygon& );
virtual void Move( long nHorzMove, long nVertMove );
virtual void Scale( double fScaleX, double fScaleY );
@@ -479,7 +479,7 @@ private:
public:
DECL_META_ACTION( PolyPolygon, META_POLYPOLYGON_ACTION )
- MetaPolyPolygonAction( const PolyPolygon& rPolyPoly );
+ explicit MetaPolyPolygonAction( const PolyPolygon& );
virtual void Move( long nHorzMove, long nVertMove );
virtual void Scale( double fScaleX, double fScaleY );
@@ -1065,7 +1065,7 @@ private:
public:
DECL_META_ACTION( ISectRectClipRegion, META_ISECTRECTCLIPREGION_ACTION )
- MetaISectRectClipRegionAction( const Rectangle& rRect );
+ explicit MetaISectRectClipRegionAction( const Rectangle& );
virtual void Move( long nHorzMove, long nVertMove );
virtual void Scale( double fScaleX, double fScaleY );
@@ -1088,7 +1088,7 @@ private:
public:
DECL_META_ACTION( ISectRegionClipRegion, META_ISECTREGIONCLIPREGION_ACTION )
- MetaISectRegionClipRegionAction( const Region& rRegion );
+ explicit MetaISectRegionClipRegionAction( const Region& );
virtual void Move( long nHorzMove, long nVertMove );
virtual void Scale( double fScaleX, double fScaleY );
@@ -1179,7 +1179,7 @@ private:
public:
DECL_META_ACTION( TextColor, META_TEXTCOLOR_ACTION )
- MetaTextColorAction( const Color& rColor );
+ explicit MetaTextColorAction( const Color& );
const Color& GetColor() const { return maColor; }
};
@@ -1265,7 +1265,7 @@ private:
public:
DECL_META_ACTION( TextAlign, META_TEXTALIGN_ACTION )
- MetaTextAlignAction( TextAlign aAlign );
+ explicit MetaTextAlignAction( TextAlign eAlign );
TextAlign GetTextAlign() const { return maAlign; }
};
@@ -1285,7 +1285,7 @@ private:
public:
DECL_META_ACTION( MapMode, META_MAPMODE_ACTION )
- MetaMapModeAction( const MapMode& rMapMode );
+ explicit MetaMapModeAction( const MapMode& );
virtual void Scale( double fScaleX, double fScaleY );
@@ -1307,7 +1307,7 @@ private:
public:
DECL_META_ACTION( Font, META_FONT_ACTION )
- MetaFontAction( const Font& rFont );
+ explicit MetaFontAction( const Font& );
virtual void Scale( double fScaleX, double fScaleY );
@@ -1329,7 +1329,7 @@ private:
public:
DECL_META_ACTION( Push, META_PUSH_ACTION )
- MetaPushAction( sal_uInt16 nFlags );
+ explicit MetaPushAction( sal_uInt16 nFlags );
sal_uInt16 GetFlags() const { return mnFlags; }
};
@@ -1360,7 +1360,7 @@ private:
public:
DECL_META_ACTION( RasterOp, META_RASTEROP_ACTION )
- MetaRasterOpAction( RasterOp eRasterOp );
+ explicit MetaRasterOpAction( RasterOp eRasterOp );
RasterOp GetRasterOp() const { return meRasterOp; }
};
@@ -1489,13 +1489,13 @@ private:
virtual sal_Bool Compare( const MetaAction& ) const;
protected:
- ~MetaCommentAction();
+ virtual ~MetaCommentAction();
public:
- MetaCommentAction( sal_Int32 nValue = 0L );
- MetaCommentAction( const MetaCommentAction& rAct );
- MetaCommentAction( const ByteString& rComment, sal_Int32 nValue = 0L, const sal_uInt8* pData = NULL, sal_uInt32 nDataSize = 0UL );
- MetaCommentAction( const sal_uInt8* pData, sal_uInt32 nDataSize );
+ explicit MetaCommentAction( sal_Int32 nValue = 0L );
+ explicit MetaCommentAction( const MetaCommentAction& );
+ explicit MetaCommentAction( const ByteString& rComment, sal_Int32 nValue = 0L, const sal_uInt8* pData = NULL, sal_uInt32 nDataSize = 0UL );
+ explicit MetaCommentAction( const sal_uInt8* pData, sal_uInt32 nDataSize );
virtual void Move( long nHorzMove, long nVertMove );
virtual void Scale( double fScaleX, double fScaleY );
@@ -1525,7 +1525,7 @@ private:
public:
DECL_META_ACTION( LayoutMode, META_LAYOUTMODE_ACTION )
- MetaLayoutModeAction( sal_uInt32 nLayoutMode );
+ explicit MetaLayoutModeAction( sal_uInt32 nLayoutMode );
sal_uInt32 GetLayoutMode() const { return mnLayoutMode; }
};
@@ -1544,9 +1544,10 @@ private:
public:
DECL_META_ACTION( TextLanguage, META_TEXTLANGUAGE_ACTION )
- MetaTextLanguageAction( LanguageType );
+ explicit MetaTextLanguageAction( LanguageType );
LanguageType GetTextLanguage() const { return meTextLanguage; }
};
#endif // _SV_METAACT_HXX
+
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/morebtn.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/morebtn.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/morebtn.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/morebtn.hxx Sun Feb 3 13:23:59 2013
@@ -54,9 +54,9 @@ protected:
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
public:
- MoreButton( Window* pParent, WinBits nStyle = 0 );
- MoreButton( Window* pParent, const ResId& rResId );
- ~MoreButton();
+ explicit MoreButton( Window* pParent, WinBits nStyle = 0 );
+ explicit MoreButton( Window* pParent, const ResId& );
+ virtual ~MoreButton();
void Click();
@@ -89,3 +89,4 @@ inline void MoreButton::SetState( sal_Bo
}
#endif // _SV_MOREBTN_HXX
+
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/outdev.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/outdev.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/outdev.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/outdev.hxx Sun Feb 3 13:23:59 2013
@@ -77,6 +77,7 @@ class SalLayout;
class ImplLayoutArgs;
class ImplFontAttributes;
class VirtualDevice;
+struct SalTwoRect;
namespace com {
namespace sun {
@@ -355,27 +356,29 @@ private:
Point maRefPoint;
sal_uInt16 mnAntialiasing;
LanguageType meTextLanguage;
- mutable sal_Bool mbMap:1,
- mbMapIsDefault:1,
- mbClipRegion:1,
- mbBackground:1,
- mbOutput:1,
- mbDevOutput:1,
- mbOutputClipped:1,
- mbLineColor:1,
- mbFillColor:1,
- mbInitLineColor:1,
- mbInitFillColor:1,
- mbInitFont:1,
- mbInitTextColor:1,
- mbInitClipRegion:1,
- mbClipRegionSet:1,
- mbKerning:1,
- mbNewFont:1,
- mbTextLines:1,
- mbTextSpecial:1,
- mbRefPoint:1,
- mbEnableRTL:1;
+
+ /// bitfield
+ mutable bool mbMap : 1;
+ mutable bool mbMapIsDefault : 1;
+ mutable bool mbClipRegion : 1;
+ mutable bool mbBackground : 1;
+ mutable bool mbOutput : 1;
+ mutable bool mbDevOutput : 1;
+ mutable bool mbOutputClipped : 1;
+ mutable bool mbLineColor : 1;
+ mutable bool mbFillColor : 1;
+ mutable bool mbInitLineColor : 1;
+ mutable bool mbInitFillColor : 1;
+ mutable bool mbInitFont : 1;
+ mutable bool mbInitTextColor : 1;
+ mutable bool mbInitClipRegion : 1;
+ mutable bool mbClipRegionSet : 1;
+ mutable bool mbKerning : 1;
+ mutable bool mbNewFont : 1;
+ mutable bool mbTextLines : 1;
+ mutable bool mbTextSpecial : 1;
+ mutable bool mbRefPoint : 1;
+ mutable bool mbEnableRTL : 1;
public:
SAL_DLLPRIVATE sal_Int32 ImplGetDPIX() const { return mnDPIX; }
@@ -482,7 +485,7 @@ public:
SAL_DLLPRIVATE void ImplDrawGradientWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper );
SAL_DLLPRIVATE void ImplDraw2ColorFrame( const Rectangle& rRect, const Color& rLeftTopColor, const Color& rRightBottomColor );
- SAL_DLLPRIVATE void ImplDrawOutDevDirect( const OutputDevice* pSrcDev, void* pPosAry );
+ SAL_DLLPRIVATE void ImplDrawOutDevDirect( const OutputDevice* pSrcDev, SalTwoRect& rPosAry );
SAL_DLLPRIVATE void ImplDrawBitmap( const Point& rDestPt, const Size& rDestSize,
const Point& rSrcPtPixel, const Size& rSrcSizePixel,
const Bitmap& rBitmap, const sal_uLong nAction );
@@ -772,6 +775,20 @@ public:
const Point& rSrcPtPixel, const Size& rSrcSizePixel,
const BitmapEx& rBitmapEx );
+ /** Draw BitampEx transformed
+
+ @param rTransformation
+ The transformation describing the target positioning of the given bitmap. Transforming
+ the unit object coordinates (0, 0, 1, 1) with this matrix is the transformation to
+ discrete coordinates
+
+ @param rBitmapEx
+ The BitmapEx to be painted
+ */
+ void DrawTransformedBitmapEx(
+ const basegfx::B2DHomMatrix& rTransformation,
+ const BitmapEx& rBitmapEx);
+
void DrawMask( const Point& rDestPt,
const Bitmap& rBitmap, const Color& rMaskColor );
void DrawMask( const Point& rDestPt, const Size& rDestSize,
@@ -820,6 +837,14 @@ public:
bool DrawEPS( const Point& rPt, const Size& rSz,
const GfxLink& rGfxLink, GDIMetaFile* pSubst = NULL );
+ /// Fill the given rectangle with checkered rectangles of size nLen x nLen using the colors aStart and aEnd
+ void DrawCheckered(
+ const Point& rPos,
+ const Size& rSize,
+ sal_uInt32 nLen = 8,
+ Color aStart = Color(COL_WHITE),
+ Color aEnd = Color(COL_BLACK));
+
Color GetPixel( const Point& rPt ) const;
Color* GetPixel( const Polygon& rPts ) const;
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/pngread.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/pngread.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/pngread.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/pngread.hxx Sun Feb 3 13:23:59 2013
@@ -44,7 +44,7 @@ namespace vcl
/* the PNG chunks are read within the c'tor, so the stream will
be positioned at the end of the PNG */
- PNGReader( SvStream& rStm );
+ explicit PNGReader( SvStream& rStm );
~PNGReader();
/* an empty preview size hint (=default) will read the whole image
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/pngwrite.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/pngwrite.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/pngwrite.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/pngwrite.hxx Sun Feb 3 13:23:59 2013
@@ -44,7 +44,7 @@ namespace vcl
public:
- PNGWriter( const BitmapEx& BmpEx,
+ explicit PNGWriter( const BitmapEx&,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData = NULL );
~PNGWriter();
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/salbtype.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/salbtype.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/salbtype.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/salbtype.hxx Sun Feb 3 13:23:59 2013
@@ -255,6 +255,7 @@ public:
inline void SetColorFor24Bit( const BitmapColor& rColor, HPBYTE pPixel ) const;
inline void GetColorFor32Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const;
+ inline void GetColorAndAlphaFor32Bit( BitmapColor& rColor, sal_uInt8& rAlpha, ConstHPBYTE pPixel ) const;
inline void SetColorFor32Bit( const BitmapColor& rColor, HPBYTE pPixel ) const;
};
@@ -281,8 +282,9 @@ struct VCL_DLLPUBLIC BitmapBuffer
// - StretchAndConvert -
// ---------------------
-VCL_DLLPUBLIC BitmapBuffer* StretchAndConvert( const BitmapBuffer& rSrcBuffer, const SalTwoRect& rTwoRect,
- sal_uLong nDstBitmapFormat, BitmapPalette* pDstPal = NULL, ColorMask* pDstMask = NULL );
+VCL_DLLPUBLIC BitmapBuffer* StretchAndConvert(
+ const BitmapBuffer& rSrcBuffer, const SalTwoRect& rTwoRect,
+ sal_uLong nDstBitmapFormat, const BitmapPalette* pDstPal = NULL, const ColorMask* pDstMask = NULL );
// ------------------------------------------------------------------
@@ -880,6 +882,21 @@ inline void ColorMask::GetColorFor32Bit(
// ------------------------------------------------------------------
+inline void ColorMask::GetColorAndAlphaFor32Bit( BitmapColor& rColor, sal_uInt8& rAlpha, ConstHPBYTE pPixel ) const
+{
+#ifdef OSL_BIGENDIAN
+ const sal_uInt32 nVal = (sal_uInt32) pPixel[ 0 ] | ( (sal_uInt32) pPixel[ 1 ] << 8UL ) |
+ ( (sal_uInt32) pPixel[ 2 ] << 16UL ) | ( (sal_uInt32) pPixel[ 3 ] << 24UL );
+#else
+ const sal_uInt32 nVal = *(sal_uInt32*) pPixel;
+#endif
+ rAlpha = (sal_uInt8)(nVal >> 24);
+
+ MASK_TO_COLOR( nVal, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift, rColor );
+}
+
+// ------------------------------------------------------------------
+
inline void ColorMask::SetColorFor32Bit( const BitmapColor& rColor, HPBYTE pPixel ) const
{
#ifdef OSL_BIGENDIAN
Modified: openoffice/branches/l10n/main/vcl/inc/vcl/scrbar.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/vcl/scrbar.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/vcl/scrbar.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/vcl/scrbar.hxx Sun Feb 3 13:23:59 2013
@@ -93,9 +93,9 @@ private:
DECL_DLLPRIVATE_LINK( ImplAutoTimerHdl, AutoTimer* );
public:
- ScrollBar( Window* pParent, WinBits nStyle = WB_VERT );
- ScrollBar( Window* pParent, const ResId& rResId );
- ~ScrollBar();
+ explicit ScrollBar( Window* pParent, WinBits nStyle = WB_VERT );
+ explicit ScrollBar( Window* pParent, const ResId& );
+ virtual ~ScrollBar();
virtual void MouseButtonDown( const MouseEvent& rMEvt );
virtual void Tracking( const TrackingEvent& rTEvt );
@@ -156,11 +156,12 @@ private:
SAL_DLLPRIVATE void ImplInitSettings();
public:
- ScrollBarBox( Window* pParent, WinBits nStyle = 0 );
- ScrollBarBox( Window* pParent, const ResId& rResId );
+ explicit ScrollBarBox( Window* pParent, WinBits nStyle = 0 );
+ explicit ScrollBarBox( Window* pParent, const ResId& );
virtual void StateChanged( StateChangedType nType );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
};
#endif // _SV_SCRBAR_HXX
+