DOTransferable.cxx (739826ff) DOTransferable.cxx (a206ee71)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 122 unchanged lines hidden (view full) ---

131 {
132 if ( m_DataFormatTranslator.isUnicodeTextFormat( fetc.getClipformat( ) ) &&
133 m_bUnicodeRegistered )
134 {
135 OUString aUnicodeText = synthesizeUnicodeText( );
136 Any aAny = makeAny( aUnicodeText );
137 return aAny;
138 }
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 122 unchanged lines hidden (view full) ---

131 {
132 if ( m_DataFormatTranslator.isUnicodeTextFormat( fetc.getClipformat( ) ) &&
133 m_bUnicodeRegistered )
134 {
135 OUString aUnicodeText = synthesizeUnicodeText( );
136 Any aAny = makeAny( aUnicodeText );
137 return aAny;
138 }
139 // #124085# CF_DIBV5 should not be possible, but keep for reading from the
140 // clipboard for being on the safe side
139 else if(CF_DIBV5 == fetc.getClipformat())
140 {
141 // #123407# CF_DIBV5 has priority; if the try to fetch this failed,
142 // check CF_DIB availability as an alternative
143 fetc.setClipformat(CF_DIB);
141 else if(CF_DIBV5 == fetc.getClipformat())
142 {
143 // #123407# CF_DIBV5 has priority; if the try to fetch this failed,
144 // check CF_DIB availability as an alternative
145 fetc.setClipformat(CF_DIB);
144
146
145 try
146 {
147 clipDataStream = getClipboardData( fetc );
148 }
149 catch( UnsupportedFlavorException& )
150 {
151 throw; // pass through, tried all possibilities
152 }

--- 215 unchanged lines hidden (view full) ---

368 DeleteObject(stgmedium.hBitmap);
369 }
370 }
371 else
372 {
373 clipDataToByteStream( aFormatEtc.getClipformat( ), stgmedium, byteStream );
374
375 // format conversion if necessary
147 try
148 {
149 clipDataStream = getClipboardData( fetc );
150 }
151 catch( UnsupportedFlavorException& )
152 {
153 throw; // pass through, tried all possibilities
154 }

--- 215 unchanged lines hidden (view full) ---

370 DeleteObject(stgmedium.hBitmap);
371 }
372 }
373 else
374 {
375 clipDataToByteStream( aFormatEtc.getClipformat( ), stgmedium, byteStream );
376
377 // format conversion if necessary
378 // #124085# DIBV5 should not happen currently, but keep as a hint here
376 if(CF_DIBV5 == aFormatEtc.getClipformat() || CF_DIB == aFormatEtc.getClipformat())
377 {
378 byteStream = WinDIBToOOBMP(byteStream);
379 }
380 else if(CF_METAFILEPICT == aFormatEtc.getClipformat())
381 {
382 byteStream = WinMFPictToOOMFPict(byteStream);
383 }

--- 246 unchanged lines hidden --- 		379 if(CF_DIBV5 == aFormatEtc.getClipformat() || CF_DIB == aFormatEtc.getClipformat())
380 {
381 byteStream = WinDIBToOOBMP(byteStream);
382 }
383 else if(CF_METAFILEPICT == aFormatEtc.getClipformat())
384 {
385 byteStream = WinMFPictToOOMFPict(byteStream);
386 }

--- 246 unchanged lines hidden ---