sdxfer.cxx (45fd3b9a) | sdxfer.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 --- 426 unchanged lines hidden (view full) --- 435 { 436 // #i25616# 437 AddFormat( SOT_FORMATSTR_ID_DRAWING ); 438 439 AddFormat( SOT_FORMATSTR_ID_SVXB ); 440 441 if( mpGraphic->GetType() == GRAPHIC_BITMAP ) 442 { | 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 --- 426 unchanged lines hidden (view full) --- 435 { 436 // #i25616# 437 AddFormat( SOT_FORMATSTR_ID_DRAWING ); 438 439 AddFormat( SOT_FORMATSTR_ID_SVXB ); 440 441 if( mpGraphic->GetType() == GRAPHIC_BITMAP ) 442 { |
443 AddFormat( SOT_FORMATSTR_ID_PNG ); |
|
443 AddFormat( SOT_FORMAT_BITMAP ); 444 AddFormat( SOT_FORMAT_GDIMETAFILE ); 445 } 446 else 447 { 448 AddFormat( SOT_FORMAT_GDIMETAFILE ); | 444 AddFormat( SOT_FORMAT_BITMAP ); 445 AddFormat( SOT_FORMAT_GDIMETAFILE ); 446 } 447 else 448 { 449 AddFormat( SOT_FORMAT_GDIMETAFILE ); |
450 AddFormat( SOT_FORMATSTR_ID_PNG ); |
|
449 AddFormat( SOT_FORMAT_BITMAP ); 450 } 451 } 452 else if( mpBookmark ) 453 { 454 AddFormat( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK ); 455 AddFormat( FORMAT_STRING ); 456 } 457 else 458 { 459 AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE ); 460 AddFormat( SOT_FORMATSTR_ID_DRAWING ); 461 if( !mpSdDrawDocument || !lcl_HasOnlyControls( mpSdDrawDocument ) ) 462 { 463 AddFormat( SOT_FORMAT_GDIMETAFILE ); | 451 AddFormat( SOT_FORMAT_BITMAP ); 452 } 453 } 454 else if( mpBookmark ) 455 { 456 AddFormat( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK ); 457 AddFormat( FORMAT_STRING ); 458 } 459 else 460 { 461 AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE ); 462 AddFormat( SOT_FORMATSTR_ID_DRAWING ); 463 if( !mpSdDrawDocument || !lcl_HasOnlyControls( mpSdDrawDocument ) ) 464 { 465 AddFormat( SOT_FORMAT_GDIMETAFILE ); |
466 AddFormat( SOT_FORMATSTR_ID_PNG ); |
|
464 AddFormat( SOT_FORMAT_BITMAP ); 465 } 466 467 if( lcl_HasOnlyOneTable( mpSdDrawDocument ) ) 468 AddFormat( SOT_FORMAT_RTF ); 469 } 470 471 if( mpImageMap ) --- 455 unchanged lines hidden --- | 467 AddFormat( SOT_FORMAT_BITMAP ); 468 } 469 470 if( lcl_HasOnlyOneTable( mpSdDrawDocument ) ) 471 AddFormat( SOT_FORMAT_RTF ); 472 } 473 474 if( mpImageMap ) --- 455 unchanged lines hidden --- |