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 /sw/inc | |
| 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 'sw/inc')
| -rw-r--r-- | sw/inc/fesh.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 6ca2008f6b3d..7fd2dfd7274a 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -512,7 +512,7 @@ public: sal_Bool GetDrawObjGraphic( sal_uLong nFmt, Graphic& rGrf ) const; void Paste( SvStream& rStm, sal_uInt16 nAction, const Point* pPt = 0 ); - sal_Bool Paste( const Graphic &rGrf ); + bool Paste( const Graphic &rGrf, const OUString& rURL ); sal_Bool Paste( SotDataObject& rObj, const Point& rPt ); sal_Bool IsAlignPossible() const; |