Author: ydario
Date: Tue Jun 19 12:48:30 2012
New Revision: 1351684
URL: http://svn.apache.org/viewvc?rev=1351684&view=rev
Log:
i118923 - OS/2 port: rename sw.dll to swoo.dll, avoid mmos2 conflicts.
Modified:
incubator/ooo/trunk/main/RepositoryFixes.mk
incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
Modified: incubator/ooo/trunk/main/RepositoryFixes.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/RepositoryFixes.mk?rev=1351684&r1=1351683&r2=1351684&view=diff
==============================================================================
--- incubator/ooo/trunk/main/RepositoryFixes.mk (original)
+++ incubator/ooo/trunk/main/RepositoryFixes.mk Tue Jun 19 12:48:30 2012
@@ -194,6 +194,7 @@ gb_Library_FILENAMES := $(patsubst xslt:
gb_Library_FILENAMES := $(patsubst
stl:stl%,stl:stdc++%,$(gb_Library_FILENAMES))
# translate to 8.3 naming
+gb_Library_DLLFILENAMES := $(patsubst
sw:sw%,sw:swoo%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
drawinglayer:drawinglayer%,drawinglayer:drawingl%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
fsstorage:fsstorage.uno%,fsstorage:fsstorag%,$(gb_Library_DLLFILENAMES))
Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1351684&r1=1351683&r2=1351684&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp Tue Jun 19
12:48:30 2012
@@ -1422,7 +1422,11 @@ STD_LIB_FILE( gid_File_Lib_Editeng, edit
STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter)
+#ifdef OS2
+STD_LIB_FILE( gid_File_Lib_Sw , swoo)
+#else
STD_LIB_FILE( gid_File_Lib_Sw , sw)
+#endif
STD_LIB_FILE( gid_File_Lib_Swui, swui)
STD_LIB_FILE( gid_File_Lib_Msword, msword )
