You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by st...@apache.org on 2013/02/21 03:53:05 UTC
svn commit: r1448495 [6/6] - in /openoffice/branches/ia2: ./
ext_libraries/ratscan/scan/ extras/l10n/source/rw/ extras/l10n/source/te/
extras/l10n/source/uz/ main/ main/autodoc/source/display/html/
main/automation/packimages/ main/automation/prj/ main/...
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/linkdata_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/linkdata_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/linkdata_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/linkdata_mask.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define linkdata_mask_height 32
#define linkdata_mask_x_hot 1
#define linkdata_mask_y_hot 1
-static char linkdata_mask_bits[] = {
+static const unsigned char linkdata_mask_bits[] = {
0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/linkfile_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/linkfile_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/linkfile_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/linkfile_curs.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define linkfile_curs_height 32
#define linkfile_curs_x_hot 9
#define linkfile_curs_y_hot 9
-static char linkfile_curs_bits[] = {
+static const unsigned char linkfile_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x00,
0xfe, 0x00, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00,
0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x04, 0x00, 0x00,
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/linkfile_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/linkfile_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/linkfile_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/linkfile_mask.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define linkfile_mask_height 32
#define linkfile_mask_x_hot 9
#define linkfile_mask_y_hot 9
-static char linkfile_mask_bits[] = {
+static const unsigned char linkfile_mask_bits[] = {
0xff, 0x01, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/magnify_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/magnify_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/magnify_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/magnify_curs.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define magnify_curs_height 32
#define magnify_curs_x_hot 12
#define magnify_curs_y_hot 13
-static char magnify_curs_bits[] = {
+static const unsigned char magnify_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,0x7c,0x00,0x00,0x00,0x83,
0x01,0x00,0x80,0x00,0x02,0x00,0x40,0x00,0x04,0x00,0x40,0x00,0x04,0x00,0x20,
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/magnify_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/magnify_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/magnify_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/magnify_mask.h Thu Feb 21 02:52:59 2013
@@ -22,7 +22,7 @@
#define magnify_mask_width 32
#define magnify_mask_height 32
-static char magnify_mask_bits[] = {
+static const unsigned char magnify_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00,
0x00, 0xff, 0x01, 0x00, 0x80, 0xff, 0x03, 0x00, 0xc0, 0x83, 0x07, 0x00,
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/mirror_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/mirror_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/mirror_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/mirror_curs.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define mirror_curs_height 32
#define mirror_curs_x_hot 14
#define mirror_curs_y_hot 12
-static char mirror_curs_bits[] = {
+static const unsigned char mirror_curs_bits[] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0x03, 0xf8, 0xf5, 0xff,
0xfb, 0xfb, 0xee, 0xff, 0x0b, 0xfa, 0xf5, 0xff, 0xeb, 0xfa, 0xfa, 0xff,
0xeb, 0xfa, 0xfa, 0xff, 0xeb, 0x7a, 0xfd, 0xff, 0xeb, 0x7a, 0xfd, 0xff,
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/mirror_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/mirror_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/mirror_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/mirror_mask.h Thu Feb 21 02:52:59 2013
@@ -22,7 +22,7 @@
#define mirror_mask_width 32
#define mirror_mask_height 32
-static char mirror_mask_bits[] = {
+static const unsigned char mirror_mask_bits[] = {
0x00, 0x00, 0x04, 0x00, 0xfe, 0x0f, 0x0e, 0x00, 0xfe, 0x0f, 0x1f, 0x00,
0xfe, 0x8f, 0x3f, 0x00, 0xfe, 0x0f, 0x1f, 0x00, 0xfe, 0x8f, 0x0f, 0x00,
0xbe, 0x8f, 0x0f, 0x00, 0xbe, 0xcf, 0x07, 0x00, 0xbe, 0xcf, 0x87, 0x00,
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movebezierweight_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movebezierweight_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movebezierweight_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movebezierweight_curs.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define movebezierweight_curs_height 32
#define movebezierweight_curs_x_hot 0
#define movebezierweight_curs_y_hot 0
-static char movebezierweight_curs_bits[] = {
+static const unsigned char movebezierweight_curs_bits[] = {
0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xf9, 0xff, 0xff, 0xff,
0xf1, 0xff, 0xff, 0xff, 0xe1, 0xff, 0xff, 0xff, 0xc1, 0xff, 0xff, 0xff,
0x81, 0xff, 0xff, 0xff, 0x01, 0xff, 0xff, 0xff, 0x01, 0xfe, 0xff, 0xff,
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movebezierweight_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movebezierweight_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movebezierweight_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movebezierweight_mask.h Thu Feb 21 02:52:59 2013
@@ -22,7 +22,7 @@
#define movebezierweight_mask_width 32
#define movebezierweight_mask_height 32
-static char movebezierweight_mask_bits[] = {
+static const unsigned char movebezierweight_mask_bits[] = {
0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00,
0x1f, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00,
0xff, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00,
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movedata_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movedata_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movedata_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movedata_curs.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define movedata_curs_height 32
#define movedata_curs_x_hot 1
#define movedata_curs_y_hot 1
-static char movedata_curs_bits[] = {
+static const unsigned char movedata_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00,
0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00,
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movedata_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movedata_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movedata_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movedata_mask.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define movedata_mask_height 32
#define movedata_mask_x_hot 1
#define movedata_mask_y_hot 1
-static char movedata_mask_bits[] = {
+static const unsigned char movedata_mask_bits[] = {
0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movedlnk_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movedlnk_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movedlnk_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movedlnk_curs.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define movedlnk_curs_height 32
#define movedlnk_curs_x_hot 1
#define movedlnk_curs_y_hot 1
-static char movedlnk_curs_bits[] = {
+static const unsigned char movedlnk_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00,
0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00,
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movedlnk_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movedlnk_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movedlnk_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movedlnk_mask.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define movedlnk_mask_height 32
#define movedlnk_mask_x_hot 1
#define movedlnk_mask_y_hot 1
-static char movedlnk_mask_bits[] = {
+static const unsigned char movedlnk_mask_bits[] = {
0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movefile_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movefile_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movefile_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movefile_curs.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define movefile_curs_height 32
#define movefile_curs_x_hot 9
#define movefile_curs_y_hot 9
-static char movefile_curs_bits[] = {
+static const unsigned char movefile_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x00,
0xfe, 0x00, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00,
0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x04, 0x00, 0x00,
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movefile_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movefile_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movefile_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movefile_mask.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define movefile_mask_height 32
#define movefile_mask_x_hot 9
#define movefile_mask_y_hot 9
-static char movefile_mask_bits[] = {
+static const unsigned char movefile_mask_bits[] = {
0xff, 0x01, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movefiles_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movefiles_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movefiles_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movefiles_curs.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define movefiles_curs_height 32
#define movefiles_curs_x_hot 8
#define movefiles_curs_y_hot 9
-static char movefiles_curs_bits[] = {
+static const unsigned char movefiles_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0xe0, 0x0f, 0x00, 0x00, 0xe0, 0x2f, 0x00, 0x00,
0xe8, 0x0f, 0x00, 0x00, 0xe8, 0x7f, 0x00, 0x00, 0xea, 0x7f, 0x00, 0x00,
0xea, 0x7f, 0x00, 0x00, 0xea, 0x7f, 0x00, 0x00, 0x6a, 0x7e, 0x00, 0x00,
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movefiles_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movefiles_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movefiles_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movefiles_mask.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define movefiles_mask_height 32
#define movefiles_mask_x_hot 8
#define movefiles_mask_y_hot 9
-static char movefiles_mask_bits[] = {
+static const unsigned char movefiles_mask_bits[] = {
0xf0, 0x1f, 0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0xfc, 0x7f, 0x00, 0x00,
0xfc, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/moveflnk_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/moveflnk_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/moveflnk_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/moveflnk_curs.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define moveflnk_curs_height 32
#define moveflnk_curs_x_hot 9
#define moveflnk_curs_y_hot 9
-static char moveflnk_curs_bits[] = {
+static const unsigned char moveflnk_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x00,
0xfe, 0x00, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00,
0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00,
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/moveflnk_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/moveflnk_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/moveflnk_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/moveflnk_mask.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define moveflnk_mask_height 32
#define moveflnk_mask_x_hot 9
#define moveflnk_mask_y_hot 9
-static char moveflnk_mask_bits[] = {
+static const unsigned char moveflnk_mask_bits[] = {
0xff, 0x01, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movepoint_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movepoint_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movepoint_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movepoint_curs.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define movepoint_curs_height 32
#define movepoint_curs_x_hot 0
#define movepoint_curs_y_hot 0
-static char movepoint_curs_bits[] = {
+static const unsigned char movepoint_curs_bits[] = {
0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xf9, 0xff, 0xff, 0xff,
0xf1, 0xff, 0xff, 0xff, 0xe1, 0xff, 0xff, 0xff, 0xc1, 0xff, 0xff, 0xff,
0x81, 0xff, 0xff, 0xff, 0x01, 0xff, 0xff, 0xff, 0x01, 0xfe, 0xff, 0xff,
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movepoint_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movepoint_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movepoint_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movepoint_mask.h Thu Feb 21 02:52:59 2013
@@ -22,7 +22,7 @@
#define movepoint_mask_width 32
#define movepoint_mask_height 32
-static char movepoint_mask_bits[] = {
+static const unsigned char movepoint_mask_bits[] = {
0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00,
0x1f, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00,
0xff, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00,
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/nodrop_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/nodrop_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/nodrop_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/nodrop_curs.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define nodrop_curs_height 32
#define nodrop_curs_x_hot 9
#define nodrop_curs_y_hot 9
-static char nodrop_curs_bits[] = {
+static const unsigned char nodrop_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0xc0, 0x0f, 0x00, 0x00, 0xf0, 0x3f, 0x00, 0x00,
0xf8, 0x7f, 0x00, 0x00, 0x7c, 0xf8, 0x00, 0x00, 0x1c, 0xfc, 0x00, 0x00,
0x1e, 0xfe, 0x01, 0x00, 0x0e, 0xdf, 0x01, 0x00, 0x8e, 0xcf, 0x01, 0x00,
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/nodrop_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/nodrop_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/nodrop_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/nodrop_mask.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define nodrop_mask_height 32
#define nodrop_mask_x_hot 9
#define nodrop_mask_y_hot 9
-static char nodrop_mask_bits[] = {
+static const unsigned char nodrop_mask_bits[] = {
0xc0, 0x0f, 0x00, 0x00, 0xf0, 0x3f, 0x00, 0x00, 0xf8, 0x7f, 0x00, 0x00,
0xfc, 0xff, 0x00, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x7e, 0xfe, 0x01, 0x00,
0x3f, 0xff, 0x03, 0x00, 0x9f, 0xff, 0x03, 0x00, 0xdf, 0xff, 0x03, 0x00,
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/null_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/null_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/null_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/null_curs.h Thu Feb 21 02:52:59 2013
@@ -24,4 +24,4 @@
#define nullcurs_height 4
#define nullcurs_x_hot 2
#define nullcurs_y_hot 2
-static char nullcurs_bits[] = { 0x00, 0x00 };
+static const unsigned char nullcurs_bits[] = { 0x00, 0x00 };
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/null_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/null_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/null_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/null_mask.h Thu Feb 21 02:52:59 2013
@@ -22,4 +22,4 @@
#define nullmask_width 4
#define nullmask_height 4
-static char nullmask_bits[] = { 0x00, 0x00 };
+static const unsigned char nullmask_bits[] = { 0x00, 0x00 };
Modified: openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/paintbrush_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/paintbrush_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/paintbrush_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/paintbrush_curs.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/paintbrush_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/paintbrush_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/paintbrush_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/paintbrush_mask.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/pivotcol_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotcol_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotcol_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotcol_curs.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/pivotcol_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotcol_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotcol_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotcol_mask.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/pivotdel_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotdel_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotdel_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotdel_curs.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/pivotdel_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotdel_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotdel_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotdel_mask.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/pivotfld_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotfld_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotfld_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotfld_curs.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/pivotfld_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotfld_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotfld_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotfld_mask.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/pivotrow_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotrow_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotrow_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotrow_curs.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/pivotrow_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotrow_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotrow_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotrow_mask.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/rotate_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/rotate_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/rotate_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/rotate_curs.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/rotate_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/rotate_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/rotate_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/rotate_mask.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/tblsele_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblsele_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblsele_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblsele_curs.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/tblsele_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblsele_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblsele_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblsele_mask.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/tblsels_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblsels_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblsels_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblsels_curs.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/tblsels_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblsels_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblsels_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblsels_mask.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/tblselse_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblselse_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblselse_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblselse_curs.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/tblselse_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblselse_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblselse_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblselse_mask.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/tblselsw_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblselsw_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblselsw_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblselsw_curs.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/tblselw_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblselw_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblselw_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblselw_curs.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/tblselw_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblselw_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblselw_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblselw_mask.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/timemove_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/timemove_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/timemove_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/timemove_curs.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/timemove_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/timemove_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/timemove_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/timemove_mask.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/timesize_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/timesize_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/timesize_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/timesize_curs.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/timesize_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/timesize_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/timesize_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/timesize_mask.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/vertcurs_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/vertcurs_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/vertcurs_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/vertcurs_curs.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/vertcurs_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/vertcurs_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/vertcurs_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/vertcurs_mask.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/vshear_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/vshear_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/vshear_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/vshear_curs.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/unx/x11_cursors/vshear_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/vshear_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/vshear_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/vshear_mask.h Thu Feb 21 02:52: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/ia2/main/vcl/inc/vcl/bitmap.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/vcl/bitmap.hxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/vcl/bitmap.hxx (original)
+++ openoffice/branches/ia2/main/vcl/inc/vcl/bitmap.hxx Thu Feb 21 02:52:59 2013
@@ -30,6 +30,17 @@
#include <tools/rc.hxx>
#include <vcl/region.hxx>
+#ifdef WNT
+#define _STLP_HAS_NATIVE_FLOAT_ABS
+#endif
+
+#include <boost/math/special_functions/sinc.hpp>
+
+using namespace boost::math::policies;
+typedef policy<
+ promote_double<false>
+> SincPolicy;
+
// -----------
// - Defines -
// -----------
@@ -261,8 +272,7 @@ public:
}
x *= M_PI;
-
- return sin(x) / x;
+ return boost::math::sinc_pi(x, SincPolicy());
}
};
Modified: openoffice/branches/ia2/main/vcl/source/window/printdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/source/window/printdlg.cxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/source/window/printdlg.cxx (original)
+++ openoffice/branches/ia2/main/vcl/source/window/printdlg.cxx Thu Feb 21 02:52:59 2013
@@ -250,7 +250,7 @@ void PrintDialog::PrintPreviewWindow::Pa
Point aOffset( (aSize.Width() - maPreviewSize.Width()) / 2 + nTextHeight,
(aSize.Height() - maPreviewSize.Height()) / 2 + nTextHeight );
- Size aVDevSize( maPageVDev.GetOutputSizePixel() );
+ const Size aVDevSize( maPageVDev.GetOutputSizePixel() );
const Size aLogicSize( maPageVDev.PixelToLogic( aVDevSize, MapMode( MAP_100TH_MM ) ) );
Size aOrigSize( maOrigSize );
if( aOrigSize.Width() < 1 )
@@ -271,12 +271,38 @@ void PrintDialog::PrintPreviewWindow::Pa
aMtf.WindStart();
aMtf.Scale( fScale, fScale );
aMtf.WindStart();
+
+ const sal_uInt16 nOriginalAA(maPageVDev.GetAntialiasing());
+ static bool bNicePrintPreview(true);
+
+ if(bNicePrintPreview)
+ {
+ // replay metafile with AntiAliasing
+ maPageVDev.SetAntialiasing(nOriginalAA | ANTIALIASING_ENABLE_B2DDRAW);
+ }
+
aMtf.Play( &maPageVDev, Point( 0, 0 ), aLogicSize );
+
+ maPageVDev.SetAntialiasing(nOriginalAA);
maPageVDev.Pop();
SetMapMode( MAP_PIXEL );
maPageVDev.SetMapMode( MAP_PIXEL );
- DrawOutDev( aOffset, maPreviewSize, Point( 0, 0 ), aVDevSize, maPageVDev );
+
+ if(bNicePrintPreview)
+ {
+ // use lanzcos scaling
+ Bitmap aContent(maPageVDev.GetBitmap(Point(0, 0), aVDevSize));
+ aContent.Scale(maPreviewSize, BMP_SCALE_BESTQUALITY);
+ DrawBitmap(aOffset, aContent);
+ }
+ else
+ {
+ // direct paint (copy from OutDev to OutDev) is fast, but does not do
+ // any good scaling at all (currently)
+ DrawOutDev( aOffset, maPreviewSize, Point( 0, 0 ), aVDevSize, maPageVDev );
+ }
+
maPageVDev.SetDrawMode( nOldDrawMode );
DecorationView aVw( this );
Modified: openoffice/branches/ia2/main/vcl/unx/generic/app/saldisp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/unx/generic/app/saldisp.cxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/unx/generic/app/saldisp.cxx (original)
+++ openoffice/branches/ia2/main/vcl/unx/generic/app/saldisp.cxx Thu Feb 21 02:52:59 2013
@@ -788,7 +788,7 @@ void SalDisplay::initScreen( int nScreen
}
rSD.m_hInvert50 = XCreateBitmapFromData( pDisp_,
rSD.m_aRefWindow,
- invert50_bits,
+ (const char*)invert50_bits,
invert50_width,
invert50_height );
}
@@ -1056,9 +1056,9 @@ inline KeySym sal_XModifier2Keysym( Disp
XModifierKeymap *pXModMap,
int n )
{
- return XKeycodeToKeysym( pDisplay,
+ return XkbKeycodeToKeysym( pDisplay,
pXModMap->modifiermap[n*pXModMap->max_keypermod],
- 0 );
+ 0, 0 );
}
void SalDisplay::ModifierMapping()
@@ -1737,7 +1737,7 @@ KeySym SalDisplay::GetKeySym( XKeyEvent
// Now get the unmodified KeySym for KeyCode retrieval
// try to strip off modifiers, e.g. Ctrl-$ becomes Ctrl-Shift-4
- *pUnmodifiedKeySym = XKeycodeToKeysym( GetDisplay(), pEvent->keycode, 0);
+ *pUnmodifiedKeySym = XkbKeycodeToKeysym( GetDisplay(), pEvent->keycode, 0, 0 );
return nKeySym;
}
@@ -1747,7 +1747,7 @@ KeySym SalDisplay::GetKeySym( XKeyEvent
#define MAKE_BITMAP( name ) \
XCreateBitmapFromData( pDisp_, \
DefaultRootWindow( pDisp_ ), \
- name##_bits, \
+ (const char*)name##_bits, \
name##_width, \
name##_height )
Modified: openoffice/branches/ia2/main/vcl/unx/generic/dtrans/X11_selection.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/unx/generic/dtrans/X11_selection.cxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/unx/generic/dtrans/X11_selection.cxx (original)
+++ openoffice/branches/ia2/main/vcl/unx/generic/dtrans/X11_selection.cxx Thu Feb 21 02:52:59 2013
@@ -434,34 +434,12 @@ void SelectionManager::initialize( const
if( m_aWindow )
{
+#define createCursorFromXPM(name) createCursor((const char*)name##curs##_bits, (const char*)name##mask##_bits, name##curs_width, name##curs_height, name##curs_x_hot, name##curs_y_hot );
// initialize default cursors
- m_aMoveCursor = createCursor( movedata_curs_bits,
- movedata_mask_bits,
- movedata_curs_width,
- movedata_curs_height,
- movedata_curs_x_hot,
- movedata_curs_y_hot );
- m_aCopyCursor = createCursor( copydata_curs_bits,
- copydata_mask_bits,
- copydata_curs_width,
- copydata_curs_height,
- copydata_curs_x_hot,
- copydata_curs_y_hot );
- m_aLinkCursor = createCursor( linkdata_curs_bits,
- linkdata_mask_bits,
- linkdata_curs_width,
- linkdata_curs_height,
- linkdata_curs_x_hot,
- linkdata_curs_y_hot );
- m_aNoneCursor = createCursor( nodrop_curs_bits,
- nodrop_mask_bits,
- nodrop_curs_width,
- nodrop_curs_height,
- nodrop_curs_x_hot,
- nodrop_curs_y_hot );
-
-
-
+ m_aMoveCursor = createCursorFromXPM( movedata_);
+ m_aCopyCursor = createCursorFromXPM( copydata_);
+ m_aLinkCursor = createCursorFromXPM( linkdata_);
+ m_aNoneCursor = createCursorFromXPM( nodrop_);
// just interested in SelectionClear/Notify/Request and PropertyChange
XSelectInput( m_pDisplay, m_aWindow, PropertyChangeMask );
@@ -2746,8 +2724,8 @@ bool SelectionManager::handleDragEvent(
}
else if( rMessage.type == XLIB_KeyPress || rMessage.type == KeyRelease )
{
- bHandled = true;
- KeySym aKey = XKeycodeToKeysym( m_pDisplay, rMessage.xkey.keycode, 0 );
+ bHandled = true;
+ const KeySym aKey = XkbKeycodeToKeysym( m_pDisplay, rMessage.xkey.keycode, 0, 0 );
if( aKey == XK_Escape )
{
// abort drag
Modified: openoffice/branches/ia2/main/vcl/unx/generic/dtrans/copydata_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/unx/generic/dtrans/copydata_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/unx/generic/dtrans/copydata_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/unx/generic/dtrans/copydata_curs.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define copydata_curs_height 32
#define copydata_curs_x_hot 1
#define copydata_curs_y_hot 1
-static char copydata_curs_bits[] = {
+static const unsigned char copydata_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00,
0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00,
Modified: openoffice/branches/ia2/main/vcl/unx/generic/dtrans/copydata_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/unx/generic/dtrans/copydata_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/unx/generic/dtrans/copydata_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/unx/generic/dtrans/copydata_mask.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define copydata_mask_height 32
#define copydata_mask_x_hot 1
#define copydata_mask_y_hot 1
-static char copydata_mask_bits[] = {
+static const unsigned char copydata_mask_bits[] = {
0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
Modified: openoffice/branches/ia2/main/vcl/unx/generic/dtrans/linkdata_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/unx/generic/dtrans/linkdata_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/unx/generic/dtrans/linkdata_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/unx/generic/dtrans/linkdata_curs.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define linkdata_curs_height 32
#define linkdata_curs_x_hot 1
#define linkdata_curs_y_hot 1
-static char linkdata_curs_bits[] = {
+static const unsigned char linkdata_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00,
0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00,
Modified: openoffice/branches/ia2/main/vcl/unx/generic/dtrans/linkdata_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/unx/generic/dtrans/linkdata_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/unx/generic/dtrans/linkdata_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/unx/generic/dtrans/linkdata_mask.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define linkdata_mask_height 32
#define linkdata_mask_x_hot 1
#define linkdata_mask_y_hot 1
-static char linkdata_mask_bits[] = {
+static const unsigned char linkdata_mask_bits[] = {
0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
Modified: openoffice/branches/ia2/main/vcl/unx/generic/dtrans/movedata_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/unx/generic/dtrans/movedata_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/unx/generic/dtrans/movedata_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/unx/generic/dtrans/movedata_curs.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define movedata_curs_height 32
#define movedata_curs_x_hot 1
#define movedata_curs_y_hot 1
-static char movedata_curs_bits[] = {
+static const unsigned char movedata_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00,
0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00,
Modified: openoffice/branches/ia2/main/vcl/unx/generic/dtrans/movedata_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/unx/generic/dtrans/movedata_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/unx/generic/dtrans/movedata_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/unx/generic/dtrans/movedata_mask.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define movedata_mask_height 32
#define movedata_mask_x_hot 1
#define movedata_mask_y_hot 1
-static char movedata_mask_bits[] = {
+static const unsigned char movedata_mask_bits[] = {
0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
Modified: openoffice/branches/ia2/main/vcl/unx/generic/dtrans/nodrop_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/unx/generic/dtrans/nodrop_curs.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/unx/generic/dtrans/nodrop_curs.h (original)
+++ openoffice/branches/ia2/main/vcl/unx/generic/dtrans/nodrop_curs.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define nodrop_curs_height 32
#define nodrop_curs_x_hot 9
#define nodrop_curs_y_hot 9
-static char nodrop_curs_bits[] = {
+static const unsigned char nodrop_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0xc0, 0x0f, 0x00, 0x00, 0xf0, 0x3f, 0x00, 0x00,
0xf8, 0x7f, 0x00, 0x00, 0x7c, 0xf8, 0x00, 0x00, 0x1c, 0xfc, 0x00, 0x00,
0x1e, 0xfe, 0x01, 0x00, 0x0e, 0xdf, 0x01, 0x00, 0x8e, 0xcf, 0x01, 0x00,
Modified: openoffice/branches/ia2/main/vcl/unx/generic/dtrans/nodrop_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/unx/generic/dtrans/nodrop_mask.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/unx/generic/dtrans/nodrop_mask.h (original)
+++ openoffice/branches/ia2/main/vcl/unx/generic/dtrans/nodrop_mask.h Thu Feb 21 02:52:59 2013
@@ -24,7 +24,7 @@
#define nodrop_mask_height 32
#define nodrop_mask_x_hot 9
#define nodrop_mask_y_hot 9
-static char nodrop_mask_bits[] = {
+static const unsigned char nodrop_mask_bits[] = {
0xc0, 0x0f, 0x00, 0x00, 0xf0, 0x3f, 0x00, 0x00, 0xf8, 0x7f, 0x00, 0x00,
0xfc, 0xff, 0x00, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x7e, 0xfe, 0x01, 0x00,
0x3f, 0xff, 0x03, 0x00, 0x9f, 0xff, 0x03, 0x00, 0xdf, 0xff, 0x03, 0x00,
Modified: openoffice/branches/ia2/main/vcl/unx/gtk/app/gtkdata.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/unx/gtk/app/gtkdata.cxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/unx/gtk/app/gtkdata.cxx (original)
+++ openoffice/branches/ia2/main/vcl/unx/gtk/app/gtkdata.cxx Thu Feb 21 02:52:59 2013
@@ -353,7 +353,7 @@ GdkCursor* GtkSalDisplay::getFromXPM( co
#define MAKE_CURSOR( vcl_name, name ) \
case vcl_name: \
- pCursor = getFromXPM( name##curs##_bits, name##mask##_bits, \
+ pCursor = getFromXPM( (const char*)name##curs##_bits, (const char*)name##mask##_bits, \
name##curs_width, name##curs_height, \
name##curs_x_hot, name##curs_y_hot ); \
break
Modified: openoffice/branches/ia2/main/vigra/vigra1.6.0.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vigra/vigra1.6.0.patch?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vigra/vigra1.6.0.patch (original)
+++ openoffice/branches/ia2/main/vigra/vigra1.6.0.patch Thu Feb 21 02:52:59 2013
@@ -379,7 +379,7 @@ diff -uprN misc/vigra1.6.0/include/vigra
{
value_type * newdata = 0;
value_type ** newlines = 0;
-@@ -1124,8 +1156,8 @@ BasicImage<PIXELTYPE, Alloc>::resizeCopy
+@@ -1124,15 +1156,15 @@ BasicImage<PIXELTYPE, Alloc>::resizeCopy
if (newsize != width_*height_) // different sizes, must reallocate
{
newdata = allocator_.allocate(typename Alloc::size_type(newsize));
@@ -390,6 +390,15 @@ diff -uprN misc/vigra1.6.0/include/vigra
deallocate();
}
else // need only to reshape
+ {
+ newdata = data_;
+- std::copy(data, data + newsize, newdata);
+- newlines = initLineStartArray(newdata, width, height);
++ std::copy(src_data, src_data + newsize, newdata);
++ newlines = initLineStartArray(newdata, w, h);
+ pallocator_.deallocate(lines_, typename Alloc::size_type(height_));
+ }
+ }
@@ -1143,12 +1175,12 @@ BasicImage<PIXELTYPE, Alloc>::resizeCopy
data_ = newdata;
Modified: openoffice/branches/ia2/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml (original)
+++ openoffice/branches/ia2/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml Thu Feb 21 02:52:59 2013
@@ -73,7 +73,7 @@
</target>
<target name="init" depends="solar">
- <property name="build.compiler" value="classic"/>
+ <property name="build.compiler" value="modern"/>
<property file="${solar.properties}"/>
<property file="${build.dir}/class/solar.properties"/>
</target>
Modified: openoffice/branches/ia2/main/xmerge/workben/build.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/xmerge/workben/build.xml?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/xmerge/workben/build.xml (original)
+++ openoffice/branches/ia2/main/xmerge/workben/build.xml Thu Feb 21 02:52:59 2013
@@ -73,7 +73,7 @@
</target>
<target name="init" depends="solar">
- <property name="build.compiler" value="classic"/>
+ <property name="build.compiler" value="modern"/>
<property file="${solar.properties}"/>
<property file="${build.dir}/class/solar.properties"/>
</target>
Modified: openoffice/branches/ia2/main/xml2cmp/source/xcd/filebuff.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/xml2cmp/source/xcd/filebuff.cxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/xml2cmp/source/xcd/filebuff.cxx (original)
+++ openoffice/branches/ia2/main/xml2cmp/source/xcd/filebuff.cxx Thu Feb 21 02:52:59 2013
@@ -52,7 +52,7 @@ LoadXmlFile( Buffer & o_rBuffer,
// Read file:
aXmlFile.read(o_rBuffer.Data(), (int) nBufferSize);
- bool ret = aXmlFile.good() != 0;
+ const bool ret = !aXmlFile.fail();
aXmlFile.close();
return ret;
}
Modified: openoffice/branches/ia2/main/xmloff/source/chart/PropertyMap.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/xmloff/source/chart/PropertyMap.hxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/xmloff/source/chart/PropertyMap.hxx (original)
+++ openoffice/branches/ia2/main/xmloff/source/chart/PropertyMap.hxx Thu Feb 21 02:52:59 2013
@@ -87,11 +87,11 @@
#define XML_SCH_CONTEXT_SPECIAL_LABEL_SEPARATOR ( XML_SCH_CTF_START + 24 )
#define MAP_FULL( ApiName, NameSpace, XMLTokenName, XMLType, ContextId, EarliestODFVersionForExport ) { ApiName, sizeof(ApiName)-1, XML_NAMESPACE_##NameSpace, xmloff::token::XMLTokenName, XMLType|XML_TYPE_PROP_CHART, ContextId, EarliestODFVersionForExport }
-#define MAP_ENTRY( a, ns, nm, t ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, SvtSaveOptions::ODFVER_010 }
-#define MAP_ENTRY_ODF12( a, ns, nm, t ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, SvtSaveOptions::ODFVER_012 }
-#define MAP_CONTEXT( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, c, SvtSaveOptions::ODFVER_010 }
-#define MAP_SPECIAL( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART | MID_FLAG_SPECIAL_ITEM, c, SvtSaveOptions::ODFVER_010 }
-#define MAP_SPECIAL_ODF12( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART | MID_FLAG_SPECIAL_ITEM, c, SvtSaveOptions::ODFVER_012 }
+#define MAP_ENTRY( a, ns, nm, t ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, static_cast<sal_Int32>(t|XML_TYPE_PROP_CHART), 0, SvtSaveOptions::ODFVER_010 }
+#define MAP_ENTRY_ODF12( a, ns, nm, t ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, static_cast<sal_Int32>(t|XML_TYPE_PROP_CHART), 0, SvtSaveOptions::ODFVER_012 }
+#define MAP_CONTEXT( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, static_cast<sal_Int32>(t|XML_TYPE_PROP_CHART), c, SvtSaveOptions::ODFVER_010 }
+#define MAP_SPECIAL( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, static_cast<sal_Int32>(t|XML_TYPE_PROP_CHART | MID_FLAG_SPECIAL_ITEM), c, SvtSaveOptions::ODFVER_010 }
+#define MAP_SPECIAL_ODF12( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, static_cast<sal_Int32>(t|XML_TYPE_PROP_CHART | MID_FLAG_SPECIAL_ITEM), c, SvtSaveOptions::ODFVER_012 }
#define MAP_ENTRY_END { 0,0,0,xmloff::token::XML_TOKEN_INVALID,0,0,SvtSaveOptions::ODFVER_010 }
// ---------------------------------------------------------
Modified: openoffice/branches/ia2/main/xmloff/source/draw/sdpropls.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/xmloff/source/draw/sdpropls.cxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/xmloff/source/draw/sdpropls.cxx (original)
+++ openoffice/branches/ia2/main/xmloff/source/draw/sdpropls.cxx Thu Feb 21 02:52:59 2013
@@ -84,10 +84,10 @@ using namespace ::xmloff::token;
#define _MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_010 }
#define _MAPV(name,prefix,token,type,context,version) { name, sizeof(name)-1, prefix, token, type, context, version }
-#define GMAP(name,prefix,token,type,context) _MAP(name,prefix,token,type|XML_TYPE_PROP_GRAPHIC,context)
-#define GMAPV(name,prefix,token,type,context,version) _MAPV(name,prefix,token,type|XML_TYPE_PROP_GRAPHIC,context,version)
-#define DPMAP(name,prefix,token,type,context) _MAP(name,prefix,token,type|XML_TYPE_PROP_DRAWING_PAGE,context)
-#define TMAP(name,prefix,token,type,context) _MAP(name,prefix,token,type|XML_TYPE_PROP_TEXT,context)
+#define GMAP(name,prefix,token,type,context) _MAP(name,prefix,token,static_cast<sal_Int32>(type|XML_TYPE_PROP_GRAPHIC),context)
+#define GMAPV(name,prefix,token,type,context,version) _MAPV(name,prefix,token,static_cast<sal_Int32>(type|XML_TYPE_PROP_GRAPHIC),context,version)
+#define DPMAP(name,prefix,token,type,context) _MAP(name,prefix,token,static_cast<sal_Int32>(type|XML_TYPE_PROP_DRAWING_PAGE),context)
+#define TMAP(name,prefix,token,type,context) _MAP(name,prefix,token,static_cast<sal_Int32>(type|XML_TYPE_PROP_TEXT),context)
#define PMAP(name,prefix,token,type,context) _MAP(name,prefix,token,type|XML_TYPE_PROP_PARAGRAPH,context)
#define MAP_END() { 0L, 0, 0, XML_EMPTY, 0 ,0, SvtSaveOptions::ODFVER_010}
Modified: openoffice/branches/ia2/main/xmloff/source/forms/controlpropertymap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/xmloff/source/forms/controlpropertymap.cxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/xmloff/source/forms/controlpropertymap.cxx (original)
+++ openoffice/branches/ia2/main/xmloff/source/forms/controlpropertymap.cxx Thu Feb 21 02:52:59 2013
@@ -43,9 +43,9 @@ namespace xmloff
{
//.........................................................................
-#define MAP_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 }
-#define MAP_CONST( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 }
-#define MAP_CONST_P( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFVER_010 }
+#define MAP_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, static_cast<sal_Int32>(type|XML_TYPE_PROP_TEXT), context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, static_cast<sal_Int32>(type|XML_TYPE_PROP_TEXT), context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_P( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, static_cast<sal_Int32>(type|XML_TYPE_PROP_PARAGRAPH), context, SvtSaveOptions::ODFVER_010 }
#define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0, 0, SvtSaveOptions::ODFVER_010 }
XMLPropertyMapEntry* getControlStylePropertyMap_Access( )
Modified: openoffice/branches/ia2/main/xmloff/source/style/PageMasterStyleMap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/xmloff/source/style/PageMasterStyleMap.cxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/xmloff/source/style/PageMasterStyleMap.cxx (original)
+++ openoffice/branches/ia2/main/xmloff/source/style/PageMasterStyleMap.cxx Thu Feb 21 02:52:59 2013
@@ -31,7 +31,7 @@
using namespace ::xmloff::token;
-#define _MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_010 }
+#define _MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, static_cast<sal_Int32>(type), context, SvtSaveOptions::ODFVER_010 }
#define PLMAP(name,prefix,token,type,context) \
_MAP(name,prefix,token,type|XML_TYPE_PROP_PAGE_LAYOUT,context)
#define HFMAP(name,prefix,token,type,context) \
Modified: openoffice/branches/ia2/main/xmloff/source/text/txtprmap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/xmloff/source/text/txtprmap.cxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/xmloff/source/text/txtprmap.cxx (original)
+++ openoffice/branches/ia2/main/xmloff/source/text/txtprmap.cxx Thu Feb 21 02:52:59 2013
@@ -37,13 +37,13 @@ using namespace ::com::sun::star::uno;
using namespace ::xmloff::token;
#define _M_E( a, p, l, t, c ) \
- { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, t, c, SvtSaveOptions::ODFVER_010 }
+ { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, static_cast<sal_Int32>(t), c, SvtSaveOptions::ODFVER_010 }
#define _M_EV( a, p, l, t, c, v ) \
- { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, t, c, v }
+ { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, static_cast<sal_Int32>(t), c, v }
#define _M_ED( a, p, l, t, c ) \
- { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, (t) | MID_FLAG_DEFAULT_ITEM_EXPORT, c, SvtSaveOptions::ODFVER_010 }
+ { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, static_cast<sal_Int32>((t) | MID_FLAG_DEFAULT_ITEM_EXPORT), c, SvtSaveOptions::ODFVER_010 }
// text properties
#define MT_E( a, p, l, t, c ) \
Modified: openoffice/branches/ia2/main/xmloff/source/transform/TransformerActionInit.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/xmloff/source/transform/TransformerActionInit.hxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/xmloff/source/transform/TransformerActionInit.hxx (original)
+++ openoffice/branches/ia2/main/xmloff/source/transform/TransformerActionInit.hxx Thu Feb 21 02:52:59 2013
@@ -36,7 +36,7 @@ struct XMLTransformerActionInit
sal_uInt32 m_nParam2;
sal_uInt32 m_nParam3;
- static sal_Int32 QNameParam( sal_uInt16 nPrefix,
+ static sal_uInt32 QNameParam( sal_uInt16 nPrefix,
::xmloff::token::XMLTokenEnum eLocalName )
{
return (static_cast< sal_uInt32 >( nPrefix ) << 16) +
Modified: openoffice/branches/ia2/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx (original)
+++ openoffice/branches/ia2/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx Thu Feb 21 02:52:59 2013
@@ -296,9 +296,9 @@ bool nsscrypto_initialize( const css::un
deleteRootsModule();
#if defined SYSTEM_MOZILLA
- OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("libnssckbi"SAL_DLLEXTENSION));
+ OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "libnssckbi" SAL_DLLEXTENSION));
#else
- OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("${OOO_BASE_DIR}/program/libnssckbi"SAL_DLLEXTENSION));
+ OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "${OOO_BASE_DIR}/program/libnssckbi" SAL_DLLEXTENSION));
#endif
::rtl::Bootstrap::expandMacros(rootModule);
@@ -328,18 +328,18 @@ bool nsscrypto_initialize( const css::un
RootsModule = 0;
if (found)
xmlsec_trace("Added new root certificate module "
- "\""ROOT_CERTS"\" contained in \n%s", ospath.getStr());
+ "\"" ROOT_CERTS "\" contained in \n%s", ospath.getStr());
else
{
xmlsec_trace("FAILED to load the new root certificate module "
- "\""ROOT_CERTS"\" contained in \n%s", ospath.getStr());
+ "\"" ROOT_CERTS "\" contained in \n%s", ospath.getStr());
return_value = false;
}
}
else
{
xmlsec_trace("FAILED to add new root certifice module: "
- "\""ROOT_CERTS"\" contained in \n%s", ospath.getStr());
+ "\"" ROOT_CERTS "\" contained in \n%s", ospath.getStr());
return_value = false;
}
@@ -368,17 +368,17 @@ extern "C" void nsscrypto_finalize()
if (SECSuccess == SECMOD_UnloadUserModule(RootsModule))
{
- xmlsec_trace("Unloaded module \""ROOT_CERTS"\".");
+ xmlsec_trace( "Unloaded module \"" ROOT_CERTS "\".");
}
else
{
- xmlsec_trace("Failed unloadeding module \""ROOT_CERTS"\".");
+ xmlsec_trace( "Failed unloadeding module \"" ROOT_CERTS "\".");
}
SECMOD_DestroyModule(RootsModule);
}
else
{
- xmlsec_trace("Unloading module \""ROOT_CERTS
+ xmlsec_trace( "Unloading module \"" ROOT_CERTS
"\" failed because it was not found.");
}
PK11_LogoutAll();
Propchange: openoffice/branches/ia2/test/
------------------------------------------------------------------------------
Merged /openoffice/trunk/test:r1438339-1448058
Modified: openoffice/branches/ia2/test/testcommon/source/org/openoffice/test/Run.help
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/test/testcommon/source/org/openoffice/test/Run.help?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/test/testcommon/source/org/openoffice/test/Run.help (original)
+++ openoffice/branches/ia2/test/testcommon/source/org/openoffice/test/Run.help Thu Feb 21 02:52:59 2013
@@ -19,5 +19,5 @@ System Property
Example
run -Dopenoffice.home=/Applications/OpenOffice.org.app/Contents -tp bvt
run -Dopenoffice.home=/Applications/OpenOffice.org.app/Contents -tc bvt:bvt.gui.BasicFunctionTest,bvt.gui.FileTypeTest
- run -Dopenoffice.pack=http://ci.apache.org/projects/openoffice/install/linux64/Apache_OpenOffice_3.5.0_Linux_x86-64_install-arc_en-US.tar.gz -tp bvt
+ run -Dopenoffice.pack=http://ci.apache.org/projects/openoffice/install/linux64/Apache_OpenOffice_4.0.0_Linux_x86-64_install-arc_en-US.tar.gz -tp bvt
\ No newline at end of file
Modified: openoffice/branches/ia2/test/testgui/source/fvt/gui/sc/validity/ValidityDialogSetting.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/test/testgui/source/fvt/gui/sc/validity/ValidityDialogSetting.java?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/test/testgui/source/fvt/gui/sc/validity/ValidityDialogSetting.java (original)
+++ openoffice/branches/ia2/test/testgui/source/fvt/gui/sc/validity/ValidityDialogSetting.java Thu Feb 21 02:52:59 2013
@@ -526,7 +526,7 @@ public class ValidityDialogSetting {
scInputBarInput.activate();
typeKeys("13");
typeKeys("<enter>");
- assertEquals("OpenOffice.org Calc", activeMsgBox.getCaption());
+ assertEquals("Apache OpenOffice Calc", activeMsgBox.getCaption());
// assertEquals("Invalid value.",ActiveMsgBox.getMessage()); // Can not
// verify in multi-language
activeMsgBox.ok();
Modified: openoffice/branches/ia2/test/testuno/source/fvt/uno/sd/shape/ShapeProperties.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/test/testuno/source/fvt/uno/sd/shape/ShapeProperties.java?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/test/testuno/source/fvt/uno/sd/shape/ShapeProperties.java (original)
+++ openoffice/branches/ia2/test/testuno/source/fvt/uno/sd/shape/ShapeProperties.java Thu Feb 21 02:52:59 2013
@@ -316,7 +316,7 @@ public class ShapeProperties {
xShape=saveAndLoadShape(1,0);
xPropSet = (XPropertySet) UnoRuntime.queryInterface(
XPropertySet.class, xShape);
- assertEquals("RotateAngle is not 2500", 2500 , xPropSet.getPropertyValue("RotateAngle"));
+ assertEquals("RotateAngle is not 2500", 2500L, xPropSet.getPropertyValue("RotateAngle"));
}