This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new ab96cd939c Remove unused cursors (#453)
ab96cd939c is described below
commit ab96cd939cde1a19e747a32211616bb0c8a81d0b
Author: Matthias Seidel <[email protected]>
AuthorDate: Tue Dec 30 13:28:55 2025 +0100
Remove unused cursors (#453)
* Remove unused cursors
* Additional files
* Some forgotten changes
(cherry picked from commit c1d6b848b728061ca0aa483aad64c425ca123e05)
---
main/vcl/WinResTarget_vcl.mk | 4 --
main/vcl/aqua/source/app/saldata.cxx | 2 -
main/vcl/aqua/source/res/cursors/timemove.png | Bin 249 -> 0 bytes
main/vcl/aqua/source/res/cursors/timesize.png | Bin 241 -> 0 bytes
main/vcl/inc/os2/salids.hrc | 4 +-
main/vcl/inc/unx/x11_cursors/salcursors.h | 5 ---
main/vcl/inc/unx/x11_cursors/timemove_curs.h | 60 --------------------------
main/vcl/inc/unx/x11_cursors/timemove_mask.h | 60 --------------------------
main/vcl/inc/unx/x11_cursors/timesize_curs.h | 60 --------------------------
main/vcl/inc/unx/x11_cursors/timesize_mask.h | 60 --------------------------
main/vcl/inc/win/salids.hrc | 4 +-
main/vcl/os2/source/src/makefile.mk | 2 -
main/vcl/os2/source/src/salsrc.rc | 2 -
main/vcl/os2/source/src/timemove.ptr | Bin 1190 -> 0 bytes
main/vcl/os2/source/src/timesize.ptr | Bin 1190 -> 0 bytes
main/vcl/os2/source/window/salframe.cxx | 60 ++++++++++++--------------
main/vcl/unx/generic/app/saldisp.cxx | 6 ---
main/vcl/unx/gtk/app/gtkdata.cxx | 2 -
main/vcl/win/source/src/salsrc.rc | 2 -
main/vcl/win/source/src/timemove.cur | Bin 326 -> 0 bytes
main/vcl/win/source/src/timesize.cur | Bin 326 -> 0 bytes
main/vcl/win/source/window/salframe.cxx | 2 -
22 files changed, 32 insertions(+), 303 deletions(-)
diff --git a/main/vcl/WinResTarget_vcl.mk b/main/vcl/WinResTarget_vcl.mk
index 8ef66b052e..65c570642e 100644
--- a/main/vcl/WinResTarget_vcl.mk
+++ b/main/vcl/WinResTarget_vcl.mk
@@ -71,10 +71,8 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
vcl/win/source/src/asnw.cur \
vcl/win/source/src/darc.cur \
vcl/win/source/src/nullptr.cur \
- vcl/win/source/src/timemove.cur \
vcl/win/source/src/ass.cur \
vcl/win/source/src/dbezier.cur \
- vcl/win/source/src/timesize.cur \
vcl/win/source/src/asse.cur \
vcl/win/source/src/dcapt.cur \
vcl/win/source/src/pen.cur \
@@ -181,8 +179,6 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
vcl/os2/source/src/tblselse.ptr \
vcl/os2/source/src/tblselsw.ptr \
vcl/os2/source/src/tblselw.ptr \
- vcl/os2/source/src/timemove.ptr \
- vcl/os2/source/src/timesize.ptr \
vcl/os2/source/src/vshear.ptr \
vcl/os2/source/src/vsizebar.ptr \
vcl/os2/source/src/vsplit.ptr \
diff --git a/main/vcl/aqua/source/app/saldata.cxx
b/main/vcl/aqua/source/app/saldata.cxx
index 158e114da4..33a5ecc411 100644
--- a/main/vcl/aqua/source/app/saldata.cxx
+++ b/main/vcl/aqua/source/app/saldata.cxx
@@ -212,8 +212,6 @@ const aCursorTab[ POINTER_COUNT ] =
{ "pivotfld", { 8, 7 } }, // POINTER_PIVOT_FIELD
{ "chain", { 0, 2 } }, // POINTER_CHAIN
{ "chainnot", { 2, 2 } }, // POINTER_CHAIN_NOTALLOWED
-{ "timemove", { 16, 16 } }, // POINTER_TIMEEVENT_MOVE
-{ "timesize", { 16, 17 } }, // POINTER_TIMEEVENT_SIZE
{ "asn", { 16, 12 } }, // POINTER_AUTOSCROLL_N
{ "ass", { 15, 19 } }, // POINTER_AUTOSCROLL_S
{ "asw", { 12, 15 } }, // POINTER_AUTOSCROLL_W
diff --git a/main/vcl/aqua/source/res/cursors/timemove.png
b/main/vcl/aqua/source/res/cursors/timemove.png
deleted file mode 100644
index 3dae038a20..0000000000
Binary files a/main/vcl/aqua/source/res/cursors/timemove.png and /dev/null
differ
diff --git a/main/vcl/aqua/source/res/cursors/timesize.png
b/main/vcl/aqua/source/res/cursors/timesize.png
deleted file mode 100644
index 22178c9b8d..0000000000
Binary files a/main/vcl/aqua/source/res/cursors/timesize.png and /dev/null
differ
diff --git a/main/vcl/inc/os2/salids.hrc b/main/vcl/inc/os2/salids.hrc
index 75c7fd7642..fec188b6d4 100644
--- a/main/vcl/inc/os2/salids.hrc
+++ b/main/vcl/inc/os2/salids.hrc
@@ -75,8 +75,8 @@
#define SAL_RESID_POINTER_PIVOT_FIELD 10049
#define SAL_RESID_POINTER_CHAIN 10050
#define SAL_RESID_POINTER_CHAIN_NOTALLOWED 10051
-#define SAL_RESID_POINTER_TIMEEVENT_MOVE 10052
-#define SAL_RESID_POINTER_TIMEEVENT_SIZE 10053
+//#define SAL_RESID_POINTER_TIMEEVENT_MOVE 10052 // Removed in
December 2025
+//#define SAL_RESID_POINTER_TIMEEVENT_SIZE 10053 // Removed in
December 2025
#define SAL_RESID_POINTER_AUTOSCROLL_N 10054
#define SAL_RESID_POINTER_AUTOSCROLL_S 10055
#define SAL_RESID_POINTER_AUTOSCROLL_W 10056
diff --git a/main/vcl/inc/unx/x11_cursors/salcursors.h
b/main/vcl/inc/unx/x11_cursors/salcursors.h
index be7a446033..63e723f5e6 100644
--- a/main/vcl/inc/unx/x11_cursors/salcursors.h
+++ b/main/vcl/inc/unx/x11_cursors/salcursors.h
@@ -106,11 +106,6 @@
#include "unx/x11_cursors/chainnot_curs.h"
#include "unx/x11_cursors/chainnot_mask.h"
-#include "unx/x11_cursors/timemove_curs.h"
-#include "unx/x11_cursors/timemove_mask.h"
-#include "unx/x11_cursors/timesize_curs.h"
-#include "unx/x11_cursors/timesize_mask.h"
-
#include "unx/x11_cursors/ase_curs.h"
#include "unx/x11_cursors/ase_mask.h"
#include "unx/x11_cursors/asn_curs.h"
diff --git a/main/vcl/inc/unx/x11_cursors/timemove_curs.h
b/main/vcl/inc/unx/x11_cursors/timemove_curs.h
deleted file mode 100644
index 4c2a4b5d5a..0000000000
--- a/main/vcl/inc/unx/x11_cursors/timemove_curs.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/**************************************************************
- *
- * 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
- * regarding copyright ownership. The ASF licenses this file
- * 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 timemove_curs_width 32
-#define timemove_curs_height 32
-#define timemove_curs_x_hot 16
-#define timemove_curs_y_hot 16
-
-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,0x00,0x01,0x00,
- 0x00,0x00,0x01,0x00,
- 0x00,0x00,0x01,0x00,
- 0x00,0xff,0xff,0x01,
- 0x00,0x01,0x01,0x01,
- 0x00,0x01,0x01,0x01,
- 0x00,0x01,0x01,0x01,
- 0x00,0xff,0xff,0x01,
- 0x00,0x00,0x01,0x00,
- 0x00,0x00,0x01,0x00,
- 0x00,0x00,0x01,0x00,
- 0x00,0xc0,0x07,0x00,
- 0x00,0x80,0x03,0x00,
- 0x00,0x00,0x01,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};
diff --git a/main/vcl/inc/unx/x11_cursors/timemove_mask.h
b/main/vcl/inc/unx/x11_cursors/timemove_mask.h
deleted file mode 100644
index 5610d8fc0e..0000000000
--- a/main/vcl/inc/unx/x11_cursors/timemove_mask.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/**************************************************************
- *
- * 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
- * regarding copyright ownership. The ASF licenses this file
- * 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 timemove_mask_width 32
-#define timemove_mask_height 32
-#define timemove_mask_x_hot 16
-#define timemove_mask_y_hot 16
-
-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,0xc0,0x07,0x00,
- 0x00,0x80,0x03,0x00,
- 0x80,0xff,0xff,0x03,
- 0x80,0xff,0xff,0x03,
- 0x80,0xff,0xff,0x03,
- 0x80,0xff,0xff,0x03,
- 0x80,0xff,0xff,0x03,
- 0x80,0xff,0xff,0x03,
- 0x80,0xff,0xff,0x03,
- 0x00,0x80,0x03,0x00,
- 0x00,0xc0,0x07,0x00,
- 0x00,0xe0,0x0f,0x00,
- 0x00,0xc0,0x07,0x00,
- 0x00,0x80,0x03,0x00,
- 0x00,0x00,0x01,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};
diff --git a/main/vcl/inc/unx/x11_cursors/timesize_curs.h
b/main/vcl/inc/unx/x11_cursors/timesize_curs.h
deleted file mode 100644
index b6472a47c1..0000000000
--- a/main/vcl/inc/unx/x11_cursors/timesize_curs.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/**************************************************************
- *
- * 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
- * regarding copyright ownership. The ASF licenses this file
- * 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 timesize_curs_width 32
-#define timesize_curs_height 32
-#define timesize_curs_x_hot 16
-#define timesize_curs_y_hot 16
-
-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,0x01,0x01,0x01,
- 0x00,0x81,0x03,0x01,
- 0x00,0xc1,0x07,0x01,
- 0x00,0x01,0x01,0x01,
- 0x00,0x01,0x01,0x01,
- 0x00,0x01,0x01,0x01,
- 0x00,0xff,0xff,0x01,
- 0x00,0x00,0x01,0x00,
- 0x00,0x00,0x01,0x00,
- 0x00,0x00,0x01,0x00,
- 0x00,0xc0,0x07,0x00,
- 0x00,0x80,0x03,0x00,
- 0x00,0x00,0x01,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};
diff --git a/main/vcl/inc/unx/x11_cursors/timesize_mask.h
b/main/vcl/inc/unx/x11_cursors/timesize_mask.h
deleted file mode 100644
index 38a76a2f8a..0000000000
--- a/main/vcl/inc/unx/x11_cursors/timesize_mask.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/**************************************************************
- *
- * 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
- * regarding copyright ownership. The ASF licenses this file
- * 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 timesize_mask_width 32
-#define timesize_mask_height 32
-#define timesize_mask_x_hot 16
-#define timesize_mask_y_hot 16
-
-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,0xff,0xff,0x03,
- 0x80,0xff,0xff,0x03,
- 0x80,0xff,0xff,0x03,
- 0x80,0xff,0xff,0x03,
- 0x80,0xff,0xff,0x03,
- 0x80,0xff,0xff,0x03,
- 0x80,0xff,0xff,0x03,
- 0x80,0xff,0xff,0x03,
- 0x00,0x80,0x03,0x00,
- 0x00,0xc0,0x07,0x00,
- 0x00,0xe0,0x0f,0x00,
- 0x00,0xc0,0x07,0x00,
- 0x00,0x80,0x03,0x00,
- 0x00,0x00,0x01,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};
diff --git a/main/vcl/inc/win/salids.hrc b/main/vcl/inc/win/salids.hrc
index 25ee4dad46..9ddcf9abd0 100644
--- a/main/vcl/inc/win/salids.hrc
+++ b/main/vcl/inc/win/salids.hrc
@@ -80,8 +80,8 @@
#define SAL_RESID_POINTER_PIVOT_FIELD 10054
#define SAL_RESID_POINTER_CHAIN 10055
#define SAL_RESID_POINTER_CHAIN_NOTALLOWED 10056
-#define SAL_RESID_POINTER_TIMEEVENT_MOVE 10057
-#define SAL_RESID_POINTER_TIMEEVENT_SIZE 10058
+//#define SAL_RESID_POINTER_TIMEEVENT_MOVE 10057 // Removed in
December 2025
+//#define SAL_RESID_POINTER_TIMEEVENT_SIZE 10058 // Removed in
December 2025
#define SAL_RESID_POINTER_AUTOSCROLL_N 10059
#define SAL_RESID_POINTER_AUTOSCROLL_S 10060
#define SAL_RESID_POINTER_AUTOSCROLL_W 10061
diff --git a/main/vcl/os2/source/src/makefile.mk
b/main/vcl/os2/source/src/makefile.mk
index c44f010107..d16ec256c1 100644
--- a/main/vcl/os2/source/src/makefile.mk
+++ b/main/vcl/os2/source/src/makefile.mk
@@ -83,8 +83,6 @@ RCDEPN= nullptr.ptr \
pivotfld.ptr \
chain.ptr \
chainnot.ptr \
- timemove.ptr \
- timesize.ptr \
asn.ptr \
ass.ptr \
asw.ptr \
diff --git a/main/vcl/os2/source/src/salsrc.rc
b/main/vcl/os2/source/src/salsrc.rc
index 6690d9bf5a..2769c1db11 100644
--- a/main/vcl/os2/source/src/salsrc.rc
+++ b/main/vcl/os2/source/src/salsrc.rc
@@ -75,8 +75,6 @@ POINTER SAL_RESID_POINTER_PIVOT_ROW
PIVOTROW.PTR
POINTER SAL_RESID_POINTER_PIVOT_FIELD
PIVOTFLD.PTR
POINTER SAL_RESID_POINTER_CHAIN
CHAIN.PTR
POINTER SAL_RESID_POINTER_CHAIN_NOTALLOWED
CHAINNOT.PTR
-POINTER SAL_RESID_POINTER_TIMEEVENT_MOVE
TIMEMOVE.PTR
-POINTER SAL_RESID_POINTER_TIMEEVENT_SIZE
TIMESIZE.PTR
POINTER SAL_RESID_POINTER_AUTOSCROLL_N ASN.PTR
POINTER SAL_RESID_POINTER_AUTOSCROLL_S ASS.PTR
POINTER SAL_RESID_POINTER_AUTOSCROLL_W ASW.PTR
diff --git a/main/vcl/os2/source/src/timemove.ptr
b/main/vcl/os2/source/src/timemove.ptr
deleted file mode 100644
index a9298cee86..0000000000
Binary files a/main/vcl/os2/source/src/timemove.ptr and /dev/null differ
diff --git a/main/vcl/os2/source/src/timesize.ptr
b/main/vcl/os2/source/src/timesize.ptr
deleted file mode 100644
index e543c1ff79..0000000000
Binary files a/main/vcl/os2/source/src/timesize.ptr and /dev/null differ
diff --git a/main/vcl/os2/source/window/salframe.cxx
b/main/vcl/os2/source/window/salframe.cxx
index c38097ec7e..19733c1513 100644
--- a/main/vcl/os2/source/window/salframe.cxx
+++ b/main/vcl/os2/source/window/salframe.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#define INCL_DOS
#define INCL_PM
#define INCL_WIN
@@ -159,7 +157,7 @@ sal_Bool APIENTRY _WinQueryWindowPos( Os2SalFrame* pFrame,
PSWP pswp)
}
sal_Bool APIENTRY _WinSetWindowPos( Os2SalFrame* pFrame, HWND
hwndInsertBehind, LONG x, LONG y,
- LONG cx, LONG cy, ULONG fl)
+ LONG cx, LONG cy, ULONG fl)
{
SWP swpOwner = {0};
POINTL ptlOwner = {0};
@@ -344,20 +342,20 @@ static SalIMEData* GetSalIMEData()
}
}
- return pSalData->mpIMEData;
+ return pSalData->mpIMEData;
}
// -----------------------------------------------------------------------
void ImplReleaseSALIMEData()
{
- SalData* pSalData = GetSalData();
+ SalData* pSalData = GetSalData();
- if ( pSalData->mpIMEData )
- {
- DosFreeModule( pSalData->mpIMEData->mhModIME );
- delete pSalData->mpIMEData;
- }
+ if ( pSalData->mpIMEData )
+ {
+ DosFreeModule( pSalData->mpIMEData->mhModIME );
+ delete pSalData->mpIMEData;
+ }
}
#endif
@@ -366,11 +364,11 @@ void ImplReleaseSALIMEData()
static void ImplSaveFrameState( Os2SalFrame* pFrame )
{
- // Position, Groesse und Status fuer GetWindowState() merken
- if ( !pFrame->mbFullScreen )
- {
- SWP aSWP;
- sal_Bool bVisible = WinIsWindowVisible( pFrame->mhWndFrame);
+ // Position, Groesse und Status fuer GetWindowState() merken
+ if ( !pFrame->mbFullScreen )
+ {
+ SWP aSWP;
+ sal_Bool bVisible = WinIsWindowVisible( pFrame->mhWndFrame);
// Query actual state (maState uses screen coords)
WinQueryWindowPos( pFrame->mhWndFrame, &aSWP );
@@ -521,7 +519,7 @@ static void ImplSalFrameFullScreenPos( Os2SalFrame* pFrame,
sal_Bool bAlways = F
// -----------------------------------------------------------------------
-// Uebersetzungstabelle von System-Keycodes in StarView-Keycodes
+// Übersetzungstabelle von System-Keycodes in StarView-Keycodes
#define KEY_TAB_SIZE (VK_ENDDRAG+1)
static USHORT aImplTranslateKeyTab[KEY_TAB_SIZE] =
@@ -600,7 +598,7 @@ SalFrame* ImplSalCreateFrame( Os2SalInstance* pInst, HWND
hWndParent, ULONG nSal
sal_Bool bSubFrame = FALSE;
#if OSL_DEBUG_LEVEL>0
- debug_printf(">ImplSalCreateFrame hWndParent 0x%x, nSalFrameStyle 0x%x\n",
hWndParent, nSalFrameStyle);
+ debug_printf(">ImplSalCreateFrame hWndParent 0x%x, nSalFrameStyle
0x%x\n", hWndParent, nSalFrameStyle);
#endif
if ( hWndParent )
@@ -609,10 +607,10 @@ SalFrame* ImplSalCreateFrame( Os2SalInstance* pInst, HWND
hWndParent, ULONG nSal
pFrame->mbNoIcon = TRUE;
}
- // determine creation data (bei Moveable nehmen wir DLG-Border, damit
- // es besser aussieht)
- if ( nSalFrameStyle & SAL_FRAME_STYLE_CLOSEABLE )
- nFrameFlags |= FCF_CLOSEBUTTON;
+ // determine creation data (bei Moveable nehmen wir DLG-Border, damit
+ // es besser aussieht)
+ if ( nSalFrameStyle & SAL_FRAME_STYLE_CLOSEABLE )
+ nFrameFlags |= FCF_CLOSEBUTTON;
if ( nSalFrameStyle & SAL_FRAME_STYLE_MOVEABLE ) {
pFrame->mbCaption = TRUE;
@@ -1613,8 +1611,6 @@ void Os2SalFrame::SetPointer( PointerStyle ePointerStyle )
{ 0, 0, SAL_RESID_POINTER_PIVOT_FIELD }, // POINTER_PIVOT_FIELD
{ 0, 0, SAL_RESID_POINTER_CHAIN }, // POINTER_CHAIN
{ 0, 0, SAL_RESID_POINTER_CHAIN_NOTALLOWED }, // POINTER_CHAIN_NOTALLOWED
- { 0, 0, SAL_RESID_POINTER_TIMEEVENT_MOVE }, // POINTER_TIMEEVENT_MOVE
- { 0, 0, SAL_RESID_POINTER_TIMEEVENT_SIZE }, // POINTER_TIMEEVENT_SIZE
{ 0, 0, SAL_RESID_POINTER_AUTOSCROLL_N }, // POINTER_AUTOSCROLL_N
{ 0, 0, SAL_RESID_POINTER_AUTOSCROLL_S }, // POINTER_AUTOSCROLL_S
{ 0, 0, SAL_RESID_POINTER_AUTOSCROLL_W }, // POINTER_AUTOSCROLL_W
@@ -3715,10 +3711,10 @@ MRESULT EXPENTRY SalFrameWndProc( HWND hWnd, ULONG nMsg,
}
}
- if ( bDef )
- nRet = WinDefWindowProc( hWnd, nMsg, nMP1, nMP2 );
+ if ( bDef )
+ nRet = WinDefWindowProc( hWnd, nMsg, nMP1, nMP2 );
- return nRet;
+ return nRet;
}
// -----------------------------------------------------------------------
@@ -3744,10 +3740,10 @@ void Os2SalFrame::EndSetClipRegion()
MRESULT EXPENTRY SalFrameSubClassWndProc( HWND hWnd, ULONG nMsg,
MPARAM nMP1, MPARAM nMP2 )
{
- MRESULT mReturn = 0L;
+ MRESULT mReturn = 0L;
- // ticket#124 min size of 132 px is too much
- if (nMsg == WM_QUERYTRACKINFO) {
+ // ticket#124 min size of 132 px is too much
+ if (nMsg == WM_QUERYTRACKINFO) {
PTRACKINFO pti;
// first, let PM initialize TRACKINFO
mReturn = aSalShlData.mpFrameProc( hWnd, nMsg, nMP1, nMP2 );
@@ -3756,9 +3752,9 @@ MRESULT EXPENTRY SalFrameSubClassWndProc( HWND hWnd,
ULONG nMsg,
pti->ptlMinTrackSize.x = 64L;
// now return to PM
return mReturn;
- }
+ }
- return aSalShlData.mpFrameProc( hWnd, nMsg, nMP1, nMP2 );
+ return aSalShlData.mpFrameProc( hWnd, nMsg, nMP1, nMP2 );
}
-// -----------------------------------------------------------------------
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/vcl/unx/generic/app/saldisp.cxx
b/main/vcl/unx/generic/app/saldisp.cxx
index df928646bc..531c968211 100644
--- a/main/vcl/unx/generic/app/saldisp.cxx
+++ b/main/vcl/unx/generic/app/saldisp.cxx
@@ -2008,12 +2008,6 @@ XLIB_Cursor SalDisplay::GetPointer( int ePointerStyle )
break;
case POINTER_CHAIN_NOTALLOWED:
MAKE_CURSOR( chainnot_ );
- break;
- case POINTER_TIMEEVENT_MOVE:
- MAKE_CURSOR( timemove_ );
- break;
- case POINTER_TIMEEVENT_SIZE:
- MAKE_CURSOR( timesize_ );
break;
case POINTER_AUTOSCROLL_N:
MAKE_CURSOR(asn_ );
diff --git a/main/vcl/unx/gtk/app/gtkdata.cxx b/main/vcl/unx/gtk/app/gtkdata.cxx
index f59a5459d8..36f35f8364 100644
--- a/main/vcl/unx/gtk/app/gtkdata.cxx
+++ b/main/vcl/unx/gtk/app/gtkdata.cxx
@@ -453,8 +453,6 @@ GdkCursor *GtkSalDisplay::getCursor( PointerStyle
ePointerStyle )
MAKE_CURSOR( POINTER_PIVOT_DELETE, pivotdel_ );
MAKE_CURSOR( POINTER_CHAIN, chain_ );
MAKE_CURSOR( POINTER_CHAIN_NOTALLOWED, chainnot_ );
- MAKE_CURSOR( POINTER_TIMEEVENT_MOVE, timemove_ );
- MAKE_CURSOR( POINTER_TIMEEVENT_SIZE, timesize_ );
MAKE_CURSOR( POINTER_AUTOSCROLL_N, asn_ );
MAKE_CURSOR( POINTER_AUTOSCROLL_S, ass_ );
MAKE_CURSOR( POINTER_AUTOSCROLL_W, asw_ );
diff --git a/main/vcl/win/source/src/salsrc.rc
b/main/vcl/win/source/src/salsrc.rc
index 20d31e7be0..b8bce90661 100644
--- a/main/vcl/win/source/src/salsrc.rc
+++ b/main/vcl/win/source/src/salsrc.rc
@@ -68,8 +68,6 @@ SAL_RESID_POINTER_PIVOT_FIELD CURSOR
pivotfld.cur
SAL_RESID_POINTER_PIVOT_DELETE CURSOR pivotdel.cur
SAL_RESID_POINTER_CHAIN CURSOR
chain.cur
SAL_RESID_POINTER_CHAIN_NOTALLOWED CURSOR chainnot.cur
-SAL_RESID_POINTER_TIMEEVENT_MOVE CURSOR timemove.cur
-SAL_RESID_POINTER_TIMEEVENT_SIZE CURSOR timesize.cur
SAL_RESID_POINTER_AUTOSCROLL_N CURSOR asn.cur
SAL_RESID_POINTER_AUTOSCROLL_S CURSOR ass.cur
SAL_RESID_POINTER_AUTOSCROLL_W CURSOR asw.cur
diff --git a/main/vcl/win/source/src/timemove.cur
b/main/vcl/win/source/src/timemove.cur
deleted file mode 100644
index 319b6edc57..0000000000
Binary files a/main/vcl/win/source/src/timemove.cur and /dev/null differ
diff --git a/main/vcl/win/source/src/timesize.cur
b/main/vcl/win/source/src/timesize.cur
deleted file mode 100644
index 1ec23de05b..0000000000
Binary files a/main/vcl/win/source/src/timesize.cur and /dev/null differ
diff --git a/main/vcl/win/source/window/salframe.cxx
b/main/vcl/win/source/window/salframe.cxx
index 2e5f1adbf8..c5c708a1e1 100644
--- a/main/vcl/win/source/window/salframe.cxx
+++ b/main/vcl/win/source/window/salframe.cxx
@@ -2329,8 +2329,6 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle )
{ 0, 0, SAL_RESID_POINTER_PIVOT_FIELD }, // POINTER_PIVOT_FIELD
{ 0, 0, SAL_RESID_POINTER_CHAIN }, // POINTER_CHAIN
{ 0, 0, SAL_RESID_POINTER_CHAIN_NOTALLOWED }, // POINTER_CHAIN_NOTALLOWED
- { 0, 0, SAL_RESID_POINTER_TIMEEVENT_MOVE }, // POINTER_TIMEEVENT_MOVE
- { 0, 0, SAL_RESID_POINTER_TIMEEVENT_SIZE }, // POINTER_TIMEEVENT_SIZE
{ 0, 0, SAL_RESID_POINTER_AUTOSCROLL_N }, // POINTER_AUTOSCROLL_N
{ 0, 0, SAL_RESID_POINTER_AUTOSCROLL_S }, // POINTER_AUTOSCROLL_S
{ 0, 0, SAL_RESID_POINTER_AUTOSCROLL_W }, // POINTER_AUTOSCROLL_W
