Author: ydario
Date: Wed Mar 28 16:54:09 2018
New Revision: 1827935
URL: http://svn.apache.org/viewvc?rev=1827935&view=rev
Log:
#i126518# adjust building of sysdtrans module for OS/2.
Modified:
openoffice/trunk/main/dtrans/Library_sysdtrans_os2.mk
openoffice/trunk/main/dtrans/source/os2/clipb/Os2Clipboard.hxx
openoffice/trunk/main/dtrans/source/os2/clipb/Os2Transferable.hxx
Modified: openoffice/trunk/main/dtrans/Library_sysdtrans_os2.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/Library_sysdtrans_os2.mk?rev=1827935&r1=1827934&r2=1827935&view=diff
==============================================================================
--- openoffice/trunk/main/dtrans/Library_sysdtrans_os2.mk (original)
+++ openoffice/trunk/main/dtrans/Library_sysdtrans_os2.mk Wed Mar 28 16:54:09
2018
@@ -42,10 +42,15 @@ $(eval $(call gb_Library_add_linked_libs
cppu \
sal \
stl \
- UClip \
+ uclip \
$(gb_STDLIBS) \
))
+# YD FIXME this is not working... needs ldflags hack...
+$(eval $(call gb_Library_add_libs,sysdtrans,\
+ -luclip \
+))
+
$(eval $(call gb_Library_add_exception_objects,sysdtrans,\
dtrans/source/os2/clipb/Os2Clipboard \
dtrans/source/os2/clipb/Os2Bitmap \
Modified: openoffice/trunk/main/dtrans/source/os2/clipb/Os2Clipboard.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/source/os2/clipb/Os2Clipboard.hxx?rev=1827935&r1=1827934&r2=1827935&view=diff
==============================================================================
--- openoffice/trunk/main/dtrans/source/os2/clipb/Os2Clipboard.hxx (original)
+++ openoffice/trunk/main/dtrans/source/os2/clipb/Os2Clipboard.hxx Wed Mar 28
16:54:09 2018
@@ -42,9 +42,6 @@
// the implementation names
#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"
-
namespace os2 {
class Os2Clipboard :
Modified: openoffice/trunk/main/dtrans/source/os2/clipb/Os2Transferable.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/source/os2/clipb/Os2Transferable.hxx?rev=1827935&r1=1827934&r2=1827935&view=diff
==============================================================================
--- openoffice/trunk/main/dtrans/source/os2/clipb/Os2Transferable.hxx (original)
+++ openoffice/trunk/main/dtrans/source/os2/clipb/Os2Transferable.hxx Wed Mar
28 16:54:09 2018
@@ -38,10 +38,10 @@
#define CHAR_POINTER(THE_OUSTRING) ::rtl::OUStringToOString (THE_OUSTRING,
RTL_TEXTENCODING_UTF8).pData->buffer
-#if OSL_DEBUG_LEVEL>10
+#if OSL_DEBUG_LEVEL>0
extern "C" int debug_printf(const char *f, ...);
#else
-#define debug_printf( ...) { 1; }
+#define debug_printf( ...)
#endif
#define CPPUTYPE_SEQSALINT8 getCppuType( (const Sequence<
sal_Int8 >*) 0 )
