Don't bundle gdiplus.dll any more

It was needed for Windows 2000 support.

Change-Id: I1c0bec3fd3c76005b843d62c636410201abfa8e1

7 files changed, 0 insertions, 101 deletions

diff --git a/download b/download
index 637642db5300..9a54e7c009cf 100755
--- a/download
+++ b/download
@@ -183,10 +183,6 @@ for i in $filelist ; do
     fi
 done
 
-if [ "$COM" = "MSC" ]; then
-    downloaditem "http://download.microsoft.com/download/E/9/F/E9FCA9E9-9908-4D8F-B491-8E8A4C294C01/" "WindowsXP-KB958911-x86-ENU.exe" "ff084c5815b0672d54628158b820f5b1"
-fi
-
 if [ -f $start_dir/sources.ver -a ! -d $start_dir/.git ] ; then
     # these sources are from a tarball, so get the other source tarballs
     . $start_dir/sources.ver
@@ -230,51 +226,6 @@ if [ "$COM" = "MSC" -a "$CPUNAME" = "INTEL" ]; then
         echo "<http://www.microsoft.com/downloads/release.asp?releaseid=30682>."
         exit 1
     fi
-
-    # Windows builds need gdiplus.dll in external/gdiplus/
-    if [ ! -f ./external/gdiplus/gdiplus.dll -a -f $TARFILE_LOCATION/WindowsXP-KB958911-x86-ENU.exe -a -n "$md5sum" ]; then
-        # This can be run only on Windows itself (Cygwin)
-        TMPUNPACK=`cygpath -d $TARFILE_LOCATION/tmp`
-        chmod a+w $TARFILE_LOCATION/tmp
-        gdiplus_dll_path=SP3QFE/asms/10/msft/windows/gdiplus/gdiplus.dll
-        chmod +x $TARFILE_LOCATION/WindowsXP-KB958911-x86-ENU.exe
-
-        # Run it through cmd so that the UAC prompt is displayed
-        echo
-        echo "NOTE: We are running the Microsoft KB958911 security fix installer"
-        echo "to get gdiplus.dll. You will most probably get a UAC prompt now."
-        echo "If you trust us, just enter your administrator password."
-        echo "The security fix is run with the /extract switch to just unpack"
-        echo "its files."
-        echo "If you don't trust us, just get gdiplus.dll yourself and put it"
-        echo "in external/gdiplus/gdiplus.dll."
-        echo "gdiplus.dll is included in the LibreOffice installer for the benefit of"
-        echo "Windows 2000 users."
-        # A few empty lines so that the above is visible even if the taskbar's auto-hide is turned on,
-        # and the UAC prompt caused it to taise (with a blinking icon for the UAC prompt)
-        echo
-        echo
-        echo
-            cmd /c "`cygpath -w $TARFILE_LOCATION/WindowsXP-KB958911-x86-ENU.exe` /extract:$TMPUNPACK /q"
-        if [ -f $TARFILE_LOCATION/tmp/$gdiplus_dll_path ]; then
-            echo "Extraction succeeded"
-            sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/$gdiplus_dll_path | sed "s/ .*//"`
-            if [ "$sum" = "3a95b4d80a3586ab1e2f0c608608ebac" ]; then
-            cp $TARFILE_LOCATION/tmp/$gdiplus_dll_path ./external/gdiplus/gdiplus.dll
-            else
-            echo "But unexpected checksum of $gdiplus_dll_path"
-            fi
-        else
-            echo "WindowsXP-KB958911-x86-ENU.exe did not unpack the expected $gdiplus_dll_path"
-        fi
-    fi
-    if [ ! -f ./external/gdiplus/gdiplus.dll ]; then
-        echo "gdiplus.dll is missing in external/gdiplus/."
-        echo "Get it from the Microsoft site and put it there."
-        echo "You may have to search Microsoft's website. Last time it was seen at:"
-        echo "<http://www.microsoft.com/downloads/details.aspx?familyid=6A63AB9C-DF12-4D41-933C-BE590FEAA05A&displaylang=en>."
-        exit 1
-    fi
 fi
 
 if [ "$COM" = "MSC" ]; then
diff --git a/external/gdiplus/README_gdiplus.dll b/external/gdiplus/README_gdiplus.dll
deleted file mode 100644
index 13846699ee8b..000000000000
--- a/external/gdiplus/README_gdiplus.dll
+++ /dev/null
@@ -1 +0,0 @@
-Put the gdiplus.dll in this directory for Windows builds.
diff --git a/external/prj/d.lst b/external/prj/d.lst
index 645fe4a2bab0..ae55dd44f445 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -28,8 +28,6 @@ mkdir: %_DEST%\inc\external\wine
 
 ..\dbghelp\dbghelp.dll %_DEST%\bin\dbghelp.dll
 
-..\gdiplus\gdiplus.dll %_DEST%\bin\gdiplus.dll
-
 ..\msvcp80\msvcm80*.dll %_DEST%\bin
 ..\msvcp80\msvcp80*.dll %_DEST%\bin
 ..\msvcp80\msvcr80*.dll %_DEST%\bin
diff --git a/postprocess/signing/no_signing.txt b/postprocess/signing/no_signing.txt
index e3b1d2a44d42..26ba6aab7e92 100644
--- a/postprocess/signing/no_signing.txt
+++ b/postprocess/signing/no_signing.txt
@@ -8,5 +8,4 @@ policy.1.0.cli_oootypes.dll
 policy.1.0.cli_ure.dll
 policy.1.0.cli_cppuhelper.dll
 policy.1.0.cli_basetypes.dll
-gdiplus.dll
 mingwm10.dll
diff --git a/readlicense_oo/html/LICENSE.html b/readlicense_oo/html/LICENSE.html
index 4d3bc061f91a..8f5be105bf1a 100644
--- a/readlicense_oo/html/LICENSE.html
+++ b/readlicense_oo/html/LICENSE.html
@@ -1685,25 +1685,6 @@ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
 ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 SOFTWARE.</P>

-<H2 CLASS="western">Platform SDK Redistributable: GDI+</H2>

-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The

-following software may be included in this product: Platform SDK

-Redistributable: GDI+ (gdiplus.dll). Use of any of this software is

-governed by the terms of the license below:</P>

-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">PLEASE

-NOTE: Microsoft Corporation (or based on where you live, one of its

-affiliates) licenses this supplement to you. The supplement is

-identified for use with one or more Microsoft operating system

-products (the 'software'). You may use a copy of this supplement with

-each validly licensed copy of the software. You may not use it if you

-do not have a license for the software. The license terms for the

-software apply to your use of this supplement. To read the license

-terms, go to <A HREF="http://www.microsoft.com/useterms">www.microsoft.com/useterms</A>.</P>

-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Microsoft

-provides support services for the supplement as described at

-<A HREF="../C:/Documents%20and%20Settings/timar/Dokumentumok/www.support.%20microsoft.com/common/international.aspx">www.support.

-microsoft.com/common/international.aspx</A>.</P>

-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">EULAID:HFX_RM.1_GDR_NRL_EN</P>

 <H2 CLASS="western">PostgreSQL</H2>

 <P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The

 following software may be included in this product: PostgreSQL. Use

diff --git a/readlicense_oo/txt/license.txt b/readlicense_oo/txt/license.txt
index af9febc82ce0..7234c17290eb 100644
--- a/readlicense_oo/txt/license.txt
+++ b/readlicense_oo/txt/license.txt
@@ -1632,26 +1632,6 @@ Pixman
    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-Platform SDK Redistributable: GDI+
-
-   The following software may be included in this product: Platform SDK
-   Redistributable: GDI+ (gdiplus.dll). Use of any of this software is
-   governed by the terms of the license below:
-
-   PLEASE NOTE: Microsoft Corporation (or based on where you live, one of
-   its affiliates) licenses this supplement to you. The supplement is
-   identified for use with one or more Microsoft operating system products
-   (the 'software'). You may use a copy of this supplement with each
-   validly licensed copy of the software. You may not use it if you do not
-   have a license for the software. The license terms for the software
-   apply to your use of this supplement. To read the license terms, go to
-   www.microsoft.com/useterms.
-
-   Microsoft provides support services for the supplement as described at
-   www.support. microsoft.com/common/international.aspx.
-
-   EULAID:HFX_RM.1_GDR_NRL_EN
-
 PostgreSQL
 
    The following software may be included in this product: PostgreSQL. Use
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index fa5a2c51a640..e88cb714f347 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -645,15 +645,6 @@ STD_LIB_FILE( gid_File_Lib_Fwl , fwl)
 
 STD_LIB_FILE( gid_File_Lib_Fwm , fwm)
 
-#ifdef ENABLE_DIRECTX
-File gid_File_Lib_Gdiplus
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "gdiplus.dll";
-End
-#endif
-
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.uno )
 
 STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)