[Libreoffice-commits] .: RepositoryFixes.mk scp2/source

Norbert Thiebaud nthiebaud at kemper.freedesktop.org
Sat Apr 23 13:26:00 PDT 2011


 RepositoryFixes.mk                      |    1 -
 scp2/source/impress/module_ogltrans.scp |    4 ----
 2 files changed, 5 deletions(-)

New commits:
commit 53d8fc337bb0f0f3c1b8fd8eab54e25c0505de09
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Apr 23 15:25:07 2011 -0500

    harmonize OGLTrans.uno library name on MacOs with the rest of the world

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 9cd30c7..76aca51 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -47,7 +47,6 @@ gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_c
 gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst OGLTrans:OGLTrans%,OGLTrans:libOGLTrans%,$(gb_Library_FILENAMES))
 
 endif
 
diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp
index e204e04..300deca 100644
--- a/scp2/source/impress/module_ogltrans.scp
+++ b/scp2/source/impress/module_ogltrans.scp
@@ -41,11 +41,7 @@ File gid_File_Lib_OpenGLTransitions
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
-    #ifdef QUARTZ
-    Name = STRING(CONCAT2(libOGLTrans.uno,UNXSUFFIX));
-    #else
     Name = STRING(CONCAT2(OGLTrans.uno,UNXSUFFIX));
-    #endif
   #else
     Name = "OGLTrans.uno.dll";
   #endif


More information about the Libreoffice-commits mailing list