diff options
author | Oliver-Rainer Wittmann <od@openoffice.org> | 2011-03-25 12:18:37 +0100 |
---|---|---|
committer | Oliver-Rainer Wittmann <od@openoffice.org> | 2011-03-25 12:18:37 +0100 |
commit | 443675c34ff1ea349a6c68601b7f3bd27529f614 (patch) | |
tree | 5619408a27d4bfd5b884d6a1940f2c74d34ff261 | |
parent | 56d73a5c200d9ec16b08e3ff0aa053cd217ac7b3 (diff) |
os151: #i98753# - method <SwTransferable::PrepareForCopy(..)> - set size of embedded object at the object description structure
-rwxr-xr-x[-rw-r--r--] | sw/source/ui/dochdl/swdtflvr.cxx | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index a37317160dfa..c12b4a9e7878 100644..100755 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -154,24 +154,6 @@ using namespace nsTransferBufferType; #define DDE_TXT_ENCODING gsl_getSystemTextEncoding() -//--------------------------------------------- -// this struct conforms to the Microsoft -// OBJECTDESCRIPTOR -> see oleidl.h -// (MS platform sdk) -//--------------------------------------------- - -struct OleObjectDescriptor -{ - sal_uInt32 cbSize; - ClsId clsid; - sal_uInt32 dwDrawAspect; - Size sizel; - Point pointl; - sal_uInt32 dwStatus; - sal_uInt32 dwFullUserTypeName; - sal_uInt32 dwSrcOfCopy; -}; - class SwTrnsfrDdeLink : public ::sfx2::SvBaseLink { String sName; @@ -831,6 +813,10 @@ int SwTransferable::PrepareForCopy( sal_Bool bIsCut ) AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE ); + // --> OD #i98753# + // set size of embedded object at the object description structure + aObjDesc.maSize = OutputDevice::LogicToLogic( pWrtShell->GetObjSize(), MAP_TWIP, MAP_100TH_MM ); + // <-- PrepareOLE( aObjDesc ); AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR ); |