Author: mseidel
Date: Mon Jan 14 16:13:17 2019
New Revision: 1851276
URL: http://svn.apache.org/viewvc?rev=1851276&view=rev
Log:
Corrected hotspot and mask for X11 pointer (autoscroll south west)
Merged r1851111 and r1851214 from trunk.
Modified:
openoffice/branches/AOO42X/ (props changed)
openoffice/branches/AOO42X/main/vcl/inc/unx/x11_cursors/assw_curs.h
openoffice/branches/AOO42X/main/vcl/inc/unx/x11_cursors/assw_mask.h
Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 14 16:13:17 2019
@@ -9,4 +9,4 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110
+/openoffice/trunk:1851110-1851111,1851214
Modified: openoffice/branches/AOO42X/main/vcl/inc/unx/x11_cursors/assw_curs.h
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/vcl/inc/unx/x11_cursors/assw_curs.h?rev=1851276&r1=1851275&r2=1851276&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/vcl/inc/unx/x11_cursors/assw_curs.h
(original)
+++ openoffice/branches/AOO42X/main/vcl/inc/unx/x11_cursors/assw_curs.h Mon Jan
14 16:13:17 2019
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,22 +7,22 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
#define assw_curs_width 32
#define assw_curs_height 32
-#define assw_curs_x_hot 21
+#define assw_curs_x_hot 10
#define assw_curs_y_hot 21
static const unsigned char assw_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
Modified: openoffice/branches/AOO42X/main/vcl/inc/unx/x11_cursors/assw_mask.h
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/vcl/inc/unx/x11_cursors/assw_mask.h?rev=1851276&r1=1851275&r2=1851276&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/vcl/inc/unx/x11_cursors/assw_mask.h
(original)
+++ openoffice/branches/AOO42X/main/vcl/inc/unx/x11_cursors/assw_mask.h Mon Jan
14 16:13:17 2019
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,30 +7,30 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
#define assw_mask_width 32
#define assw_mask_height 32
-#define assw_mask_x_hot 21
+#define assw_mask_x_hot 10
#define assw_mask_y_hot 21
static const unsigned char assw_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,
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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x0e,0x00,0x00,0x00,0x1f,0x00,0x00,0x00,0x1f,0x00,0x00,0x10,0x1f,
- 0x00,0x00,0x18,0x0e,0x00,0x00,0x38,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0xfc,
- 0x00,0x00,0x00,0xfc,0x03,0x00,0x00,0xfc,0x01,0x00,0x00,0x3c,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0E,0x00,
+ 0x00,0x00,0x1F,0x00,0x00,0x80,0x3F,0x00,0x00,0x90,0x3F,0x00,0x00,0xB8,0x3F,
+ 0x00,0x00,0x3C,0x1F,0x00,0x00,0x7C,0x0E,0x00,0x00,0xFC,0x00,0x00,0x00,0xFE,
+ 0x03,0x00,0x00,0xFE,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xFE,0x01,0x00,0x00,
+ 0x3E,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
