incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yda...@apache.org
Subject svn commit: r1351692 - in /incubator/ooo/trunk/main: dtrans/source/os2/clipb/Os2Clipboard.hxx dtrans/util/makefile.mk postprocess/packcomponents/makefile.mk vcl/Library_vcl.mk
Date Tue, 19 Jun 2012 13:00:57 GMT
Author: ydario
Date: Tue Jun 19 13:00:55 2012
New Revision: 1351692

URL: http://svn.apache.org/viewvc?rev=1351692&view=rev
Log:
i118923 - OS/2 port: Fix clipboard component passive registration using windows way.

Modified:
    incubator/ooo/trunk/main/dtrans/source/os2/clipb/Os2Clipboard.hxx
    incubator/ooo/trunk/main/dtrans/util/makefile.mk
    incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
    incubator/ooo/trunk/main/vcl/Library_vcl.mk

Modified: incubator/ooo/trunk/main/dtrans/source/os2/clipb/Os2Clipboard.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/dtrans/source/os2/clipb/Os2Clipboard.hxx?rev=1351692&r1=1351691&r2=1351692&view=diff
==============================================================================
--- incubator/ooo/trunk/main/dtrans/source/os2/clipb/Os2Clipboard.hxx (original)
+++ incubator/ooo/trunk/main/dtrans/source/os2/clipb/Os2Clipboard.hxx Tue Jun 19 13:00:55
2012
@@ -40,7 +40,7 @@
 #define OS2_CLIPBOARD_SERVICE_NAME "com.sun.star.datatransfer.clipboard.SystemClipboard"
 
 // the implementation names
-#define OS2_CLIPBOARD_IMPL_NAME "com.sun.star.datatransfer.clipboard.Os2Clipboard"
+#define OS2_CLIPBOARD_IMPL_NAME "com.sun.star.datatransfer.clipboard.ClipboardW32"
 
 // the registry key names
 #define OS2_CLIPBOARD_REGKEY_NAME "/com.sun.star.datatransfer.clipboard.Os2Clipboard/UNO/SERVICES/com.sun.star.datatransfer.clipboard.SystemClipboard"

Modified: incubator/ooo/trunk/main/dtrans/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/dtrans/util/makefile.mk?rev=1351692&r1=1351691&r2=1351692&view=diff
==============================================================================
--- incubator/ooo/trunk/main/dtrans/util/makefile.mk (original)
+++ incubator/ooo/trunk/main/dtrans/util/makefile.mk Tue Jun 19 13:00:55 2012
@@ -29,6 +29,9 @@ TARGET1=mcnttype
 TARGET2=ftransl
 TARGET3=sysdtrans
 TARGET4=dnd
+.IF "$(GUI)"=="OS2"
+TARGET3=sysdtran
+.ENDIF
 
 # --- Settings -----------------------------------------------------
 

Modified: incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk?rev=1351692&r1=1351691&r2=1351692&view=diff
==============================================================================
--- incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk Tue Jun 19 13:00:55 2012
@@ -179,7 +179,7 @@ my_components = \
 .IF "$(OS)" == "MACOSX"
 my_components += component/vcl/vcl.macosx
 .ELSE
-.IF "$(OS)" == "WNT"
+.IF "$(OS)" == "WNT" || "$(OS)" == "OS2"
 my_components += component/vcl/vcl.windows
 .ELSE
 my_components += component/vcl/vcl.unx
@@ -316,6 +316,12 @@ my_components += \
     wininetbe1
 .END
 
+.IF "$(OS)" == "OS2"
+my_components += \
+    dtrans \
+    sysdtrans
+.END
+
 .IF "$(OS)" == "WNT" && "$(DISABLE_ATL)" == ""
 my_components += \
     emser \

Modified: incubator/ooo/trunk/main/vcl/Library_vcl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/Library_vcl.mk?rev=1351692&r1=1351691&r2=1351692&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/Library_vcl.mk (original)
+++ incubator/ooo/trunk/main/vcl/Library_vcl.mk Tue Jun 19 13:00:55 2012
@@ -27,6 +27,8 @@ ifeq ($(OS),MACOSX)
 $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx))
 else ifeq ($(OS),WNT)
 $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows))
+else ifeq ($(OS),OS2)
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows))
 else
 $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx))
 endif



Mime
View raw message