[Libreoffice-commits] .: postprocess/rebase postprocess/signing RepositoryFixes.mk solenv/gbuild ure/source vcl/win

[Norbert Thiebaud]

 RepositoryFixes.mk                 |    3 +--
 postprocess/rebase/no_rebase.txt   |    1 -
 postprocess/signing/no_signing.txt |    1 -
 solenv/gbuild/platform/windows.mk  |    1 -
 solenv/gbuild/platform/winmingw.mk |    1 -
 ure/source/README                  |    1 -
 vcl/win/source/app/salinfo.cxx     |    6 ------
 vcl/win/source/window/salframe.cxx |    2 --
 8 files changed, 1 insertion(+), 15 deletions(-)

New commits:
commit ddc28b8ad61e71af94d9bc72f5588556ccfe9b11
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Sep 30 08:11:10 2011 -0500

    clean-up ghost traces of unicow

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 959fa61..6b2d230 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -72,8 +72,7 @@ gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
 # cross-compile that module then using MinGW. That needs to be fixed
 # then, and we need to use these libraries through run-time lookup of
 # APIs. Or something.
-gb_Library_SDKLIBFILENAMES:=\
-    unicows \
+gb_Library_SDKLIBFILENAMES:=
 
 gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_SDKLIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_SDKLIBFILENAMES),$(lib):$(WINDOWS_SDK_HOME)/lib/$(lib).lib)
diff --git a/postprocess/rebase/no_rebase.txt b/postprocess/rebase/no_rebase.txt
index 7d40ba3..3f1596e 100644
--- a/postprocess/rebase/no_rebase.txt
+++ b/postprocess/rebase/no_rebase.txt
@@ -8,7 +8,6 @@ policy.1.0.cli_oootypes.dll
 policy.1.0.cli_ure.dll
 policy.1.0.cli_cppuhelper.dll
 policy.1.0.cli_basetypes.dll
-unicows.dll
 gdiplus.dll
 mingwm10.dll
 msvcm80d.dll
diff --git a/postprocess/signing/no_signing.txt b/postprocess/signing/no_signing.txt
index 7c663cc..e3b1d2a 100644
--- a/postprocess/signing/no_signing.txt
+++ b/postprocess/signing/no_signing.txt
@@ -8,6 +8,5 @@ policy.1.0.cli_oootypes.dll
 policy.1.0.cli_ure.dll
 policy.1.0.cli_cppuhelper.dll
 policy.1.0.cli_basetypes.dll
-unicows.dll
 gdiplus.dll
 mingwm10.dll
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index cd2a07f..8546a69 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -447,7 +447,6 @@ gb_Library_PLAINLIBS_NONE += \
 	oleaut32 \
 	shell32 \
 	shlwapi \
-	unicows \
 	user32 \
 	uuid \
 	uwinapi \
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 4f0a188..ea890c2 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -457,7 +457,6 @@ gb_Library_PLAINLIBS_NONE += \
 	oleaut32 \
 	shell32 \
 	shlwapi \
-	unicows \
 	user32 \
 	uuid \
 	uwinapi \
diff --git a/ure/source/README b/ure/source/README
index 789fb46..64fa40b 100644
--- a/ure/source/README
+++ b/ure/source/README
@@ -160,7 +160,6 @@ Program Files\URE\bin\textinstream.uno.dll  [private]
 Program Files\URE\bin\textoutstream.uno.dll  [private]
 Program Files\URE\bin\stocservices.uno.dll  [private]
 Program Files\URE\bin\uuresolver.uno.dll  [private]
-Program Files\URE\bin\unicows.dll  [private]
 Program Files\URE\bin\uwinapi.dll  [private]
 Program Files\URE\java\java_uno.jar  [private]
 Program Files\URE\misc\javavendors.xml  [private]
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index 4436c02..67b23e9 100644
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.cxx
@@ -29,12 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-// rely on unicows on for multimon functions for older versions
-#if WINVER < 0x0500
-#undef WINVER
-#define WINVER 0x0500
-#endif
-
 #include "svsys.h"
 #include "rtl/ustrbuf.hxx"
 
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 5fa18e6..0c5e5ee 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2401,8 +2401,6 @@ static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf,
     if ( lParam )
     {
         nKeyLen = GetKeyNameTextW( lParam, aKeyBuf, nMaxKeyLen );
-        // #i12401# the current unicows.dll has a bug in CharUpperBuffW, which corrupts the stack
-        // fall back to the ANSI version instead
         DBG_ASSERT( nKeyLen <= nMaxKeyLen, "Invalid key name length!" );
         if( nKeyLen > nMaxKeyLen )
             nKeyLen = 0;