svtools/inc/svtools/transfer.hxx | 7 +++++++ 1 file changed, 7 insertions(+)
New commits: commit 7da28b1cc0953e8d67248235f0eeac2abf140fe3 Author: Michael Stahl <[email protected]> Date: Mon Feb 25 13:11:04 2013 +0100 fdo#59405: initialize members of TransferableObjectDescriptor The mnViewAspect member is otherwise only initialized if a SOT_FORMATSTR_ID_OBJECTDESCRIPTOR thingy is in the clipboard, which only happens if the clipboard source is OOo/LO. When inserting an OLE object, the value MSOLE_CONTENT apparently results in requesting the current size from the OLE object, which looks much better than the square default. Change-Id: I8c7fb80a8ae88272f1ecaf3a375bef5d917f2a5b (cherry picked from commit 0cf6433117477642897fb2d874a4353eff8a1f35) Reviewed-on: https://gerrit.libreoffice.org/2393 Reviewed-by: Fridrich Strba <[email protected]> Tested-by: Fridrich Strba <[email protected]> (cherry picked from commit a724fb43d8540687e33d75c90660250e5308585d) Reviewed-on: https://gerrit.libreoffice.org/2397 Reviewed-by: Michael Meeks <[email protected]> Reviewed-by: Petr Mladek <[email protected]> Tested-by: Petr Mladek <[email protected]> diff --git a/svtools/inc/svtools/transfer.hxx b/svtools/inc/svtools/transfer.hxx index 25c0d52..93dab75 100644 --- a/svtools/inc/svtools/transfer.hxx +++ b/svtools/inc/svtools/transfer.hxx @@ -37,6 +37,7 @@ #include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp> #include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp> #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp> +#include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/io/XInputStream.hpp> // ------------------------ @@ -82,6 +83,12 @@ struct TransferableObjectDescriptor String maDisplayName; sal_Bool mbCanLink; + TransferableObjectDescriptor() + : mnViewAspect(::com::sun::star::embed::Aspects::MSOLE_CONTENT) + , mnOle2Misc(0) + , mbCanLink(false) + {} + SVT_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, TransferableObjectDescriptor& rObjDesc ); SVT_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const TransferableObjectDescriptor& rObjDesc ); }; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
