drwtrans.cxx (45fd3b9a) | drwtrans.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 --- 304 unchanged lines hidden (view full) --- 313} 314 315void ScDrawTransferObj::AddSupportedFormats() 316{ 317 if ( bGrIsBit ) // single bitmap graphic 318 { 319 AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR ); 320 AddFormat( SOT_FORMATSTR_ID_SVXB ); | 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 --- 304 unchanged lines hidden (view full) --- 313} 314 315void ScDrawTransferObj::AddSupportedFormats() 316{ 317 if ( bGrIsBit ) // single bitmap graphic 318 { 319 AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR ); 320 AddFormat( SOT_FORMATSTR_ID_SVXB ); |
321 AddFormat( SOT_FORMATSTR_ID_PNG ); |
|
321 AddFormat( SOT_FORMAT_BITMAP ); 322 AddFormat( SOT_FORMAT_GDIMETAFILE ); 323 } 324 else if ( bGraphic ) // other graphic 325 { 326 // #i25616# 327 AddFormat( SOT_FORMATSTR_ID_DRAWING ); 328 329 AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR ); 330 AddFormat( SOT_FORMATSTR_ID_SVXB ); 331 AddFormat( SOT_FORMAT_GDIMETAFILE ); | 322 AddFormat( SOT_FORMAT_BITMAP ); 323 AddFormat( SOT_FORMAT_GDIMETAFILE ); 324 } 325 else if ( bGraphic ) // other graphic 326 { 327 // #i25616# 328 AddFormat( SOT_FORMATSTR_ID_DRAWING ); 329 330 AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR ); 331 AddFormat( SOT_FORMATSTR_ID_SVXB ); 332 AddFormat( SOT_FORMAT_GDIMETAFILE ); |
333 AddFormat( SOT_FORMATSTR_ID_PNG ); |
|
332 AddFormat( SOT_FORMAT_BITMAP ); 333 } 334 else if ( pBookmark ) // url button 335 { 336// AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE ); 337 AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR ); 338 AddFormat( SOT_FORMATSTR_ID_SOLK ); 339 AddFormat( SOT_FORMAT_STRING ); --- 29 unchanged lines hidden (view full) --- 369 { 370 AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE ); 371 AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR ); 372 AddFormat( SOT_FORMATSTR_ID_DRAWING ); 373 374 // #103556# leave out bitmap and metafile if there are only controls 375 if ( !lcl_HasOnlyControls( pModel ) ) 376 { | 334 AddFormat( SOT_FORMAT_BITMAP ); 335 } 336 else if ( pBookmark ) // url button 337 { 338// AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE ); 339 AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR ); 340 AddFormat( SOT_FORMATSTR_ID_SOLK ); 341 AddFormat( SOT_FORMAT_STRING ); --- 29 unchanged lines hidden (view full) --- 371 { 372 AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE ); 373 AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR ); 374 AddFormat( SOT_FORMATSTR_ID_DRAWING ); 375 376 // #103556# leave out bitmap and metafile if there are only controls 377 if ( !lcl_HasOnlyControls( pModel ) ) 378 { |
379 AddFormat( SOT_FORMATSTR_ID_PNG ); |
|
377 AddFormat( SOT_FORMAT_BITMAP ); 378 AddFormat( SOT_FORMAT_GDIMETAFILE ); 379 } 380 } 381 382// if( pImageMap ) 383// AddFormat( SOT_FORMATSTR_ID_SVIM ); 384} --- 36 unchanged lines hidden (view full) --- 421 if ( nFormat == SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR || nFormat == SOT_FORMATSTR_ID_OBJECTDESCRIPTOR ) 422 { 423 bOK = SetTransferableObjectDescriptor( aObjDesc, rFlavor ); 424 } 425 else if ( nFormat == SOT_FORMATSTR_ID_DRAWING ) 426 { 427 bOK = SetObject( pModel, SCDRAWTRANS_TYPE_DRAWMODEL, rFlavor ); 428 } | 380 AddFormat( SOT_FORMAT_BITMAP ); 381 AddFormat( SOT_FORMAT_GDIMETAFILE ); 382 } 383 } 384 385// if( pImageMap ) 386// AddFormat( SOT_FORMATSTR_ID_SVIM ); 387} --- 36 unchanged lines hidden (view full) --- 424 if ( nFormat == SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR || nFormat == SOT_FORMATSTR_ID_OBJECTDESCRIPTOR ) 425 { 426 bOK = SetTransferableObjectDescriptor( aObjDesc, rFlavor ); 427 } 428 else if ( nFormat == SOT_FORMATSTR_ID_DRAWING ) 429 { 430 bOK = SetObject( pModel, SCDRAWTRANS_TYPE_DRAWMODEL, rFlavor ); 431 } |
429 else if ( nFormat == SOT_FORMAT_BITMAP || nFormat == SOT_FORMAT_GDIMETAFILE ) | 432 else if ( nFormat == SOT_FORMAT_BITMAP 433 || nFormat == SOT_FORMATSTR_ID_PNG 434 || nFormat == SOT_FORMAT_GDIMETAFILE ) |
430 { 431 // #i71538# use complete SdrViews 432 // SdrExchangeView aView( pModel ); 433 SdrView aView( pModel ); 434 SdrPageView* pPv = aView.ShowSdrPage(aView.GetModel()->GetPage(0)); 435 DBG_ASSERT( pPv, "pPv not there..." ); 436 aView.MarkAllObj( pPv ); 437 if ( nFormat == SOT_FORMAT_GDIMETAFILE ) --- 373 unchanged lines hidden --- | 435 { 436 // #i71538# use complete SdrViews 437 // SdrExchangeView aView( pModel ); 438 SdrView aView( pModel ); 439 SdrPageView* pPv = aView.ShowSdrPage(aView.GetModel()->GetPage(0)); 440 DBG_ASSERT( pPv, "pPv not there..." ); 441 aView.MarkAllObj( pPv ); 442 if ( nFormat == SOT_FORMAT_GDIMETAFILE ) --- 373 unchanged lines hidden --- |