diff options
| author | Armin Le Grand <alg@apache.org> | 2014-02-07 01:26:23 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-07 12:24:46 +0000 |
| commit | 5c75cd95178e3d57e53fee64a9d64023c6d18acf (patch) | |
| tree | 0b8608bbb949b1f07e62c82a188ba5d96da861e3 /sc/source/ui/inc/viewfunc.hxx | |
| parent | 96ca3d2f563d1f057b251c49541827223e6712d0 (diff) | |
Resolves: #i123922# Refactored D&D and insert picture from file...
in all apps for all object types to work the same
(cherry picked from commit 080a23dfb836bac49d9496fa1460b9dda9138f65)
Conflicts:
sc/source/ui/drawfunc/fuins1.cxx
sc/source/ui/inc/drawview.hxx
sc/source/ui/inc/viewfunc.hxx
sc/source/ui/view/drawview.cxx
sc/source/ui/view/viewfun3.cxx
sc/source/ui/view/viewfun7.cxx
sd/source/ui/func/fuinsert.cxx
sd/source/ui/view/sdview4.cxx
sw/source/core/frmedt/fecopy.cxx
sw/source/ui/dochdl/swdtflvr.cxx
sw/source/ui/inc/view.hxx
sw/source/ui/inc/wrtsh.hxx
sw/source/ui/shells/drawsh.cxx
sw/source/ui/uiview/view2.cxx
sw/source/ui/wrtsh/wrtsh1.cxx
Change-Id: I7f77d8c0812278ad434fe1c503a03d9747ea0b00
Diffstat (limited to 'sc/source/ui/inc/viewfunc.hxx')
| -rw-r--r-- | sc/source/ui/inc/viewfunc.hxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index 4736964b82b7..daad48ecea63 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -118,9 +118,9 @@ public: void PasteDraw( const Point& rLogicPos, SdrModel* pModel, sal_Bool bGroup = false, sal_Bool bSameDocClipboard = false ); - sal_Bool PasteOnDrawObject( const ::com::sun::star::uno::Reference< - ::com::sun::star::datatransfer::XTransferable >& rxTransferable, - SdrObject* pHitObj, sal_Bool bLink ); + sal_Bool PasteOnDrawObjectLinked( + const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, + SdrObject& rHitObj); sal_Bool PasteDataFormat( sal_uLong nFormatId, const ::com::sun::star::uno::Reference< @@ -141,8 +141,6 @@ public: bool PasteLink( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable ); - sal_Bool ApplyGraphicToObject( SdrObject* pObject, const Graphic& rGraphic ); - void InsertBookmark( const OUString& rDescription, const OUString& rURL, SCCOL nPosX, SCROW nPosY, const OUString* pTarget = NULL, sal_Bool bTryReplace = false ); |