[Libreoffice-commits] .: scp2/source

Stephan Bergmann sbergmann at kemper.freedesktop.org
Thu Dec 15 06:09:56 PST 2011


 scp2/source/ooo/ure.scp |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 35c6f50eab69968fb02512fe0e89800f52702efd
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Dec 15 15:08:33 2011 +0100

    Potential fix for gbuild salhelper on MinGW problem.

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index aece726..18df366 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -252,7 +252,11 @@ End
 File gid_File_Dl_Salhelper
     LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#if defined WNT && !defined _MSC // Hack for gbuild'ified salhelper on MinGW:
+    Name = "uno_salhelpergcc3.dll"
+#else
     Name = SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "879B80E0-F6E1-4931-8EE6-7CF867CB6AA5";
 End


More information about the Libreoffice-commits mailing list