diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2009-01-29 10:50:15 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2009-01-29 10:50:15 +0000 |
| commit | 9562c0ab1ec170443eb7e946b7e98937a39af668 (patch) | |
| tree | a09405ba7c8768c0c7910d101c9bc699db70e42f /sd | |
| parent | 3824483c6eb95bf337c987f41d35b227a8b7c119 (diff) | |
CWS-TOOLING: integrate CWS metropatch01_DEV300
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/app/sdxfer.cxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview3.cxx | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index a6f4e5192af6..54a0ba111927 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -729,6 +729,7 @@ void SdTransferable::SetObjectDescriptor( const TransferableObjectDescriptor& rO { delete mpObjDesc; mpObjDesc = new TransferableObjectDescriptor( rObjDesc ); + PrepareOLE( rObjDesc ); } // ----------------------------------------------------------------------------- diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 89dd2bbf018e..baf2549acae9 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -896,12 +896,18 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, // try to get the replacement image from the clipboard Graphic aGraphic; ULONG nGrFormat = 0; + +// (wg. Selection Manager bei Trustet Solaris) +#ifndef SOLARIS +/* if( aDataHelper.GetGraphic( SOT_FORMATSTR_ID_SVXB, aGraphic ) ) nGrFormat = SOT_FORMATSTR_ID_SVXB; else if( aDataHelper.GetGraphic( FORMAT_GDIMETAFILE, aGraphic ) ) nGrFormat = SOT_FORMAT_GDIMETAFILE; else if( aDataHelper.GetGraphic( FORMAT_BITMAP, aGraphic ) ) nGrFormat = SOT_FORMAT_BITMAP; +*/ +#endif // insert replacement image ( if there is one ) into the object helper if ( nGrFormat ) @@ -1040,12 +1046,16 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, // try to get the replacement image from the clipboard Graphic aGraphic; ULONG nGrFormat = 0; + +// (wg. Selection Manager bei Trustet Solaris) +#ifndef SOLARIS if( aDataHelper.GetGraphic( SOT_FORMATSTR_ID_SVXB, aGraphic ) ) nGrFormat = SOT_FORMATSTR_ID_SVXB; else if( aDataHelper.GetGraphic( FORMAT_GDIMETAFILE, aGraphic ) ) nGrFormat = SOT_FORMAT_GDIMETAFILE; else if( aDataHelper.GetGraphic( FORMAT_BITMAP, aGraphic ) ) nGrFormat = SOT_FORMAT_BITMAP; +#endif // insert replacement image ( if there is one ) into the object helper if ( nGrFormat ) |