You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2011/10/05 20:54:03 UTC
svn commit: r1179380 - in /incubator/ooo/trunk/main:
dtrans/source/os2/clipb/ ucb/source/ucp/odma/
Author: pfg
Date: Wed Oct 5 18:54:03 2011
New Revision: 1179380
URL: http://svn.apache.org/viewvc?rev=1179380&view=rev
Log:
Remove Os2Bitmap.cxx and odma.h due to uncertain licensing. This only affects the OS2 port since ODMA is not built by default. Submitted by Oliver-Rainer Wittmann
Removed:
incubator/ooo/trunk/main/dtrans/source/os2/clipb/OS2Bitmap.cxx
incubator/ooo/trunk/main/ucb/source/ucp/odma/odma.h
Modified:
incubator/ooo/trunk/main/dtrans/source/os2/clipb/Os2Clipboard.cxx
incubator/ooo/trunk/main/dtrans/source/os2/clipb/Os2Transferable.cxx
incubator/ooo/trunk/main/dtrans/source/os2/clipb/Os2Transferable.hxx
incubator/ooo/trunk/main/dtrans/source/os2/clipb/makefile.mk
Modified: incubator/ooo/trunk/main/dtrans/source/os2/clipb/Os2Clipboard.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/dtrans/source/os2/clipb/Os2Clipboard.cxx?rev=1179380&r1=1179379&r2=1179380&view=diff
==============================================================================
--- incubator/ooo/trunk/main/dtrans/source/os2/clipb/Os2Clipboard.cxx (original)
+++ incubator/ooo/trunk/main/dtrans/source/os2/clipb/Os2Clipboard.cxx Wed Oct 5 18:54:03 2011
@@ -287,19 +287,6 @@ void SAL_CALL Os2Clipboard::setContents(
debug_printf("Os2Clipboard::setContents UnsupportedFlavorException (no text)\n");
}
- // try bitmap transfer data (if any)
- try
- {
- Any aAnyB = m_aContents->getTransferData( nFlavorBitmap );
- if (aAnyB.hasValue())
- {
- hbm = OOoBmpToOS2Handle( aAnyB);
- debug_printf("Os2Clipboard::setContents SetClipbrdData bitmap done\n");
- }
- } catch ( UnsupportedFlavorException&) {
- debug_printf("Os2Clipboard::setContents UnsupportedFlavorException (no bitmap)\n");
- }
-
// copy to clipboard
if ( UWinOpenClipbrd( hAB) && (pSharedText || hbm))
{
Modified: incubator/ooo/trunk/main/dtrans/source/os2/clipb/Os2Transferable.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/dtrans/source/os2/clipb/Os2Transferable.cxx?rev=1179380&r1=1179379&r2=1179380&view=diff
==============================================================================
--- incubator/ooo/trunk/main/dtrans/source/os2/clipb/Os2Transferable.cxx (original)
+++ incubator/ooo/trunk/main/dtrans/source/os2/clipb/Os2Transferable.cxx Wed Oct 5 18:54:03 2011
@@ -113,27 +113,6 @@ Any SAL_CALL Os2Transferable::getTransfe
}
}
- // retrieve bitmap
- if( rFlavor.MimeType.equalsIgnoreAsciiCase( OUString::createFromAscii( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ) ) )
- {
- if( UWinOpenClipbrd( hAB ) )
- {
- // check if clipboard has text format
- ULONG handle = UWinQueryClipbrdData( hAB, UCLIP_CF_BITMAP);
- if (handle) {
- Sequence< sal_Int8 > winDIBStream;
- // convert to oustring and return it
- if (OS2HandleToOOoBmp( handle, &winDIBStream))
- aRet <<= winDIBStream;
- else
- handle = 0;
- }
- UWinCloseClipbrd( hAB );
- if (handle)
- return aRet;
- }
- }
-
// clipboard format unsupported, throw exception
throw UnsupportedFlavorException( rFlavor.MimeType, static_cast < XTransferable * > ( this ) );
}
Modified: incubator/ooo/trunk/main/dtrans/source/os2/clipb/Os2Transferable.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/dtrans/source/os2/clipb/Os2Transferable.hxx?rev=1179380&r1=1179379&r2=1179380&view=diff
==============================================================================
--- incubator/ooo/trunk/main/dtrans/source/os2/clipb/Os2Transferable.hxx (original)
+++ incubator/ooo/trunk/main/dtrans/source/os2/clipb/Os2Transferable.hxx Wed Oct 5 18:54:03 2011
@@ -52,15 +52,6 @@
#define CPPUTYPE_SEQSALINT8 getCppuType( (const Sequence< sal_Int8 >*) 0 )
#define CPPUTYPE_DEFAULT CPPUTYPE_SEQSALINT8
-#ifdef OOO_VENDOR
-using namespace com::sun::star::uno;
-HBITMAP OOoBmpToOS2Handle( Any &aAnyB);
-int OS2HandleToOOoBmp( HBITMAP hbm, Sequence< sal_Int8 >* winDIBStream);
-#else
-#define OOoBmpToOS2Handle(a) 0
-#define OS2HandleToOOoBmp(a,b) 0
-#endif
-
namespace os2 {
class Os2Transferable : public ::cppu::WeakImplHelper1 <
Modified: incubator/ooo/trunk/main/dtrans/source/os2/clipb/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/dtrans/source/os2/clipb/makefile.mk?rev=1179380&r1=1179379&r2=1179380&view=diff
==============================================================================
--- incubator/ooo/trunk/main/dtrans/source/os2/clipb/makefile.mk (original)
+++ incubator/ooo/trunk/main/dtrans/source/os2/clipb/makefile.mk Wed Oct 5 18:54:03 2011
@@ -49,11 +49,6 @@ SLOFILES= $(SLO)$/Os2Clipboard.obj \
$(SLO)$/Os2Service.obj \
$(SLO)$/Os2Transferable.obj
-.IF "$(OOO_VENDOR)"=="Serenity Systems Intl"
-SLOFILES+= $(SLO)$/OS2Bitmap.obj
-CDEFS+=-DOOO_VENDOR
-.ENDIF
-
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk